diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index 814624d7f8..82756b16d3 100644
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -463,6 +463,7 @@ BOOL LLFloaterUIPreview::postBuild()
 	main_panel_tmp->getChild<LLButton>("save_floater")->setClickedCallback(boost::bind(&LLFloaterUIPreview::onClickSaveFloater, this, PRIMARY_FLOATER));
 	main_panel_tmp->getChild<LLButton>("save_all_floaters")->setClickedCallback(boost::bind(&LLFloaterUIPreview::onClickSaveAll, this, PRIMARY_FLOATER));
 
+	getChild<LLButton>("refresh_btn")->setClickedCallback(boost::bind(&LLFloaterUIPreview::refreshList, this)); // <FS:CR> Manual refresh
 	getChild<LLButton>("export_schema")->setClickedCallback(boost::bind(&LLFloaterUIPreview::onClickExportSchema, this));
 	getChild<LLUICtrl>("show_rectangles")->setCommitCallback(
 		boost::bind(&LLFloaterUIPreview::onClickShowRectangles, this, _2));
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
index 9316dff296..6b1672678f 100644
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -58,7 +58,7 @@ or specifying its path in the "Editor Path" field.</string>
          label="Show"
          label_selected="Show"
          layout="topleft"
-         left_pad="10"
+         left_pad="5"
          name="display_floater"
          tool_tip="Display the XUI floater defined by the selected XML file"
          top_delta="-2"
@@ -70,7 +70,7 @@ or specifying its path in the "Editor Path" field.</string>
          label="Hide"
          label_selected="Hide"
          layout="topleft"
-         left_pad="10"
+         left_pad="3"
          name="close_displayed_floater"
          tool_tip="Closes the currently-displayed floater, if one exists"
          top_delta="0"
@@ -81,7 +81,7 @@ or specifying its path in the "Editor Path" field.</string>
          label="Edit..."
          label_selected="Edit..."
          layout="topleft"
-         left_pad="10"
+         left_pad="3"
          name="edit_floater"
          tool_tip="Edit the XUI floater defined by the selected XML file (opens external editor).  Opens en version if no localized version exists."
          top_delta="0"
@@ -92,7 +92,7 @@ or specifying its path in the "Editor Path" field.</string>
          label="Save"
          label_selected="Save"
          layout="topleft"
-         left_pad="5"
+         left_pad="3"
          name="save_floater"
          tool_tip="Save the XUI floater defined by the selected XML file"
          top_delta="0"
@@ -103,7 +103,7 @@ or specifying its path in the "Editor Path" field.</string>
          label="Save All"
          label_selected="Save All"
          layout="topleft"
-         left_pad="10"
+         left_pad="3"
          name="save_all_floaters"
          tool_tip="Save all XUI floaters defined by the selected language"
          top_delta="0"
@@ -115,7 +115,7 @@ or specifying its path in the "Editor Path" field.</string>
          label="&gt; &gt;"
          label_selected="&lt; &lt;"
          layout="topleft"
-         left_pad="15"
+         left_pad="48"
          name="toggle_overlap_panel"
          tool_tip="Toggle highlighting and display panel for overlapping elements; right-click an element to select it for this feature.  The selected element is marked by a red rectangle."
          top_delta="0"
@@ -152,7 +152,7 @@ or specifying its path in the "Editor Path" field.</string>
          height="25"
          label="Show"
          layout="topleft"
-         left_pad="10"
+         left_pad="5"
          name="display_floater_2"
          tool_tip="Display the XUI floater defined by the selected XML file"
          top_delta="-2"
@@ -163,7 +163,7 @@ or specifying its path in the "Editor Path" field.</string>
          height="25"
          label="Hide"
          layout="topleft"
-         left_pad="10"
+         left_pad="3"
          name="close_displayed_floater_2"
          tool_tip="Closes the currently-displayed floater, if one exists"
          top_delta="0"
@@ -173,10 +173,19 @@ or specifying its path in the "Editor Path" field.</string>
          height="25"
          label="Export Schema"
          layout="topleft"
-         left_pad="10"
+         left_pad="3"
          name="export_schema"
          top_delta="0"
          width="120" />
+		<button
+		 follows="left|top"
+		 height="25"
+		 label="Refresh"
+		 layout="topleft"
+		 left_pad="3"
+		 name="refresh_btn"
+		 top_delta="0"
+		 width="95" />
         <check_box
           follows="left|top"
           label="Show Rectangles"