diff --git a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutLauncherActivity.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutLauncherActivity.java
index d29da953..8d2ddff1 100644
--- a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutLauncherActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutLauncherActivity.java
@@ -5,9 +5,9 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import com.dkanada.gramophone.BuildConfig;
-import com.dkanada.gramophone.views.shortcuts.shortcuttype.LatestShortcutType;
-import com.dkanada.gramophone.views.shortcuts.shortcuttype.ShuffleShortcutType;
-import com.dkanada.gramophone.views.shortcuts.shortcuttype.FrequentShortcutType;
+import com.dkanada.gramophone.views.shortcuts.type.LatestShortcutType;
+import com.dkanada.gramophone.views.shortcuts.type.ShuffleShortcutType;
+import com.dkanada.gramophone.views.shortcuts.type.FrequentShortcutType;
 import com.dkanada.gramophone.model.Playlist;
 import com.dkanada.gramophone.service.MusicService;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/DynamicShortcutManager.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/DynamicShortcutManager.java
index 50e3d3fe..34eb09c9 100644
--- a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/DynamicShortcutManager.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/DynamicShortcutManager.java
@@ -8,9 +8,9 @@ import android.content.pm.ShortcutManager;
 import android.graphics.drawable.Icon;
 import android.os.Build;
 
-import com.dkanada.gramophone.views.shortcuts.shortcuttype.LatestShortcutType;
-import com.dkanada.gramophone.views.shortcuts.shortcuttype.ShuffleShortcutType;
-import com.dkanada.gramophone.views.shortcuts.shortcuttype.FrequentShortcutType;
+import com.dkanada.gramophone.views.shortcuts.type.LatestShortcutType;
+import com.dkanada.gramophone.views.shortcuts.type.ShuffleShortcutType;
+import com.dkanada.gramophone.views.shortcuts.type.FrequentShortcutType;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/BaseShortcutType.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/BaseShortcutType.java
similarity index 94%
rename from app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/BaseShortcutType.java
rename to app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/BaseShortcutType.java
index e0c68145..70c6b7ba 100644
--- a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/BaseShortcutType.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/BaseShortcutType.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.views.shortcuts.shortcuttype;
+package com.dkanada.gramophone.views.shortcuts.type;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/FrequentShortcutType.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/FrequentShortcutType.java
similarity index 94%
rename from app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/FrequentShortcutType.java
rename to app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/FrequentShortcutType.java
index 5a84406d..85879e7c 100644
--- a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/FrequentShortcutType.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/FrequentShortcutType.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.views.shortcuts.shortcuttype;
+package com.dkanada.gramophone.views.shortcuts.type;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/LatestShortcutType.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/LatestShortcutType.java
similarity index 94%
rename from app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/LatestShortcutType.java
rename to app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/LatestShortcutType.java
index de2f8ff8..70ab2c46 100644
--- a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/LatestShortcutType.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/LatestShortcutType.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.views.shortcuts.shortcuttype;
+package com.dkanada.gramophone.views.shortcuts.type;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/ShuffleShortcutType.java b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/ShuffleShortcutType.java
similarity index 94%
rename from app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/ShuffleShortcutType.java
rename to app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/ShuffleShortcutType.java
index dff6ca2e..633230f6 100644
--- a/app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/ShuffleShortcutType.java
+++ b/app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/ShuffleShortcutType.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.views.shortcuts.shortcuttype;
+package com.dkanada.gramophone.views.shortcuts.type;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml b/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
index 8d7a97b0..e254d765 100644
--- a/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
+++ b/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
@@ -1,32 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <item
         android:id="@+id/action_play_next"
         android:title="@string/action_play_next"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_add_to_queue"
         android:title="@string/action_add_to_queue"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_add_to_playlist"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_go_to_album"
         android:title="@string/action_go_to_album"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_go_to_artist"
         android:title="@string/action_go_to_artist"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_share"
         android:title="@string/action_share"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_details"
         android:title="@string/action_details"
         app:showAsAction="never" />
+
 </menu>
diff --git a/app/src/main/res/menu/menu_item_playing_queue_song.xml b/app/src/main/res/menu/menu_item_playing_queue_song.xml
index 2e54b3d9..576945b4 100644
--- a/app/src/main/res/menu/menu_item_playing_queue_song.xml
+++ b/app/src/main/res/menu/menu_item_playing_queue_song.xml
@@ -1,33 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <item
         android:id="@+id/action_play_next"
         android:title="@string/action_play_next"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_remove_from_queue"
         android:title="@string/action_remove_from_queue"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_add_to_playlist"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_go_to_album"
         android:title="@string/action_go_to_album"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_go_to_artist"
         android:title="@string/action_go_to_artist"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_share"
         android:title="@string/action_share"
         app:showAsAction="never" />
+
     <item
         android:visible="false"
         android:id="@+id/action_details"
         android:title="@string/action_details"
         app:showAsAction="never" />
+
 </menu>
diff --git a/app/src/main/res/menu/menu_item_playlist.xml b/app/src/main/res/menu/menu_item_playlist.xml
index 983d78ed..9383187a 100644
--- a/app/src/main/res/menu/menu_item_playlist.xml
+++ b/app/src/main/res/menu/menu_item_playlist.xml
@@ -4,18 +4,23 @@
     <item
         android:id="@+id/action_play"
         android:title="@string/action_play" />
+
     <item
         android:id="@+id/action_play_next"
         android:title="@string/action_play_next" />
+
     <item
         android:id="@+id/action_add_to_queue"
         android:title="@string/action_add_to_queue" />
+
     <item
         android:id="@+id/action_add_to_playlist"
         android:title="@string/action_add_to_playlist" />
+
     <item
         android:id="@+id/action_rename_playlist"
         android:title="@string/action_rename" />
+
     <item
         android:id="@+id/action_delete_playlist"
         android:title="@string/action_delete" />
diff --git a/app/src/main/res/menu/menu_item_playlist_song.xml b/app/src/main/res/menu/menu_item_playlist_song.xml
index ea7680f3..db2e427f 100644
--- a/app/src/main/res/menu/menu_item_playlist_song.xml
+++ b/app/src/main/res/menu/menu_item_playlist_song.xml
@@ -1,36 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <item
         android:id="@+id/action_remove_from_playlist"
         android:title="@string/action_remove_from_playlist"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_play_next"
         android:title="@string/action_play_next"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_add_to_queue"
         android:title="@string/action_add_to_queue"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_add_to_playlist"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_go_to_album"
         android:title="@string/action_go_to_album"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_go_to_artist"
         android:title="@string/action_go_to_artist"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_share"
         android:title="@string/action_share"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_details"
         android:title="@string/action_details"
         app:showAsAction="never" />
+
 </menu>
diff --git a/app/src/main/res/menu/menu_item_song.xml b/app/src/main/res/menu/menu_item_song.xml
index f93195c5..b7fdf64a 100644
--- a/app/src/main/res/menu/menu_item_song.xml
+++ b/app/src/main/res/menu/menu_item_song.xml
@@ -1,36 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <item
         android:id="@+id/action_play_next"
         android:title="@string/action_play_next"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_add_to_queue"
         android:title="@string/action_add_to_queue"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_add_to_playlist"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_go_to_album"
         android:title="@string/action_go_to_album"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_go_to_artist"
         android:title="@string/action_go_to_artist"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_share"
         android:title="@string/action_share"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_details"
         android:title="@string/action_details"
         app:showAsAction="never" />
+
     <item
         android:id="@+id/action_download"
         android:title="@string/action_download"
         app:showAsAction="never" />
+
 </menu>
diff --git a/app/src/main/res/menu/menu_player.xml b/app/src/main/res/menu/menu_player.xml
index 904a530d..e5dcad53 100644
--- a/app/src/main/res/menu/menu_player.xml
+++ b/app/src/main/res/menu/menu_player.xml
@@ -25,4 +25,5 @@
         android:orderInCategory="1"
         android:title="@string/action_sleep_timer"
         app:showAsAction="never" />
+
 </menu>
diff --git a/app/src/main/res/menu/menu_playlist_detail.xml b/app/src/main/res/menu/menu_playlist_detail.xml
index c7bcbfb5..16d56b2e 100644
--- a/app/src/main/res/menu/menu_playlist_detail.xml
+++ b/app/src/main/res/menu/menu_playlist_detail.xml
@@ -24,7 +24,8 @@
 
     <item
         android:id="@+id/action_add_to_playlist"
-        android:title="@string/action_add_to_playlist" />
+        android:title="@string/action_add_to_playlist"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_rename_playlist"
diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml
index 4e77cf96..1784ace9 100644
--- a/app/src/main/res/menu/menu_search.xml
+++ b/app/src/main/res/menu/menu_search.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <item
         android:id="@+id/search"
         android:icon="@drawable/ic_search_white_24dp"
         android:title="@string/action_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="ifRoom|collapseActionView" />
+
 </menu>