diff --git a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
index 3e44b6c2..59506011 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -194,7 +194,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             val density = resources.displayMetrics.density
             // status bar height + toolbar height + margin
             val margin =
-                insets.systemWindowInsetTop + (48 * density).toInt() + (28 * density).toInt()
+                if (binding.toolbarContainer.layoutParams.width == ViewGroup.LayoutParams.MATCH_PARENT) {
+                    insets.systemWindowInsetTop + (48 * density).toInt() + (28 * density).toInt()
+                } else {
+                    insets.systemWindowInsetTop + (12 * density).toInt()
+                }
             binding.fabLayers.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                 topMargin = margin
             }
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
index 177a8fcd..6bd1a0a4 100644
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -42,7 +42,7 @@
 
         <FrameLayout
             android:id="@+id/toolbar_container"
-            android:layout_width="match_parent"
+            android:layout_width="@dimen/map_toolbar_width"
             android:layout_height="wrap_content"
             android:fitsSystemWindows="true"
             app:layout_behavior="@string/ScrollingAppBarLayoutBehavior">
@@ -231,7 +231,7 @@
             android:focusable="true"
             android:layout_gravity="top|end"
             android:layout_marginEnd="20dp"
-            android:layout_marginTop="100dp"
+            android:layout_marginTop="@dimen/layers_fab_top_padding"
             app:tint="?android:colorControlNormal"
             app:backgroundTint="?android:colorBackground"
             app:borderWidth="0dp"
@@ -246,7 +246,7 @@
             android:layout_width="200dp"
             android:layout_gravity="top|end"
             android:layout_marginEnd="16dp"
-            android:layout_marginTop="100dp"
+            android:layout_marginTop="@dimen/layers_fab_top_padding"
             android:visibility="gone"
             app:cardCornerRadius="16dp"
             tools:visibility="visible">
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
new file mode 100644
index 00000000..194a15d0
--- /dev/null
+++ b/app/src/main/res/values-sw720dp/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="map_toolbar_width">500dp</dimen>
+    <dimen name="layers_fab_top_padding">20dp</dimen>
+</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 43e8a5e2..2167e569 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,4 +7,8 @@
     <dimen name="detail_corner_radius_negative">-8dp</dimen>
     <dimen name="expand_toggle_padding_large">16dp</dimen>
     <dimen name="expand_toggle_padding_small">8dp</dimen>
+
+    <item name="match_parent" type="dimen">-1</item>
+    <dimen name="map_toolbar_width">@dimen/match_parent</dimen>
+    <dimen name="layers_fab_top_padding">100dp</dimen>
 </resources>
\ No newline at end of file