diff --git a/app/src/main/res/drawable-v21/round_ripple_selector.xml b/app/src/main/res/drawable-v21/round_ripple_selector.xml
new file mode 100644
index 00000000..622a85b9
--- /dev/null
+++ b/app/src/main/res/drawable-v21/round_ripple_selector.xml
@@ -0,0 +1,9 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:colorControlHighlight">
+
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@drawable/round_selected"/>
+    <item android:drawable="@drawable/round_selector"/>
+
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/round_ripple_selector_dark.xml b/app/src/main/res/drawable-v21/round_ripple_selector_dark.xml
new file mode 100644
index 00000000..8e87f190
--- /dev/null
+++ b/app/src/main/res/drawable-v21/round_ripple_selector_dark.xml
@@ -0,0 +1,9 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:colorControlHighlight">
+
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@drawable/round_selected_dark"/>
+    <item android:drawable="@drawable/round_selector_dark"/>
+
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/round_selector.xml b/app/src/main/res/drawable-v21/round_selector.xml
new file mode 100644
index 00000000..d1809684
--- /dev/null
+++ b/app/src/main/res/drawable-v21/round_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="true" android:drawable="@drawable/round_selected" />
+    <item android:drawable="@drawable/transparent" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/round_selector_dark.xml b/app/src/main/res/drawable-v21/round_selector_dark.xml
new file mode 100644
index 00000000..fc2932f9
--- /dev/null
+++ b/app/src/main/res/drawable-v21/round_selector_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="true" android:drawable="@drawable/round_selected_dark" />
+    <item android:drawable="@drawable/transparent" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_item_activated.xml b/app/src/main/res/drawable/list_item_activated.xml
index 603cde48..5c1a210f 100755
--- a/app/src/main/res/drawable/list_item_activated.xml
+++ b/app/src/main/res/drawable/list_item_activated.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-    <solid android:color="#26000000"/>
+    <solid android:color="@color/list_item_activated"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_item_activated_dark.xml b/app/src/main/res/drawable/list_item_activated_dark.xml
index cc568803..a0aa840f 100755
--- a/app/src/main/res/drawable/list_item_activated_dark.xml
+++ b/app/src/main/res/drawable/list_item_activated_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-    <solid android:color="#26FFFFFF"/>
+    <solid android:color="@color/list_item_activated_dark"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_item_selected.xml b/app/src/main/res/drawable/list_item_selected.xml
index f11a29f3..eaa1bd2f 100755
--- a/app/src/main/res/drawable/list_item_selected.xml
+++ b/app/src/main/res/drawable/list_item_selected.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-    <solid android:color="#D0D0D0"/>
+    <solid android:color="@color/list_item_selected"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_item_selected_dark.xml b/app/src/main/res/drawable/list_item_selected_dark.xml
index 90fd83f2..a32bd4df 100755
--- a/app/src/main/res/drawable/list_item_selected_dark.xml
+++ b/app/src/main/res/drawable/list_item_selected_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-    <solid android:color="#77404040"/>
+    <solid android:color="@color/list_item_selected_dark"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_selected.xml b/app/src/main/res/drawable/round_selected.xml
new file mode 100644
index 00000000..190dd7df
--- /dev/null
+++ b/app/src/main/res/drawable/round_selected.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/button_selected" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_selected_dark.xml b/app/src/main/res/drawable/round_selected_dark.xml
new file mode 100644
index 00000000..33405edb
--- /dev/null
+++ b/app/src/main/res/drawable/round_selected_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/button_selected_dark" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_selector.xml b/app/src/main/res/drawable/round_selector.xml
new file mode 100644
index 00000000..b12bc490
--- /dev/null
+++ b/app/src/main/res/drawable/round_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true" android:drawable="@drawable/round_selected" />
+    <item android:drawable="@drawable/transparent" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_selector_dark.xml b/app/src/main/res/drawable/round_selector_dark.xml
new file mode 100644
index 00000000..8eaa1e81
--- /dev/null
+++ b/app/src/main/res/drawable/round_selector_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true" android:drawable="@drawable/round_selected_dark" />
+    <item android:drawable="@drawable/transparent" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_music_controller.xml b/app/src/main/res/layout/activity_music_controller.xml
index 4bcd0e71..d1c3d516 100644
--- a/app/src/main/res/layout/activity_music_controller.xml
+++ b/app/src/main/res/layout/activity_music_controller.xml
@@ -114,7 +114,7 @@
             android:layout_centerVertical="true"
             android:layout_margin="8dp"
             android:layout_toLeftOf="@+id/fab"
-            android:background="?android:attr/selectableItemBackground"
+            android:background="?round_selector"
             android:padding="14dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_skip_previous_white_48dp"/>
@@ -126,7 +126,7 @@
             android:layout_centerVertical="true"
             android:layout_margin="8dp"
             android:layout_toRightOf="@+id/fab"
-            android:background="?android:attr/selectableItemBackground"
+            android:background="?round_selector"
             android:padding="14dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_skip_next_white_48dp"/>
@@ -138,7 +138,7 @@
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
             android:layout_margin="8dp"
-            android:background="?android:attr/selectableItemBackground"
+            android:background="?round_selector"
             android:padding="14dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_repeat_grey600_48dp"/>
@@ -150,7 +150,7 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_margin="8dp"
-            android:background="?android:attr/selectableItemBackground"
+            android:background="?round_selector"
             android:padding="14dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_shuffle_grey600_48dp"/>
diff --git a/app/src/main/res/layout/fragment_place_holder.xml b/app/src/main/res/layout/fragment_place_holder.xml
index b018f65f..bf4fae40 100644
--- a/app/src/main/res/layout/fragment_place_holder.xml
+++ b/app/src/main/res/layout/fragment_place_holder.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <TextView
-    android:id="@+id/fragment_placeholder"
+    android:id="@+id/fragment_placeholder_text"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fontFamily="sans-serif-medium"
     android:gravity="center"
-    android:text="Comming soon!"
     android:textAppearance="@style/TextAppearance.AppCompat.Title"
     android:textColor="?title_text_color"/>
diff --git a/app/src/main/res/values-v21/colors.xml b/app/src/main/res/values-v21/colors.xml
index 1bb789d5..5efe8760 100644
--- a/app/src/main/res/values-v21/colors.xml
+++ b/app/src/main/res/values-v21/colors.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="notification_buttons_tint">#de000000</color>
+
+    <color name="button_selected">#D0D0D0</color>
+    <color name="button_selected_dark">#88FFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 0729ca41..acc77a2e 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,11 +1,11 @@
 <resources>
 
     <style name="Theme.MaterialMusic" parent="Theme.MaterialMusic.Base">
-        <!-- Customize your theme here. -->
+        <item name="round_selector">@drawable/round_ripple_selector_dark</item>
     </style>
 
     <style name="Theme.MaterialMusic.Light" parent="Theme.MaterialMusic.Base.Light">
-        <!-- Customize your theme here. -->
+        <!--<item name="round_selector">@drawable/round_ripple_selector</item>-->
     </style>
 
     <style name="Theme.MaterialMusic.Notification" parent="@android:style/TextAppearance.Material.Notification"/>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 5fcbd456..71441d50 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -6,4 +6,5 @@
     <attr name="fab_color" format="color"/>
     <attr name="fab_color_pressed" format="color"/>
     <attr name="list_selector" format="reference"/>
+    <attr name="round_selector" format="reference"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3dda9443..12563273 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -25,4 +25,12 @@
     <color name="materialmusic_dark_music_controller_container_color">@color/grey_800</color>
 
     <drawable name="notification_template_divider_media">#29ffffff</drawable>
+
+    <color name="list_item_activated">#26000000</color>
+    <color name="list_item_activated_dark">#26FFFFFF</color>
+    <color name="list_item_selected">#D0D0D0</color>
+    <color name="list_item_selected_dark">#77404040</color>
+
+    <color name="button_selected">#D0D0D0</color>
+    <color name="button_selected_dark">#30FFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e40891b7..82eb911d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,11 +1,11 @@
 <resources>
 
     <style name="Theme.MaterialMusic" parent="Theme.MaterialMusic.Base">
-        <!-- Customize your theme here. -->
+
     </style>
 
     <style name="Theme.MaterialMusic.Light" parent="Theme.MaterialMusic.Base.Light">
-        <!-- Customize your theme here. -->
+
     </style>
 
     <style name="Theme.MaterialMusic.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent"/>
@@ -18,7 +18,7 @@
         <item name="android:layout_height">48dp</item>
         <item name="android:src">@drawable/ic_overflow</item>
         <item name="android:scaleType">fitXY</item>
-        <item name="android:background">?selectableItemBackground</item>
+        <item name="android:background">?round_selector</item>
         <item name="android:layout_centerVertical">true</item>
         <item name="android:focusableInTouchMode">false</item>
         <item name="android:focusable">false</item>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index d38d752f..b5e195dd 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -20,6 +20,8 @@
         </item>
 
         <item name="list_selector">@drawable/list_selector_dark</item>
+        <item name="round_selector">@drawable/round_selector_dark</item>
+
         <item name="md_dark_theme">true</item>
 
     </style>
@@ -43,7 +45,9 @@
         </item>
 
         <item name="list_selector">@drawable/list_selector</item>
+        <item name="round_selector">@drawable/round_selector</item>
 
+        <item name="md_dark_theme">false</item>
     </style>
 
     <style name="PlayPauseFabParent">