diff --git a/MPDroid/src/main/res/layout/library_tabs_fragment.xml b/MPDroid/src/main/res/layout/library_tabs_fragment.xml
index f4b7fa5939..fdd2a339ca 100644
--- a/MPDroid/src/main/res/layout/library_tabs_fragment.xml
+++ b/MPDroid/src/main/res/layout/library_tabs_fragment.xml
@@ -47,6 +47,7 @@
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:paddingBottom="?attr/libraryPagerBottomMargin"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/MPDroid/src/main/res/layout/streams_list.xml b/MPDroid/src/main/res/layout/streams_list.xml
index 5cd38ed3c7..1db54df443 100644
--- a/MPDroid/src/main/res/layout/streams_list.xml
+++ b/MPDroid/src/main/res/layout/streams_list.xml
@@ -77,12 +77,16 @@
                 android:text="@string/no_result" />
         </ScrollView>
 
+        <!-- Shitty padding workaround for the collapsable actionbar issue -->
         <com.melnykov.fab.FloatingActionButton
             android:id="@+id/streamAddButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_margin="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginBottom="?attr/streamsFabBottomMargin"
             android:src="@drawable/ic_fab_add"
             fab:fab_colorNormal="@color/fab_color"
             fab:fab_colorPressed="@color/fab_color_pressed"
diff --git a/MPDroid/src/main/res/values-v21/styles.xml b/MPDroid/src/main/res/values-v21/styles.xml
index b584ecf0cf..311d6a8bec 100644
--- a/MPDroid/src/main/res/values-v21/styles.xml
+++ b/MPDroid/src/main/res/values-v21/styles.xml
@@ -32,12 +32,16 @@
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
+        <item name="streamsFabBottomMargin">80dp</item>
+        <item name="libraryPagerBottomMargin">0dp</item>
     </style>
 
     <style name="AppThemeBase.Light" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:colorPrimary">@color/actionbar_background_blue</item>
         <item name="android:colorPrimaryDark">@color/statusbar_background_blue</item>
         <item name="android:colorAccent">@color/accent_blue</item>
+        <item name="streamsFabBottomMargin">80dp</item>
+        <item name="libraryPagerBottomMargin">0dp</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/MPDroid/src/main/res/values/attrs.xml b/MPDroid/src/main/res/values/attrs.xml
index 6820ab20ce..5ed6e8eb56 100644
--- a/MPDroid/src/main/res/values/attrs.xml
+++ b/MPDroid/src/main/res/values/attrs.xml
@@ -46,6 +46,9 @@
         <attr name="listItemSecondaryTextColor" format="color" />
         <attr name="toolbarPopupTheme" format="reference" />
         <attr name="nowPlayingSongInfoBackground" format="reference" />
+
+        <attr name="streamsFabBottomMargin" format="dimension" />
+        <attr name="libraryPagerBottomMargin" format="dimension" />
     </declare-styleable>
 
 </resources>
\ No newline at end of file
diff --git a/MPDroid/src/main/res/values/styles.xml b/MPDroid/src/main/res/values/styles.xml
index 167451f9c3..0c62c11632 100644
--- a/MPDroid/src/main/res/values/styles.xml
+++ b/MPDroid/src/main/res/values/styles.xml
@@ -32,9 +32,15 @@
         <item name="background">@drawable/tab_indicator_ab_light</item>
     </style>
 
-    <style name="AppThemeBase" parent="Theme.AppCompat" />
+    <style name="AppThemeBase" parent="Theme.AppCompat">
+        <item name="streamsFabBottomMargin">16dp</item>
+        <item name="libraryPagerBottomMargin">?attr/actionBarSize</item>
+    </style>
 
-    <style name="AppThemeBase.Light" parent="Theme.AppCompat.Light.DarkActionBar" />
+    <style name="AppThemeBase.Light" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="streamsFabBottomMargin">16dp</item>
+        <item name="libraryPagerBottomMargin">?attr/actionBarSize</item>
+    </style>
 
     <style name="AppTheme" parent="@style/AppThemeBase">
         <item name="colorPrimary">@color/nowplaying_background</item>