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 2520428234..425d93a530 100644
--- a/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- default_tab_group="1"
  follows="all"
  height="423"
  label="Things"
  layout="topleft"
  min_height="300"
  min_width="240"
- name="main inventory panel"
- width="330">
+ name="main inventory panel">
   <panel.string
    name="Itemcount">
   </panel.string>
@@ -24,150 +22,336 @@
    name="ItemcountUnknown">
     Fetched [ITEM_COUNT] Elements [FILTER]
   </panel.string>
-  <text
-		     type="string"
-		     length="1"
-		     follows="left|top|right"
-		     height="13"
-		     layout="topleft"
-    		 left="12"
-		     name="ItemcountText"
-		     font="SansSerifMedium"
-		     text_color="EmphasisColor"
-		     tool_tip="[ITEMS] Items, [CATEGORIES] Folders"
-		     use_ellipses="true"
-		     top_pad="0"
-		     width="300">
-    Elements:
-  </text>
-  <combo_box
-   name="filter_combo_box"
-   width="80"
-   height="21"
-   top="18"
-   left="10"
-   follows="top|left"
-   layout="topleft">
-
-  <combo_box.item value="filter_type_all" label="All Types" />
-  <combo_box.item value="filter_separator" label="------------" enabled="false" />
-  <combo_box.item value="filter_type_animations" label="Animations" />
-  <combo_box.item value="filter_type_calling_cards" label="Calling Cards" />
-  <combo_box.item value="filter_type_clothing" label="Clothing / Body Parts" />
-  <combo_box.item value="filter_type_gestures" label="Gestures" />
-  <combo_box.item value="filter_type_landmarks" label="Landmarks" />
-  <combo_box.item value="filter_type_notecards" label="Notecards" />
-  <combo_box.item value="filter_type_objects" label="Objects" />
-  <combo_box.item value="filter_type_scripts" label="Scripts" />
-  <combo_box.item value="filter_type_sounds" label="Sounds" />
-  <combo_box.item value="filter_type_textures" label="Textures" />
-  <combo_box.item value="filter_type_snapshots" label="Snapshots" />
-  <combo_box.item value="filter_type_meshes" label="Meshes" />
-  <combo_box.item value="filter_type_settings" label="Settings" />
-  <combo_box.item value="filter_separator" label="------------" enabled="false" />
-  <combo_box.item value="filter_type_custom" label="Custom..." />
-
-  </combo_box>
-  <menu_button
-   follows="top|left"
-   tool_tip="Show search visibility options"
-   height="21"
-   image_overlay="Inv_Toolbar_SearchVisibility"
-   layout="topleft"
-   left_pad="3"
-   name="options_visibility_btn"
-   width="31" />
-  <filter_editor
-   text_pad_left="10"
+  <panel.string name="inventory_title">Inventory</panel.string>
+  <panel.string name="default_mode_btn">Multi_Folder_Mode</panel.string>
+  <panel.string name="single_folder_mode_btn">Single_Folder_Mode</panel.string>
+  
+  <layout_stack
    follows="left|top|right"
-   height="23"
-   label="Filter Inventory"
+   height="25"
+   animate="false"
+   top_pad="4"
+   left="10"
+   name="nav_stack"
+   orientation="horizontal">
+    <layout_panel
+     border="false"
+     bevel_style="in"
+     user_resize="false"
+     auto_resize="false"
+     height="25"
+     width="62"
+     name="nav_buttons"
+     visible="false">
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Back"
+      image_pressed="Single_Folder_Back"
+      image_unselected="Single_Folder_Back"
+      scale_image="false"
+      layout="topleft"
+      left="0"
+      top="2"
+      name="back_btn"
+      tool_tip="Back"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Forward"
+      image_pressed="Single_Folder_Forward"
+      image_unselected="Single_Folder_Forward"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="forward_btn"
+      tool_tip="Forward"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Up"
+      image_pressed="Single_Folder_Up"
+      image_unselected="Single_Folder_Up"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="up_btn"
+      tool_tip="Go up one level"
+      width="20" />
+    </layout_panel>
+    <layout_panel
+      border="false"
+      bevel_style="in"
+      user_resize="false"
+      height="25"
+      width="324"
+      name="filter_panel"
+      visible="true">
+      <filter_editor
+       text_pad_left="10"
+       follows="left|top|right"
+       height="23"
+       label="Filter Inventory"
+       layout="topleft"
+       left="2"
+       max_length_chars="300"
+       highlight_text_field="true"
+       name="inventory search editor"
+       tool_tip="Type in one or more words to search for, separated by '+' "
+       top="0"
+       width="322" />
+    </layout_panel>
+  </layout_stack>
+
+  <layout_stack
+   follows="left|top|right"
+   height="16"
+   animate="false"
+   top_pad="4"
+   left="4"
+   name="ctrl_stack"
+   orientation="horizontal">
+    <layout_panel
+     border="false"
+     bevel_style="in"
+     user_resize="false"
+     auto_resize="false"
+     height="16"
+     width="168"
+     name="collapse_expand_buttons">
+      <button
+       name="collapse_btn"
+       label="Collapse"
+       width="80"
+       height="16"
+       left="0"
+       top="0"
+       follows="top|left"
+       layout="topleft"/>
+
+      <button
+       name="expand_btn"
+       label="Expand"
+       width="80"
+       height="16"
+       left_pad="4"
+       follows="top|left"
+       layout="topleft" />
+
+    </layout_panel>
+    <layout_panel
+     border="false"
+     bevel_style="in"
+     user_resize="false"
+     height="16"
+     width="164"
+     name="filter_ctrls">
+
+      <text
+       name="filter_label"
+       value="Filter:"
+       width="40"
+       height="16"
+       left="0"
+       top="0"
+       follows="top|left"
+       layout="topleft" />
+
+      <combo_box
+       name="filter_combo_box"
+       right="-35"
+       height="16"
+       left_pad="4"
+       follows="top|left|right"
+       layout="topleft">
+        <combo_box.item value="filter_type_all" label="All Types" />
+        <combo_box.item value="filter_separator" label="------------" enabled="false" />
+        <combo_box.item value="filter_type_animations" label="Animations" />
+        <combo_box.item value="filter_type_calling_cards" label="Calling Cards" />
+        <combo_box.item value="filter_type_clothing" label="Clothing / Body Parts" />
+        <combo_box.item value="filter_type_gestures" label="Gestures" />
+        <combo_box.item value="filter_type_landmarks" label="Landmarks" />
+        <combo_box.item value="filter_type_notecards" label="Notecards" />
+        <combo_box.item value="filter_type_objects" label="Objects" />
+        <combo_box.item value="filter_type_scripts" label="Scripts" />
+        <combo_box.item value="filter_type_sounds" label="Sounds" />
+        <combo_box.item value="filter_type_textures" label="Textures" />
+        <combo_box.item value="filter_type_snapshots" label="Snapshots" />
+        <combo_box.item value="filter_type_meshes" label="Meshes" />
+        <combo_box.item value="filter_type_settings" label="Settings" />
+        <combo_box.item value="filter_separator" label="------------" enabled="false" />
+        <combo_box.item value="filter_type_custom" label="Custom..." />
+      </combo_box>
+
+      <menu_button
+       follows="top|right"
+       tool_tip="Show search visibility options"
+       height="16"
+       image_overlay="Inv_Toolbar_SearchVisibility"
+       layout="topleft"
+       right="-1"
+       top_delta="0"
+       name="options_visibility_btn"
+       width="31" />
+    </layout_panel>
+  </layout_stack>
+
+  <panel
+   follows="all"
+   halign="center"
+   height="338"
    layout="topleft"
-   left_pad="3"
-   max_length_chars="300"
-   highlight_text_field="true"
-   name="inventory search editor"
-   tool_tip="Type in one or more words to search for, separated by '+' "
-   top="18"
-   width="185" />
-  <tab_container
-     bg_alpha_color="Transparent"
-     bg_opaque_color="Transparent"
-     background_visible="true"
-     background_opaque="false"
+   left="3"
+   right="-3"
+   name="default_inventory_panel"
+   top_pad="4">
+    <tab_container
+       bg_alpha_color="Transparent"
+       bg_opaque_color="Transparent"
+       background_visible="false"
+       background_opaque="false"
+       follows="all"
+       halign="center"
+       height="338"
+       layout="topleft"
+       left="0"
+       name="inventory filter tabs"
+       open_tabs_on_drag_and_drop="true"
+       tab_position="top"
+       top="0">
+      <inventory_panel
+       border="false"
+       bevel_style="none"
+       follows="all"
+       label="Inventory"
+       help_topic="my_inventory_tab"
+       layout="topleft"
+       name="All Items"
+       sort_order_setting="InventorySortOrder"
+       show_item_link_overlays="true"
+       preinitialize_views="false"
+       scroll.reserve_scroll_corner="false">
+          <folder double_click_override="true"/>
+      </inventory_panel>
+      <recent_inventory_panel
+       border="false"
+       bevel_style="none"
+       follows="all"
+       label="Recent"
+       sort_order_setting="RecentItemsSortOrder"
+       help_topic="recent_inventory_tab"
+       layout="topleft"
+       name="Recent Items"
+       show_item_link_overlays="true"
+       preinitialize_views="false"
+       scroll.reserve_scroll_corner="false">
+          <folder double_click_override="true"/>
+      </recent_inventory_panel>
+      <worn_inventory_panel
+       border="false"
+       bevel_style="none"
+       follows="all"
+       label="Worn"
+       help_topic="worn_inventory_tab"
+       layout="topleft"
+       name="Worn Items"
+       show_item_link_overlays="true"
+       preinitialize_views="false">
+          <folder double_click_override="true"/>
+      </worn_inventory_panel>
+    </tab_container>
+  </panel>
+    <panel
      follows="all"
      halign="center"
-     height="339"
-     layout="topleft"
-     left="7"
-     name="inventory filter tabs"
-     open_tabs_on_drag_and_drop="true"
-     tab_height="23"
-     tab_group="1"
-     tab_position="top"
-     tab_min_width="100"
-     top_pad="10"
-     width="312">
-    <inventory_panel
-     bevel_style="none"
-     follows="all"
      height="338"
-     label="Inventory"
-     help_topic="my_inventory_tab"
      layout="topleft"
-     left="0"
-     name="All Items"
-     sort_order_setting="InventorySortOrder"
-	 show_item_link_overlays="true"
-     top="16"
-     width="288" >
-        <folder double_click_override="true"/>
-    </inventory_panel>
-    <recent_inventory_panel
-     bevel_style="none"
-     follows="all"
-     height="338"
-     label="Recent"
-     sort_order_setting="RecentItemsSortOrder"
-     help_topic="recent_inventory_tab"
-     layout="topleft"
-     left_delta="0"
-     name="Recent Items"
-	 show_item_link_overlays="true"
-     width="290" >
-        <folder double_click_override="true"/>
-    </recent_inventory_panel>
-	<worn_inventory_panel
-     bevel_style="none"
-     follows="all"
-     height="338"
-     label="Worn"
-     help_topic="worn_inventory_tab"
-     layout="topleft"
-     left_delta="0"
-     name="Worn Items"
-	 show_item_link_overlays="true"
-     width="290" >
-        <folder double_click_override="true"/>
-    </worn_inventory_panel>
-  </tab_container>
+     left="4"
+     name="combination_view_inventory"
+     top_delta="0"
+     visible="false">
+     <layout_stack
+      follows="all"
+      height="338"
+      name="combination_view_stack"
+      animate="false"
+      drag_handle_thickness="6"
+      drag_handle_first_indent="18"
+      drag_handle_second_indent="18"
+      drag_handle_color="PanelGray"
+      drag_handle_shift="5"
+      show_drag_handle="true"
+      top="0"
+      left="0"
+      orientation="vertical">
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="228"
+        min_width="150"
+        name="comb_gallery_layout">
+        <panel
+         class="inventory_gallery"
+         filename="panel_inventory_gallery.xml"
+         left="0"
+         top_pad="0"
+         height="228"
+         name="comb_gallery_view_inv"
+         background_visible="true"
+         follows="all"
+         layout="topleft">
+        </panel>
+       </layout_panel>
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="110"
+        name="comb_inventory_layout">
+        <single_folder_inventory_panel
+         name="comb_single_folder_inv"
+         follows="all"
+         left="0"
+         top="0"
+         height="110"
+         layout="topleft"
+         show_item_link_overlays="true"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         scroll.reserve_scroll_corner="false">
+         <item
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+         <folder
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+        </single_folder_inventory_panel>
+       </layout_panel>
+     </layout_stack>
+    </panel>
   <panel
    follows="left|right|bottom"
    height="25"
    layout="topleft"
-   top_pad="0"
-   left="10"
+   bottom="-8"
+   left="4"
    name="bottom_panel"
-   width="307">
+   right="-4">
       <panel
-	   follows="top|left"
-       left="0"
+       follows="top|left"
        height="25"
+       left="0"
        layout="topleft"
        name="options_gear_btn_panel"
        width="32">
           <menu_button
-           follows="bottom|left"
+           follows="top|left"
            tool_tip="Show additional options"
            height="25"
            image_hover_unselected="Toolbar_Left_Over"
@@ -181,14 +365,14 @@
            width="31" />
       </panel>
       <panel
-	   follows="top|left"
-       left_pad="0"
+       follows="top|left"
        height="25"
        layout="topleft"
+       left_pad="0"
        name="add_btn_panel"
        width="32">
           <button
-           follows="bottom|left"
+           follows="top|left"
            height="25"
            image_hover_unselected="Toolbar_Middle_Over"
            image_overlay="AddItem_Off"
@@ -201,15 +385,15 @@
            top="0"
            width="31" />
       </panel>
-	  <panel
-	  follows="top|left"
-       left_pad="0"
+      <panel
+       follows="top|left"
        height="25"
        layout="topleft"
+       left_pad="0"
        name="new_inventory_panel"
        width="32">
           <button
-           follows="bottom|left"
+           follows="top|left"
            height="25"
            image_hover_unselected="Toolbar_Middle_Over"
            image_overlay="inventory_18"
@@ -227,65 +411,66 @@
            </button>
       </panel>
       <panel
-	   follows="top|left"
-       left_pad="0"
+       follows="top|left"
        height="25"
        layout="topleft"
-       name="collapse_panel"
-       width="90">
-	      <button
-		   auto_resize="true"
-           follows="bottom|left|right"
+       left_pad="0"
+       name="view_mode_panel"
+       width="32">
+          <button
+           follows="top|left"
            height="25"
            image_hover_unselected="Toolbar_Middle_Over"
-		   label="Collapse All"
+           image_overlay="Single_Folder_Mode"
            image_selected="Toolbar_Middle_Selected"
            image_unselected="Toolbar_Middle_Off"
            layout="topleft"
            left="0"
-           name="collapse_btn"
-           tool_tip="Collapse Folders"
+           name="view_mode_btn"
+           tool_tip="Switch between views"
            top="0"
-           width="89" />
-	  </panel>	   
+           width="31"/>
+      </panel>
       <panel
-	   follows="top|left|right"
-       left_pad="0"
+       follows="top|left|right"
        height="25"
+       left_pad="0"
+       right="-33"
        layout="topleft"
-       name="expand_panel"
-       width="90">
-		  <button
-		   auto_resize="true"
-           follows="bottom|left|right"
-           height="25"
-           image_hover_unselected="Toolbar_Middle_Over"
-		   label="Expand All"
-           image_selected="Toolbar_Middle_Selected"
-           image_unselected="Toolbar_Middle_Off"
+       name="dummy_panel">
+          <text
+           type="string"
+           length="1"
+           height="13"
            layout="topleft"
-           left="0"
-           name="expand_btn"
-           tool_tip="Expand Folders"
-           top="0"
-           width="89" />
-          <!-- icon
+           left="8"
+           name="ItemcountText"
+           font="SansSerifMedium"
+           top_pad="6"
+           tool_tip="[ITEMS] Items, [CATEGORIES] Folders"
+           use_ellipses="true"
            follows="bottom|left|right"
+           right="-8">
+          Elements
+          </text>
+          <icon
+           follows="top|left|right"
            height="25"
            image_name="Toolbar_Middle_Off"
            layout="topleft"
-           left_pad="1"
+           left="0"
            top="0"
-           name="dummy_icon"
-           width="59" / -->
+           right="-1"
+           name="dummy_icon" />
       </panel>
       <panel
-	   follows="top|right"
-       left_pad="0"
+       follows="top|right"
        height="25"
+       left_pad="0"
+       right="-1"
        layout="topleft"
        name="trash_btn_panel"
-       width="31">
+       width="32">
           <dnd_button
            follows="top|right"
            height="25"
@@ -299,6 +484,6 @@
            tool_tip="Remove selected item"
            top="0"
            width="31"/>
-      </panel>
-  </panel>
+       </panel>
+    </panel>
 </panel>
diff --git a/indra/newview/skins/starlight/xui/en/sidepanel_inventory.xml b/indra/newview/skins/starlight/xui/en/sidepanel_inventory.xml
new file mode 100644
index 0000000000..31e7055359
--- /dev/null
+++ b/indra/newview/skins/starlight/xui/en/sidepanel_inventory.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+	  follows="all"
+	  height="570"
+	  label="Things"
+	  layout="topleft"
+	  min_height="350"
+	  min_width="240"
+	  name="objects panel"
+	  width="333">
+    <panel
+		 follows="all"
+		 layout="topleft"
+		 left="0"
+		 name="sidepanel_inventory_panel"
+		 top="0"
+		 label=""
+		 height="570"
+		 visible="true"
+		 width="330">
+         <layout_stack
+              follows="left|right|top|bottom"
+              layout="topleft"
+              left="0"
+              top="0"
+              orientation="vertical"
+              name="inventory_layout_stack"
+              height="565"
+              width="330">
+             <layout_panel
+                 name="main_inventory_layout_panel"
+                 layout="topleft"
+                 auto_resize="true"
+                 user_resize="true"
+                 min_dim="150"
+                 width="330"
+                 follows="bottom|left|right"
+                 height="300">
+                 <panel
+                      class="panel_main_inventory"
+                      filename="panel_main_inventory.xml"
+                      follows="all"
+                      layout="topleft"
+                      left="0"
+                      name="panel_main_inventory"
+                      top="0"
+                      label=""
+                      height="300"
+                      width="330" />
+             </layout_panel>
+			    <layout_panel
+                 layout="topleft"
+                 auto_resize="false"
+                 user_resize="true"
+                 follows="left|right|top"
+                 name="inbox_layout_panel"
+                 visible="false"
+                 min_dim="35"
+                 expanded_min_dim="90"
+                 height="235">
+                 <panel
+                      follows="all"
+                      layout="topleft"
+                      left="0"
+                      name="marketplace_inbox"
+                      class="panel_marketplace_inbox"
+                      top="0"
+                      label=""
+                      height="235">
+                     <string name="InboxLabelWithArg">Received items ([NUM])</string>
+                     <string name="InboxLabelNoArg">Received items</string>
+                     <button
+                        control_name="InventoryInboxToggleState"
+                        label="Received items"
+                        font="SansSerifMedium"
+                        name="inbox_btn"
+                        height="35"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        halign="left"
+                        handle_right_mouse="false"
+                        follows="top|left|right"
+                        is_toggle="true"
+                        tab_stop="false"
+                        pad_left="35"
+                        top="0"
+                        left="5"
+                        right="-43" />
+                     <button
+                        name="reload_received_items_btn"
+                        height="35"
+                        width="35"
+                        left_pad="3"
+                        follows="top|right"
+                        image_overlay="Refresh_Off"
+                        tool_tip="Reload the received items list." />
+                     <text
+                        type="string"
+                        length="1"
+                        follows="right|top"
+                        layout="topleft"
+                        height="13"
+                        top="10"
+                        right="-58"
+                        name="inbox_fresh_new_count"
+                        font="SansSerifMedium"
+                        halign="right"
+                        top_pad="0">
+                        [NUM] new
+                     </text>
+                     <panel
+                        name="inbox_inventory_placeholder_panel"
+                        follows="all"
+                        left="5"
+                        right="-5"
+                        top="35"
+                        height="200"
+                        bg_opaque_color="InventoryBackgroundColor"
+                        background_visible="true"
+                        background_opaque="true"
+                        tool_tip="Drag and drop items to your inventory to use them"
+                        >
+                        <text name="inbox_inventory_placeholder"
+                            type="string"
+                            follows="all"
+                            layout="topleft"
+                            top="0"
+                            height="200"
+                            wrap="true"
+                            halign="center"
+                            valign="center">
+                          Purchases from the marketplace will be delivered here.
+                        </text>
+                    </panel>
+                 </panel>
+             </layout_panel>
+         </layout_stack>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml b/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml
index 440e0d7af2..27eb1dc6c4 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- default_tab_group="1"
  follows="all"
  height="423"
  label="Things"
  layout="topleft"
  min_height="300"
  min_width="240"
- name="main inventory panel"
- bg_opaque_color="Transparent"
- bg_alpha_color="Transparent"
- width="330">
+ name="main inventory panel">
+  bg_opaque_color="Transparent"
+  bg_alpha_color="Transparent"
   <panel.string
    name="Itemcount">
   </panel.string>
@@ -26,120 +24,234 @@
    name="ItemcountUnknown">
     Fetched [ITEM_COUNT] Elements [FILTER]
   </panel.string>
-  <text
-		     type="string"
-		     length="1"
-		     follows="left|top|right"
-		     height="13"
-		     layout="topleft"
-    		 left="12"
-		     name="ItemcountText"
-		     font="SansSerifMedium"
-		     text_color="SL-EmphasisColor"
-		     tool_tip="[ITEMS] Items, [CATEGORIES] Folders"
-		     use_ellipses="true"
-		     top_pad="0"
-		     width="300">
-    Elements:
-  </text>
-  <combo_box
-   name="filter_combo_box"
-   width="80"
-   height="21"
-   top="18"
-   left="10"
-   follows="top|left"
-   layout="topleft">
-
-  <combo_box.item value="filter_type_all" label="All Types" />
-  <combo_box.item value="filter_separator" label="------------" enabled="false" />
-  <combo_box.item value="filter_type_animations" label="Animations" />
-  <combo_box.item value="filter_type_calling_cards" label="Calling Cards" />
-  <combo_box.item value="filter_type_clothing" label="Clothing / Body Parts" />
-  <combo_box.item value="filter_type_gestures" label="Gestures" />
-  <combo_box.item value="filter_type_landmarks" label="Landmarks" />
-  <combo_box.item value="filter_type_notecards" label="Notecards" />
-  <combo_box.item value="filter_type_objects" label="Objects" />
-  <combo_box.item value="filter_type_scripts" label="Scripts" />
-  <combo_box.item value="filter_type_sounds" label="Sounds" />
-  <combo_box.item value="filter_type_textures" label="Textures" />
-  <combo_box.item value="filter_type_snapshots" label="Snapshots" />
-  <combo_box.item value="filter_type_meshes" label="Meshes" />
-  <combo_box.item value="filter_type_settings" label="Settings" />
-  <combo_box.item value="filter_separator" label="------------" enabled="false" />
-  <combo_box.item value="filter_type_custom" label="Custom..." />
-
-  </combo_box>
-  <menu_button
-   follows="top|left"
-   tool_tip="Show search visibility options"
-   height="21"
-   image_overlay="Inv_Toolbar_SearchVisibility"
-   layout="topleft"
-   left_pad="3"
-   name="options_visibility_btn"
-   width="31" />
-  <filter_editor
-   text_pad_left="10"
+  <panel.string name="inventory_title">Inventory</panel.string>
+  <panel.string name="default_mode_btn">Multi_Folder_Mode</panel.string>
+  <panel.string name="single_folder_mode_btn">Single_Folder_Mode</panel.string>
+  
+  <layout_stack
    follows="left|top|right"
-   height="23"
-   label="Filter Inventory"
+   height="25"
+   animate="false"
+   top_pad="4"
+   left="10"
+   name="nav_stack"
+   orientation="horizontal">
+    <layout_panel
+     border="false"
+     bevel_style="in"
+     user_resize="false"
+     auto_resize="false"
+     height="25"
+     width="62"
+     name="nav_buttons"
+     visible="false">
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Back"
+      image_pressed="Single_Folder_Back"
+      image_unselected="Single_Folder_Back"
+      scale_image="false"
+      layout="topleft"
+      left="0"
+      top="2"
+      name="back_btn"
+      tool_tip="Back"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Forward"
+      image_pressed="Single_Folder_Forward"
+      image_unselected="Single_Folder_Forward"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="forward_btn"
+      tool_tip="Forward"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Up"
+      image_pressed="Single_Folder_Up"
+      image_unselected="Single_Folder_Up"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="up_btn"
+      tool_tip="Go up one level"
+      width="20" />
+    </layout_panel>
+    <layout_panel
+      border="false"
+      bevel_style="in"
+      user_resize="false"
+      height="25"
+      width="324"
+      name="filter_panel"
+      visible="true">
+      <filter_editor
+       text_pad_left="10"
+       follows="left|top|right"
+       height="23"
+       label="Filter Inventory"
+       layout="topleft"
+       left="2"
+       max_length_chars="300"
+       highlight_text_field="true"
+       name="inventory search editor"
+       tool_tip="Type in one or more words to search for, separated by '+' "
+       top="0"
+       width="322" />
+    </layout_panel>
+  </layout_stack>
+
+  <layout_stack
+   follows="left|top|right"
+   height="16"
+   animate="false"
+   top_pad="4"
+   left="4"
+   name="ctrl_stack"
+   orientation="horizontal">
+    <layout_panel
+     border="false"
+     bevel_style="in"
+     user_resize="false"
+     auto_resize="false"
+     height="16"
+     width="168"
+     name="collapse_expand_buttons">
+      <button
+       name="collapse_btn"
+       label="Collapse"
+       width="80"
+       height="16"
+       left="0"
+       top="0"
+       follows="top|left"
+       layout="topleft"/>
+
+      <button
+       name="expand_btn"
+       label="Expand"
+       width="80"
+       height="16"
+       left_pad="4"
+       follows="top|left"
+       layout="topleft" />
+
+    </layout_panel>
+    <layout_panel
+     border="false"
+     bevel_style="in"
+     user_resize="false"
+     height="16"
+     width="164"
+     name="filter_ctrls">
+
+      <text
+       name="filter_label"
+       value="Filter:"
+       width="40"
+       height="16"
+       left="0"
+       top="0"
+       follows="top|left"
+       layout="topleft" />
+
+      <combo_box
+       name="filter_combo_box"
+       right="-35"
+       height="16"
+       left_pad="4"
+       follows="top|left|right"
+       layout="topleft">
+        <combo_box.item value="filter_type_all" label="All Types" />
+        <combo_box.item value="filter_separator" label="------------" enabled="false" />
+        <combo_box.item value="filter_type_animations" label="Animations" />
+        <combo_box.item value="filter_type_calling_cards" label="Calling Cards" />
+        <combo_box.item value="filter_type_clothing" label="Clothing / Body Parts" />
+        <combo_box.item value="filter_type_gestures" label="Gestures" />
+        <combo_box.item value="filter_type_landmarks" label="Landmarks" />
+        <combo_box.item value="filter_type_notecards" label="Notecards" />
+        <combo_box.item value="filter_type_objects" label="Objects" />
+        <combo_box.item value="filter_type_scripts" label="Scripts" />
+        <combo_box.item value="filter_type_sounds" label="Sounds" />
+        <combo_box.item value="filter_type_textures" label="Textures" />
+        <combo_box.item value="filter_type_snapshots" label="Snapshots" />
+        <combo_box.item value="filter_type_meshes" label="Meshes" />
+        <combo_box.item value="filter_type_settings" label="Settings" />
+        <combo_box.item value="filter_separator" label="------------" enabled="false" />
+        <combo_box.item value="filter_type_custom" label="Custom..." />
+      </combo_box>
+
+      <menu_button
+       follows="top|right"
+       tool_tip="Show search visibility options"
+       height="16"
+       image_overlay="Inv_Toolbar_SearchVisibility"
+       layout="topleft"
+       right="-1"
+       top_delta="0"
+       name="options_visibility_btn"
+       width="31" />
+    </layout_panel>
+  </layout_stack>
+
+  <panel
+   follows="all"
+   halign="center"
+   height="338"
    layout="topleft"
-   left_pad="3"
-   max_length_chars="300"
-   highlight_text_field="true"
-   name="inventory search editor"
-   tool_tip="Type in one or more words to search for, separated by '+' "
-   top="18"
-   width="185" />
-  <tab_container
-     bg_alpha_color="Transparent"
-     bg_opaque_color="Transparent"
-     background_visible="true"
-     background_opaque="false"
-     follows="all"
-     halign="center"
-     height="339"
-     layout="topleft"
-     left="7"
-     name="inventory filter tabs"
-     open_tabs_on_drag_and_drop="true"
-     tab_height="23"
-     tab_group="1"
-     tab_position="top"
-     tab_min_width="100"
-     top_pad="10"
-     width="312">
-    <inventory_panel
-     bevel_style="none"
-     follows="all"
-     height="338"
-     label="Inventory"
-     help_topic="my_inventory_tab"
-     layout="topleft"
-     left="0"
-     name="All Items"
-     sort_order_setting="InventorySortOrder"
-	 show_item_link_overlays="true"
-     top="16"
-     width="288" >
-        <folder double_click_override="true"/>
-    </inventory_panel>
-    <recent_inventory_panel
-     bevel_style="none"
-     follows="all"
-     height="338"
-     label="Recent"
-     sort_order_setting="RecentItemsSortOrder"
-     help_topic="recent_inventory_tab"
-     layout="topleft"
-     left_delta="0"
-     name="Recent Items"
-	 show_item_link_overlays="true"
-     width="290" >
-        <folder double_click_override="true"/>
-    </recent_inventory_panel>
-	<worn_inventory_panel
+   left="3"
+   right="-3"
+   name="default_inventory_panel"
+   top_pad="4">
+    <tab_container
+       bg_alpha_color="Transparent"
+       bg_opaque_color="Transparent"
+       background_visible="false"
+       background_opaque="false"
+       follows="all"
+       halign="center"
+       height="338"
+       layout="topleft"
+       left="0"
+       name="inventory filter tabs"
+       open_tabs_on_drag_and_drop="true"
+       tab_position="top"
+       top="0">
+      <inventory_panel
+       border="false"
+       bevel_style="none"
+       follows="all"
+       label="Inventory"
+       help_topic="my_inventory_tab"
+       layout="topleft"
+       name="All Items"
+       sort_order_setting="InventorySortOrder"
+       show_item_link_overlays="true"
+       preinitialize_views="false"
+       scroll.reserve_scroll_corner="false">
+          <folder double_click_override="true"/>
+      </inventory_panel>
+      <recent_inventory_panel
+       border="false"
+       bevel_style="none"
+       follows="all"
+       label="Recent"
+       sort_order_setting="RecentItemsSortOrder"
+       help_topic="recent_inventory_tab"
+       layout="topleft"
+       name="Recent Items"
+       show_item_link_overlays="true"
+       preinitialize_views="false"
+       scroll.reserve_scroll_corner="false">
+          <folder double_click_override="true"/>
+      </recent_inventory_panel>
+      	<worn_inventory_panel
      bevel_style="none"
      follows="all"
      height="338"
@@ -152,24 +264,97 @@
      width="290" >
         <folder double_click_override="true"/>
     </worn_inventory_panel>
-  </tab_container>
+    </tab_container>
+  </panel>
+    <panel
+     follows="all"
+     halign="center"
+     height="338"
+     layout="topleft"
+     left="4"
+     name="combination_view_inventory"
+     top_delta="0"
+     visible="false">
+     <layout_stack
+      follows="all"
+      height="338"
+      name="combination_view_stack"
+      animate="false"
+      drag_handle_thickness="6"
+      drag_handle_first_indent="18"
+      drag_handle_second_indent="18"
+      drag_handle_color="PanelGray"
+      drag_handle_shift="5"
+      show_drag_handle="true"
+      top="0"
+      left="0"
+      orientation="vertical">
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="228"
+        min_width="150"
+        name="comb_gallery_layout">
+        <panel
+         class="inventory_gallery"
+         filename="panel_inventory_gallery.xml"
+         left="0"
+         top_pad="0"
+         height="228"
+         name="comb_gallery_view_inv"
+         background_visible="true"
+         follows="all"
+         layout="topleft">
+        </panel>
+       </layout_panel>
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="110"
+        name="comb_inventory_layout">
+        <single_folder_inventory_panel
+         name="comb_single_folder_inv"
+         follows="all"
+         left="0"
+         top="0"
+         height="110"
+         layout="topleft"
+         show_item_link_overlays="true"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         scroll.reserve_scroll_corner="false">
+         <item
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+         <folder
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+        </single_folder_inventory_panel>
+       </layout_panel>
+     </layout_stack>
+    </panel>
   <panel
    follows="left|right|bottom"
    height="25"
    layout="topleft"
-   top_pad="0"
-   left="10"
+   bottom="-8"
+   left="4"
    name="bottom_panel"
-   width="307">
+   right="-4">
       <panel
-	   follows="top|left"
-       left="0"
+       follows="top|left"
        height="25"
+       left="0"
        layout="topleft"
        name="options_gear_btn_panel"
        width="32">
           <menu_button
-           follows="bottom|left"
+           follows="top|left"
            tool_tip="Show additional options"
            height="25"
            image_hover_unselected="Toolbar_Left_Over"
@@ -183,14 +368,14 @@
            width="31" />
       </panel>
       <panel
-	   follows="top|left"
-       left_pad="0"
+       follows="top|left"
        height="25"
        layout="topleft"
+       left_pad="0"
        name="add_btn_panel"
        width="32">
           <button
-           follows="bottom|left"
+           follows="top|left"
            height="25"
            image_hover_unselected="Toolbar_Middle_Over"
            image_overlay="AddItem_Off"
@@ -203,15 +388,15 @@
            top="0"
            width="31" />
       </panel>
-	  <panel
-	  follows="top|left"
-       left_pad="0"
+      <panel
+       follows="top|left"
        height="25"
        layout="topleft"
+       left_pad="0"
        name="new_inventory_panel"
        width="32">
           <button
-           follows="bottom|left"
+           follows="top|left"
            height="25"
            image_hover_unselected="Toolbar_Middle_Over"
            image_overlay="inventory_18"
@@ -229,65 +414,66 @@
            </button>
       </panel>
       <panel
-	   follows="top|left"
-       left_pad="0"
+       follows="top|left"
        height="25"
        layout="topleft"
-       name="collapse_panel"
-       width="90">
-	      <button
-		   auto_resize="true"
-           follows="bottom|left|right"
+       left_pad="0"
+       name="view_mode_panel"
+       width="32">
+          <button
+           follows="top|left"
            height="25"
            image_hover_unselected="Toolbar_Middle_Over"
-		   label="Collapse All"
+           image_overlay="Single_Folder_Mode"
            image_selected="Toolbar_Middle_Selected"
            image_unselected="Toolbar_Middle_Off"
            layout="topleft"
            left="0"
-           name="collapse_btn"
-           tool_tip="Collapse Folders"
+           name="view_mode_btn"
+           tool_tip="Switch between views"
            top="0"
-           width="89" />
-	  </panel>	   
+           width="31"/>
+      </panel>
       <panel
-	   follows="top|left|right"
-       left_pad="0"
+       follows="top|left|right"
        height="25"
+       left_pad="0"
+       right="-33"
        layout="topleft"
-       name="expand_panel"
-       width="90">
-		  <button
-		   auto_resize="true"
-           follows="bottom|left|right"
-           height="25"
-           image_hover_unselected="Toolbar_Middle_Over"
-		   label="Expand All"
-           image_selected="Toolbar_Middle_Selected"
-           image_unselected="Toolbar_Middle_Off"
+       name="dummy_panel">
+          <text
+           type="string"
+           length="1"
+           height="13"
            layout="topleft"
-           left="0"
-           name="expand_btn"
-           tool_tip="Expand Folders"
-           top="0"
-           width="89" />
-          <!-- icon
+           left="8"
+           name="ItemcountText"
+           font="SansSerifMedium"
+           top_pad="6"
+           tool_tip="[ITEMS] Items, [CATEGORIES] Folders"
+           use_ellipses="true"
            follows="bottom|left|right"
+           right="-8">
+          Elements
+          </text>
+          <icon
+           follows="top|left|right"
            height="25"
            image_name="Toolbar_Middle_Off"
            layout="topleft"
-           left_pad="1"
+           left="0"
            top="0"
-           name="dummy_icon"
-           width="59" / -->
+           right="-1"
+           name="dummy_icon" />
       </panel>
       <panel
-	   follows="top|right"
-       left_pad="0"
+       follows="top|right"
        height="25"
+       left_pad="0"
+       right="-1"
        layout="topleft"
        name="trash_btn_panel"
-       width="31">
+       width="32">
           <dnd_button
            follows="top|right"
            height="25"
@@ -301,6 +487,6 @@
            tool_tip="Remove selected item"
            top="0"
            width="31"/>
-      </panel>
-  </panel>
+       </panel>
+    </panel>
 </panel>
diff --git a/indra/newview/skins/starlightcui/xui/en/sidepanel_inventory.xml b/indra/newview/skins/starlightcui/xui/en/sidepanel_inventory.xml
index 5990a42ecf..ed2233580b 100644
--- a/indra/newview/skins/starlightcui/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/starlightcui/xui/en/sidepanel_inventory.xml
@@ -50,8 +50,7 @@
                       height="300"
                       width="330" />
              </layout_panel>
-			 <layout_panel
-                 width="330"
+			    <layout_panel
                  layout="topleft"
                  auto_resize="false"
                  user_resize="true"
@@ -69,16 +68,15 @@
                       class="panel_marketplace_inbox"
                       top="0"
                       label=""
-                      height="235"
-                      width="330">
+                      height="235">
                      <string name="InboxLabelWithArg">Received items ([NUM])</string>
                      <string name="InboxLabelNoArg">Received items</string>
                      <button
+                        control_name="InventoryInboxToggleState"
                         label="Received items"
-						font="SansSerifMedium"
+                        font="SansSerifMedium"
                         name="inbox_btn"
                         height="35"
-                        width="270"
                         image_unselected="MarketplaceBtn_Off"
                         image_selected="MarketplaceBtn_Selected"
                         halign="left"
@@ -88,7 +86,8 @@
                         tab_stop="false"
                         pad_left="35"
                         top="0"
-                        left="10" />
+                        left="5"
+                        right="-43" />
                      <button
                         name="reload_received_items_btn"
                         height="35"
@@ -108,35 +107,32 @@
                         name="inbox_fresh_new_count"
                         font="SansSerifMedium"
                         halign="right"
-                        top_pad="0"
-                        width="300">
+                        top_pad="0">
                         [NUM] new
                      </text>
                      <panel
                         name="inbox_inventory_placeholder_panel"
                         follows="all"
-                        left="10"
-                        bottom="235"
-                        width="308"
+                        left="5"
+                        right="-5"
                         top="35"
+                        height="200"
                         bg_opaque_color="InventoryBackgroundColor"
                         background_visible="true"
                         background_opaque="true"
                         tool_tip="Drag and drop items to your inventory to use them"
                         >
-                        <text
-							name="inbox_inventory_placeholder"
-							type="string"
-							follows="all"
-							layout="topleft"
-							top="0"
-							left="0"
-							width="308"
-							height="200"
-							wrap="true"
-							halign="center">
-							Purchases from the marketplace will be delivered here.
-						</text>
+                        <text name="inbox_inventory_placeholder"
+                            type="string"
+                            follows="all"
+                            layout="topleft"
+                            top="0"
+                            height="200"
+                            wrap="true"
+                            halign="center"
+                            valign="center">
+                          Purchases from the marketplace will be delivered here.
+                        </text>
                     </panel>
                  </panel>
              </layout_panel>