diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
index 2d4a5b6fb2..43f379d4d6 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
@@ -5,7 +5,7 @@
  height="290"
  layout="topleft"
  min_height="150"
- min_width="200"
+ min_width="224"
  name="floater_buy_contents"
  help_topic="floater_buy_contents"
  save_rect="true"
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Off.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Off.png
index 4bf0eac871..f6df6deb26 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Off.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Off.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Over.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Over.png
index 4bf0eac871..f6df6deb26 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Over.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Over.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Press.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Press.png
index 4bf0eac871..5169ec06c1 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Press.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Press.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Selected.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Selected.png
index 0bb6c190cf..bef180283e 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Selected.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Selected.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Flash.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Flash.png
index 500e6c7049..c7eb01be65 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Flash.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Flash.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_IM_Unselected.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_IM_Unselected.png
index 5ba3b08849..5d0c699e5e 100644
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_IM_Unselected.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_IM_Unselected.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Off.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Off.png
index 5ba3b08849..a2e54455b0 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Off.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Off.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Over.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Over.png
index 5ba3b08849..5d0c699e5e 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Over.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Over.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Press.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Press.png
index 5ba3b08849..680e1611cf 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Press.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Press.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Selected.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Selected.png
index 500e6c7049..c7eb01be65 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Selected.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Selected.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Flash.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Flash.png
index 500e6c7049..0e87014cd2 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Flash.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Flash.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_IM_Unselected.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_IM_Unselected.png
index 5ba3b08849..cb9faa5992 100644
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_IM_Unselected.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_IM_Unselected.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Off.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Off.png
index 5ba3b08849..aebca2d6ef 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Off.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Off.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Over.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Over.png
index 5ba3b08849..844c0a6641 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Over.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Over.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Press.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Press.png
index 5ba3b08849..16d30df821 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Press.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Press.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Selected.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Selected.png
index 500e6c7049..78a47bec7f 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Selected.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Selected.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Right_Off.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Right_Off.png
index 5ba3b08849..a6e364b591 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Right_Off.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Right_Off.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Right_Press.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Right_Press.png
index 5ba3b08849..bd398f4515 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Right_Press.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Right_Press.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_Left_Over.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_Left_Over.png
index 4bf0eac871..a09147d387 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_Left_Over.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_Left_Over.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_Left_Press.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_Left_Press.png
index 4bf0eac871..a09147d387 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_Left_Press.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_Left_Press.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_left_off.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_left_off.png
index 4bf0eac871..a09147d387 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_left_off.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_left_off.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_left_selected.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_left_selected.png
index 0bb6c190cf..acbf3a19e5 100755
Binary files a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_left_selected.png and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_left_selected.png differ
diff --git a/indra/newview/skins/starlight/xui/en/floater_tools.xml b/indra/newview/skins/starlight/xui/en/floater_tools.xml
index c1fb8f780e..08cd9438e6 100644
--- a/indra/newview/skins/starlight/xui/en/floater_tools.xml
+++ b/indra/newview/skins/starlight/xui/en/floater_tools.xml
@@ -2947,7 +2947,7 @@ Low ↔ Lwst
              height="50"
              layout="topleft"
              left_pad="10"
-             top_pad="-17"
+             top_pad="-21"
              name="colorswatch"
              tool_tip="Click to open color picker"
              width="40" />
@@ -2973,7 +2973,7 @@ Low ↔ Lwst
              layout="topleft"
              left="10"
              name="Light Intensity"
-             top_pad="3"
+             top_pad="-21"
              width="128" />
           <spinner bottom_delta="0"
                    decimal_digits="3"
diff --git a/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml b/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml
index 9f9279d5e3..0203e82c52 100644
--- a/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml
@@ -437,6 +437,23 @@
        left_pad="0"
        right="-33"
        layout="topleft"
+       name="dummy_panel">
+          <icon
+           follows="top|left|right"
+           height="25"
+           image_name="Toolbar_Middle_Off"
+           layout="topleft"
+           left="0"
+           top="0"
+           right="-1"
+           name="dummy_icon" />
+      </panel>
+      <panel
+       follows="top|left|right"
+       height="25"
+       left_pad="168"
+       right="-33"
+       layout="topleft"
        name="dummy_panel">
           <text
            type="string"
@@ -453,15 +470,6 @@
            right="-8">
           Elements
           </text>
-          <icon
-           follows="top|left|right"
-           height="25"
-           image_name="Toolbar_Middle_Off"
-           layout="topleft"
-           left="0"
-           top="0"
-           right="-1"
-           name="dummy_icon" />
       </panel>
       <panel
        follows="top|right"
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_tools.xml b/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
index f9acd2d63d..08cd9438e6 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
@@ -2973,7 +2973,7 @@ Low ↔ Lwst
              layout="topleft"
              left="10"
              name="Light Intensity"
-             top_pad="-14"
+             top_pad="-21"
              width="128" />
           <spinner bottom_delta="0"
                    decimal_digits="3"