diff --git a/app/src/main/java/helium314/keyboard/settings/SearchScreen.kt b/app/src/main/java/helium314/keyboard/settings/SearchScreen.kt
index a0e5ea6ef..b9e48804d 100644
--- a/app/src/main/java/helium314/keyboard/settings/SearchScreen.kt
+++ b/app/src/main/java/helium314/keyboard/settings/SearchScreen.kt
@@ -97,13 +97,14 @@ fun <T: Any> SearchScreen(
                             else onClickBack()
                         }) {
                             Icon(
-                                painterResource(R.drawable.ic_arrow_left), // todo: "old" arrow icon existed, so must be somewhere in resources (maybe androidx?)
+                                painterResource(R.drawable.baseline_arrow_back_24),
                                 stringResource(R.string.spoken_description_action_previous)
                             )
                         }
                     },
                     actions = {
-                        IconButton(onClick = { setShowSearch(!showSearch) }) { Icon(painterResource(R.drawable.sym_keyboard_search_lxx), stringResource(R.string.label_search_key)) }
+                        IconButton(onClick = { setShowSearch(!showSearch) })
+                        { Icon(painterResource(R.drawable.sym_keyboard_search_lxx), stringResource(R.string.label_search_key)) }
                     },
                 )
                 ExpandableSearchField(
diff --git a/app/src/main/java/helium314/keyboard/settings/SettingsActivity.kt b/app/src/main/java/helium314/keyboard/settings/SettingsActivity.kt
index 2845b1d5c..212b0ee2c 100644
--- a/app/src/main/java/helium314/keyboard/settings/SettingsActivity.kt
+++ b/app/src/main/java/helium314/keyboard/settings/SettingsActivity.kt
@@ -17,6 +17,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 //  try making a dialog with reduced padding
 //  work on todos in other files
 //  check dark and light theme (don't have dynamic)
+//  any way to get rid of the "old" background on starting settings? probably comes from app theme, can we avoid it?
 //  rename both settingsActivities
 //  calling KeyboardSwitcher.getInstance().forceUpdateKeyboardTheme(requireContext()) while keyboard is showing shows just full screen background
 //   but reload while keyboard is showing would be great (isn't it at least semi-done when changing one-handed mode?)
@@ -35,17 +36,11 @@ import kotlinx.coroutines.flow.MutableStateFlow
 //    first check whether it's really necessary (test advanced or correction screen normal and with lazyColumn)
 //    screens could have a lazy column of preferences and category separators, and the list has an if-setting-then-null for hiding
 //    lazyColumn also has a "key", this should be used and be the pref name (or maybe title because that's also for category separators)
-//  nice arrows (in top bar, and as next-screen indicator)
-//  PRs adding prefs -> need to do before continuing
-//   1319 (soon)
-//   1263 (no response for 3 weeks)
-//  merge main to implement all the new settings
-//  consider IME insets when searching
 //  dialogs should be rememberSaveable to survive display orientation change and stuff?
-//  try making old fragment back stuff work better, and try the different themes (with and without top bar)
-//  any way to get rid of the "old" background on starting settings? probably comes from app theme, can we avoid it?
-//  consider using simple list picker dialog (but the "full" one is probably better for language settings stuff)
-//  spdx headers everywhere
+//  try making old fragment back stuff work better, and try the different themes (with and without top bar, it should only appear for old fragments)
+//  PRs adding prefs -> need to do before continuing
+//   1263 (no response for several weeks now...)
+//  merge main to implement all the new settings
 
 // what should be done, but not in this PR
 //  in general: changes to anything outside the new settings (unless necessary), and changes to how screens / fragments work
@@ -62,6 +57,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 //  adjust debug settings
 //   have them in main screen?
 //   allow users to find the individual settings in search even if debug settings are not enabled?
+//  replace the setup wizard
 
 //  consider disabled settings & search
 //   don't show -> users confused
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/ConfirmationDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/ConfirmationDialog.kt
index 5a45cf980..5a409fb87 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/ConfirmationDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/ConfirmationDialog.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.dialogs
 
 import androidx.compose.material3.Text
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/CustomizeIconsDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/CustomizeIconsDialog.kt
index 64ea59ea8..60862453a 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/CustomizeIconsDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/CustomizeIconsDialog.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.dialogs
 
 import android.graphics.drawable.VectorDrawable
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/CustomizeLayoutDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/CustomizeLayoutDialog.kt
index 92ba83230..9d72ab99d 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/CustomizeLayoutDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/CustomizeLayoutDialog.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.dialogs
 
 import android.widget.Toast
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/InfoDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/InfoDialog.kt
index c0ba2058e..f01b9565b 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/InfoDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/InfoDialog.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.dialogs
 
 import androidx.compose.material3.Text
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/LayoutEditDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/LayoutEditDialog.kt
index 8cbf51a53..ba178e5f7 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/LayoutEditDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/LayoutEditDialog.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.dialogs
 
 import androidx.compose.material3.Text
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/ListPickerDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/ListPickerDialog.kt
index a3907a287..b2e6157c8 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/ListPickerDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/ListPickerDialog.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.dialogs
 
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/ReorderDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/ReorderDialog.kt
index b8763a931..9d29903b5 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/ReorderDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/ReorderDialog.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.dialogs
 
 import androidx.compose.animation.core.animateDpAsState
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/SliderDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/SliderDialog.kt
index 16e7cef51..713624e00 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/SliderDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/SliderDialog.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.dialogs
 
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/TextInputDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/TextInputDialog.kt
index 7bca9f851..6c713e0f9 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/TextInputDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/TextInputDialog.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.dialogs
 
 import androidx.compose.foundation.layout.fillMaxWidth
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/ThreeButtonAlertDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/ThreeButtonAlertDialog.kt
index a0c557599..0e2d264b5 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/ThreeButtonAlertDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/ThreeButtonAlertDialog.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.dialogs
 
 import androidx.compose.foundation.layout.Row
@@ -10,7 +11,6 @@ import androidx.compose.material3.TextButton
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/ToolbarKeysCustomizer.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/ToolbarKeysCustomizer.kt
index 2879e9564..a4f6abf48 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/ToolbarKeysCustomizer.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/ToolbarKeysCustomizer.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.dialogs
 
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/helium314/keyboard/settings/screens/AdvancedScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/AdvancedScreen.kt
index 11d4e99ca..904c560fb 100644
--- a/app/src/main/java/helium314/keyboard/settings/screens/AdvancedScreen.kt
+++ b/app/src/main/java/helium314/keyboard/settings/screens/AdvancedScreen.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.screens
 
 import android.annotation.SuppressLint
diff --git a/app/src/main/java/helium314/keyboard/settings/screens/ColorsScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/ColorsScreen.kt
index 79bfe0007..693299de2 100644
--- a/app/src/main/java/helium314/keyboard/settings/screens/ColorsScreen.kt
+++ b/app/src/main/java/helium314/keyboard/settings/screens/ColorsScreen.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.screens
 
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/helium314/keyboard/settings/screens/DebugScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/DebugScreen.kt
index 4233fed3c..508def7cd 100644
--- a/app/src/main/java/helium314/keyboard/settings/screens/DebugScreen.kt
+++ b/app/src/main/java/helium314/keyboard/settings/screens/DebugScreen.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.screens
 
 import android.content.Context
diff --git a/app/src/main/java/helium314/keyboard/settings/screens/PreferencesScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/PreferencesScreen.kt
index 92dbf002f..d7fbd6581 100644
--- a/app/src/main/java/helium314/keyboard/settings/screens/PreferencesScreen.kt
+++ b/app/src/main/java/helium314/keyboard/settings/screens/PreferencesScreen.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.screens
 
 import android.content.Context
diff --git a/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt
index 221df2714..4416eb23a 100644
--- a/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt
+++ b/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.settings.screens
 
 import android.content.Context