diff --git a/app/src/main/res/anim-v21/fab_elevation.xml b/app/src/main/res/anim-v21/fab_state_list.xml
similarity index 70%
rename from app/src/main/res/anim-v21/fab_elevation.xml
rename to app/src/main/res/anim-v21/fab_state_list.xml
index 8fcb5e1..1ad07db 100644
--- a/app/src/main/res/anim-v21/fab_elevation.xml
+++ b/app/src/main/res/anim-v21/fab_state_list.xml
@@ -4,16 +4,14 @@
         <objectAnimator
             android:duration="@android:integer/config_shortAnimTime"
             android:propertyName="translationZ"
-            android:valueFrom="@dimen/fab_elevation_low"
-            android:valueTo="@dimen/fab_elevation_high"
+            android:valueTo="@dimen/fab_press_translation_z"
             android:valueType="floatType"/>
     </item>
     <item>
         <objectAnimator
             android:duration="@android:integer/config_shortAnimTime"
             android:propertyName="translationZ"
-            android:valueFrom="@dimen/fab_elevation_high"
-            android:valueTo="@dimen/fab_elevation_low"
+            android:valueTo="0"
             android:valueType="floatType"/>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/fab_background.xml b/app/src/main/res/drawable-v21/fab_background.xml
index fea05b8..8caaa1c 100644
--- a/app/src/main/res/drawable-v21/fab_background.xml
+++ b/app/src/main/res/drawable-v21/fab_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="?colorControlHighlight">
+        android:color="@color/ripple_material_dark">
     <item>
         <shape android:shape="oval">
             <solid android:color="?colorAccent"/>
diff --git a/app/src/main/res/drawable/fab_background_highlighted.xml b/app/src/main/res/drawable/fab_background_highlighted.xml
index 6b14b61..8ee6200 100644
--- a/app/src/main/res/drawable/fab_background_highlighted.xml
+++ b/app/src/main/res/drawable/fab_background_highlighted.xml
@@ -7,7 +7,7 @@
     </item>
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/ripple_material_light"/>
+            <solid android:color="@color/ripple_material_dark"/>
         </shape>
     </item>
 </layer-list>
\ 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 5de7d25..926995f 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -14,4 +14,11 @@
         <item name="android:textColorLink">?android:attr/colorAccent</item>
     </style>
 
+    <!-- Styles -->
+
+    <style name="FloatingActionButton" parent="FloatingActionButtonBase">
+        <item name="android:elevation">@dimen/fab_elevation</item>
+        <item name="android:stateListAnimator">@anim/fab_state_list</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 54337b3..3d895d1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -19,7 +19,7 @@
     <dimen name="detail_card_view_margin_top">54dp</dimen>
     <dimen name="detail_card_view_margin_bottom">-10dp</dimen>
     <dimen name="fab_diameter">56dp</dimen>
-    <dimen name="fab_elevation_low">2dp</dimen>
-    <dimen name="fab_elevation_high">4dp</dimen>
+    <dimen name="fab_elevation">8dp</dimen>
+    <dimen name="fab_press_translation_z">6dp</dimen>
 
 </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 cdc70d1..518cf27 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Main theme -->
 
@@ -77,17 +77,17 @@
         <item name="textColor">@color/tab_text</item>
     </style>
 
-    <style name="FloatingActionButton" tools:ignore="newApi">
+    <style name="FloatingActionButtonBase">
         <item name="android:layout_width">@dimen/fab_diameter</item>
         <item name="android:layout_height">@dimen/fab_diameter</item>
         <item name="android:background">@drawable/fab_background</item>
-        <item name="android:elevation">@dimen/fab_elevation_low</item>
-        <item name="android:stateListAnimator">@anim/fab_elevation</item>
         <item name="android:scaleType">center</item>
         <item name="android:clickable">true</item>
         <item name="android:focusable">true</item>
     </style>
 
+    <style name="FloatingActionButton" parent="FloatingActionButtonBase"/>
+
     <style name="SeparatorLine">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1dp</item>