diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 529374ff4..117d3aa46 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -56,6 +56,7 @@
       </option>
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="5" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 6e6eec114..79ee123c2 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,6 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
   </state>
 </component>
\ No newline at end of file
diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts
index 08e85d498..73d5ab1db 100644
--- a/app/app/build.gradle.kts
+++ b/app/app/build.gradle.kts
@@ -140,6 +140,7 @@ dependencies {
     implementation(project(":data:currencies"))
     implementation(project(":data:customattrs"))
     implementation(project(":data:searchable"))
+    implementation(project(":data:settings"))
     implementation(project(":data:plugins"))
     implementation(project(":data:themes"))
     implementation(project(":data:files"))
diff --git a/app/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt b/app/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt
index 5874ba4ea..1988b81fe 100644
--- a/app/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt
+++ b/app/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt
@@ -36,6 +36,7 @@ import de.mm20.launcher2.searchactions.searchActionsModule
 import de.mm20.launcher2.services.favorites.favoritesModule
 import de.mm20.launcher2.services.tags.servicesTagsModule
 import de.mm20.launcher2.services.widgets.widgetsServiceModule
+import de.mm20.launcher2.settings.settingsModule
 import de.mm20.launcher2.themes.themesModule
 import de.mm20.launcher2.weather.weatherModule
 import kotlinx.coroutines.*
@@ -82,6 +83,7 @@ class LauncherApplication : Application(), CoroutineScope, ImageLoaderFactory {
                     preferencesModule,
                     searchModule,
                     searchActionsModule,
+                    settingsModule,
                     themesModule,
                     unitConverterModule,
                     weatherModule,
diff --git a/app/ui/build.gradle.kts b/app/ui/build.gradle.kts
index 4aed0e48f..83c6da28e 100644
--- a/app/ui/build.gradle.kts
+++ b/app/ui/build.gradle.kts
@@ -135,6 +135,7 @@ dependencies {
     implementation(project(":data:files"))
     implementation(project(":data:widgets"))
     implementation(project(":data:searchable"))
+    implementation(project(":data:settings"))
     implementation(project(":data:themes"))
     implementation(project(":data:wikipedia"))
     implementation(project(":services:badges"))
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt
index 4f25ee4a9..8327a3054 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt
@@ -16,18 +16,15 @@ import androidx.compose.foundation.lazy.LazyItemScope
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Person
 import androidx.compose.material.icons.rounded.Star
 import androidx.compose.material.icons.rounded.Tag
 import androidx.compose.material.icons.rounded.Work
-import androidx.compose.material3.FilterChip
-import androidx.compose.material3.FilterChipDefaults
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Text
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -99,6 +96,7 @@ fun SearchColumn(
     val calculator by viewModel.calculatorResults
     val wikipedia by viewModel.articleResults
     val locations by viewModel.locationResults
+    val settings by viewModel.settingsResults
     val website by viewModel.websiteResults
     val hiddenResults by viewModel.hiddenResults
     val separateWorkProfile by viewModel.separateWorkProfile.collectAsState(true)
@@ -254,6 +252,12 @@ fun SearchColumn(
                     } else null,
                     highlightedItem = bestMatch as? SavableSearchable
                 )
+                ListResults(
+                    items = settings.toImmutableList(),
+                    reverse = reverse,
+                    key = "settings",
+                    highlightedItem = bestMatch as? SavableSearchable
+                 )
                 ListResults(
                     before = if (missingShortcutsPermission && !isSearchEmpty) {
                         {
@@ -268,138 +272,137 @@ fun SearchColumn(
                                     OutlinedButton(onClick = {
                                         viewModel.disableAppShortcutSearch()
                                     }) {
-                                        Text(
-                                            stringResource(R.string.turn_off),
-                                        )
-                                    }
+                                    Text(
+                                        stringResource(R.string.turn_off),
+                                    )
                                 }
-                            )
-                        }
-                    } else null,
-                    items = appShortcuts.toImmutableList(),
-                    reverse = reverse,
-                    key = "shortcuts",
-                    highlightedItem = bestMatch as? SavableSearchable
-                )
-                for (conv in unitConverter) {
-                    SingleResult {
-                        UnitConverterItem(unitConverter = conv)
+                            }
+                        )
                     }
+                } else null,
+                items = appShortcuts.toImmutableList(),
+                reverse = reverse,
+                key = "shortcuts",
+                highlightedItem = bestMatch as? SavableSearchable
+            )
+            for (conv in unitConverter) {
+                SingleResult {
+                    UnitConverterItem(unitConverter = conv)
                 }
-                for (calc in calculator) {
-                    SingleResult {
-                        CalculatorItem(calculator = calc)
-                    }
+            }
+            for (calc in calculator) {
+                SingleResult {
+                    CalculatorItem(calculator = calc)
                 }
-                ListResults(
-                    before = if (missingCalendarPermission && !isSearchEmpty) {
-                        {
-                            MissingPermissionBanner(
-                                modifier = Modifier.padding(8.dp),
-                                text = stringResource(R.string.missing_permission_calendar_search),
-                                onClick = { viewModel.requestCalendarPermission(context as AppCompatActivity) },
-                                secondaryAction = {
-                                    OutlinedButton(onClick = {
-                                        viewModel.disableCalendarSearch()
-                                    }) {
-                                        Text(
-                                            stringResource(R.string.turn_off),
-                                        )
-                                    }
+            }
+            ListResults(
+                before = if (missingCalendarPermission && !isSearchEmpty) {
+                    {
+                        MissingPermissionBanner(
+                            modifier = Modifier.padding(8.dp),
+                            text = stringResource(R.string.missing_permission_calendar_search),
+                            onClick = { viewModel.requestCalendarPermission(context as AppCompatActivity) },
+                            secondaryAction = {
+                                OutlinedButton(onClick = {
+                                    viewModel.disableCalendarSearch()
+                                }) {
+                                    Text(
+                                        stringResource(R.string.turn_off),
+                                    )
                                 }
-                            )
-                        }
-                    } else null,
-                    items = events.toImmutableList(),
-                    reverse = reverse,
-                    key = "events",
-                    highlightedItem = bestMatch as? SavableSearchable
-                )
-                ListResults(
-                    before = if (missingContactsPermission && !isSearchEmpty) {
-                        {
-                            MissingPermissionBanner(
-                                modifier = Modifier.padding(8.dp),
-                                text = stringResource(R.string.missing_permission_contact_search),
-                                onClick = { viewModel.requestContactsPermission(context as AppCompatActivity) },
-                                secondaryAction = {
-                                    OutlinedButton(onClick = {
-                                        viewModel.disableContactsSearch()
-                                    }) {
-                                        Text(
-                                            stringResource(R.string.turn_off),
-                                        )
-                                    }
+                            }
+                        )
+                    }
+                } else null,
+                items = events.toImmutableList(),
+                reverse = reverse,
+                key = "events",
+                highlightedItem = bestMatch as? SavableSearchable
+            )
+            ListResults(
+                before = if (missingContactsPermission && !isSearchEmpty) {
+                    {
+                        MissingPermissionBanner(
+                            modifier = Modifier.padding(8.dp),
+                            text = stringResource(R.string.missing_permission_contact_search),
+                            onClick = { viewModel.requestContactsPermission(context as AppCompatActivity) },
+                            secondaryAction = {
+                                OutlinedButton(onClick = {
+                                    viewModel.disableContactsSearch()
+                                }) {
+                                    Text(
+                                        stringResource(R.string.turn_off),
+                                    )
                                 }
-                            )
-                        }
-                    } else null,
-                    items = contacts.toImmutableList(),
-                    reverse = reverse,
-                    key = "contacts",
-                    highlightedItem = bestMatch as? SavableSearchable
-                )
-                ListResults(
-                    before = if (missingLocationPermission && !isSearchEmpty) {
-                        {
-                            MissingPermissionBanner(
-                                modifier = Modifier.padding(8.dp),
-                                text = stringResource(R.string.missing_permission_location_search),
-                                onClick = { viewModel.requestLocationPermission(context as AppCompatActivity) },
-                                secondaryAction = {
-                                    OutlinedButton(onClick = {
-                                        viewModel.disableLocationSearch()
-                                    }) {
-                                        Text(
-                                            stringResource(R.string.turn_off),
-                                        )
-                                    }
+                            }
+                        )
+                    }
+                } else null,
+                items = contacts.toImmutableList(),
+                reverse = reverse,
+                key = "contacts",
+                highlightedItem = bestMatch as? SavableSearchable
+            )
+            ListResults(
+                before = if (missingLocationPermission && !isSearchEmpty) {
+                    {
+                        MissingPermissionBanner(
+                            modifier = Modifier.padding(8.dp),
+                            text = stringResource(R.string.missing_permission_location_search),
+                            onClick = { viewModel.requestLocationPermission(context as AppCompatActivity) },
+                            secondaryAction = {
+                                OutlinedButton(onClick = {
+                                    viewModel.disableLocationSearch()
+                                }) {
+                                    Text(
+                                        stringResource(R.string.turn_off),
+                                    )
                                 }
-                            )
-                        }
-                    } else null,
-                    items = locations.toImmutableList(),
-                    reverse = reverse,
-                    key = "locations",
-                    highlightedItem = bestMatch as? SavableSearchable
-                )
-                for (wiki in wikipedia) {
-                    SingleResult(highlight = bestMatch == wiki) {
-                        ArticleItem(article = wiki)
+                            }
+                        )
                     }
+                } else null,
+                items = locations.toImmutableList(),
+                reverse = reverse,
+                key = "locations",
+                highlightedItem = bestMatch as? SavableSearchable
+            )
+            for (wiki in wikipedia) {
+                SingleResult(highlight = bestMatch == wiki) {
+                    ArticleItem(article = wiki)
                 }
-                for (ws in website) {
-                    SingleResult(highlight = bestMatch == ws) {
-                        WebsiteItem(website = ws)
-                    }
+            }
+            for (ws in website) {
+                SingleResult(highlight = bestMatch == ws) {
+                    WebsiteItem(website = ws)
                 }
-                ListResults(
-                    before = if (missingFilesPermission && !isSearchEmpty) {
-                        {
-                            MissingPermissionBanner(
-                                modifier = Modifier.padding(8.dp),
-                                text = stringResource(R.string.missing_permission_files_search),
-                                onClick = { viewModel.requestFilesPermission(context as AppCompatActivity) },
-                                secondaryAction = {
-                                    OutlinedButton(onClick = {
-                                        viewModel.disableFilesSearch()
-                                    }) {
-                                        Text(
-                                            stringResource(R.string.turn_off),
-                                        )
-                                    }
+            }
+            ListResults(
+                before = if (missingFilesPermission && !isSearchEmpty) {
+                    {
+                        MissingPermissionBanner(
+                            modifier = Modifier.padding(8.dp),
+                            text = stringResource(R.string.missing_permission_files_search),
+                            onClick = { viewModel.requestFilesPermission(context as AppCompatActivity) },
+                            secondaryAction = {
+                                OutlinedButton(onClick = {
+                                    viewModel.disableFilesSearch()
+                                }) {
+                                    Text(
+                                        stringResource(R.string.turn_off),
+                                    )
                                 }
-                            )
-                        }
-                    } else null,
-                    items = files.toImmutableList(),
-                    reverse = reverse,
-                    key = "files",
-                    highlightedItem = bestMatch as? SavableSearchable
-                )
+                            }
+                        )
+                    }
+                } else null,
+                items = files.toImmutableList(),
+                reverse = reverse,
+                key = "files",
+                highlightedItem = bestMatch as? SavableSearchable
+                    )
             }
         }
-
     }
 
 
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt
index 17647616e..3757da0bd 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt
@@ -23,13 +23,14 @@ import de.mm20.launcher2.search.Article
 import de.mm20.launcher2.search.CalendarEvent
 import de.mm20.launcher2.search.Contact
 import de.mm20.launcher2.search.File
+import de.mm20.launcher2.search.Location
 import de.mm20.launcher2.search.SavableSearchable
 import de.mm20.launcher2.search.SearchService
 import de.mm20.launcher2.search.Searchable
-import de.mm20.launcher2.search.Location
 import de.mm20.launcher2.search.SearchFilters
 import de.mm20.launcher2.search.Website
 import de.mm20.launcher2.search.data.Calculator
+import de.mm20.launcher2.search.data.PojoSettings
 import de.mm20.launcher2.search.data.UnitConverter
 import de.mm20.launcher2.searchable.SavableSearchableRepository
 import de.mm20.launcher2.searchactions.actions.SearchAction
@@ -73,6 +74,7 @@ class SearchVM : ViewModel(), KoinComponent {
     val isSearchEmpty = mutableStateOf(true)
 
     val locationResults = mutableStateOf<List<Location>>(emptyList())
+    val settingsResults = mutableStateOf<List<PojoSettings>>(emptyList())
     val appResults = mutableStateOf<List<Application>>(emptyList())
     val workAppResults = mutableStateOf<List<Application>>(emptyList())
     val appShortcutResults = mutableStateOf<List<AppShortcut>>(emptyList())
@@ -177,6 +179,7 @@ class SearchVM : ViewModel(), KoinComponent {
                             results.contacts,
                             results.calendars,
                             results.locations,
+                            results.settings,
                             results.wikipedia,
                             results.websites,
                             results.calculators,
@@ -247,6 +250,7 @@ class SearchVM : ViewModel(), KoinComponent {
                         val locations = mutableListOf<Location>()
                         val website = mutableListOf<Website>()
                         val actions = mutableListOf<SearchAction>()
+                        val settings = mutableListOf<PojoSettings>()
                         for (r in resultsList) {
                             when {
                                 r is SavableSearchable && hiddenKeys.contains(r.key) && !filters.hiddenItems -> {
@@ -264,6 +268,7 @@ class SearchVM : ViewModel(), KoinComponent {
                                 r is Article -> articles.add(r)
                                 r is Location -> locations.add(r)
                                 r is SearchAction -> actions.add(r)
+                                r is PojoSettings -> settings.add(r)
                             }
                         }
 
@@ -280,7 +285,8 @@ class SearchVM : ViewModel(), KoinComponent {
                                 articles,
                                 website,
                                 files,
-                                actions
+                                actions,
+                                settings,
                             ).firstNotNullOfOrNull { it.firstOrNull() }
                         }
 
@@ -295,6 +301,7 @@ class SearchVM : ViewModel(), KoinComponent {
                         websiteResults.value = website
                         calculatorResults.value = calc
                         unitConverterResults.value = unitConv
+                        settingsResults.value = settings
                         hiddenResults.value = hidden
                         if (results.searchActions != null) searchActionResults.value = actions
                     }
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt
index dd7e3b436..7c37c942b 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt
@@ -1,5 +1,8 @@
 package de.mm20.launcher2.ui.launcher.search.common.list
 
+import android.content.Context
+import android.content.Intent
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.*
@@ -9,12 +12,9 @@ import androidx.compose.ui.layout.boundsInWindow
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import de.mm20.launcher2.search.AppShortcut
-import de.mm20.launcher2.search.CalendarEvent
-import de.mm20.launcher2.search.Contact
-import de.mm20.launcher2.search.File
-import de.mm20.launcher2.search.Location
-import de.mm20.launcher2.search.SavableSearchable
+import de.mm20.launcher2.ktx.tryStartActivity
+import de.mm20.launcher2.search.*
+import de.mm20.launcher2.search.data.PojoSettings
 import de.mm20.launcher2.ui.component.InnerCard
 import de.mm20.launcher2.ui.ktx.toPixels
 import de.mm20.launcher2.ui.launcher.search.calendar.CalendarItem
@@ -23,8 +23,10 @@ import de.mm20.launcher2.ui.launcher.search.contacts.ContactItem
 import de.mm20.launcher2.ui.launcher.search.files.FileItem
 import de.mm20.launcher2.ui.launcher.search.listItemViewModel
 import de.mm20.launcher2.ui.launcher.search.location.LocationItem
+import de.mm20.launcher2.ui.launcher.search.settings.SettingsItem
 import de.mm20.launcher2.ui.launcher.search.shortcut.AppShortcutItem
 import de.mm20.launcher2.ui.locals.LocalGridSettings
+import de.mm20.launcher2.ui.settings.SettingsActivity
 
 @Composable
 fun ListItem(
@@ -121,6 +123,21 @@ fun ListItem(
                 )
             }
 
+            is PojoSettings -> {
+                SettingsItem(
+                    data = item,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .clickable {
+                            if (!viewModel.launch(context, bounds)) {
+                                when (item.specialId) {
+                                    PojoSettings.specialIdLauncher -> launchSettingsPage(context)
+                                }
+                            }
+                        }
+                )
+            }
+
             is AppShortcut -> {
                 AppShortcutItem(
                     shortcut = item,
@@ -141,4 +158,10 @@ fun ListItem(
             }
         }
     }
+}
+
+private fun launchSettingsPage(context: Context) {
+    context.tryStartActivity(Intent(context, SettingsActivity::class.java)).apply {
+        Intent.FLAG_ACTIVITY_NEW_TASK
+    }
 }
\ No newline at end of file
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/KeyboardFilterBarItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/KeyboardFilterBarItem.kt
index 933498538..302d5160a 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/KeyboardFilterBarItem.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/KeyboardFilterBarItem.kt
@@ -2,16 +2,7 @@ package de.mm20.launcher2.ui.launcher.search.filters
 
 import android.content.Context
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.AppShortcut
-import androidx.compose.material.icons.rounded.Apps
-import androidx.compose.material.icons.rounded.Description
-import androidx.compose.material.icons.rounded.Handyman
-import androidx.compose.material.icons.rounded.Language
-import androidx.compose.material.icons.rounded.Person
-import androidx.compose.material.icons.rounded.Place
-import androidx.compose.material.icons.rounded.Public
-import androidx.compose.material.icons.rounded.Today
-import androidx.compose.material.icons.rounded.VisibilityOff
+import androidx.compose.material.icons.rounded.*
 import de.mm20.launcher2.preferences.KeyboardFilterBarItem
 import de.mm20.launcher2.search.SearchFilters
 import de.mm20.launcher2.ui.R
@@ -25,6 +16,7 @@ val KeyboardFilterBarItem.icon
         KeyboardFilterBarItem.Places -> Icons.Rounded.Place
         KeyboardFilterBarItem.Files -> Icons.Rounded.Description
         KeyboardFilterBarItem.Tools -> Icons.Rounded.Handyman
+        KeyboardFilterBarItem.Settings -> Icons.Rounded.Settings
         KeyboardFilterBarItem.Articles -> Icons.Rounded.Wikipedia
         KeyboardFilterBarItem.Websites -> Icons.Rounded.Public
         KeyboardFilterBarItem.Shortcuts -> Icons.Rounded.AppShortcut
@@ -40,6 +32,7 @@ fun KeyboardFilterBarItem.getLabel(context: Context): String {
         KeyboardFilterBarItem.Places -> context.getString(R.string.preference_search_locations)
         KeyboardFilterBarItem.Files -> context.getString(R.string.preference_search_files)
         KeyboardFilterBarItem.Tools -> context.getString(R.string.search_filter_tools)
+        KeyboardFilterBarItem.Settings -> context.getString(R.string.preference_search_settings)
         KeyboardFilterBarItem.Articles -> context.getString(R.string.preference_search_wikipedia)
         KeyboardFilterBarItem.Websites -> context.getString(R.string.preference_search_websites)
         KeyboardFilterBarItem.Shortcuts -> context.getString(R.string.preference_search_appshortcuts)
@@ -63,6 +56,7 @@ fun SearchFilters.isSelected(item: KeyboardFilterBarItem): Boolean {
         KeyboardFilterBarItem.Places -> places
         KeyboardFilterBarItem.Files -> files
         KeyboardFilterBarItem.Tools -> tools
+        KeyboardFilterBarItem.Settings -> settings
         KeyboardFilterBarItem.Articles -> articles
         KeyboardFilterBarItem.Websites -> websites
         KeyboardFilterBarItem.Shortcuts -> shortcuts
@@ -79,6 +73,7 @@ fun SearchFilters.toggle(item: KeyboardFilterBarItem): SearchFilters {
         KeyboardFilterBarItem.Places -> return togglePlaces()
         KeyboardFilterBarItem.Files -> return toggleFiles()
         KeyboardFilterBarItem.Tools -> return toggleTools()
+        KeyboardFilterBarItem.Settings -> return toggleSettings()
         KeyboardFilterBarItem.Articles -> return toggleArticles()
         KeyboardFilterBarItem.Websites -> return toggleWebsites()
         KeyboardFilterBarItem.Shortcuts -> return toggleShortcuts()
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/SearchFilters.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/SearchFilters.kt
index c6b7142b6..a0a419fd0 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/SearchFilters.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/SearchFilters.kt
@@ -7,16 +7,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.AppShortcut
-import androidx.compose.material.icons.rounded.Apps
-import androidx.compose.material.icons.rounded.Description
-import androidx.compose.material.icons.rounded.Handyman
-import androidx.compose.material.icons.rounded.Language
-import androidx.compose.material.icons.rounded.Person
-import androidx.compose.material.icons.rounded.Place
-import androidx.compose.material.icons.rounded.Public
-import androidx.compose.material.icons.rounded.Today
-import androidx.compose.material.icons.rounded.VisibilityOff
+import androidx.compose.material.icons.rounded.*
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.FilterChipDefaults
 import androidx.compose.material3.HorizontalDivider
@@ -212,6 +203,7 @@ fun SearchFilters(
                 label = { Text(stringResource(R.string.preference_search_locations)) }
             )
             FilterChip(
+                modifier = Modifier.padding(end = 16.dp),
                 selected = filters.tools && (!allCategoriesEnabled || settings),
                 onClick = {
                     if (settings) {
@@ -229,6 +221,25 @@ fun SearchFilters(
                 },
                 label = { Text(stringResource(R.string.search_filter_tools)) }
             )
+            FilterChip(
+                selected = filters.settings && (!allCategoriesEnabled || settings),
+                onClick = {
+                    if (settings) {
+                        onFiltersChange(filters.copy(settings = !filters.settings))
+                    }
+                    else {
+                        onFiltersChange(filters.toggleSettings())
+                    }
+                },
+                leadingIcon = {
+                    Icon(
+                        imageVector = Icons.Rounded.Settings,
+                        contentDescription = null,
+                        modifier = Modifier.size(FilterChipDefaults.IconSize)
+                    )
+                },
+                label = { Text(stringResource(R.string.preference_search_settings)) }
+            )
         }
         HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
         FilterChip(
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/SearchFiltersExt.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/SearchFiltersExt.kt
index 35e3f50e2..363e5c1f6 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/SearchFiltersExt.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/SearchFiltersExt.kt
@@ -12,7 +12,8 @@ fun SearchFilters.withAllCategories(): SearchFilters {
         shortcuts = true,
         contacts = true,
         events = true,
-        tools = true
+        tools = true,
+        settings = true,
     )
 }
 
@@ -25,7 +26,8 @@ fun SearchFilters.withOnlyCategory(
     shortcuts: Boolean = false,
     contacts: Boolean = false,
     events: Boolean = false,
-    utilities: Boolean = false
+    utilities: Boolean = false,
+    settings: Boolean = false,
 ): SearchFilters {
     return copy(
         apps = apps,
@@ -36,7 +38,8 @@ fun SearchFilters.withOnlyCategory(
         shortcuts = shortcuts,
         contacts = contacts,
         events = events,
-        tools = utilities
+        tools = utilities,
+        settings = settings,
     )
 }
 
@@ -144,3 +147,14 @@ fun SearchFilters.toggleTools(): SearchFilters {
 
     return copy(tools = !tools)
 }
+
+fun SearchFilters.toggleSettings(): SearchFilters {
+    if (allCategoriesEnabled) {
+        return withOnlyCategory(settings = true)
+    }
+    if (settings && enabledCategories == 1) {
+        return withAllCategories()
+    }
+
+    return copy(settings = !settings)
+}
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/settings/SettingsItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/settings/SettingsItem.kt
new file mode 100644
index 000000000..2fec6c390
--- /dev/null
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/settings/SettingsItem.kt
@@ -0,0 +1,57 @@
+package de.mm20.launcher2.ui.launcher.search.settings
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import de.mm20.launcher2.search.data.PojoSettings
+import de.mm20.launcher2.ui.R
+import de.mm20.launcher2.ui.component.ShapedLauncherIcon
+import de.mm20.launcher2.ui.launcher.search.common.SearchableItemVM
+import de.mm20.launcher2.ui.launcher.search.listItemViewModel
+
+@Composable
+fun SettingsItem(
+    data: PojoSettings,
+    modifier: Modifier = Modifier)
+{
+    val viewModel: SearchableItemVM = listItemViewModel(key = "search-${data.key}")
+    val icon by viewModel.icon.collectAsStateWithLifecycle()
+
+    Row(
+        modifier = modifier.padding(8.dp)
+    ) {
+        Column {
+            ShapedLauncherIcon(
+                size = 48.dp,
+                icon = { icon },
+            )
+        }
+        Box(modifier = Modifier.width(16.dp))
+        Column(
+            modifier = Modifier.align(Alignment.CenterVertically)
+        ) {
+            Row {
+                Text(
+                    text = data.label,
+                    style = MaterialTheme.typography.titleMedium,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
+            Row {
+                Text(
+                    text = stringResource(R.string.preference_search_settings),
+                    style = MaterialTheme.typography.bodySmall,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt
index 97b5333ae..47efd8d4b 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt
@@ -5,23 +5,7 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.AppShortcut
-import androidx.compose.material.icons.rounded.ArrowOutward
-import androidx.compose.material.icons.rounded.Calculate
-import androidx.compose.material.icons.rounded.Description
-import androidx.compose.material.icons.rounded.FilterAlt
-import androidx.compose.material.icons.rounded.Keyboard
-import androidx.compose.material.icons.rounded.Loop
-import androidx.compose.material.icons.rounded.Person
-import androidx.compose.material.icons.rounded.Place
-import androidx.compose.material.icons.rounded.Public
-import androidx.compose.material.icons.rounded.Sort
-import androidx.compose.material.icons.rounded.Star
-import androidx.compose.material.icons.rounded.Tag
-import androidx.compose.material.icons.rounded.Today
-import androidx.compose.material.icons.rounded.VisibilityOff
-import androidx.compose.material.icons.rounded.Warning
-import androidx.compose.material.icons.rounded.Work
+import androidx.compose.material.icons.rounded.*
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -177,6 +161,17 @@ fun SearchSettingsScreen() {
                     enabled = hasAppShortcutsPermission == true
                 )
 
+                val settings by viewModel.settings.collectAsStateWithLifecycle(null)
+                SwitchPreference(
+                    title = stringResource(R.string.preference_search_settings),
+                    summary = stringResource(R.string.preference_search_settings_summary),
+                    icon = Icons.Rounded.Settings,
+                    value = settings == true,
+                    onValueChanged = {
+                        viewModel.setSettings(it)
+                    }
+                )
+
                 val calculator by viewModel.calculator.collectAsStateWithLifecycle(null)
                 SwitchPreference(
                     title = stringResource(R.string.preference_search_calculator),
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt
index fbdd95d20..f6b9c6627 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt
@@ -15,6 +15,7 @@ import de.mm20.launcher2.preferences.search.CalendarSearchSettings
 import de.mm20.launcher2.preferences.search.ContactSearchSettings
 import de.mm20.launcher2.preferences.search.LocationSearchSettings
 import de.mm20.launcher2.preferences.search.SearchFilterSettings
+import de.mm20.launcher2.preferences.search.SettingsSearchSettings
 import de.mm20.launcher2.preferences.search.ShortcutSearchSettings
 import de.mm20.launcher2.preferences.search.UnitConverterSettings
 import de.mm20.launcher2.preferences.search.WebsiteSearchSettings
@@ -40,6 +41,7 @@ class SearchSettingsScreenVM : ViewModel(), KoinComponent {
 
     private val permissionsManager: PermissionsManager by inject()
     private val locationSearchSettings: LocationSearchSettings by inject()
+    private val settingsSearchSettings: SettingsSearchSettings by inject()
 
     val hasWorkProfile = mutableStateOf(false)
 
@@ -116,6 +118,13 @@ class SearchSettingsScreenVM : ViewModel(), KoinComponent {
         locationSearchSettings.setEnabled(locations)
     }
 
+    val settings = settingsSearchSettings.enabled
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
+
+    fun setSettings(settings: Boolean) {
+        settingsSearchSettings.setEnabled(settings)
+    }
+
     val autoFocus = searchUiSettings.openKeyboard
 
     fun setAutoFocus(autoFocus: Boolean) {
diff --git a/core/base/src/main/java/de/mm20/launcher2/search/SearchFilters.kt b/core/base/src/main/java/de/mm20/launcher2/search/SearchFilters.kt
index 3edc61e3d..d9918d5bb 100644
--- a/core/base/src/main/java/de/mm20/launcher2/search/SearchFilters.kt
+++ b/core/base/src/main/java/de/mm20/launcher2/search/SearchFilters.kt
@@ -16,10 +16,11 @@ data class SearchFilters(
     val contacts: Boolean = true,
     val events: Boolean = true,
     val tools: Boolean = true,
+    val settings: Boolean = true,
 ) {
     val allCategoriesEnabled
-        get() = apps && websites && articles && places && files && shortcuts && contacts && events && tools
+        get() = apps && websites && articles && places && files && shortcuts && contacts && events && tools && settings
 
     val enabledCategories: Int
-        get() = apps.toInt() + websites.toInt() + articles.toInt() + places.toInt() + files.toInt() + shortcuts.toInt() + contacts.toInt() + events.toInt() + tools.toInt()
+        get() = apps.toInt() + websites.toInt() + articles.toInt() + places.toInt() + files.toInt() + shortcuts.toInt() + contacts.toInt() + events.toInt() + tools.toInt() + settings.toInt()
 }
diff --git a/core/base/src/main/res/drawable/ic_settings_accessibility.xml b/core/base/src/main/res/drawable/ic_settings_accessibility.xml
new file mode 100644
index 000000000..e69f333f9
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_accessibility.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m11.843,16.739 l-0.509,4.852c-0.091,0.864 -0.864,1.492 -1.727,1.401C8.744,22.9 8.118,22.126 8.209,21.261L9.344,10.443H4.143c-0.868,0 -1.571,-0.705 -1.571,-1.574 0,-0.869 0.704,-1.574 1.571,-1.574h15.714c0.868,0 1.571,0.705 1.571,1.574 0,0.869 -0.704,1.574 -1.571,1.574h-5.201l1.135,10.818c0.091,0.864 -0.535,1.639 -1.399,1.73 -0.863,0.091 -1.636,-0.536 -1.727,-1.401L12.157,16.739ZM12,7.296c-1.736,0 -3.143,-1.409 -3.143,-3.148 0,-1.738 1.407,-3.148 3.143,-3.148 1.736,0 3.143,1.409 3.143,3.148 0,1.738 -1.407,3.148 -3.143,3.148z"
+      android:strokeWidth="1.57143"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_airplane.xml b/core/base/src/main/res/drawable/ic_settings_airplane.xml
new file mode 100644
index 000000000..c8b82d0e7
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_airplane.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m22.457,1.554c-0.857,-0.86 -2.363,-0.658 -3.225,0.206l-4.386,4.375 -8.134,-3.04c-0.779,-0.201 -1.564,-0.462 -2.53,0.507 -0.493,0.494 -1.518,1.521 0,3.042l5.577,4.566 -3.629,3.621 -3.386,-0.847c-0.502,-0.129 -0.84,-0.028 -1.098,0.257 -0.13,0.162 -1.073,0.861 -0.415,1.52l3.937,3.063 3.063,3.937c0.476,0.477 0.918,0.179 1.523,-0.395 0.383,-0.384 0.301,-0.581 0.185,-1.14l-0.765,-3.363 3.604,-3.617 4.56,5.579c1.517,1.521 2.542,0.492 3.036,0 0.967,-0.97 0.707,-1.755 0.505,-2.536l-3.014,-8.148 4.368,-4.383c0.862,-0.863 1.082,-2.346 0.225,-3.205"
+      android:strokeWidth="0.687711"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_apps.xml b/core/base/src/main/res/drawable/ic_settings_apps.xml
new file mode 100644
index 000000000..a64191464
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_apps.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5.5,1L2.5,1C1.65,1 1,1.65 1,2.5l0,3c0,0.85 0.65,1.5 1.5,1.5l3,0c0.85,0 1.5,-0.65 1.5,-1.5L7,2.5C7,1.65 6.35,1 5.5,1Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M5.5,17L2.5,17c-0.85,0 -1.5,0.65 -1.5,1.5l0,3c0,0.85 0.65,1.5 1.5,1.5l3,0c0.85,0 1.5,-0.65 1.5,-1.5l0,-3c0,-0.85 -0.65,-1.5 -1.5,-1.5z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M5.5,9L2.5,9c-0.85,0 -1.5,0.65 -1.5,1.5l0,3c0,0.85 0.65,1.5 1.5,1.5l3,0c0.85,0 1.5,-0.65 1.5,-1.5l0,-3c0,-0.85 -0.65,-1.5 -1.5,-1.5z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m13.5,1l-3,0c-0.85,0 -1.5,0.65 -1.5,1.5l0,3c0,0.85 0.65,1.5 1.5,1.5l3,0c0.85,0 1.5,-0.65 1.5,-1.5L15,2.5C15,1.65 14.35,1 13.5,1Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m13.5,17l-3,0c-0.85,0 -1.5,0.65 -1.5,1.5l0,3c0,0.85 0.65,1.5 1.5,1.5l3,0c0.85,0 1.5,-0.65 1.5,-1.5l0,-3c0,-0.85 -0.65,-1.5 -1.5,-1.5z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m13.5,9l-3,0c-0.85,0 -1.5,0.65 -1.5,1.5l0,3c0,0.85 0.65,1.5 1.5,1.5l3,0c0.85,0 1.5,-0.65 1.5,-1.5l0,-3c0,-0.85 -0.65,-1.5 -1.5,-1.5z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m21.5,1l-3,0c-0.85,0 -1.5,0.65 -1.5,1.5l0,3c0,0.85 0.65,1.5 1.5,1.5l3,0c0.85,0 1.5,-0.65 1.5,-1.5L23,2.5C23,1.65 22.35,1 21.5,1Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m21.5,17l-3,0c-0.85,0 -1.5,0.65 -1.5,1.5l0,3c0,0.85 0.65,1.5 1.5,1.5l3,0c0.85,0 1.5,-0.65 1.5,-1.5l0,-3c0,-0.85 -0.65,-1.5 -1.5,-1.5z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m21.5,9l-3,0c-0.85,0 -1.5,0.65 -1.5,1.5l0,3c0,0.85 0.65,1.5 1.5,1.5l3,0c0.85,0 1.5,-0.65 1.5,-1.5l0,-3c0,-0.85 -0.65,-1.5 -1.5,-1.5z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_battery.xml b/core/base/src/main/res/drawable/ic_settings_battery.xml
new file mode 100644
index 000000000..61729c2c1
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_battery.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m10.818,1c-0.653,0 -2.363,0.548 -2.363,1.225L8.455,3.449L6.113,3.449C4.808,3.449 3.75,4.544 3.75,5.899l0,14.652c0,1.354 1.057,2.449 2.363,2.449l11.773,0c1.305,0 2.363,-1.095 2.363,-2.449L20.25,5.899c0,-1.354 -1.057,-2.449 -2.363,-2.449l-2.341,0l0,-1.225c0,-0.677 -1.711,-1.225 -2.363,-1.225L10.818,1ZM12,5.899L12,12l4.705,0L12,20.55L12,14.449L7.295,14.449Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_bluetooth.xml b/core/base/src/main/res/drawable/ic_settings_bluetooth.xml
new file mode 100644
index 000000000..341d82ab3
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_bluetooth.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.582,0.084A1.091,1.091 0,0 0,10.908 1.09L10.908,9.365L7.316,5.773a1.091,1.091 0,0 0,-1.543 0,1.091 1.091,0 0,0 0,1.543L10.457,12 5.773,16.684a1.091,1.091 0,0 0,0 1.543,1.091 1.091,0 0,0 1.543,0l3.592,-3.592v8.275a1.091,1.091 0,0 0,1.863 0.77l5.455,-5.453a1.091,1.091 0,0 0,0 -1.543L13.543,12 18.227,7.316a1.091,1.091 0,0 0,0 -1.543L12.771,0.32A1.091,1.091 0,0 0,11.582 0.084ZM13.092,3.725 L15.912,6.545 13.092,9.365zM13.092,14.635 L15.912,17.455 13.092,20.275z"
+      android:strokeLineJoin="round"
+      android:fillColor="#000000"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_developer.xml b/core/base/src/main/res/drawable/ic_settings_developer.xml
new file mode 100644
index 000000000..3a2e41199
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_developer.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m9.048,1.107c-4.091,0 -5.647,1.089 -5.314,4.112L4.069,8.398C4.247,10.065 2.89,10.577 1,10.577l0,2.847c1.912,0 3.247,0.512 3.069,2.179l-0.335,3.201c-0.311,2.979 1.223,4.089 5.314,4.089l0,-2.446c-1.356,0 -2.179,-0.289 -2.068,-1.4L7.313,15.756C7.58,13.244 6.247,12.356 3.868,12 6.113,11.667 7.58,10.734 7.313,8.244L6.98,4.953C6.869,3.842 7.669,3.553 9.048,3.553ZM14.952,1.107l0,2.446c1.356,0 2.179,0.289 2.068,1.4l-0.333,3.291C16.42,10.756 17.776,11.644 20.155,12c-2.268,0.333 -3.735,1.266 -3.468,3.756l0.333,3.291c0.111,1.112 -0.69,1.4 -2.068,1.4l0,2.446c4.091,0 5.647,-1.089 5.314,-4.112L19.931,15.602C19.753,13.935 21.133,13.423 23,13.423l0,-2.847c-1.89,0 -3.247,-0.512 -3.069,-2.179L20.266,5.197C20.577,2.218 19.043,1.107 14.952,1.107Z"
+      android:strokeWidth="1.512"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_deviceinfo.xml b/core/base/src/main/res/drawable/ic_settings_deviceinfo.xml
new file mode 100644
index 000000000..8da08411c
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_deviceinfo.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m17.499,1l-11,0C5.487,1 4.667,1.821 4.667,2.833l0,18.333c0,1.012 0.82,1.833 1.832,1.833l11,0C18.512,23 19.333,22.179 19.333,21.167L19.333,2.833C19.333,1.821 18.512,1 17.499,1ZM9.25,1.917l4.583,0l0.057,0.917L9.25,2.833ZM11.981,21.625c-0.506,0 -0.917,-0.41 -0.917,-0.917 0,-0.507 0.411,-0.917 0.917,-0.917 0.507,0 0.917,0.41 0.917,0.917 0,0.507 -0.411,0.917 -0.917,0.917zM17.499,18.417l-11,0L6.518,3.75l10.981,0z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_display.xml b/core/base/src/main/res/drawable/ic_settings_display.xml
new file mode 100644
index 000000000..7991d13a6
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_display.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23,12 L20.355,9.761 21.527,6.499 18.114,5.886 17.502,2.473 14.239,3.645 12,1 9.761,3.645 6.499,2.473 5.886,5.886 2.473,6.498 3.645,9.761 1,12l2.645,2.239 -1.172,3.262 3.412,0.613 0.613,3.413 3.262,-1.173L12,23l2.239,-2.645 3.262,1.172 0.613,-3.413 3.412,-0.612 -1.172,-3.262zM12,19.368L12,4.632c4.069,0 7.368,3.299 7.368,7.368 0,4.069 -3.299,7.368 -7.368,7.368z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_launcher.xml b/core/base/src/main/res/drawable/ic_settings_launcher.xml
new file mode 100644
index 000000000..5aa11ecf0
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_launcher.xml
@@ -0,0 +1,35 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M3.35,20.094C3.35,18.399 4.725,17.024 6.42,17.024L17.58,17.024C19.275,17.024 20.65,18.399 20.65,20.094L20.65,22.884C20.65,23.501 20.15,24 19.534,24L4.466,24C3.85,24 3.35,23.501 3.35,22.884L3.35,20.094Z"/>
+    <path
+        android:pathData="m3.35,20.094c0,-1.695 1.374,-3.069 3.069,-3.069l11.161,0c1.695,0 3.069,1.374 3.069,3.069l0,2.79c0,0.617 -0.499,1.116 -1.116,1.116L4.466,24c-0.617,0 -1.116,-0.499 -1.116,-1.116z"
+        android:strokeWidth="3.348"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"/>
+  </group>
+  <path
+      android:pathData="m6.42,6.422c-1.685,0 -3.07,1.383 -3.07,3.068l0,2.791c0,1.685 1.385,3.068 3.07,3.068L17.58,15.349c1.685,0 3.07,-1.383 3.07,-3.068L20.651,9.49c0,-1.685 -1.385,-3.068 -3.07,-3.068zM6.42,8.097L17.58,8.097c0.781,0 1.396,0.612 1.396,1.393l0,2.791c0,0.781 -0.614,1.396 -1.396,1.396L6.42,13.677c-0.781,0 -1.396,-0.614 -1.396,-1.396L5.024,9.49c0,-0.781 0.614,-1.393 1.396,-1.393z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M8.373,9.491L7.257,9.491c-0.462,0 -0.837,0.375 -0.837,0.837l0,1.116c0,0.462 0.375,0.837 0.837,0.837l1.116,0c0.462,0 0.837,-0.375 0.837,-0.837l0,-1.116c0,-0.462 -0.375,-0.837 -0.837,-0.837z"
+      android:strokeWidth="0.14"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m12.558,9.491l-1.116,0c-0.462,0 -0.837,0.375 -0.837,0.837l0,1.116c0,0.462 0.375,0.837 0.837,0.837l1.116,0c0.462,0 0.837,-0.375 0.837,-0.837l0,-1.116c0,-0.462 -0.375,-0.837 -0.837,-0.837z"
+      android:strokeWidth="0.14"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m16.743,9.491l-1.116,0c-0.462,0 -0.837,0.375 -0.837,0.837l0,1.116c0,0.462 0.375,0.837 0.837,0.837l1.116,0c0.462,0 0.837,-0.375 0.837,-0.837l0,-1.116c0,-0.462 -0.375,-0.837 -0.837,-0.837z"
+      android:strokeWidth="0.14"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M12,0C11.382,0 10.764,0.125 10.191,0.377L1.34,4.259A0.837,0.837 0,0 0,0.91 5.363,0.837 0.837,0 0,0 2.013,5.793L10.864,1.911c0.696,-0.306 1.576,-0.306 2.271,0l8.851,3.882A0.837,0.837 0,0 0,23.09 5.363,0.837 0.837,0 0,0 22.66,4.259L13.809,0.377C13.236,0.125 12.618,0 12,0Z"
+      android:strokeLineJoin="round"
+      android:fillColor="#000000"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_location.xml b/core/base/src/main/res/drawable/ic_settings_location.xml
new file mode 100644
index 000000000..6d2edde62
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_location.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m12,1c-4.556,0 -8.25,3.694 -8.25,8.25 0,1.794 0.588,3.44 1.566,4.788 0.018,0.032 0.02,0.068 0.04,0.099l5.5,8.25c0.255,0.383 0.685,0.612 1.144,0.612 0.459,0 0.889,-0.23 1.144,-0.612l5.5,-8.25c0.02,-0.031 0.023,-0.067 0.04,-0.099 0.978,-1.348 1.566,-2.994 1.566,-4.788 0,-4.556 -3.694,-8.25 -8.25,-8.25zM12,12c-1.519,0 -2.75,-1.231 -2.75,-2.75 0,-1.519 1.231,-2.75 2.75,-2.75 1.519,0 2.75,1.231 2.75,2.75 0,1.519 -1.231,2.75 -2.75,2.75z"
+      android:strokeWidth="0.34375"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_nfc.xml b/core/base/src/main/res/drawable/ic_settings_nfc.xml
new file mode 100644
index 000000000..688654910
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_nfc.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22.473,3.228A1.654,1.654 135,0 0,20.879 1.669c-0.963,-0.061 -4.079,-0.105 -4.981,-0.105 1.602,1.103 1.821,3.186 1.978,7.055 0.088,2.293 0,10.329 0,10.679l-0.044,2.188 -8.43,-8.438l0,-2.626l6.705,6.696c0.018,-1.331 0.035,-3.064 0.035,-4.639 0,-1.541 -0.026,-2.932 -0.07,-3.677C15.82,4.593 15.426,2.615 13.229,1.836A6.898,6.898 135,0 0,10.883 1.529c-0.875,0 -6.889,0 -7.764,0.044A1.619,1.619 45,0 0,1.543 3.158c-0.053,0.858 -0.061,16.781 0,17.656 0.044,0.858 0.7,1.506 1.576,1.558 0.963,0.053 4.088,0.061 4.99,0.061 -1.602,-1.103 -1.821,-3.186 -1.978,-7.055 -0.088,-2.293 0,-10.329 0,-10.679l0.044,-2.188 8.43,8.438l0,2.626L7.889,6.887c-0.018,1.331 -0.035,3.064 -0.035,4.639 0,1.541 0.026,2.932 0.07,3.677 0.254,4.21 0.648,6.189 2.845,6.959 0.674,0.245 1.304,0.298 2.346,0.315 0.875,0 6.889,0 7.756,-0.044a1.619,1.619 0,0 0,1.593 -1.584C22.508,19.991 22.516,4.103 22.464,3.236Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_privacy.xml b/core/base/src/main/res/drawable/ic_settings_privacy.xml
new file mode 100644
index 000000000..cdf5f44a6
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_privacy.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2.888,5.427C2.888,5.068 3.181,4.778 3.537,4.731 6.333,4.366 10.412,1.885 11.638,1.106c0.222,-0.141 0.502,-0.141 0.724,0 1.227,0.78 5.305,3.26 8.101,3.626C20.819,4.778 21.112,5.068 21.112,5.427l0,6.183c0,8.461 -9.112,11.39 -9.112,11.39 0,0 -9.112,-2.929 -9.112,-11.39z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_sound.xml b/core/base/src/main/res/drawable/ic_settings_sound.xml
new file mode 100644
index 000000000..1c25c8df9
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_sound.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2.128,15.949C1.505,15.949 1,15.444 1,14.821l0,-5.64c0,-0.623 0.505,-1.128 1.128,-1.128 0.623,0 1.128,0.505 1.128,1.128l0,5.64c0,0.622 -0.505,1.128 -1.128,1.128z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m5.419,18.769c-0.623,0 -1.128,-0.505 -1.128,-1.128L4.291,6.359c0,-0.623 0.505,-1.128 1.128,-1.128 0.623,0 1.128,0.505 1.128,1.128l0,11.283c0,0.623 -0.505,1.128 -1.128,1.128z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m8.709,17.359c-0.623,0 -1.128,-0.505 -1.128,-1.128L7.581,7.769c0,-0.623 0.505,-1.128 1.128,-1.128 0.623,0 1.129,0.505 1.129,1.128l0,8.461c-0,0.623 -0.506,1.128 -1.129,1.128z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m12,20.18c-0.623,0 -1.128,-0.505 -1.128,-1.128L10.872,4.949c0,-0.623 0.505,-1.128 1.128,-1.128 0.623,0 1.128,0.505 1.128,1.128l0,14.102c0,0.623 -0.505,1.129 -1.128,1.129z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m15.29,23c-0.623,0 -1.128,-0.505 -1.128,-1.128L14.162,2.128c0,-0.623 0.506,-1.128 1.128,-1.128 0.623,0 1.128,0.505 1.128,1.128l0,19.744c0,0.623 -0.505,1.128 -1.128,1.128z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m18.582,18.769c-0.623,0 -1.128,-0.505 -1.128,-1.128L17.454,6.359c0,-0.623 0.505,-1.128 1.128,-1.128 0.623,0 1.128,0.505 1.128,1.128l0,11.283c0,0.623 -0.506,1.128 -1.128,1.128z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m21.872,14.538c-0.623,0 -1.128,-0.505 -1.128,-1.128l0,-2.821c0,-0.623 0.505,-1.128 1.128,-1.128 0.623,0 1.128,0.505 1.128,1.128l0,2.821c0,0.623 -0.505,1.128 -1.128,1.128z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_storage.xml b/core/base/src/main/res/drawable/ic_settings_storage.xml
new file mode 100644
index 000000000..27afd798d
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_storage.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5.002,0C3.357,0 2,1.357 2,3.002L2,20.998C2,22.643 3.357,24 5.002,24L18.998,24C20.643,24 22,22.643 22,20.998L22,3.002C22,1.357 20.643,0 18.998,0ZM5.002,2L18.998,2c0.572,0 1,0.43 1,1.002L19.998,20.998c0,0.572 -0.428,1.002 -1,1.002L5.002,22c-0.572,0 -1,-0.43 -1,-1.002L4.002,3.002C4.002,2.43 4.43,2 5.002,2Z"
+      android:fillColor="#020202"/>
+  <path
+      android:pathData="m12,4.002c-3.3,0 -5.998,2.698 -5.998,5.998 0,3.3 2.698,5.996 5.998,5.996 3.3,0 5.998,-2.696 5.998,-5.996 0,-3.3 -2.698,-5.998 -5.998,-5.998zM12,6.002c2.219,0 3.996,1.779 3.996,3.998 0,2.219 -1.777,3.996 -3.996,3.996C9.781,13.996 8.004,12.219 8.004,10 8.004,7.781 9.781,6.002 12,6.002Z"
+      android:fillColor="#020202"/>
+  <path
+      android:pathData="m14.205,10.789 l-1.414,1.416 3.006,3.006 1.416,-1.414z"
+      android:fillColor="#020202"/>
+  <path
+      android:pathData="M12,9.999m-0.995,0a0.995,0.995 0,1 1,1.99 0a0.995,0.995 0,1 1,-1.99 0"
+      android:strokeWidth="1.04758"
+      android:fillColor="#020202"/>
+  <path
+      android:pathData="m7.004,17.998v2h9.992v-2z"
+      android:fillColor="#020202"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_tethering.xml b/core/base/src/main/res/drawable/ic_settings_tethering.xml
new file mode 100644
index 000000000..343b7e12f
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_tethering.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m17.193,21.534c0.287,0.472 0.907,0.628 1.351,0.3 1.649,-1.22 2.93,-2.882 3.688,-4.803 0.881,-2.232 1.008,-4.69 0.362,-7.001C21.948,7.72 20.564,5.684 18.654,4.233 16.743,2.781 14.411,1.995 12.012,1.992 9.613,1.989 7.278,2.771 5.365,4.218 3.451,5.666 2.063,7.699 1.412,10.008 0.762,12.317 0.884,14.776 1.76,17.009c0.754,1.922 2.031,3.587 3.677,4.811 0.443,0.329 1.064,0.174 1.352,-0.297C7.077,21.051 6.926,20.437 6.489,20.099 5.213,19.11 4.222,17.791 3.628,16.276 2.912,14.45 2.812,12.44 3.344,10.552 3.876,8.664 5.011,7.002 6.575,5.819 8.14,4.636 10.048,3.997 12.01,3.999c1.962,0.002 3.868,0.645 5.43,1.832 1.562,1.186 2.693,2.851 3.221,4.74 0.528,1.889 0.424,3.899 -0.296,5.723 -0.597,1.513 -1.591,2.83 -2.869,3.816 -0.437,0.338 -0.59,0.951 -0.303,1.423z"
+      android:fillColor="#0f0f0f"/>
+  <path
+      android:pathData="m15.074,18.144c0.283,0.474 0.903,0.635 1.332,0.287 0.922,-0.747 1.644,-1.72 2.09,-2.832 0.571,-1.423 0.659,-2.993 0.251,-4.471C18.339,9.651 17.457,8.348 16.237,7.42 15.017,6.492 13.526,5.991 11.993,5.992 10.46,5.993 8.97,6.498 7.752,7.428 6.534,8.359 5.654,9.663 5.249,11.141 4.844,12.62 4.935,14.19 5.509,15.612c0.448,1.111 1.172,2.083 2.096,2.828 0.43,0.347 1.049,0.185 1.331,-0.29C9.218,17.675 9.053,17.067 8.644,16.697 8.087,16.193 7.648,15.567 7.364,14.863 6.955,13.848 6.889,12.726 7.179,11.67 7.468,10.615 8.096,9.683 8.966,9.019 9.836,8.354 10.9,7.994 11.995,7.993c1.095,-0.001 2.159,0.357 3.031,1.02 0.871,0.663 1.501,1.593 1.793,2.648 0.291,1.055 0.228,2.177 -0.179,3.193 -0.283,0.705 -0.72,1.331 -1.276,1.836 -0.409,0.372 -0.572,0.979 -0.289,1.454z"
+      android:fillColor="#0f0f0f"/>
+  <path
+      android:pathData="m12,15.992c1.657,0 3,-1.343 3,-3 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3zM12,14.002c-0.558,0 -1.01,-0.452 -1.01,-1.01 0,-0.558 0.452,-1.01 1.01,-1.01 0.558,0 1.01,0.452 1.01,1.01 0,0.558 -0.452,1.01 -1.01,1.01z"
+      android:fillColor="#0f0f0f"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_updates.xml b/core/base/src/main/res/drawable/ic_settings_updates.xml
new file mode 100644
index 000000000..6a96fd58c
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_updates.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m22.642,14.292q0,0.072 -0.015,0.1 -0.917,3.839 -3.839,6.223Q15.867,23 11.943,23 9.852,23 7.896,22.212 5.941,21.424 4.409,19.964L2.561,21.811Q2.289,22.083 1.917,22.083 1.544,22.083 1.272,21.811 1,21.539 1,21.167L1,14.75Q1,14.378 1.272,14.105 1.544,13.833 1.917,13.833L8.333,13.833Q8.706,13.833 8.978,14.105 9.25,14.378 9.25,14.75 9.25,15.122 8.978,15.395L7.016,17.357Q8.033,18.302 9.322,18.818 10.611,19.333 12,19.333 13.919,19.333 15.581,18.402 17.242,17.471 18.245,15.839 18.402,15.595 19.004,14.163 19.118,13.833 19.434,13.833l2.75,0q0.186,0 0.322,0.136 0.136,0.136 0.136,0.322zM23,2.833L23,9.25Q23,9.622 22.728,9.895 22.456,10.167 22.083,10.167L15.667,10.167Q15.294,10.167 15.022,9.895 14.75,9.622 14.75,9.25 14.75,8.878 15.022,8.605L16.999,6.629Q14.879,4.667 12,4.667 10.081,4.667 8.419,5.598 6.758,6.529 5.755,8.161 5.598,8.405 4.996,9.837 4.882,10.167 4.566,10.167L1.716,10.167Q1.53,10.167 1.394,10.031 1.258,9.895 1.258,9.708L1.258,9.608Q2.189,5.77 5.125,3.385 8.061,1 12,1 14.091,1 16.068,1.795 18.044,2.59 19.577,4.036L21.439,2.189Q21.711,1.917 22.083,1.917 22.456,1.917 22.728,2.189 23,2.461 23,2.833Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_wifi.xml b/core/base/src/main/res/drawable/ic_settings_wifi.xml
new file mode 100644
index 000000000..7d5f81639
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_wifi.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m2.723,9.787c5.124,-5.124 13.431,-5.124 18.555,0 0.394,0.394 1.033,0.394 1.427,0 0.394,-0.394 0.394,-1.033 0,-1.427 -5.912,-5.912 -15.497,-5.912 -21.409,0 -0.394,0.394 -0.394,1.033 0,1.427 0.394,0.394 1.033,0.394 1.427,0zM5.577,12.642c3.547,-3.547 9.298,-3.547 12.846,0 0.394,0.394 1.033,0.394 1.427,0 0.394,-0.394 0.394,-1.033 0,-1.427 -4.336,-4.335 -11.365,-4.335 -15.7,0 -0.394,0.394 -0.394,1.033 0,1.427 0.394,0.394 1.033,0.394 1.427,0zM8.432,15.497c1.971,-1.971 5.166,-1.971 7.136,0 0.394,0.394 1.033,0.394 1.427,0 0.394,-0.394 0.394,-1.033 0,-1.427 -2.759,-2.759 -7.232,-2.759 -9.991,0 -0.394,0.394 -0.394,1.033 0,1.427 0.394,0.394 1.033,0.394 1.427,0zM9.859,16.924c1.182,-1.182 3.1,-1.182 4.282,0 0.394,0.394 0.394,1.033 0,1.427l-1.427,1.427c-0.394,0.394 -1.033,0.394 -1.427,0L9.859,18.351c-0.394,-0.394 -0.394,-1.033 0,-1.427z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/core/base/src/main/res/drawable/ic_settings_wireless.xml b/core/base/src/main/res/drawable/ic_settings_wireless.xml
new file mode 100644
index 000000000..90974497a
--- /dev/null
+++ b/core/base/src/main/res/drawable/ic_settings_wireless.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m19,16.83c0.332,0.383 0.912,0.383 1.306,-0.052 1.72,-1.865 2.694,-4.352 2.694,-7.036 0,-2.684 -0.974,-5.171 -2.694,-7.036 -0.394,-0.435 -0.974,-0.435 -1.306,-0.052 -0.332,0.373 -0.238,0.86 0.145,1.285 1.389,1.544 2.166,3.575 2.166,5.803 0,2.228 -0.777,4.259 -2.166,5.803 -0.383,0.425 -0.477,0.912 -0.145,1.285zM5,16.83c0.332,-0.373 0.228,-0.86 -0.145,-1.285 -1.389,-1.544 -2.166,-3.575 -2.166,-5.803 0,-2.228 0.777,-4.259 2.166,-5.803 0.373,-0.425 0.477,-0.912 0.145,-1.285 -0.332,-0.383 -0.912,-0.383 -1.316,0.052 -1.72,1.865 -2.684,4.352 -2.684,7.036 0,2.684 0.964,5.171 2.684,7.036 0.404,0.435 0.984,0.435 1.316,0.052zM8.109,13.877c0.332,-0.373 0.187,-0.839 -0.135,-1.285 -0.622,-0.767 -0.933,-1.772 -0.933,-2.85 0,-1.078 0.332,-2.052 0.933,-2.85 0.321,-0.456 0.466,-0.912 0.135,-1.285 -0.342,-0.394 -0.964,-0.404 -1.326,0.073 -0.902,1.119 -1.43,2.539 -1.43,4.062 0,1.523 0.529,2.943 1.43,4.062 0.363,0.477 0.984,0.466 1.326,0.073zM15.881,13.877c0.352,0.394 0.964,0.404 1.337,-0.073 0.902,-1.119 1.42,-2.539 1.42,-4.062 0,-1.523 -0.518,-2.943 -1.42,-4.062 -0.373,-0.477 -0.984,-0.466 -1.337,-0.073 -0.332,0.373 -0.187,0.829 0.135,1.285 0.601,0.798 0.933,1.772 0.933,2.85 0,1.078 -0.311,2.083 -0.933,2.85 -0.321,0.446 -0.466,0.912 -0.135,1.285zM11.995,21.628c0.497,0 0.798,-0.352 0.798,-0.891L12.793,11.431c0.632,-0.301 1.067,-0.943 1.067,-1.689 0,-1.036 -0.819,-1.876 -1.865,-1.876 -1.036,0 -1.855,0.839 -1.855,1.876 0,0.746 0.425,1.389 1.067,1.689L11.207,20.737c0,0.529 0.321,0.891 0.788,0.891z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/i18n/src/main/res/values/strings.xml b/core/i18n/src/main/res/values/strings.xml
index aeebc72bf..ea3eb0bde 100644
--- a/core/i18n/src/main/res/values/strings.xml
+++ b/core/i18n/src/main/res/values/strings.xml
@@ -664,6 +664,25 @@
     <string name="preference_search_locations_radius">Search radius</string>
     <string name="preference_search_websites_summary">Show a preview of a website if the search query is a URL</string>
     <string name="preference_search_locations_summary">Search the local area for shops and other places</string>
+    <string name="preference_search_settings">Settings</string>
+    <string name="preference_search_settings_summary">Search for common settings pages for your device</string>
+    <string name="settings_airplane">Airplane mode</string>
+    <string name="settings_deviceinfo">Device info</string>
+    <string name="settings_manage_applications">All apps</string>
+    <string name="settings_storage">Storage</string>
+    <string name="settings_wireless">Wireless connection</string>
+    <string name="settings_tethering">Tethering</string>
+    <string name="settings_accessibility">Accessibility</string>
+    <string name="settings_battery">Battery</string>
+    <string name="settings_sound">Sound</string>
+    <string name="settings_display">Display</string>
+    <string name="settings_developer">Development</string>
+    <string name="settings_security">Security</string>
+    <string name="settings_updates">System updates</string>
+    <string name="settings_wifi" translatable="false">Wi-Fi</string>
+    <string name="settings_bluetooth" translatable="false">Bluetooth</string>
+    <string name="settings_nfc" translatable="false">NFC</string>
+    <string name="settings_location">Location</string>
     <string name="preference_search_locations_show_position_on_map_summary">Show your own location in the map</string>
     <string name="preference_search_websearch">Web search</string>
     <string name="preference_search_websearch_summary">Show shortcuts to different search engines</string>
diff --git a/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherSettingsData.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherSettingsData.kt
index 3a8cc8c7d..0a7b848eb 100644
--- a/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherSettingsData.kt
+++ b/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherSettingsData.kt
@@ -158,9 +158,11 @@ data class LauncherSettingsData internal constructor(
         KeyboardFilterBarItem.Websites,
         KeyboardFilterBarItem.Places,
         KeyboardFilterBarItem.Tools,
+        KeyboardFilterBarItem.Settings,
         KeyboardFilterBarItem.HiddenResults,
     ),
 
+    val settingsSearchEnabled: Boolean = true,
 
     ) {
     constructor(
@@ -408,5 +410,6 @@ enum class KeyboardFilterBarItem {
     @SerialName("contacts") Contacts,
     @SerialName("events") Events,
     @SerialName("tools") Tools,
+    @SerialName("settings") Settings,
     @SerialName("hidden") HiddenResults,
 }
\ No newline at end of file
diff --git a/core/preferences/src/main/java/de/mm20/launcher2/preferences/Module.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/Module.kt
index e19a509f3..84309b853 100644
--- a/core/preferences/src/main/java/de/mm20/launcher2/preferences/Module.kt
+++ b/core/preferences/src/main/java/de/mm20/launcher2/preferences/Module.kt
@@ -10,6 +10,7 @@ import de.mm20.launcher2.preferences.search.FileSearchSettings
 import de.mm20.launcher2.preferences.search.LocationSearchSettings
 import de.mm20.launcher2.preferences.search.RankingSettings
 import de.mm20.launcher2.preferences.search.SearchFilterSettings
+import de.mm20.launcher2.preferences.search.SettingsSearchSettings
 import de.mm20.launcher2.preferences.search.ShortcutSearchSettings
 import de.mm20.launcher2.preferences.search.UnitConverterSettings
 import de.mm20.launcher2.preferences.search.WebsiteSearchSettings
@@ -51,4 +52,5 @@ val preferencesModule = module {
     factory { ClockWidgetSettings(get()) }
     factory { LocationSearchSettings(get()) }
     factory { SearchFilterSettings(get()) }
+    factory { SettingsSearchSettings(get()) }
 }
\ No newline at end of file
diff --git a/core/preferences/src/main/java/de/mm20/launcher2/preferences/search/SettingsSearchSettings.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/search/SettingsSearchSettings.kt
new file mode 100644
index 000000000..df09f2ebf
--- /dev/null
+++ b/core/preferences/src/main/java/de/mm20/launcher2/preferences/search/SettingsSearchSettings.kt
@@ -0,0 +1,30 @@
+package de.mm20.launcher2.preferences.search
+
+import de.mm20.launcher2.preferences.LauncherDataStore
+import kotlinx.coroutines.flow.map
+
+class SettingsSearchSettings internal constructor(
+    private val launcherDataStore: LauncherDataStore,
+) {
+
+    val data
+        get() = launcherDataStore.data.map {
+            SettingsSearchSettingsData(
+                enabled = it.settingsSearchEnabled,
+            )
+        }
+
+    val enabled
+        get() = launcherDataStore.data.map { it.settingsSearchEnabled }
+
+    fun setEnabled(enabled: Boolean) {
+        launcherDataStore.update {
+            it.copy(settingsSearchEnabled = enabled)
+        }
+    }
+
+}
+
+data class SettingsSearchSettingsData(
+    val enabled: Boolean = false,
+)
\ No newline at end of file
diff --git a/data/settings/.gitignore b/data/settings/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/data/settings/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/data/settings/build.gradle.kts b/data/settings/build.gradle.kts
new file mode 100644
index 000000000..fe55d0258
--- /dev/null
+++ b/data/settings/build.gradle.kts
@@ -0,0 +1,49 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    compileSdk = libs.versions.compileSdk.get().toInt()
+
+    defaultConfig {
+        minSdk = libs.versions.minSdk.get().toInt()
+        
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            proguardFiles(
+                    getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro"
+            )
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    namespace = "de.mm20.launcher2.settings"
+}
+
+dependencies {
+    implementation(libs.bundles.kotlin)
+    implementation(libs.androidx.core)
+    implementation(libs.androidx.appcompat)
+
+    implementation(libs.bundles.androidx.lifecycle)
+
+    implementation(libs.koin.android)
+
+    implementation(project(":core:base"))
+    implementation(project(":core:preferences"))
+    implementation(project(":core:ktx"))
+
+}
diff --git a/data/settings/consumer-rules.pro b/data/settings/consumer-rules.pro
new file mode 100644
index 000000000..e69de29bb
diff --git a/data/settings/proguard-rules.pro b/data/settings/proguard-rules.pro
new file mode 100644
index 000000000..01639a198
--- /dev/null
+++ b/data/settings/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.kts.kts.kts.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/data/settings/src/main/AndroidManifest.xml b/data/settings/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..a5c402166
--- /dev/null
+++ b/data/settings/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    /
+</manifest>
\ No newline at end of file
diff --git a/data/settings/src/main/java/de/mm20/launcher2/search/data/PojoSettings.kt b/data/settings/src/main/java/de/mm20/launcher2/search/data/PojoSettings.kt
new file mode 100644
index 000000000..494156ef3
--- /dev/null
+++ b/data/settings/src/main/java/de/mm20/launcher2/search/data/PojoSettings.kt
@@ -0,0 +1,77 @@
+package de.mm20.launcher2.search.data
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
+import de.mm20.launcher2.base.R
+import de.mm20.launcher2.icons.ColorLayer
+import de.mm20.launcher2.icons.StaticLauncherIcon
+import de.mm20.launcher2.icons.TintedIconLayer
+import de.mm20.launcher2.ktx.tryStartActivity
+import de.mm20.launcher2.search.NullSerializer
+import de.mm20.launcher2.search.SavableSearchable
+import de.mm20.launcher2.search.SearchableSerializer
+
+data class PojoSettings(
+    @get:DrawableRes val icon: Int,
+
+    val actionId: String? = null,
+    val specialId: String? = null,
+    val packageName: String? = null,
+
+    override val key: String,
+    override val label: String
+) : SavableSearchable {
+    override fun overrideLabel(label: String): SavableSearchable {
+        return copy(label = label)
+    }
+
+    override fun launch(context: Context, options: Bundle?): Boolean {
+        return when {
+            specialId != null -> false
+
+            packageName != null -> context.tryStartActivity(
+                Intent(actionId).apply {
+                    setClassName(packageName, actionId!!)
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                }, options
+            )
+
+            else -> context.tryStartActivity(
+                Intent(actionId).apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                }, options
+            )
+        }
+    }
+
+    override val preferDetailsOverLaunch: Boolean
+        get() = false
+
+    override val domain: String
+        get() = Domain
+
+    override fun getPlaceholderIcon(context: Context): StaticLauncherIcon {
+        val bgColor = R.color.teal
+        return StaticLauncherIcon(
+            foregroundLayer = TintedIconLayer(
+                icon = ContextCompat.getDrawable(context, icon)!!,
+                scale = 0.5f,
+                color = ContextCompat.getColor(context, bgColor)
+            ),
+            backgroundLayer = ColorLayer(ContextCompat.getColor(context, bgColor))
+        )
+    }
+
+    override fun getSerializer(): SearchableSerializer {
+        return NullSerializer()
+    }
+
+    companion object {
+        const val Domain: String = "settings"
+
+        const val specialIdLauncher = "launcher-settings"
+    }
+}
\ No newline at end of file
diff --git a/data/settings/src/main/java/de/mm20/launcher2/settings/Module.kt b/data/settings/src/main/java/de/mm20/launcher2/settings/Module.kt
new file mode 100644
index 000000000..dab17b748
--- /dev/null
+++ b/data/settings/src/main/java/de/mm20/launcher2/settings/Module.kt
@@ -0,0 +1,8 @@
+package de.mm20.launcher2.settings
+
+import org.koin.android.ext.koin.androidContext
+import org.koin.dsl.module
+
+val settingsModule = module {
+    single<SettingsRepository> { SettingsRepositoryImpl(androidContext(), get()) }
+}
\ No newline at end of file
diff --git a/data/settings/src/main/java/de/mm20/launcher2/settings/SettingsRepository.kt b/data/settings/src/main/java/de/mm20/launcher2/settings/SettingsRepository.kt
new file mode 100644
index 000000000..7f03743e0
--- /dev/null
+++ b/data/settings/src/main/java/de/mm20/launcher2/settings/SettingsRepository.kt
@@ -0,0 +1,180 @@
+package de.mm20.launcher2.settings
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.provider.Settings
+import de.mm20.launcher2.preferences.search.SettingsSearchSettings
+import de.mm20.launcher2.search.data.PojoSettings
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+import org.koin.core.component.KoinComponent
+
+interface SettingsRepository {
+    fun search(query: String) : Flow<ImmutableList<PojoSettings>>
+}
+
+class SettingsRepositoryImpl(
+    private val context: Context,
+    private val settings: SettingsSearchSettings
+) : SettingsRepository, KoinComponent {
+
+    override fun search(query: String): Flow<ImmutableList<PojoSettings>> {
+        return settings.enabled.map {
+            if (it && query.isNotBlank()) {
+                filteredSettingsList(query)
+            } else {
+                persistentListOf()
+            }
+        }
+    }
+
+    private suspend fun filteredSettingsList(query: String): ImmutableList<PojoSettings> {
+        return withContext(Dispatchers.IO) {
+            getKnownSettingsList(context).filter {
+                context.getString(R.string.preference_search_settings).contains(query, ignoreCase = true) ||
+                it.label.contains(query, ignoreCase = true)
+            }.toImmutableList()
+        }
+    }
+    private fun getKnownSettingsList(context: Context): List<PojoSettings> {
+        val pm = context.packageManager
+        val list = mutableListOf<PojoSettings>()
+
+        list.addAll(
+            listOf(
+                PojoSettings(
+                    icon = R.drawable.ic_settings_airplane,
+                    actionId = Settings.ACTION_AIRPLANE_MODE_SETTINGS,
+                    key = "settings-airplane",
+                    label = context.getString(R.string.settings_airplane)
+                ),
+                PojoSettings(
+                    icon = R.drawable.ic_settings_deviceinfo,
+                    actionId = Settings.ACTION_DEVICE_INFO_SETTINGS,
+                    key = "settings-device",
+                    label = context.getString(R.string.settings_deviceinfo)
+                ),
+                PojoSettings(
+                    icon = R.drawable.ic_settings_apps,
+                    actionId = Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS,
+                    key = "settings-apps",
+                    label = context.getString(R.string.settings_manage_applications)
+                ),
+                PojoSettings(
+                    icon = R.drawable.ic_settings_storage,
+                    actionId = Settings.ACTION_INTERNAL_STORAGE_SETTINGS,
+                    key = "settings-storage",
+                    label = context.getString(R.string.settings_storage)
+                ),
+                PojoSettings(
+                    icon = R.drawable.ic_settings_wireless,
+                    actionId = Settings.ACTION_WIRELESS_SETTINGS,
+                    key = "settings-wireless",
+                    label = context.getString(R.string.settings_wireless)
+                ),
+                PojoSettings(
+                    icon = R.drawable.ic_settings_tethering,
+                    actionId = "com.android.settings.TetherSettings",
+                    packageName = "com.android.settings",
+                    key = "settings-tethering",
+                    label = context.getString(R.string.settings_tethering)
+                ),
+                PojoSettings(
+                    icon = R.drawable.ic_settings_accessibility,
+                    actionId = Settings.ACTION_ACCESSIBILITY_SETTINGS,
+                    key = "settings-accessibility",
+                    label = context.getString(R.string.settings_accessibility)
+                ),
+                PojoSettings(
+                    icon = R.drawable.ic_settings_battery,
+                    actionId = Intent.ACTION_POWER_USAGE_SUMMARY,
+                    key = "settings-battery",
+                    label = context.getString(R.string.settings_battery)
+                ),
+                PojoSettings(
+                    icon = R.drawable.ic_settings_sound,
+                    actionId = Settings.ACTION_SOUND_SETTINGS,
+                    key = "settings-sound",
+                    label = context.getString(R.string.settings_sound)
+                ),
+                PojoSettings(
+                    icon = R.drawable.ic_settings_display,
+                    actionId = Settings.ACTION_DISPLAY_SETTINGS,
+                    key = "settings-display",
+                    label = context.getString(R.string.settings_display)
+                ),
+                PojoSettings(
+                    icon = R.drawable.ic_settings_developer,
+                    actionId = Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS,
+                    key = "settings-developer",
+                    label = context.getString(R.string.settings_developer)
+                ),
+                PojoSettings(
+                    icon = R.drawable.ic_settings_privacy,
+                    actionId = Settings.ACTION_SECURITY_SETTINGS,
+                    key = "settings-security",
+                    label = context.getString(R.string.settings_security)
+                ),
+                PojoSettings(
+                    icon = R.drawable.ic_settings_updates,
+                    actionId = "android.settings.SYSTEM_UPDATE_SETTINGS",
+                    key = "settings-updates",
+                    label = context.getString(R.string.settings_updates)
+                ),
+
+
+                PojoSettings(
+                    icon = R.drawable.ic_settings_launcher,
+                    specialId = PojoSettings.specialIdLauncher,
+                    key = "settings-launcher",
+                    label = context.getString(R.string.app_name)
+                ),
+            )
+        )
+
+        if (pm.hasSystemFeature(PackageManager.FEATURE_WIFI)) {
+            list.add(PojoSettings(
+                icon = R.drawable.ic_settings_wifi,
+                actionId = Settings.ACTION_WIFI_SETTINGS,
+                key = "settings-wifi",
+                label = context.getString(R.string.settings_wifi)
+            ))
+        }
+
+        if (pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) {
+            list.add(PojoSettings(
+                icon = R.drawable.ic_settings_bluetooth,
+                actionId = Settings.ACTION_BLUETOOTH_SETTINGS,
+                key = "settings-bluetooth",
+                label = context.getString(R.string.settings_bluetooth)
+            ))
+        }
+
+        if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
+            list.add(PojoSettings(
+                icon = R.drawable.ic_settings_nfc,
+                actionId = Settings.ACTION_NFC_SETTINGS,
+                key = "settings-nfc",
+                label = context.getString(R.string.settings_nfc)
+            ))
+        }
+
+        if (pm.hasSystemFeature(PackageManager.FEATURE_LOCATION)) {
+            list.add(PojoSettings(
+                icon = R.drawable.ic_settings_location,
+                actionId = Settings.ACTION_LOCATION_SOURCE_SETTINGS,
+                key = "settings-location",
+                label = context.getString(R.string.settings_location)
+            ))
+        }
+
+        return list
+    }
+
+}
\ No newline at end of file
diff --git a/services/search/build.gradle.kts b/services/search/build.gradle.kts
index fbb97dc58..0229b588c 100644
--- a/services/search/build.gradle.kts
+++ b/services/search/build.gradle.kts
@@ -47,6 +47,7 @@ dependencies {
     implementation(libs.coil.core)
 
     implementation(project(":data:calculator"))
+    implementation(project(":data:settings"))
     implementation(project(":data:unitconverter"))
     implementation(project(":data:customattrs"))
     implementation(project(":data:search-actions"))
diff --git a/services/search/src/main/java/de/mm20/launcher2/search/Module.kt b/services/search/src/main/java/de/mm20/launcher2/search/Module.kt
index a560c8898..d5dace2aa 100644
--- a/services/search/src/main/java/de/mm20/launcher2/search/Module.kt
+++ b/services/search/src/main/java/de/mm20/launcher2/search/Module.kt
@@ -15,6 +15,7 @@ val searchModule = module {
             get(named<Location>()),
             get(),
             get(),
+            get(),
             get(named<Website>()),
             get(),
             get(),
diff --git a/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt b/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt
index 99ecb29da..bc52052da 100644
--- a/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt
+++ b/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt
@@ -4,10 +4,12 @@ import de.mm20.launcher2.calculator.CalculatorRepository
 import de.mm20.launcher2.data.customattrs.CustomAttributesRepository
 import de.mm20.launcher2.data.customattrs.utils.withCustomLabels
 import de.mm20.launcher2.search.data.Calculator
+import de.mm20.launcher2.search.data.PojoSettings
 import de.mm20.launcher2.search.data.UnitConverter
 import de.mm20.launcher2.searchactions.SearchActionService
 import de.mm20.launcher2.searchactions.actions.SearchAction
 import de.mm20.launcher2.unitconverter.UnitConverterRepository
+import de.mm20.launcher2.settings.SettingsRepository
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
@@ -37,6 +39,7 @@ internal class SearchServiceImpl(
     private val locationRepository: SearchableRepository<Location>,
     private val unitConverterRepository: UnitConverterRepository,
     private val calculatorRepository: CalculatorRepository,
+    private val settingsRepository: SettingsRepository,
     private val websiteRepository: SearchableRepository<Website>,
     private val searchActionService: SearchActionService,
     private val customAttributesRepository: CustomAttributesRepository,
@@ -119,6 +122,15 @@ internal class SearchServiceImpl(
                         }
                 }
             }
+            if (filters.settings) {
+                launch {
+                    settingsRepository.search(query).collectLatest { r ->
+                        results.update {
+                            it.copy(settings = r)
+                        }
+                    }
+                }
+            }
             if (filters.websites) {
                 launch {
                     websiteRepository.search(query, filters.allowNetwork)
@@ -207,6 +219,7 @@ data class SearchResults(
     val websites: ImmutableList<Website>? = null,
     val wikipedia: ImmutableList<Article>? = null,
     val locations: ImmutableList<Location>? = null,
+    val settings: ImmutableList<PojoSettings>? = null,
     val searchActions: ImmutableList<SearchAction>? = null,
     val other: ImmutableList<SavableSearchable>? = null,
 )
@@ -222,6 +235,7 @@ fun SearchResults.toList(): List<Searchable> {
         unitConverters,
         websites,
         wikipedia,
+        settings,
         searchActions,
         other,
     ).flatten()
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f9a180c09..a2a6f6545 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,6 +44,7 @@ include(":data:weather")
 include(":data:notifications")
 include(":data:search-actions")
 include(":data:searchable")
+include(":data:settings")
 include(":data:plugins")
 
 include(":services:accounts")