diff --git a/app/src/main/java/com/sameerasw/essentials/ui/activities/SettingsActivity.kt b/app/src/main/java/com/sameerasw/essentials/ui/activities/SettingsActivity.kt
index cde55c3de..098f29c0a 100644
--- a/app/src/main/java/com/sameerasw/essentials/ui/activities/SettingsActivity.kt
+++ b/app/src/main/java/com/sameerasw/essentials/ui/activities/SettingsActivity.kt
@@ -1212,7 +1212,7 @@ fun SettingsContent(
                                 SimpleDateFormat(
                                     "yyyyMMdd_HHmmss",
                                     Locale.getDefault(),
-                                ).format(Date())
+                                    ).format(Date())
                             exportLauncher.launch("essentials_config_$timeStamp.json")
                         },
                         modifier =
@@ -1222,7 +1222,7 @@ fun SettingsContent(
                         shape = ButtonGroupDefaults.connectedLeadingButtonShapes().shape,
                     ) {
                         Icon(
-                            painter = painterResource(R.drawable.rounded_vertical_align_bottom_24),
+                            painter = painterResource(R.drawable.rounded_vertical_align_top_24),
                             contentDescription = null,
                             modifier = Modifier.size(20.dp),
                         )
@@ -1241,7 +1241,7 @@ fun SettingsContent(
                         shape = ButtonGroupDefaults.connectedTrailingButtonShapes().shape,
                     ) {
                         Icon(
-                            painter = painterResource(R.drawable.rounded_vertical_align_top_24),
+                            painter = painterResource(R.drawable.rounded_vertical_align_bottom_24),
                             contentDescription = null,
                             modifier = Modifier.size(20.dp),
                         )
diff --git a/app/src/main/java/com/sameerasw/essentials/ui/core/sheets/PermissionsBottomSheet.kt b/app/src/main/java/com/sameerasw/essentials/ui/core/sheets/PermissionsBottomSheet.kt
index 66c8aebd7..8117adf59 100644
--- a/app/src/main/java/com/sameerasw/essentials/ui/core/sheets/PermissionsBottomSheet.kt
+++ b/app/src/main/java/com/sameerasw/essentials/ui/core/sheets/PermissionsBottomSheet.kt
@@ -28,6 +28,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -77,6 +78,12 @@ fun PermissionsBottomSheet(
     val pendingPermissions = permissions.filter { !it.isGranted }
     val grantedPermissions = permissions.filter { it.isGranted }
 
+    LaunchedEffect(pendingPermissions.isEmpty()) {
+        if (pendingPermissions.isEmpty() && permissions.isNotEmpty()) {
+            onDismissRequest()
+        }
+    }
+
     EssentialsBottomSheet(
         onDismissRequest = onDismissRequest,
     ) {