diff --git a/app/src/main/res/layout-w720dp/fragment_main.xml b/app/src/main/res/layout-w720dp/fragment_main.xml
index 2b8a21ad3..90a55472a 100644
--- a/app/src/main/res/layout-w720dp/fragment_main.xml
+++ b/app/src/main/res/layout-w720dp/fragment_main.xml
@@ -22,6 +22,7 @@
             app:navGraph="@navigation/inner"
             tools:layout="@layout/fragment_home" />
 
+
         <org.oxycblt.auxio.home.EdgeFrameLayout
             android:id="@+id/main_fab_container"
             android:layout_width="match_parent"
@@ -29,7 +30,6 @@
             android:layout_gravity="bottom|end"
             android:clipChildren="false"
             android:clipToPadding="false"
-            android:layout_margin="@dimen/spacing_medium"
             app:layout_anchor="@id/home_content">
 
             <org.oxycblt.auxio.home.ThemedSpeedDialView
@@ -41,6 +41,7 @@
                 android:contentDescription="@string/lbl_new_playlist"
                 android:focusable="true"
                 android:gravity="bottom|end"
+                android:layout_margin="@dimen/spacing_medium"
                 app:sdMainFabAnimationRotateAngle="135"
                 app:sdMainFabClosedIconColor="@android:color/white"
                 app:sdMainFabClosedSrc="@drawable/ic_add_24" />
@@ -49,9 +50,9 @@
                 android:id="@+id/home_shuffle_fab"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="bottom|end"
                 android:layout_margin="@dimen/spacing_medium"
-                android:contentDescription="@string/desc_shuffle_all"
+                android:layout_gravity="bottom|end"
+                android:contentDescription="@string/lbl_shuffle"
                 android:src="@drawable/ic_shuffle_off_24" />
 
         </org.oxycblt.auxio.home.EdgeFrameLayout>
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index e6458b2bd..ad115ed4c 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -34,7 +34,6 @@
             android:layout_height="match_parent"
             android:layout_gravity="bottom|end"
             android:clipChildren="false"
-            android:layout_margin="@dimen/spacing_medium"
             android:clipToPadding="false"
             app:layout_anchor="@id/home_content">
 
@@ -47,6 +46,7 @@
                 android:contentDescription="@string/lbl_new_playlist"
                 android:focusable="true"
                 android:gravity="bottom|end"
+                android:layout_margin="@dimen/spacing_medium"
                 app:sdMainFabAnimationRotateAngle="135"
                 app:sdMainFabClosedIconColor="@android:color/white"
                 app:sdMainFabClosedSrc="@drawable/ic_add_24" />
@@ -55,6 +55,7 @@
                 android:id="@+id/home_shuffle_fab"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_margin="@dimen/spacing_medium"
                 android:layout_gravity="bottom|end"
                 android:contentDescription="@string/lbl_shuffle"
                 android:src="@drawable/ic_shuffle_off_24" />