diff --git a/app/src/main/res/drawable/ic_sleep_timer.xml b/app/src/main/res/drawable/ic_sleep_timer.xml
new file mode 100644
index 000000000..e5ff2f862
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sleep_timer.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M11.975,19.95Q13.3,19.95 14.513,19.538Q15.725,19.125 16.775,18.325Q15.225,17.75 13.613,16.575Q12,15.4 10.812,13.662Q9.625,11.925 9.1,9.65Q8.575,7.375 9.15,4.65Q6.85,5.525 5.45,7.525Q4.05,9.525 4.05,12Q4.05,15.325 6.35,17.637Q8.65,19.95 11.975,19.95ZM11.975,22.225Q9.85,22.225 7.988,21.425Q6.125,20.625 4.75,19.25Q3.375,17.875 2.575,16Q1.775,14.125 1.775,12Q1.775,8.125 4.213,5.325Q6.65,2.525 10.6,1.95Q11.375,1.825 11.725,2.325Q12.075,2.825 11.775,3.65Q11,5.8 11.2,7.912Q11.4,10.025 12.387,11.787Q13.375,13.55 15.062,14.825Q16.75,16.1 18.975,16.575Q19.85,16.75 20.1,17.3Q20.35,17.85 19.85,18.45Q18.4,20.225 16.375,21.225Q14.35,22.225 11.975,22.225ZM10.425,12.3Q10.425,12.3 10.425,12.3Q10.425,12.3 10.425,12.3Q10.425,12.3 10.425,12.3Q10.425,12.3 10.425,12.3Q10.425,12.3 10.425,12.3Q10.425,12.3 10.425,12.3Q10.425,12.3 10.425,12.3Q10.425,12.3 10.425,12.3Q10.425,12.3 10.425,12.3Q10.425,12.3 10.425,12.3Z"/>
+</vector>
diff --git a/app/src/main/res/menu/menu_player.xml b/app/src/main/res/menu/menu_player.xml
index 34bef5148..0123400d1 100755
--- a/app/src/main/res/menu/menu_player.xml
+++ b/app/src/main/res/menu/menu_player.xml
@@ -1,13 +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"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/action_playback_speed"
-        android:icon="@drawable/ic_playback_speed"
+        android:id="@+id/action_sleep_timer"
+        android:icon="@drawable/ic_sleep_timer"
         android:orderInCategory="0"
-        android:title="@string/playback_speed"
-        tools:targetApi="23" />
+        android:title="@string/action_sleep_timer"
+        app:showAsAction="always" />
     <item
         android:id="@+id/action_toggle_lyrics"
         android:checkable="true"
@@ -28,6 +27,12 @@
         android:orderInCategory="3"
         android:title="@string/now_playing_queue"
         app:showAsAction="always" />
+    <item
+        android:id="@+id/action_playback_speed"
+        android:icon="@drawable/ic_playback_speed"
+        android:orderInCategory="4"
+        android:title="@string/playback_speed"
+        android:visible="@bool/isMarshmallow"/>
     <item
         android:id="@+id/action_go_to_drive_mode"
         android:icon="@drawable/ic_drive_eta"
@@ -76,11 +81,6 @@
         android:id="@+id/action_go_to_lyrics"
         android:orderInCategory="11"
         android:title="@string/action_go_to_lyrics" />
-    <item
-        android:id="@+id/action_sleep_timer"
-        android:orderInCategory="12"
-        android:title="@string/action_sleep_timer"
-        app:showAsAction="never" />
     <item
         android:id="@+id/action_equalizer"
         android:orderInCategory="13"
diff --git a/app/src/main/res/values-v23/bools.xml b/app/src/main/res/values-v23/bools.xml
new file mode 100644
index 000000000..0a9fcbada
--- /dev/null
+++ b/app/src/main/res/values-v23/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="isMarshmallow">true</bool>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index 3084d216b..654eeffa5 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -9,4 +9,5 @@
     <bool name="wallpaper_accent_visible">false</bool>
 
     <bool name="isNotOreo">true</bool>
+    <bool name="isMarshmallow">false</bool>
 </resources>
\ No newline at end of file