diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 36eed38bbe..7275f4daf6 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -217,16 +217,19 @@ void LLFloaterSnapshotBase::ImplBase::updateLayout(LLFloaterSnapshotBase* floate
     if (!mSkipReshaping && !floaterp->isMinimized())
     {
         LLView* controls_container = floaterp->getChild<LLView>("controls_container");
+        constexpr S32 THUMB_HEIGHT_LARGE = 420;
+        constexpr S32 THUMB_HEIGHT_SMALL = 124;
+        constexpr S32 THUMB_WIDTH_SMALL = 216;
         if (mAdvanced)
         {
             LLRect cc_rect = controls_container->getRect();
 
-            floaterp->reshape(floater_width, 483);
+            floaterp->reshape(floater_width, floaterp->getOriginalHeight());
 
             controls_container->setRect(cc_rect);
             controls_container->updateBoundingRect();
 
-            thumbnail_placeholder->reshape(panel_width, 420);
+            thumbnail_placeholder->reshape(panel_width, THUMB_HEIGHT_LARGE);
 
             LLRect tn_rect = thumbnail_placeholder->getRect();
             tn_rect.setLeftTopAndSize(215, floaterp->getRect().getHeight() - 30, tn_rect.getWidth(), tn_rect.getHeight());
@@ -240,15 +243,15 @@ void LLFloaterSnapshotBase::ImplBase::updateLayout(LLFloaterSnapshotBase* floate
         {
             LLRect cc_rect = controls_container->getRect();
 
-            floaterp->reshape(floater_width, 613);
+            floaterp->reshape(floater_width,floaterp->getOriginalHeight()+THUMB_HEIGHT_SMALL);
 
             controls_container->setRect(cc_rect);
             controls_container->updateBoundingRect();
 
-            thumbnail_placeholder->reshape(216, 124);
+            thumbnail_placeholder->reshape(THUMB_WIDTH_SMALL, THUMB_HEIGHT_SMALL);
 
             LLRect tn_rect = thumbnail_placeholder->getRect();
-            tn_rect.setLeftTopAndSize(5, floaterp->getRect().getHeight() - 30, 216, 124);
+            tn_rect.setLeftTopAndSize(5, floaterp->getRect().getHeight() - 30, THUMB_WIDTH_SMALL, THUMB_HEIGHT_SMALL);
             thumbnail_placeholder->setRect(tn_rect);
             thumbnail_placeholder->updateBoundingRect();
 
@@ -1207,7 +1210,7 @@ bool LLFloaterSnapshot::postBuild()
     //getChild<LLComboBox>("local_size_combo")->selectNthItem(8);
     //getChild<LLComboBox>("local_format_combo")->selectNthItem(0);
     // </FS:Ansariel>
-
+    mOriginalHeight = getRect().getHeight();
     impl->mPreviewHandle = previewp->getHandle();
     previewp->setContainer(this);
     impl->updateControls(this);
diff --git a/indra/newview/llfloatersnapshot.h b/indra/newview/llfloatersnapshot.h
index 1fc101848c..e6c4025bb3 100644
--- a/indra/newview/llfloatersnapshot.h
+++ b/indra/newview/llfloatersnapshot.h
@@ -67,8 +67,9 @@ public:
     class ImplBase;
     friend class ImplBase;
     ImplBase* impl;
-
+    S32 getOriginalHeight() const { return mOriginalHeight; }
 protected:
+    S32       mOriginalHeight;
     LLUICtrl* mThumbnailPlaceholder;
     LLUICtrl *mRefreshBtn, *mRefreshLabel;
     LLUICtrl *mSucceessLblPanel, *mFailureLblPanel;
diff --git a/indra/newview/skins/default/xui/en/floater_flickr.xml b/indra/newview/skins/default/xui/en/floater_flickr.xml
index 89b0045e53..1ab9c515b0 100644
--- a/indra/newview/skins/default/xui/en/floater_flickr.xml
+++ b/indra/newview/skins/default/xui/en/floater_flickr.xml
@@ -27,7 +27,7 @@
      tab_height="21"
      tab_position="top"
      top="7"
-     height="565"
+     height="570"
      follows="all"
      halign="center">
      <panel
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 55ba1a8c26..9e5d2c7c5d 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -5,7 +5,7 @@
  can_minimize="true"
  can_resize="false"
  can_close="true"
- height="480"
+ height="510"
  layout="topleft"
  name="Snapshot"
  single_instance="true"
@@ -91,7 +91,7 @@
      left="10"
 	 label="Refresh"
      name="new_snapshot_btn"
-     top_pad="0"
+     top_pad="10"
      width="167" />
 	<button
        follows="left|top"