diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 3a26c3b547c4120bb6cf01a20a6ba933117dd98c..e7689076e0eb115cdce048eff7fc0c5d98710665 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -6,11 +6,11 @@
         height="330"
         layout="topleft"
         min_height="330"
-        min_width="225"
+        min_width="250"
         name="settings picker"
         help_topic="settings_picker"
-        title="PICK: SETTINGS"
-        width="225">
+        title="Pick: Settings"
+        width="250">
 
     <!--  top static -->
     <floater.string
@@ -38,14 +38,51 @@
             name="track_sky">
         Sky[NUM]
     </floater.string>
-
+<icon
+  follows="all"
+  height="300"
+  color="1 1 1 1"
+  image_name="Panel_Background"
+  layout="topleft"
+  name="vicon"
+  mouse_opaque="false"
+  visible="true"
+  width="234"
+  top="45"
+  bottom="-8"
+  left="8"/>
+<combo_box
+             allow_text_entry="false"
+             follows="left|top"
+             height="23"
+             left="9"
+             max_chars="100"
+             mouse_opaque="true"
+             name="track_selection"
+             enabled="false"
+             top="20"
+             width="231">
+    <combo_box.combo_button
+		image_unselected="ToolbarDropDown_Off"
+		image_selected="ToolbarDropDown_Press"
+		image_disabled="ToolbarDropDown_Off" />
+		<combo_box.drop_down_button
+		pad_right="0"
+		image_unselected="ToolbarDropDown_Off"
+		image_selected="ToolbarDropDown_Press"
+		image_pressed="ToolbarDropDown_Press" 
+		image_pressed_selected="ToolbarDropDown_Press"
+		image_disabled="ToolbarDropDown_Off" />
+</combo_box>
     <layout_stack name="test_stack"
             follows="all"
+            bg_opaque_image="Panel_Background"
+            background_visible="true"
             animate="false"
             top="20"
-            left="6"
+            left="9"
             right="-6"
-            bottom="-10"
+            bottom="-7"
             orientation="vertical">
         <layout_panel name="inv_list"
                 border="false"
@@ -55,32 +92,19 @@
                 min_height="29"
                 bg_alpha_color="blue"
                 background_visible="false">
-            <filter_editor
-                    follows="left|top|right"
-                    height="23"
-                    label="Filter Settings"
-                    layout="topleft"
-                    left="4"
-                    name="flt_inventory_search"
-                    top="4"
-                    right="-2" />
             <panel
               name="pnl_inv_wrap"
               follows="all"
               layout="topleft"
               left="2"
-              top="28"
+              top="1"
               right="-2"
-              bottom="-2"
-              background_visible="true"
-              bg_alpha_color="DkGray2">
+              bottom="-2">
                 <asset_filtered_inv_panel
                     allow_multi_select="false"
                     allow_drag="false"
                     accepts_drag_and_drop="false"
                     suppress_folder_menu="true"
-                    bg_visible="true"
-                    bg_alpha_color="DkGray2"
                     border="false"
                     follows="all"
                     layout="topleft"
@@ -92,52 +116,79 @@
                     filter_asset_type="settings" />
             </panel>
         </layout_panel>
-        <layout_panel name="pnl_combo"
-                border="false"
-                auto_resize="false"
-                user_resize="false"
-                visible="true"
-                height="29"
-                bg_alpha_color="blue"
-                background_visible="false">
-            <combo_box
-             allow_text_entry="false"
-             follows="left|top"
-             height="23"
-             left="10"
-             max_chars="100"
-             mouse_opaque="true"
-             name="track_selection"
-             enabled="false"
-             top="1"
-             width="190"/>
-        </layout_panel>
         <layout_panel name="temp"
                 border="false"
                 auto_resize="false"
                 user_resize="false"
                 height="29"
                 min_height="29">
+            <layout_stack
+   animate="false"
+   border_size="0"
+   height="26"
+   layout="topleft"
+   orientation="horizontal"
+   follows="left|right|bottom"
+   top_pad="0"
+   left_delta="0"
+   name="bottom_panel"
+   width="277">
+      <layout_panel
+       background_visible="false"
+       auto_resize="true"
+       height="25"
+       layout="topleft"
+       name="dummy_panel"
+       width="282">
+          <icon
+           follows="bottom|left|right"
+           height="25"
+           image_name="Toolbar_Middle_Off"
+           layout="topleft"
+           left="1"
+           top="1"
+           name="dummy_icon"
+           width="123" />
+          <filter_editor
+                    follows="left|top|right"
+                    height="22"
+                    label="Filter Settings"
+                    layout="topleft"
+                    left="3"
+                    name="flt_inventory_search"
+                    top="3"
+                    width="119"
+                    background_image="TextField_Off"
+                    background_image_disabled="TextField_Disabled"
+                    background_image_focused="TextField_Active"/>
             <button
                     follows="top|left"
-                    height="20"
+                    height="25"
                     label="OK"
                     label_selected="OK"
+                    image_hover_unselected="Toolbar_Middle_Over"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
                     layout="topleft"
-                    left="2"
+                    left_pad="-2"
                     top="2"
                     name="btn_select"
-                    width="100" />
+                    width="30" />
             <button
                     follows="top|left"
-                    height="20"
+                    height="25"
                     label="Cancel"
                     label_selected="Cancel"
+                    image_hover_unselected="Toolbar_Middle_Over"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
                     layout="topleft"
-                    left_delta="110"
+                    left_pad="1"
                     top_delta="0"
                     name="btn_cancel"
-                    width="100" />
+                    width="80" />
+        </layout_panel>
+    </layout_stack>
         </layout_panel>
     </layout_stack>