Reduce size of menus

    Bug: 5452031

Change-Id: I3cc638b981e50796293b0f61dac2d93b8e3df1a0
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 2b651c3..bf95574 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -44,12 +44,6 @@
             android:icon="@drawable/ic_bookmark_on_holo_dark"
             android:alphabeticShortcut="d"
             android:visible="@bool/menu_show_bookmarks" />
-        <item
-            android:id="@+id/bookmarks_menu_id"
-            android:title="@string/bookmarks"
-            android:icon="@drawable/ic_bookmarks_history_holo_dark"
-            android:alphabeticShortcut="b"
-            android:visible="@bool/menu_show_bookmarks" />
         <group
             android:id="@+id/LIVE_MENU">
             <item
@@ -74,6 +68,16 @@
                 android:id="@+id/snapshot_go_live"
                 android:title="@string/snapshot_go_live" />
         </group>
+        <group
+            android:id="@+id/COMBO_MENU">
+            <item
+                android:id="@+id/history_menu_id"
+                android:title="@string/tab_history"
+                android:alphabeticShortcut="h" />
+            <item
+                android:id="@+id/snapshots_menu_id"
+                android:title="@string/tab_snapshots" />
+        </group>
         <item
             android:id="@+id/page_info_menu_id"
             android:title="@string/page_info" />
@@ -97,8 +101,6 @@
             android:alphabeticShortcut="j" />
         <item android:id="@+id/homepage_menu_id"
             android:alphabeticShortcut="&#32;" />
-        <item android:id="@+id/classic_history_menu_id"
-            android:alphabeticShortcut="h" />
         <item android:id="@+id/zoom_in_menu_id"
             android:alphabeticShortcut="i" />
         <item android:id="@+id/zoom_out_menu_id"
@@ -128,6 +130,8 @@
             android:alphabeticShortcut="f" />
         <item android:id="@+id/page_info_menu_id"
             android:alphabeticShortcut="g" />
+        <item android:id="@+id/bookmarks_menu_id"
+            android:alphabeticShortcut="b" />
     </group>
     <!-- these items are toggled in and out of @+id/stop_reload_menu_id -->
     <item android:id="@+id/stop_menu_id"