diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index d4830adbf..50f7044cb 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -295,7 +295,6 @@ public:
 		mAvatarPauseHandles.clear();
 		mQualityMouseUpConnection.disconnect();
 	}
-	static void onClickDiscard(void* data);
 	static void onClickKeep(void* data);
 	static void onCommitSave(LLUICtrl* ctrl, void* data);
 	static void onClickNewSnapshot(void* data);
@@ -1852,7 +1851,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater, bool de
 	floater->childSetVisible("keep_aspect",				is_advance);
 	floater->childSetVisible("type_label3",				is_advance);
 	floater->childSetVisible("format_label",			is_advance && is_local);
-	floater->childSetVisible("local_format_combo",		is_advance && is_local);
+	floater->childSetVisible("local_format_combo",		is_local);
 	floater->childSetVisible("layer_types",				is_advance);
 	floater->childSetVisible("layer_type_label",		is_advance);
 	floater->childSetVisible("aspect_one_label",		is_advance);
@@ -1864,7 +1863,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater, bool de
 	floater->childSetVisible("keep_open_check",			is_advance);
 	floater->childSetVisible("freeze_time_check",		is_advance);
 	floater->childSetVisible("auto_snapshot_check",		is_advance);
-	floater->childSetVisible("image_quality_slider",	is_advance && show_slider);
+	floater->childSetVisible("image_quality_slider",	show_slider);
 	floater->childSetVisible("temp_check",				is_advance);
 
 	BOOL got_bytes = previewp && previewp->getDataSize() > 0;
@@ -1932,23 +1931,6 @@ void LLFloaterSnapshot::Impl::checkAutoSnapshot(LLSnapshotLivePreview* previewp,
 	}
 }
 
-// static
-void LLFloaterSnapshot::Impl::onClickDiscard(void* data)
-{
-	LLFloaterSnapshot* view = static_cast<LLFloaterSnapshot*>(data);
-	if (gSavedSettings.getBOOL("FreezeTime"))
-	{
-		LLSnapshotLivePreview* previewp = view->impl.getPreviewView();
-		if (previewp && previewp->getShowFreezeFrameSnapshot())
-			previewp->showFreezeFrameSnapshot(false);
-		view->impl.freezeTime(false);
-	}
-	else
-	{
-		view->close();
-	}
-}
-
 // static
 void LLFloaterSnapshot::Impl::onCommitFeedResolution(LLUICtrl* ctrl, void* data)
 {
@@ -2942,7 +2924,6 @@ BOOL LLFloaterSnapshot::postBuild()
 	childSetAction("send_btn", Impl::onClickKeep, this);
 	childSetAction("feed_btn", Impl::onClickKeep, this);
 	childSetCommitCallback("save_btn", Impl::onCommitSave, this);
-	childSetAction("discard_btn", Impl::onClickDiscard, this);
 
 	childSetCommitCallback("image_quality_slider", Impl::onCommitQuality, this);
 	childSetValue("image_quality_slider", gSavedSettings.getS32("SnapshotQuality"));
diff --git a/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index f8ecc510a..cb9d8cfda 100644
--- a/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -1,72 +1,91 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" follows="left|top" height="629" name="Snapshot"
+     can_resize="false" follows="left|top" height="629" name="Snapshot" 
      rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="219">
-	<text bottom="-210" right="-10" follows="left|top" height="25" name="file_size_label" halign="right" width="150">
+	<text bottom="-201" right="-6" height="25" name="file_size_label" halign="right" width="120">
 		File size: [SIZE] KB
 	</text>
-	<text bottom_delta="10" follows="top|left" height="15" left="10" name="type_label">
+	<text bottom="-195" height="15" left="10" name="type_label" halign="left">
 		Target
 	</text>
-	<radio_group bottom_delta="-82" follows="left|top" height="79" label="Snapshot type"
+	<radio_group bottom_delta="-79" follows="left|top" height="79" label="Snapshot type"
 	     left="10" name="snapshot_type_radio" width="200">
 		<radio_item bottom="-19" height="16" name="feed">
-			Post to profile feed
+			Post to my.secondlife.com feed
 		</radio_item>
 		<radio_item bottom="-38" height="16" name="postcard">
 			Send via email
 		</radio_item>
 		<radio_item bottom="-57" height="16" name="texture">
-			Save to inventory ([UPLOADFEE])
+			Save to my inventory ([UPLOADFEE])
 		</radio_item>
 		<radio_item bottom="-76" height="16" name="local">
-			Save to hard drive
+			Save to my hard drive
 		</radio_item>
 	</radio_group>
-	<button bottom="-309" follows="left|top" height="20" label="Refresh" left="10"
-	  name="new_snapshot_btn" width="105"/>
-	<button bottom_delta="0" follows="left|top" height="20" label="Freeze" left="120"
-	     name="freeze_time_btn" width="90" tool_tip="Show a fullscreen preview. Allows camming around as if time is frozen to make multiple snapshots of the same scene. Press ESC to undo!" />
+	<button bottom_delta="-28" follows="left|top" height="20" label="Refresh snapshot" left="10"
+	  name="new_snapshot_btn" width="115" tool_tip="Make a snapshot of the current view. Use the save and/or upload button to actually save it. The latest snapshot is shown in the thumbnail. In Freeze Time mode a preview of the new snapshot is also shown full screen (note that this has NOT the same quality as the real thing that will be saved: it is downscaled from the actual formatted image to a power of two with a max. resolution of 1024x1024, in order to be displayed in openGL and then probably stretched again to fill your screen). Press ESC to go back to Freeze Time." />
+	<button bottom_delta="0" follows="left|top" height="20" label="Freeze time" left="129"
+	     name="freeze_time_btn" width="80" tool_tip="Freeze time and show a fullscreen preview. Allows to cam around as if time is frozen and make multiple snapshots of the same scene. Press ESC to undo!" />
 	<button bottom_delta="-22" follows="left|top" height="20" label="Upload" left="10"
 	     name="feed_btn" width="105" />
 	<button bottom_delta="0" follows="left|top" height="20" label="Send" left="10"
 	     name="send_btn" width="105" />
 	<button bottom_delta="0" follows="left|top" height="20" label="Upload ([UPLOADFEE])" left="10"
 	     name="upload_btn" width="105" />
-	<flyout_button bottom_delta="0" follows="left|top" height="20" label="Save" left="10"
+	<flyout_button bottom_delta="-2" follows="left|top" height="20" label="Save" left="10"
        list_position="below" mouse_opaque="true" name="save_btn" tool_tip="Save image to a file" width="105">
     <flyout_button_item value="save" name="save_item">Save</flyout_button_item>
     <flyout_button_item value="saveas" name="saveas_item">Save As...</flyout_button_item>
 	</flyout_button>
-	<button bottom_delta="0" follows="left|top" height="20" label="Cancel" left="120" name="discard_btn" width="90"/>
-	<button bottom="-353" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="20" label="More &gt;&gt;" left="10"
+	<combo_box bottom_delta="-4" follows="left|top" height="20" label="Format" left="139"
+	     name="local_format_combo" width="70">
+		<combo_item name="PNG">
+			PNG
+		</combo_item>
+		<combo_item name="JPEG">
+			JPEG
+		</combo_item>
+		<combo_item name="BMP">
+			BMP
+		</combo_item>
+	</combo_box>
+	<button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
+	     height="20" label="Advanced&gt;&gt;" left="10"
 	     mouse_opaque="true" name="more_btn" scale_image="TRUE"
-	     tool_tip="Advanced Options" width="80" />
+	     tool_tip="Advanced Options. Default uses current window size ((cropped to) 4:3 for profile feed)." width="72" />
 	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="20" label="&lt;&lt; Less" left_delta="0"
+	     height="20" label="&lt;&lt;Default" left_delta="0"
 	     mouse_opaque="true" name="less_btn" scale_image="TRUE"
-	     tool_tip="Advanced Options" width="80" />
+	     tool_tip="Advanced Options. Default uses current window size ((cropped to) 4:3 for profile feed)." width="72" />
+	<slider bottom_delta="0" decimal_digits="0" follows="left|top" height="15"
+	     increment="1" initial_val="75" left="80"
+	     max_val="100" min_val="0" name="image_quality_slider" width="150" />
 	<text bottom_delta="-20" follows="top|left" height="15" left="10" name="type_label2" width="115">
 	Target Resolution
 	</text>
-	<text bottom_delta="0" follows="top|left" height="15" left="130" name="format_label"
-	     width="70">
-	Format
-	</text>
 	<combo_box bottom_delta="-22" follows="left|top" height="20" label="Resolution" left="10"
-	     name="feed_size_combo" width="115">
+	     name="feed_size_combo" width="125">
 		<combo_item name="CurrentWindow" value="[i0,i0]">
 			Current Window
 		</combo_item>
-		<combo_item name="640x480" value="[i640,i480]">
-			640x480
+		<combo_item name="500x500" value="[i630,i-2]">
+			500x500 (1:1)
 		</combo_item>
-		<combo_item name="800x600" value="[i800,i600]">
-			800x600
+		<combo_item name="500x375" value="[i840,i-2]">
+			500x375 (4:3)
 		</combo_item>
-		<combo_item name="1024x768" value="[i1024,i768]">
-			1024x768
+		<combo_item name="500x350" value="[i900,i-2]">
+			500x350 (10:7)
+		</combo_item>
+		<combo_item name="500x313" value="[i1008,i-2]">
+			500x313 (16:10)
+		</combo_item>
+		<combo_item name="500x281" value="[i1120,i-2]">
+			500x281 (16:9)
+		</combo_item>
+		<combo_item name="500x250" value="[i1260,i-2]">
+			500x250 (2:1)
 		</combo_item>
 		<combo_item name="Custom" value="[i-1,i-1]">
 			Custom
@@ -156,30 +175,18 @@
 			Custom
 		</combo_item>
 	</combo_box>
-	<combo_box bottom_delta="0" follows="left|top" height="20" label="Format" left="130"
-	     name="local_format_combo" width="80">
-		<combo_item name="PNG">
-			PNG
-		</combo_item>
-		<combo_item name="JPEG">
-			JPEG
-		</combo_item>
-		<combo_item name="BMP">
-			BMP
-		</combo_item>
-	</combo_box>
 	<spinner bottom_delta="-25" decimal_digits="0" follows="left|top" height="20"
-	     increment="32" label="Width" label_width="30" left="10" max_val="6016"
-	     min_val="32" name="snapshot_width" width="95"/>
+	     increment="32" label="Width" label_width="30" left="14" max_val="6016"
+	     min_val="32" name="snapshot_width" width="95" allow_text_entry="false"/>
 	<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
-	     increment="32" label="Height" label_width="38" left="112" max_val="6016"
-	     min_val="32" name="snapshot_height" width="98"/>
-	<slider bottom_delta="-15" decimal_digits="0" follows="left|top" height="15"
-	     increment="1" initial_val="75" label="Image Quality" left="10"
-	     max_val="100" min_val="0" name="image_quality_slider" width="210" />
-	<check_box bottom_delta="-19" follows="top|left" label="Keep aspect ratio"
-	     left="8" name="keep_aspect" tool_tip="Note: setting the resolution to non-Custom, or the Aspect to Default will reset this check box because they aren't compatible." />
-	<text bottom_delta="-15" follows="top|left" height="15" left="10" name="type_label3" width="200"/>
+	     increment="32" label="Height" label_width="35" left="114" max_val="6016"
+	     min_val="32" name="snapshot_height" width="95" allow_text_entry="false"/>
+	<check_box bottom_delta="-14" follows="top|left" label="Keep aspect ratio"
+	     left="10" name="keep_aspect" tool_tip="When changing the resolution keep its aspect ratio the same. This also enforces this aspect ratio to be equal to the target aspect (as if the Aspect was set to Default): changing the target aspect will change the aspect of the resolution. Note: setting the resolution to non-Custom, or the Aspect to Default will reset this check box because they are not compatible." />
+	<text bottom_delta="-20" follows="top|left" height="15" left="10" name="type_label3"
+	     width="200">
+		 place holder, see targetAR / sourceAR
+	</text>
 	<combo_box bottom_delta="-22" follows="left|top" height="20" label="Aspect" left="10"
 	     name="feed_aspect_combo" width="115">
 		<combo_item name="Default" value="-2">
@@ -261,16 +268,16 @@
 			Custom
 		</combo_item>
 	</combo_box>
-	<spinner bottom_delta="-4" decimal_digits="5" follows="left|top" height="20"
+	<spinner bottom_delta="0" decimal_digits="5" follows="left|top" height="20"
 	     increment="0.01" label="" left="130" max_val="32"
 	     min_val="0.03125" name="aspect_ratio" width="64" allow_text_entry="false"/>
     <text bottom_delta="-4" height="20" left="196" name="aspect_one_label">:1</text>
-	<text bottom_delta="-20" follows="left|top" height="20" left="10"
+	<text bottom_delta="-26" follows="left|top" height="20" left="15"
 	     name="layer_type_label" width="50">
 		Capture:
 	</text>
 	<combo_box bottom_delta="3" follows="left|top" height="20" label="Image Layers" left="61"
-	     name="layer_types" width="149">
+	     name="layer_types" width="145">
 		<combo_item name="Colors" value="colors">
 			Colors
 		</combo_item>
@@ -278,27 +285,27 @@
 			Depth
 		</combo_item>
 	</combo_box>
-	<check_box bottom_delta="-20" follows="left|top" label="Show interface in snapshot"
-	     left="10" name="ui_check" tool_tip="Locks resolution to current window size." />
-	<check_box bottom_delta="-17" follows="left|top" label="Show HUD objects in snapshot"
-	     left="10" name="hud_check" tool_tip="Locks resolution to current window size." />
-	<check_box bottom_delta="-17" follows="left|top" label="Keep open after saving" left="10"
-	     name="keep_open_check" />
-	<check_box bottom_delta="-17" follows="left|top" label="Open floater in Freeze Time mode"
-	     left="10" name="freeze_time_check" tool_tip="Allows to quickly open snapshot floater, then position camera and take multiple shots of frozen scene." />
-	<check_box bottom_delta="-17" follows="left|top" label="Auto-refresh" left="10"
+	<check_box bottom_delta="-18" follows="left|top" label="Show interface in snapshot"
+	     left="10" name="ui_check" tool_tip="Show the UI in the snapshot. This enforces the resolution of the snapshot to that of your current window." />
+	<check_box bottom_delta="-20" follows="left|top" label="Show HUD objects in snapshot"
+	     left="10" name="hud_check" tool_tip="Show your HUD objects in the snapshot. This enforces the resolution of the snapshot to that of your current window." />
+	<check_box bottom_delta="-20" follows="left|top" label="Keep open after saving" left="10"
+	     name="keep_open_check" tool_tip="Do not close the snapshot floater after saving or uploading. This allows you to save, upload or send the SAME snapshot again with different formats and/or to a different destination." />
+	<check_box bottom_delta="-20" follows="left|top" label="Open floater in Freeze Time mode"
+	     left="10" name="freeze_time_check" tool_tip="This allows one to quickly press cntrl-shift-S and then take your time to choose the camera position and even make multiple shots of the frozen scene." />
+	<check_box bottom_delta="-20" follows="left|top" label="Auto-refresh" left="10"
 	     name="auto_snapshot_check" tool_tip="Handy in conjunction with Freeze Time: creates a new fullscreen preview whenever you stop camming." />
-	<check_box bottom_delta="-17" follows="left|top" control_name="TemporaryUpload" enabled="true"
+	<check_box bottom_delta="-20" follows="left|top" control_name="TemporaryUpload" enabled="true"
              initial_value="false" label="Temporary Image (Free)" left="10"
-             name="temp_check" tool_tip="Sets the asset to be temporary, meaning it's free, but in return, only good for a short time before it ceases to exist. (May not work on SL grid)" />
+             name="temp_check" tool_tip="Uploads the texture to the sim instead of the asset server, meaning it's free but only visible in the current sim and deleted when you leave the sim." />
 	<string name="unknown">
 		unknown
 	</string>
 	<string name="targetAR">
-		Target aspect ratio
+		Target Aspect Ratio
 	</string>
 	<string name="sourceAR">
-		Resolution AND Target aspect ratio
+		Resolution- AND Target- Aspect Ratio
 	</string>
 </floater>
-
+