diff --git a/app/src/main/res/layout-land/activity_music_controller.xml b/app/src/main/res/layout-land/activity_music_controller.xml
index c7648f1e..ecafe62c 100644
--- a/app/src/main/res/layout-land/activity_music_controller.xml
+++ b/app/src/main/res/layout-land/activity_music_controller.xml
@@ -121,18 +121,18 @@
             <RelativeLayout
                 android:id="@+id/media_controller_container"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="88dp"
                 android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
                 android:layout_margin="16dp"
                 android:background="?attr/music_controller_container_color"
-                android:elevation="1dp">
+                android:elevation="2dp"
+                android:padding="8dp">
 
                 <com.melnykov.fab.FloatingActionButton
                     android:id="@+id/fab"
                     style="@style/PlayPauseFab"
                     android:layout_centerInParent="true"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginTop="16dp"
                     />
 
                 <ImageButton
@@ -140,8 +140,9 @@
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_centerVertical="true"
+
                     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"/>
@@ -151,8 +152,9 @@
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_centerVertical="true"
+
                     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"/>
@@ -163,8 +165,8 @@
                     android:layout_height="56dp"
                     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"/>
@@ -175,8 +177,8 @@
                     android:layout_height="56dp"
                     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"/>
@@ -196,7 +198,6 @@
 
         </RelativeLayout>
 
-
     </LinearLayout>
 
     <android.support.v7.widget.Toolbar
diff --git a/app/src/main/res/layout/activity_music_controller.xml b/app/src/main/res/layout/activity_music_controller.xml
index d1c3d516..dd9bf55a 100644
--- a/app/src/main/res/layout/activity_music_controller.xml
+++ b/app/src/main/res/layout/activity_music_controller.xml
@@ -5,10 +5,11 @@
                 android:orientation="vertical"
                 tools:context="com.kabouzeid.materialmusic.ui.activities.AlbumDetailActivity$PlaceholderFragment">
 
-    <com.kabouzeid.materialmusic.view.SquareImageView
+    <ImageView
         android:id="@+id/album_art"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_above="@+id/footer"
         android:background="@color/black"
         android:scaleType="centerCrop"
         android:src="@drawable/default_album_art"
@@ -59,7 +60,7 @@
         android:id="@+id/footer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/album_art"
+        android:layout_above="@+id/media_controller_container"
         android:background="?attr/colorPrimary"
         android:elevation="1dp"
         android:orientation="vertical"
@@ -67,10 +68,9 @@
         android:paddingLeft="72dp"
         android:paddingRight="72dp"
         android:paddingTop="16dp"
-        android:transitionName="@string/transition_album_text"
-        >
+        android:transitionName="@string/transition_album_text">
 
-        <TextView
+    <TextView
             android:id="@+id/song_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -93,13 +93,13 @@
     <RelativeLayout
         android:id="@+id/media_controller_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_below="@+id/footer"
         android:layout_centerHorizontal="true"
         android:layout_margin="16dp"
         android:background="?attr/music_controller_container_color"
-        android:elevation="1dp">
+        android:elevation="2dp"
+        android:padding="8dp">
 
         <com.melnykov.fab.FloatingActionButton
             android:id="@+id/fab"
@@ -109,49 +109,49 @@
 
         <ImageButton
             android:id="@+id/prev_button"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
+            android:layout_width="72dp"
+            android:layout_height="72dp"
             android:layout_centerVertical="true"
-            android:layout_margin="8dp"
+
             android:layout_toLeftOf="@+id/fab"
             android:background="?round_selector"
-            android:padding="14dp"
+            android:padding="22dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_skip_previous_white_48dp"/>
 
         <ImageButton
             android:id="@+id/next_button"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
+            android:layout_width="72dp"
+            android:layout_height="72dp"
             android:layout_centerVertical="true"
-            android:layout_margin="8dp"
+
             android:layout_toRightOf="@+id/fab"
             android:background="?round_selector"
-            android:padding="14dp"
+            android:padding="22dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_skip_next_white_48dp"/>
 
         <ImageButton
             android:id="@+id/repeat_button"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
+            android:layout_width="72dp"
+            android:layout_height="72dp"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
-            android:layout_margin="8dp"
+
             android:background="?round_selector"
-            android:padding="14dp"
+            android:padding="22dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_repeat_grey600_48dp"/>
 
         <ImageButton
             android:id="@+id/shuffle_button"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
+            android:layout_width="72dp"
+            android:layout_height="72dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_margin="8dp"
+
             android:background="?round_selector"
-            android:padding="14dp"
+            android:padding="22dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_shuffle_grey600_48dp"/>
 
diff --git a/app/src/main/res/values-v21/colors.xml b/app/src/main/res/values-v21/colors.xml
index 5efe8760..716b4247 100644
--- a/app/src/main/res/values-v21/colors.xml
+++ b/app/src/main/res/values-v21/colors.xml
@@ -2,6 +2,7 @@
 <resources>
     <color name="notification_buttons_tint">#de000000</color>
 
-    <color name="button_selected">#D0D0D0</color>
-    <color name="button_selected_dark">#88FFFFFF</color>
+    <!--must be solid colors so the ripple will not be semi transparent. Note: the color have no effect on the ripple-->
+    <color name="button_selected">#FFFFFFFF</color>
+    <color name="button_selected_dark">#FFFFFFFF</color>
 </resources>
\ No newline at end of file