diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index 6d86a84e..7ec04d39 100644
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -149,7 +149,7 @@
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/play_pause_fab"
-        style="@style/PlayPauseFab"
+        style="@style/Fab"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin_top_left_right"
         app:srcCompat="@drawable/ic_done_white_24dp" />
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index 687012ca..1d8887c9 100644
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -173,7 +173,7 @@
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/play_pause_fab"
-        style="@style/PlayPauseFab"
+        style="@style/Fab"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin_top_left_right"
         app:srcCompat="@drawable/ic_done_white_24dp" />
diff --git a/app/src/main/res/layout/fragment_playback_controls.xml b/app/src/main/res/layout/fragment_playback_controls.xml
index 260e0689..2f652bb1 100644
--- a/app/src/main/res/layout/fragment_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_playback_controls.xml
@@ -126,7 +126,7 @@
             app:pressedTranslationZ="2dp"
             app:elevation="4dp"
             android:id="@+id/player_play_pause_fab"
-            style="@style/PlayPauseFab"
+            style="@style/Fab"
             android:layout_centerInParent="true" />
 
     </RelativeLayout>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index c59c5ef9..d0e722b7 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -19,7 +19,7 @@
 
     <style name="Theme.Phonograph.Notification.Title" parent="@android:style/TextAppearance.Material.Notification.Title" />
 
-    <style name="PlayPauseFab" parent="PlayPauseFabParent">
+    <style name="Fab" parent="FabParent">
         <item name="android:transitionName">@string/transition_fab</item>
     </style>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2332aec6..0335caba 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,7 +28,7 @@
         <item name="android:layout_gravity">center</item>
     </style>
 
-    <style name="PlayPauseFab" parent="PlayPauseFabParent" />
+    <style name="Fab" parent="FabParent" />
 
     <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
         <item name="android:thumbOffset">0dp</item>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index da9184c3..c4292da2 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -67,7 +67,7 @@
         <item name="md_background_color">@color/grey_900</item>
     </style>
 
-    <style name="PlayPauseFabParent">
+    <style name="FabParent">
         <item name="borderWidth">0dp</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -87,18 +87,6 @@
         <item name="android:layout_marginRight">@dimen/seek_bar_margin_left_right</item>
     </style>
 
-    <style name="OverFlowButtonParent">
-        <item name="android:tint">?attr/iconColor</item>
-        <item name="srcCompat">@drawable/abc_ic_menu_overflow_material</item>
-        <item name="android:layout_margin">8dp</item>
-        <item name="android:layout_width">48dp</item>
-        <item name="android:layout_height">48dp</item>
-        <item name="android:scaleType">center</item>
-        <item name="android:background">?attr/roundSelector</item>
-        <item name="android:focusableInTouchMode">false</item>
-        <item name="android:focusable">false</item>
-    </style>
-
     <!-- content description is necessary to find the overflow button later in the layout-->
     <style name="Widget.ActionButton.Overflow" parent="Widget.AppCompat.ActionButton.Overflow">
         <item name="android:contentDescription">@string/abc_action_menu_overflow_description</item>