diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 77695b0cd6..085663ec7e 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -103,36 +103,36 @@
              width="307"/>
         </panel>
     </tab_container>
-    <panel
-       background_visible="true"
+ <panel
+     background_visible="true"
      bevel_style="none"
-     bottom="0"
+     bottom="3"
      follows="left|right|bottom"
      height="27"
      layout="bottomleft"
+	 auto_resize="true"
      left="3"
      name="bottom_panel"
      width="313">
-
-     	  <layout_stack
-		   animate="false"
-		   border_size="0"
-		   follows="left|right|bottom"
+     	  <panel
+   		  border_size="0"
+		   follows="top|left|right"
 		   height="25"
 		   layout="topleft"
-		   orientation="horizontal"
 		   top_pad="1"
 		   left="0"
 		   name="bottom_panel"
 		   width="307">
-		      <layout_panel
+		      <panel
 		       auto_resize="false"
 		       height="25"
 		       layout="topleft"
+			   follows="top|left"
+			   left="0"
 		       name="options_gear_btn_panel"
-		       user_resize="false"
-		       width="32">
-		          <button
+		       width="32"
+               user_resize="false">
+		          <menu_button
 		           follows="bottom|left"
 		           tool_tip="Show additional options"
 		           height="25"
@@ -145,13 +145,15 @@
 		           name="options_gear_btn"
 		           top="0"
 		           width="31" />
-		      </layout_panel>
-		      <layout_panel
+		      </panel>
+		      <panel
 		       auto_resize="false"
 		       height="25"
 		       layout="topleft"
+			   follows="top|left"
+			   left_pad="0"
 		       name="add_btn_panel"
-		       user_resize="false"
+               user_resize="false"
 		       width="32">
 		          <button
 		           follows="bottom|left"
@@ -166,13 +168,16 @@
 		           tool_tip="Add new landmark"
 		           top="0"
 		           width="31" />
-		      </layout_panel>
-		      <layout_panel
+		      </panel>
+		      <panel
 		       auto_resize="true"
 		       height="25"
 		       layout="topleft"
+			   follows="top|left|right"
+			   left_pad="0"
 		       name="dummy_panel"
-		       user_resize="false"
+               user_resize="false"
+			   min_width="1"
 		       width="212">
 		          <icon
 		           follows="bottom|left|right"
@@ -183,16 +188,18 @@
 		           top="0"
 		           name="dummy_icon"
 		           width="211" />
-		      </layout_panel>
-		      <layout_panel
+		      </panel>
+		      <panel
 		       auto_resize="false"
 		       height="25"
 		       layout="topleft"
 		       name="trash_btn_panel"
-		       user_resize="false"
+			   follows="top|right"
+			   left_pad="0"
+               user_resize="false"
 		       width="31">
 		          <dnd_button
-		           follows="bottom|left"
+		           follows="bottom|right"
 		           height="25"
 		           image_hover_unselected="Toolbar_Right_Over"
 		           image_overlay="TrashItem_Off"
@@ -204,7 +211,9 @@
 		           tool_tip="Remove selected landmark"
 		           top="0"
 		           width="31"/>
-		      </layout_panel>
-  	</layout_stack>
+		      </panel>
+  	</panel>
    </panel>
 </panel>
+
+
diff --git a/indra/newview/skins/starlight/textures/textures.xml b/indra/newview/skins/starlight/textures/textures.xml
index 0c67f529f5..e3cae3f1a5 100644
--- a/indra/newview/skins/starlight/textures/textures.xml
+++ b/indra/newview/skins/starlight/textures/textures.xml
@@ -760,6 +760,7 @@ with the same filename but different name
   <texture name="teleport_icon_24x24" file_name="icons/genie_icon_24x24.png" preload="false" />
   <texture name="friends_icon_24x24" file_name="icons/Friends_Icon_24x24.png" preload="false" />
   <texture name="gift_icon_24x24" file_name="icons/gift_icon_24x24.png" preload="false" />
+  <texture name="phoenix_18" file_name="bottomtray/phoenix_18.png" preload="false" />
 
 <!-- StarLight Textures - rationalise with sections above -->
 
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/bottomtray/phoenix_18.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/bottomtray/phoenix_18.png
new file mode 100644
index 0000000000..f50de38c06
Binary files /dev/null and b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/bottomtray/phoenix_18.png differ
diff --git a/indra/newview/skins/starlight/themes/original_orange/textures/bottomtray/phoenix_18.png b/indra/newview/skins/starlight/themes/original_orange/textures/bottomtray/phoenix_18.png
new file mode 100644
index 0000000000..f50de38c06
Binary files /dev/null and b/indra/newview/skins/starlight/themes/original_orange/textures/bottomtray/phoenix_18.png differ
diff --git a/indra/newview/skins/starlight/themes/original_teal/textures/bottomtray/phoenix_18.png b/indra/newview/skins/starlight/themes/original_teal/textures/bottomtray/phoenix_18.png
new file mode 100644
index 0000000000..f50de38c06
Binary files /dev/null and b/indra/newview/skins/starlight/themes/original_teal/textures/bottomtray/phoenix_18.png differ
diff --git a/indra/newview/skins/starlight/themes/silver_blue/textures/bottomtray/phoenix_18.png b/indra/newview/skins/starlight/themes/silver_blue/textures/bottomtray/phoenix_18.png
new file mode 100644
index 0000000000..d6b830a96b
Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_blue/textures/bottomtray/phoenix_18.png differ
diff --git a/indra/newview/skins/starlight/themes/silver_pink/textures/bottomtray/phoenix_18.png b/indra/newview/skins/starlight/themes/silver_pink/textures/bottomtray/phoenix_18.png
new file mode 100644
index 0000000000..d6b830a96b
Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_pink/textures/bottomtray/phoenix_18.png differ
diff --git a/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml b/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml
index 2e152e0b2a..43f01d3fdd 100644
--- a/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml
@@ -104,18 +104,17 @@
             <gesture_combo_list
              follows="left|right"
              height="26"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
              layout="topleft"
-             left="0"
              name="Gesture"
              tool_tip="Shows/hides gestures"
              top="5"
              width="42">
                 <combo_button
-				image_overlay="Gesture_btn"
-                 pad_right="10"
+                 height="26"
+                 image_overlay="Gesture_btn"
+             	 image_pressed="PushButton_Press"
+             	 image_pressed_selected="PushButton_Selected_Press"
+             	 image_selected="PushButton_Selected_Press"
                  use_ellipses="true" />
                 <combo_list
                  page_lines="17" />
@@ -133,6 +132,7 @@
          layout="topleft"
          min_height="28"
          min_width="59"
+		 left_delta="0"
          mouse_opaque="false"
          name="speak_panel"
          top_delta="0"
@@ -536,9 +536,8 @@
                  parameter="mini_map" />
             </bottomtray_button>
         </layout_panel>
-
-<!--        
-         <layout_panel
+      
+         <!-- layout_panel
          mouse_opaque="false"
          auto_resize="false"
          follows="left|right"
@@ -568,8 +567,7 @@
                  function="Button.SetDockableFloaterToggle"
                  parameter="inventory" />
             </button>
-        </layout_panel>
--->
+        </layout_panel -->
 
         <layout_panel
          auto_resize="false"
@@ -647,7 +645,41 @@
          parameter="animation_overrider" />
       </bottomtray_button>
         </layout_panel>
-<!-- ## Zi: AO button -->      
+<!-- ## Zi: AO button -->   
+
+<!-- Quick Preferences panel    -WoLf -->
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="43"
+         mouse_opaque="false"
+         name="quickprefs_btn_panel"
+         user_resize="false"
+         width="43">
+       <bottomtray_button
+        name="quickprefs_toggle"
+        tool_tip="Shows/hides the Quick Preferences Panel"
+        left="0"
+        top="5"
+        height="26"
+        width="40"
+        layout="topleft"
+        follows="left|right"
+        image_pressed="PushButton_Press"
+        image_pressed_selected="PushButton_Selected_Press"
+        image_selected="PushButton_Selected_Press"
+        image_overlay="phoenix_18"
+        is_toggle="true"
+        tab_stop="true">
+        <init_callback
+         function="Button.SetDockableFloaterToggle"
+         parameter="quickprefs" />
+      </bottomtray_button>
+        </layout_panel>
+<!-- Quick Preferences panel    -WoLf -->   
 
         <icon
          auto_resize="false"