diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 7e2fc2319..9dfc2153a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -12,6 +12,9 @@
  - fixed: anonymous registration leaves user at blank page
  - fixed: Thingy: field type 'other thing' does not stay selected
  - fixed: Thingy: delete a thing dysfunctions linked things
+ - fixed: i18n discrepencies in Gallery / GalleryAlbum / Photo
+ - fixed: After saving Photo, Add an Image points to wrong link
+ - fixed: "Back to Album" link doesn't work
 
 7.5.9
  - fixed: Collaboration System attachments follow site's max size instead of CS's
diff --git a/docs/upgrades/packages-7.5.10/root_import_gallery-templates.wgpkg b/docs/upgrades/packages-7.5.10/root_import_gallery-templates.wgpkg
new file mode 100644
index 000000000..3e5d446a5
Binary files /dev/null and b/docs/upgrades/packages-7.5.10/root_import_gallery-templates.wgpkg differ
diff --git a/lib/WebGUI/Asset/File/GalleryFile/Photo.pm b/lib/WebGUI/Asset/File/GalleryFile/Photo.pm
index ec7021151..65cc7655a 100644
--- a/lib/WebGUI/Asset/File/GalleryFile/Photo.pm
+++ b/lib/WebGUI/Asset/File/GalleryFile/Photo.pm
@@ -453,6 +453,7 @@ sub www_edit {
     #my $var     = $self->getTemplateVars; 
     my $var     = {
         url_addArchive      => $self->getParent->getUrl('func=addArchive'),
+        url_album           => $self->getParent->getUrl('func=album'),
     };
 
     if ( $form->get('func') eq "add" ) {
@@ -552,7 +553,7 @@ sub www_showConfirmation {
     return $self->processStyle(
         sprintf( $i18n->get('save message'), 
             $self->getUrl, 
-            $self->getParent->getUrl('func=add;className='.__PACKAGE__),
+            $self->getParent->getUrl('func=add;class='.__PACKAGE__),
         )
     );
 }
diff --git a/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm b/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm
index 228dc378a..35543311c 100644
--- a/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm
+++ b/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm
@@ -384,7 +384,7 @@ our $I18N = {
     },
 
     'editForm description label' => {
-        message     => 'Description',
+        message     => 'Album Description',
         lastUpdated => 0,
         context     => 'Label for the "Description" property of the Album asset',
     },
@@ -443,7 +443,7 @@ our $I18N = {
     },
 
     'template delete message' => {
-        message     => q{Are you sure you wish to delete this gallery?},
+        message     => q{Are you sure you wish to delete this album?},
         lastUpdated => 0,
         context     => q{The message for the delete page},
     },
diff --git a/lib/WebGUI/i18n/English/Asset_Photo.pm b/lib/WebGUI/i18n/English/Asset_Photo.pm
index db2440a1f..427e12186 100644
--- a/lib/WebGUI/i18n/English/Asset_Photo.pm
+++ b/lib/WebGUI/i18n/English/Asset_Photo.pm
@@ -422,7 +422,7 @@ our $I18N = {
     },
 
     'editForm synopsis label' => {
-        message     => 'Description',
+        message     => 'Photo Caption',
         lastUpdated => 0,
         context     => 'Label for "synopsis" property',
     },
@@ -554,7 +554,7 @@ our $I18N = {
     },
 
     'template delete message' => {
-        message     => q{Are you sure you wish to delete this gallery?},
+        message     => q{Are you sure you wish to delete this?},
         lastUpdated => 0,
         context     => q{The message for the delete page},
     },