diff --git a/app/build.gradle b/app/build.gradle
index 004da96c..8c46f284 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,7 +51,7 @@ dependencies {
     compile 'com.nhaarman.listviewanimations:lib-manipulation:3.1.0@aar'
     compile 'com.nhaarman.listviewanimations:lib-core-slh:3.1.0@aar'
     compile 'com.nineoldandroids:library:2.4.0+'
-    compile 'com.melnykov:floatingactionbutton:1.1.+'
+    compile 'com.melnykov:floatingactionbutton:1.2.0'
     compile 'com.github.ksoichiro:android-observablescrollview:1.3.0'
     compile 'com.mcxiaoke.volley:library:1.0.+'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'
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 ecafe62c..6acbd5ef 100644
--- a/app/src/main/res/layout-land/activity_music_controller.xml
+++ b/app/src/main/res/layout-land/activity_music_controller.xml
@@ -126,8 +126,7 @@
                 android:layout_centerHorizontal="true"
                 android:layout_margin="16dp"
                 android:background="?attr/music_controller_container_color"
-                android:elevation="2dp"
-                android:padding="8dp">
+                android:elevation="2dp">
 
                 <com.melnykov.fab.FloatingActionButton
                     android:id="@+id/fab"
@@ -140,7 +139,6 @@
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_centerVertical="true"
-
                     android:layout_toLeftOf="@+id/fab"
                     android:background="?round_selector"
                     android:padding="14dp"
@@ -152,7 +150,6 @@
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_centerVertical="true"
-
                     android:layout_toRightOf="@+id/fab"
                     android:background="?round_selector"
                     android:padding="14dp"
@@ -165,7 +162,7 @@
                     android:layout_height="56dp"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-
+                    android:layout_marginLeft="8dp"
                     android:background="?round_selector"
                     android:padding="14dp"
                     android:scaleType="fitCenter"
@@ -177,7 +174,7 @@
                     android:layout_height="56dp"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-
+                    android:layout_marginRight="8dp"
                     android:background="?round_selector"
                     android:padding="14dp"
                     android:scaleType="fitCenter"
diff --git a/app/src/main/res/layout/activity_music_controller.xml b/app/src/main/res/layout/activity_music_controller.xml
index dd9bf55a..1f48db87 100644
--- a/app/src/main/res/layout/activity_music_controller.xml
+++ b/app/src/main/res/layout/activity_music_controller.xml
@@ -93,13 +93,12 @@
     <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="2dp"
-        android:padding="8dp">
+        android:elevation="2dp">
 
         <com.melnykov.fab.FloatingActionButton
             android:id="@+id/fab"
@@ -112,7 +111,6 @@
             android:layout_width="72dp"
             android:layout_height="72dp"
             android:layout_centerVertical="true"
-
             android:layout_toLeftOf="@+id/fab"
             android:background="?round_selector"
             android:padding="22dp"
@@ -124,7 +122,6 @@
             android:layout_width="72dp"
             android:layout_height="72dp"
             android:layout_centerVertical="true"
-
             android:layout_toRightOf="@+id/fab"
             android:background="?round_selector"
             android:padding="22dp"
@@ -137,7 +134,7 @@
             android:layout_height="72dp"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
-
+            android:layout_marginLeft="8dp"
             android:background="?round_selector"
             android:padding="22dp"
             android:scaleType="fitCenter"
@@ -149,7 +146,7 @@
             android:layout_height="72dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-
+            android:layout_marginRight="8dp"
             android:background="?round_selector"
             android:padding="22dp"
             android:scaleType="fitCenter"
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 1b4a7311..c736798a 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -55,6 +55,7 @@
     <style name="PlayPauseFabParent">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="fab_shadow">true</item>
         <item name="fab_color">@color/materialmusic_accent_color</item>
         <item name="fab_colorNormal">@color/materialmusic_accent_color</item>
         <item name="fab_colorPressed">@color/materialmusic_accent_color_darker</item>