diff --git a/scripts/system/html/js/SnapshotReview.js b/scripts/system/html/js/SnapshotReview.js
index 4e2e0223a0..f140c54e09 100644
--- a/scripts/system/html/js/SnapshotReview.js
+++ b/scripts/system/html/js/SnapshotReview.js
@@ -84,12 +84,14 @@ window.onload = function () {
             if (messageOptions.containsGif) {
                 if (messageOptions.processingGif) {
                     imageCount = message.action.length + 1; // "+1" for the GIF that'll finish processing soon
-                    message.action.unshift({ localPath: '../../../resources/icons/loadingDark.gif' });
+                    message.action.unshift({ localPath: messageOptions.loadingGifPath });
                     message.action.forEach(addImage);
                     document.getElementById('p0').disabled = true;
                 } else {
+                    var gifPath = message.action[0].localPath;
                     document.getElementById('p0').disabled = false;
-                    document.getElementById('p0img').src = message.action[0].localPath;
+                    document.getElementById('p0img').src = gifPath;
+                    paths[0].localPath = gifPath;
                 }
             } else {
                 imageCount = message.action.length;
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index ee441278aa..6039bc09c1 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -90,12 +90,12 @@ function onMessage(message) {
                     needsLogin = true;
                     submessage.share = false;
                     shareAfterLogin = true;
-                    snapshotToShareAfterLogin = {path: submessage.localPath, href: submessage.href};
+                    snapshotToShareAfterLogin = {path: submessage.localPath, href: submessage.href || href};
                 }
                 if (submessage.share) {
                     print('sharing', submessage.localPath);
                     outstanding = true;
-                    Window.shareSnapshot(submessage.localPath, submessage.href);
+                    Window.shareSnapshot(submessage.localPath, submessage.href || href);
                 } else {
                     print('not sharing', submessage.localPath);
                 }
@@ -239,6 +239,7 @@ function processingGifStarted(pathStillSnapshot) {
         {
             containsGif: true,
             processingGif: true,
+            loadingGifPath: Script.resolvePath(Script.resourcesPath() + 'icons/loadingDark.gif'),
             canShare: !!isDomainOpen(domainId),
             openFeedAfterShare: shouldOpenFeedAfterShare()
         }];