diff --git a/indra/newview/skins/starlight/xui/en/floater_camera.xml b/indra/newview/skins/starlight/xui/en/floater_camera.xml
index b5aa8263ff..736a05c851 100644
--- a/indra/newview/skins/starlight/xui/en/floater_camera.xml
+++ b/indra/newview/skins/starlight/xui/en/floater_camera.xml
@@ -1,73 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- header_height="0"-->
 <floater
- legacy_header_height="18"
+ legacy_header_height="0"
+ header_height="0"
+ bg_alpha_color="SL-Background_86"
  can_dock="false"
  can_minimize="false"
  can_resize="true"
  can_close="false"
  chrome="true"
  follows="bottom"
- min_width="188"
- min_height="100"
- height="102"
+ height="77"
+ min_height="25"
  layout="topleft"
  name="camera_floater"
  help_topic="camera_floater"
- bg_alpha_color="SL-Background_86"
  save_rect="true"
  save_visibility="true"
  save_dock_state="false"
  single_instance="true"
- width="194">
-    <panel
-     border="false"
-     height="23"
-     layout="topleft"
-	 follows="right|top|left"
-     left="60"
-     bottom_delta="18"
-     name="buttons"
-     width="82">
-        <button
-         height="23"
-         label=""
-         layout="topleft"
-         left="1"
-         is_toggle="true"
-         image_overlay="Cam_Avatar_Off"
-         image_selected="PushButton_Selected_Press"
-         name="presets_btn"
-         tab_stop="false"
-         tool_tip="Preset Views"
-         top="0" 
-         width="25">
-        </button>
-        <button
-         height="23"
-         label=""
-         layout="topleft"
-         left_pad="1"
-         is_toggle="true"
-         image_overlay="PanOrbit_Off"
-         image_selected="PushButton_Selected_Press"
-         name="pan_btn"
-         tab_stop="false"
-         tool_tip="Orbit Zoom Pan"
-         width="25">
-        </button>
-        <button
-         height="23"
-         label=""
-         layout="topleft"
-         left_pad="1"
-         image_overlay="Cam_FreeCam_Off"
-         image_selected="PushButton_Selected_Press"
-         name="avatarview_btn"
-         tab_stop="false"
-         tool_tip="Camera modes"
-         width="25">
-        </button>
-    </panel>
+ width="155"
+ min_width="155">
+    <!-- presence of the string "use_flat_ui" allows a cam floater without mode switches  -->
+    <floater.string
+     name="use_flat_ui">
+    </floater.string>
+
+    <!-- "flat_ui_title" is the title of the cam floater if without mode switches  -->
+    <floater.string
+     name="flat_ui_title">
+    </floater.string>
     <floater.string
      name="rotate_tooltip">
         Rotate Camera Around Focus
@@ -82,258 +44,368 @@
     </floater.string>
     <floater.string
      name="camera_modes_title">
-        View
+camera_modes_title
     </floater.string>
     <floater.string
      name="pan_mode_title">
-        Camera
+pan_mode_title
     </floater.string>
     <floater.string
      name="presets_mode_title">
-        Preset
+presets_mode_title
     </floater.string>
     <floater.string
      name="free_mode_title">
-        Mode
+free_mode_title
     </floater.string>
     <panel
-     border="false"
-     height="110"
-     layout="topleft"
-	 follows="all"
-     left="2"
-     top="0"
-     mouse_opaque="false"
-     name="controls"
-     width="180">
-       <panel
+       border="false"
+       class="camera_zoom_panel"
+       height="50"
+       layout="topleft"
+       left="2"
+       mouse_opaque="false"
+       name="zoom"
+       follows="all"
+       top="25"
+       width="150">
+
+       <layout_stack
+             top="0"
+             enabled="true"
+             height="50"
+             left="0"
+             mouse_opaque="true"
+             name="camera_view_layout_stack"
+             orientation="horizontal"
+             width="150"
+             follows="all">
+
+            <layout_panel
+             name="camera_rotate_layout_panel"
+             user_resize="false"
+             height="80"
+             width="80">
+
+      <joystick_rotate
          follows="all"
-         height="102"
-         layout="topleft"
-         left="4"
-         name="preset_views_list"
-         top="22"
-         width="170"
-         visible="false">
-        <panel_camera_item
-          name="front_view">
-          <panel_camera_item.mousedown_callback
-            function="CameraPresets.ChangeView"
-            parameter="front_view" />
-          <panel_camera_item.picture
-            image_name="Cam_Preset_Front_Off" />
-          <panel_camera_item.selected_picture
-            image_name="Cam_Preset_Front_On" />
-          <panel_camera_item.text
-            name="front_view_text">
-            Front View
-          </panel_camera_item.text>
-        </panel_camera_item>
-        <panel_camera_item
-          name="group_view"
-          top_pad="4">
-          <panel_camera_item.mousedown_callback
-            function="CameraPresets.ChangeView"
-            parameter="group_view" />
-          <panel_camera_item.picture
-            image_name="Cam_Preset_Side_Off" />
-          <panel_camera_item.selected_picture
-            image_name="Cam_Preset_Side_On" />
-          <panel_camera_item.text
-            name="side_view_text">
-            Side View
-          </panel_camera_item.text>
-        </panel_camera_item>
-        <panel_camera_item
-          name="rear_view"
-          layout="topleft"
-          top_pad="4">
-          <panel_camera_item.mousedown_callback
-            function="CameraPresets.ChangeView"
-            parameter="rear_view" />
-          <panel_camera_item.picture
-            image_name="Cam_Preset_Back_Off" />
-          <panel_camera_item.selected_picture
-            image_name="Cam_Preset_Back_On" />
-          <panel_camera_item.text
-            name="rear_view_text">
-            Rear View
-          </panel_camera_item.text>
-        </panel_camera_item>
-      </panel>
-      <panel
-          follows="all"
-          height="68"
-          layout="topleft"
-          left="4"
-          name="camera_modes_list"
-          top="24"
-          width="170"
-          visible="false">
-        <panel_camera_item
-          name="object_view">
-          <panel_camera_item.mousedown_callback
-            function="CameraPresets.ChangeView"
-            parameter="object_view" />
-          <panel_camera_item.text
-            name="object_view_text">
-            Object View
-          </panel_camera_item.text>
-          <panel_camera_item.picture
-            image_name="Object_View_Off" />
-          <panel_camera_item.selected_picture
-            image_name="Object_View_On" />
-        </panel_camera_item>
-        <panel_camera_item
-          name="mouselook_view"
-          layout="topleft">
-          <panel_camera_item.mousedown_callback
-            function="CameraPresets.ChangeView"
-            parameter="mouselook_view" />
-          <panel_camera_item.text
-            name="mouselook_view_text">
-            Mouselook
-          </panel_camera_item.text>
-          <panel_camera_item.picture
-            image_name="MouseLook_View_Off" />
-          <panel_camera_item.selected_picture
-            image_name="MouseLook_View_On" />
-        </panel_camera_item>
-      </panel>
-        <!-- Camera controls panel -->
-        <panel
-         border="false"
-         class="camera_zoom_panel"
-         follows="all"
-         height="100"
+         height="80"
+         width="80"
+         image_selected="Cam_Rotate_In"
+         image_unselected="Cam_Rotate_Out"
          layout="topleft"
          left="0"
          mouse_opaque="false"
-         name="zoom"
-         top="0"
+         name="cam_rotate_stick"
+         quadrant="left"
+         scale_image="true"
+         sound_flags="3"
          visible="true"
-         width="188">
-
-            <!-- Camera joystick controls layout starts here -->
-            <layout_stack
-             top="20"
-             enabled="true"
-             height="80"
-             left="2"
-             mouse_opaque="true"
-             name="stack"
-             orientation="horizontal"
-             width="186"
-             follows="all">
-
-            <!-- Camera rotate layout panel -->
+         tool_tip="Orbit camera around focus"
+		 held_down_delay.seconds="0.0"
+         top="0" />
+    </layout_panel>
+    
             <layout_panel
-             name="panel_rotate"
-             user_resize="false"
-             height="78"
-             width="78">
-
-            <joystick_rotate
-             follows="all"
-             height="78"
-             image_selected="Cam_Rotate_In"
-             image_unselected="Cam_Rotate_Out"
-             layout="topleft"
-             left="0"
-             mouse_opaque="false"
-             name="cam_rotate_stick"
-             quadrant="left"
-             scale_image="true"
-             sound_flags="3"
-             visible="true"
-             tool_tip="Orbit camera around focus"
-             top="0"
-             width="78"
-             held_down_delay.seconds="0.0"/>
-            </layout_panel>
-
-            <!-- Camera zoom layout panel -->
-            <layout_panel
-             name="panel_zoom"
+             name="camera_zoom_layout_panel"
              can_resize="false"
              auto_resize="false"
              user_resize="false"
-             height="78"
-             width="18">
+             height="70"
+             width="16">
+             
+             
+      <button
+         follows="top|left"
+         height="16"
+         image_disabled="AddItem_Disabled"
+         image_selected="AddItem_Press"
+         image_unselected="AddItem_Off"
+         layout="topleft"
+         left_delta="-2" 
+         name="zoom_plus_btn"
+         scale_image="false"
+         width="16"
+         top="0">
+        <commit_callback
+           function="Zoom.plus" />
+        <mouse_held_callback
+           function="Zoom.plus" />
+      </button>
+      <slider_bar
+         height="48"
+         layout="topleft"
+         name="zoom_slider"
+         orientation="vertical"
+         follows="top|left|bottom"
+         tool_tip="Zoom camera toward focus"
+         top_delta="13"
+         left_delta="1"
+         min_val="0"
+         max_val="1" 
+         width="16">
+        <commit_callback function="Slider.value_changed"/>
+      </slider_bar>
+      <button
+         follows="bottom|left"
+         height="16"
+         image_disabled="MinusItem_Disabled"
+         image_selected="MinusItem_Press"
+         image_unselected="MinusItem_Off"
+         layout="topleft"
+         name="zoom_minus_btn"
+         scale_image="true"
+         top_delta="44"
+         left_delta="0"
+         width="16">
+        <commit_callback
+           function="Zoom.minus" />
+        <mouse_held_callback
+           function="Zoom.minus" />
+     </button>
+     </layout_panel>
 
-            <button
-             follows="right|top"
-             height="18"
-             image_disabled="AddItem_Disabled"
-             image_selected="AddItem_Press"
-             image_unselected="AddItem_Off"
-             layout="topleft"
-             left="0"
-             name="zoom_plus_btn"
-             tool_tip="Zoom in"
-             width="18"
-             top="0">
-            <commit_callback
-             function="Zoom.plus" />
-            <mouse_held_callback
-             function="Zoom.plus" />
-            </button>
-            <slider_bar
-             height="42"
-             layout="topleft"
-             name="zoom_slider"
-             orientation="vertical"
-             follows="top|right|bottom"
-             tool_tip="Zoom camera toward focus"
-             top_pad="0"
-             min_val="0"
-             max_val="1"
-             width="18">
-            <commit_callback function="Slider.value_changed"/>
-            </slider_bar>
-            <button
-             follows="bottom|right"
-             height="18"
-             image_disabled="MinusItem_Disabled"
-             image_selected="MinusItem_Press"
-             image_unselected="MinusItem_Off"
-             layout="topleft"
-             name="zoom_minus_btn"
-             tool_tip="Zoom out"
-             top_pad="0"
-             width="18">
-            <commit_callback
-             function="Zoom.minus" />
-            <mouse_held_callback
-             function="Zoom.minus" />
-            </button>
-            </layout_panel>
-
-            <!-- Camera movement layout panel -->
             <layout_panel
              name="panel_track"
              user_resize="false"
-             height="78"
-             width="78">
+             height="80"
+             width="80">
+     
+     <joystick_track
+     follows="all"
+     height="80"
+     width="80"
+     image_selected="Cam_Tracking_In"
+     image_unselected="Cam_Tracking_Out"
+     layout="topleft"
+     left_delta="0"
+     name="cam_track_stick"
+     quadrant="left"
+     scale_image="true"
+     sound_flags="3"
+     tool_tip="Move camera up and down, left and right"
+     top="0"/>
+    </layout_panel>
+    </layout_stack>
 
-            <joystick_track
-             follows="all"
-             height="78"
-             image_selected="Cam_Tracking_In"
-             image_unselected="Cam_Tracking_Out"
-             layout="topleft"
-             left="0"
-             name="cam_track_stick"
-             quadrant="left"
-             scale_image="true"
-             sound_flags="3"
-             tool_tip="Move camera up and down, left and right"
-             top="0"
-             visible="true"
-             width="78"/>
-
-            </layout_panel>
-            </layout_stack>
-        </panel>
+    </panel>
+    
+    <panel
+     border="false"
+     height="25"
+     layout="topleft"
+     left="5"
+     top="0"
+     follows="top|left"
+     name="buttons_view"
+     width="60">
+        <panel_camera_item
+          name="front_view"
+          tool_tip="Front view"
+          border="true"
+          bevel_style="none"
+          width="18"
+          height="18"
+          layout="topleft"
+          left="0">
+            <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="front_view" />
+            <panel_camera_item.icon_over
+            height="18"
+            width="18" />
+            <panel_camera_item.icon_selected
+            height="18"
+            width="18" />
+            <panel_camera_item.picture
+            height="18"
+            width="18"
+            image_name="Cam_Preset_Front_Off" />
+            <panel_camera_item.selected_picture
+            height="18"
+            width="18"
+            image_name="Cam_Preset_Front_On" />
+            <panel_camera_item.text
+            width="0"
+            name="front_view_text">
+            ""
+            </panel_camera_item.text>
+        </panel_camera_item>
+        <panel_camera_item
+          name="group_view"
+          tool_tip="Side view"
+          border="true"
+          bevel_style="none"
+          width="18"
+          height="18"
+          layout="topleft"
+          left_delta="20"
+          top_delta="0">
+            <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="group_view" />
+            <panel_camera_item.icon_over
+            height="18"
+            width="18" />
+            <panel_camera_item.icon_selected
+            height="18"
+            width="18" />
+            <panel_camera_item.picture
+            height="18"
+            width="18"
+            image_name="Cam_Preset_Side_Off" />
+            <panel_camera_item.selected_picture
+            height="18"
+            width="18"
+            image_name="Cam_Preset_Side_On" />
+            <panel_camera_item.text
+            width="0"
+            name="group_view_text">
+            ""
+            </panel_camera_item.text>
+        </panel_camera_item>
+        <panel_camera_item
+          name="rear_view"
+          tool_tip="Rear view"
+          border="true"
+          bevel_style="none"
+          width="18"
+          height="18"
+          layout="topleft"
+          left_delta="20"
+          top_delta="0">
+            <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="rear_view" />
+            <panel_camera_item.icon_over
+            height="18"
+            width="18" />
+            <panel_camera_item.icon_selected
+            height="18"
+            width="18" />
+            <panel_camera_item.picture
+            height="18"
+            width="18"
+            image_name="Cam_Preset_Back_Off" />
+            <panel_camera_item.selected_picture
+            height="18"
+            width="18"
+            image_name="Cam_Preset_Back_On" />
+            <panel_camera_item.text
+            width="0"
+            name="rear_view_text">
+            ""
+            </panel_camera_item.text>
+        </panel_camera_item>
+    </panel>
+    
+    <panel
+     border="false"
+     height="25"
+     layout="topleft"
+     follows="top|left"
+     left_pad="0"
+     top="0"
+     name="buttons"
+     width="60">
+        <panel_camera_item
+          name="object_view"
+          tool_tip="Object view"
+          border="true"
+          bevel_style="none"
+          width="18"
+          height="18"
+          layout="topleft"
+          left_delta="0"
+          top_pad="4">
+            <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="object_view" />
+            <panel_camera_item.icon_over
+            height="18"
+            width="18" />
+            <panel_camera_item.icon_selected
+            height="18"
+            width="18" />
+            <panel_camera_item.picture
+            height="18"
+            width="18"
+            image_name="Object_View_Off" />
+            <panel_camera_item.selected_picture
+            height="18"
+            width="18"
+            image_name="Object_View_On" />
+            <panel_camera_item.text
+            width="0"
+            name="object_view_text">
+            ""
+            </panel_camera_item.text>
+        </panel_camera_item>
+        <panel_camera_item
+          name="mouselook_view"
+          tool_tip="Mouselook view"
+          border="true"
+          bevel_style="none"
+          width="18"
+          height="18"
+          layout="topleft"
+          left_delta="20"
+          top_delta="0">
+            <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="mouselook_view" />
+            <panel_camera_item.icon_over
+            height="18"
+            width="18" />
+            <panel_camera_item.icon_selected
+            height="18"
+            width="18" />
+            <panel_camera_item.picture
+            height="18"
+            width="18"
+            image_name="Mouselook_View_Off" />
+            <panel_camera_item.selected_picture
+            height="18"
+            width="18"
+            image_name="Mouselook_View_On" />
+            <panel_camera_item.text
+            width="0"
+            name="mouselook_view_text">
+            ""
+            </panel_camera_item.text>
+        </panel_camera_item>
+        <panel_camera_item
+          name="reset_view"
+          tool_tip="Reset view"
+          border="true"
+          bevel_style="none"
+          width="18"
+          height="18"
+          layout="topleft"
+          left_delta="20"
+          top_delta="0">
+            <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="reset_view" />
+            <panel_camera_item.icon_over
+            height="18"
+            width="18" />
+            <panel_camera_item.icon_selected
+            height="18"
+            width="18" />
+            <panel_camera_item.picture
+            height="18"
+            width="18"
+            image_name="StopReload_Off" />
+            <panel_camera_item.selected_picture
+            height="18"
+            width="18"
+            image_name="StopReload_Over" />
+            <panel_camera_item.text
+            width="0"
+            name="reset_view_text">
+            ""
+            </panel_camera_item.text>
+        </panel_camera_item>
     </panel>
 </floater>
diff --git a/indra/newview/skins/starlight/xui/en/widgets/panel_camera_item.xml b/indra/newview/skins/starlight/xui/en/widgets/panel_camera_item.xml
index 8a79e51dd6..aa79d84b94 100644
--- a/indra/newview/skins/starlight/xui/en/widgets/panel_camera_item.xml
+++ b/indra/newview/skins/starlight/xui/en/widgets/panel_camera_item.xml
@@ -1,62 +1,62 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel_camera_item
  background_visible="false"
- height="20"
+ height="18"
  layout="topleft"
- width="150">
+ width="18">
   <panel_camera_item.icon_over
    follows="top|left"
-     height="20"
+     height="18"
      image_name="ListItem_Over"
      left="0"
      mouse_opaque="false"
      layout="topleft"
      name="hovered_icon"
-     top="20"
+     top="18"
      scale_image="true"
      visible="false"
      width="152" />
   <panel_camera_item.icon_selected
    follows="top|left"
-     height="20"
-     image_name="ListItem_Select"
+     height="18"
+     image_name="PushButton_On_Selected"
      layout="topleft"
      left="0"
      mouse_opaque="false"
      name="selected_icon"
-     top="20"
+     top="18"
      scale_image="true"
      visible="false"
      width="152" />
   <panel_camera_item.picture
      follows="top|left"
-     height="20"
+     height="18"
      image_name="Icon_For_Sale"
      layout="topleft"
      left="0"
      mouse_opaque="false"
      name="picture"
      tab_stop="false"
-     top="20"
+     top="18"
      top_pad="10"
-     width="20" />
+     width="18" />
   <panel_camera_item.selected_picture
      follows="top|left"
-     height="20"
+     height="18"
      image_name="Cam_Rotate_In"
      layout="topleft"
      left="0"
      mouse_opaque="false"
      name="selected_picture"
      tab_stop="false"
-     top="20"
+     top="18"
      top_pad="8"
      visible="false" 
-     width="20" />
+     width="18" />
   <panel_camera_item.text
    follows="top|left|right"
      font="SansSerifMedium"
-     height="20"
+     height="18"
      layout="topleft"
      left="25"
      name="picture_name"
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_camera.xml b/indra/newview/skins/starlightcui/xui/en/floater_camera.xml
index 9f0c352d4c..108535d7ea 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_camera.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_camera.xml
@@ -18,16 +18,16 @@
  save_visibility="true"
  save_dock_state="false"
  single_instance="true"
- width="194">
+ width="188">
     <panel
      border="false"
      height="23"
      layout="topleft"
 	 follows="right|top|left"
-     left="60"
+     left="55"
      bottom_delta="18"
      name="buttons"
-     width="82">
+     width="78">
         <button
          height="23"
          label=""
@@ -105,14 +105,14 @@
      top="0"
      mouse_opaque="false"
      name="controls"
-     width="180">
+     width="184">
        <panel
          follows="all"
          height="102"
          layout="topleft"
          left="4"
          name="preset_views_list"
-         top="22"
+         top="24"
          width="170"
          visible="false">
         <panel_camera_item
@@ -131,7 +131,7 @@
         </panel_camera_item>
         <panel_camera_item
           name="group_view"
-          top_pad="4">
+          top_pad="2">
           <panel_camera_item.mousedown_callback
             function="CameraPresets.ChangeView"
             parameter="group_view" />
@@ -147,7 +147,7 @@
         <panel_camera_item
           name="rear_view"
           layout="topleft"
-          top_pad="4">
+          top_pad="2">
           <panel_camera_item.mousedown_callback
             function="CameraPresets.ChangeView"
             parameter="rear_view" />
@@ -212,7 +212,7 @@
          name="zoom"
          top="0"
          visible="true"
-         width="188">
+         width="184">
 
             <!-- Camera joystick controls layout starts here -->
             <layout_stack
@@ -223,7 +223,7 @@
              mouse_opaque="true"
              name="stack"
              orientation="horizontal"
-             width="186"
+             width="180"
              follows="all">
 
             <!-- Camera rotate layout panel -->