diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/IconButton.kt b/app/src/main/java/com/geeksville/mesh/ui/map/MapButton.kt
similarity index 88%
rename from app/src/main/java/com/geeksville/mesh/ui/components/IconButton.kt
rename to app/src/main/java/com/geeksville/mesh/ui/map/MapButton.kt
index 5a33b21ec..1e9803613 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/IconButton.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/MapButton.kt
@@ -1,4 +1,4 @@
-package com.geeksville.mesh.ui.components
+package com.geeksville.mesh.ui.map
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
@@ -15,14 +15,14 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 
 @Composable
-fun IconButton(
+fun MapButton(
     onClick: () -> Unit,
     @DrawableRes drawableRes: Int,
     @StringRes contentDescription: Int,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
 ) {
-    IconButton(
+    MapButton(
         onClick = onClick,
         drawableRes = drawableRes,
         contentDescription = stringResource(contentDescription),
@@ -32,7 +32,7 @@ fun IconButton(
 }
 
 @Composable
-fun IconButton(
+fun MapButton(
     onClick: () -> Unit,
     @DrawableRes drawableRes: Int,
     contentDescription: String?,
@@ -47,15 +47,15 @@ fun IconButton(
         Icon(
             painterResource(id = drawableRes),
             contentDescription,
-            modifier = Modifier.scale(1.5f),
+            modifier = Modifier.scale(scale = 1.5f),
         )
     }
 }
 
 @Preview(showBackground = true)
 @Composable
-private fun IconButtonsPreview() {
-    IconButton(
+private fun MapButtonPreview() {
+    MapButton(
         onClick = {},
         drawableRes = R.drawable.ic_twotone_layers_24,
         R.string.map_style_selection,
diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
index cf0308afa..04b426ebc 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
@@ -12,6 +12,7 @@ import android.view.ViewGroup
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.content.res.AppCompatResources
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -52,7 +53,6 @@ import com.geeksville.mesh.model.UIViewModel
 import com.geeksville.mesh.model.map.CustomTileSource
 import com.geeksville.mesh.model.map.MarkerWithLabel
 import com.geeksville.mesh.ui.ScreenFragment
-import com.geeksville.mesh.ui.components.IconButton
 import com.geeksville.mesh.ui.theme.AppTheme
 import com.geeksville.mesh.util.SqlTileWriterExt
 import com.geeksville.mesh.util.formatAgo
@@ -643,13 +643,14 @@ fun MapView(
                 modifier = Modifier
                     .padding(top = 16.dp, end = 16.dp)
                     .align(Alignment.TopEnd),
+                verticalArrangement = Arrangement.spacedBy(8.dp),
             ) {
-                IconButton(
+                MapButton(
                     onClick = { showMapStyleDialog() },
                     drawableRes = R.drawable.ic_twotone_layers_24,
                     contentDescription = R.string.map_style_selection,
                 )
-                IconButton(
+                MapButton(
                     onClick = {
                         if (context.hasLocationPermission()) map.toggleMyLocation()
                         else requestPermissionAndToggleLauncher.launch(context.getLocationPermissions())
@@ -658,7 +659,6 @@ fun MapView(
                     drawableRes = if (myLocationOverlay == null) R.drawable.ic_twotone_my_location_24
                     else R.drawable.ic_twotone_location_disabled_24,
                     contentDescription = null,
-                    modifier = Modifier.padding(top = 8.dp),
                 )
             }
         }