diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 50a5fb8f89..e051a011f3 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+legacy_header_height="0"
  header_height="0"
  bg_opaque_image="Window_NoTitle_Foreground"
  bg_alpha_image="Window_NoTitle_Foreground"
@@ -7,10 +8,9 @@
  right="-460"
  bottom="-50"
  follows="left|bottom"
- legacy_header_height="0"
  can_minimize="false"
- can_close="false"
- height="85"
+ can_close="true"
+ height="165"
  layout="topleft"
  name="camera_floater"
  help_topic="camera_floater"
@@ -20,7 +20,7 @@
  title="Camera Controls"
  chrome="true"
  save_rect="true"
- width="340">
+ width="195">
     <floater.string
      name="rotate_tooltip">
         Rotate Camera Around Focus
@@ -41,10 +41,10 @@
     <panel
      border="false"
      follows="top|left"
-     height="123"
+     height="110"
      layout="topleft"
      left="2"
-     top_pad="-23"
+     top_pad="0"
      mouse_opaque="false"
      name="controls"
      width="190">
@@ -58,7 +58,7 @@
             mouse_opaque="false"
             name="zoom"
             top="0"
-            width="220">
+            width="190">
            <joystick_rotate
               follows="top|left"
               height="78"
@@ -134,14 +134,15 @@
      follows="all"
      height="27"
      layout="topleft"
-     left_pad="2"
+     left="2"
      name="buttons_panel"
-     top_delta="18"
-     width="120">
+     top_pad="0"
+     width="190">
     <panel_camera_item
       name="front_view"
       tool_tip="Front View"
-      width="18">
+      width="18"
+      left="2">
       <panel_camera_item.mousedown_callback
         function="CameraPresets.ChangeView"
         parameter="Front View" />
@@ -216,21 +217,32 @@
           <panel_camera_item.selected_picture
           image_name="StopReload_Over" />
       </panel_camera_item>
-    </panel>
-      <combo_box
-        height="23"
-        left_delta="-1"
-        mouse_opaque="true"
-        name="preset_combo"
-        top_pad="7"
-        width="122">
-        <combo_list
-        mouse_wheel_opaque="true"/>
-        <combo_box.item
-         label="Use preset"
-         name="Use preset"
-         value="default" />
-      </combo_box>
+      <button
+      follows="top|left"
+      height="23"
+      top_delta="2"
+      label="Position..."
+      layout="topleft"
+      left_pad="5"
+      name="camera_position_btn"
+      width="63">
+      <button.commit_callback
+      function="Floater.Show"
+      parameter="prefs_view_advanced"/>
+    </button>
+  </panel>
+  <combo_box
+    height="23"
+    mouse_opaque="true"
+    name="preset_combo"
+    width="162">
+    <combo_list
+    mouse_wheel_opaque="true"/>
+    <combo_box.item
+      label="Use preset"
+      name="Use preset"
+      value="default" />
+  </combo_box>
       <button
         height="16"
         width="16"  
@@ -239,7 +251,7 @@
         name="gear_btn"
         tool_tip="Camera Presets"
         top_delta="3"
-        left_pad="3" 
+        left_pad="8" 
         image_selected="Icon_Gear"
         image_pressed="Icon_Gear"
         image_unselected="Icon_Gear"
@@ -261,17 +273,4 @@
           function="CameraPresets.Save"/>
       </button>
       -->
-      <button
-        follows="top|left"
-        height="23"
-        label="Camera Position..."
-        layout="topleft"
-        left_delta="-125"
-        name="camera_position_btn"
-        top_pad="9"
-        width="143">
-        <button.commit_callback
-          function="Floater.Show"
-          parameter="prefs_view_advanced"/>
-      </button>
-</floater>
+</floater>
\ No newline at end of file