diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 65f0f38b..b3675272 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -18,50 +18,65 @@
     <item
         android:id="@+id/action_grid_size"
         android:title="@string/action_grid_size">
+
         <menu>
+
             <group
                 android:id="@+id/group_grid_size"
                 android:checkableBehavior="single">
+
                 <item
                     android:id="@+id/action_grid_size_1"
                     android:title="@string/grid_size_1" />
+
                 <item
                     android:id="@+id/action_grid_size_2"
                     android:title="@string/grid_size_2" />
+
                 <item
                     android:id="@+id/action_grid_size_3"
                     android:title="@string/grid_size_3" />
+
                 <item
                     android:id="@+id/action_grid_size_4"
                     android:title="@string/grid_size_4" />
+
                 <item
                     android:id="@+id/action_grid_size_5"
                     android:title="@string/grid_size_5" />
+
                 <item
                     android:id="@+id/action_grid_size_6"
                     android:title="@string/grid_size_6" />
+
                 <item
                     android:id="@+id/action_grid_size_7"
                     android:title="@string/grid_size_7" />
+
                 <item
                     android:id="@+id/action_grid_size_8"
                     android:title="@string/grid_size_8" />
+
             </group>
+
         </menu>
+
     </item>
 
     <item
         android:id="@+id/action_sort_method"
         android:title="@string/action_sort_method">
-        <menu>
-        </menu>
+
+        <menu />
+
     </item>
 
     <item
         android:id="@+id/action_sort_order"
         android:title="@string/action_sort_order">
-        <menu>
-        </menu>
+
+        <menu />
+
     </item>
 
     <item
diff --git a/app/src/main/res/menu/menu_player.xml b/app/src/main/res/menu/menu_player.xml
index e5dcad53..3026a34a 100644
--- a/app/src/main/res/menu/menu_player.xml
+++ b/app/src/main/res/menu/menu_player.xml
@@ -4,25 +4,21 @@
     <item
         android:id="@+id/action_toggle_favorite"
         android:icon="@drawable/ic_favorite_border_white_24dp"
-        android:orderInCategory="1"
         android:title="@string/action_add_to_favorites"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_clear_queue"
-        android:orderInCategory="1"
         android:title="@string/action_clear_queue"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/action_save_queue"
-        android:orderInCategory="1"
         android:title="@string/action_save_queue"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/action_sleep_timer"
-        android:orderInCategory="1"
         android:title="@string/action_sleep_timer"
         app:showAsAction="never" />