diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt
index 1e5758b2..8f2bb2ac 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt
@@ -19,11 +19,11 @@ package com.rtbishop.look4sat.presentation.entriesScreen
 
 import android.os.Bundle
 import android.view.View
-import android.view.inputmethod.EditorInfo
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
+import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.SimpleItemAnimator
 import com.google.android.material.snackbar.Snackbar
@@ -39,10 +39,6 @@ import dagger.hilt.android.AndroidEntryPoint
 class EntriesFragment : Fragment(R.layout.fragment_entries) {
 
     private val viewModel: EntriesViewModel by viewModels()
-    private val contentContract = ActivityResultContracts.GetContent()
-    private val filePicker = registerForActivityResult(contentContract) { uri ->
-        uri?.let { viewModel.updateDataFromFile(uri) }
-    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -57,16 +53,12 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {
                 adapter = entriesAdapter
                 layoutManager = GridLayoutManager(requireContext(), 2)
                 (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
-                addItemDecoration(ItemDivider(R.drawable.rec_divider_dark))
+                addItemDecoration(ItemDivider(R.drawable.divider_dark))
             }
-//            entriesImportWeb.setOnClickListener {
-//                findNavController().navigateSafe(R.id.action_entries_to_sources)
-//            }
-//            entriesImportFile.setOnClickListener { filePicker.launch("*/*") }
-            entriesSelectMode.setOnClickListener { showModesDialog() }
+            entriesBack.setOnClickListener { findNavController().navigateUp() }
+            entriesSearch.doOnTextChanged { text, _, _, _ -> viewModel.setQuery(text.toString()) }
+            entriesMode.setOnClickListener { showModesDialog() }
             entriesSelectAll.setOnClickListener { viewModel.selectCurrentItems() }
-            entriesSearchBar.setOnQueryTextListener(viewModel)
-            entriesSearchBar.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
         }
         viewModel.satData.observe(viewLifecycleOwner, { satData ->
             handleSatData(satData, binding, entriesAdapter)
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt
index 6647ae0d..1083fdbc 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt
@@ -21,13 +21,12 @@ import android.content.ContentResolver
 import android.net.Uri
 import android.widget.SearchView
 import androidx.lifecycle.*
-import com.rtbishop.look4sat.domain.model.SatItem
-import com.rtbishop.look4sat.domain.model.DataState
 import com.rtbishop.look4sat.domain.DataRepository
+import com.rtbishop.look4sat.domain.model.DataState
+import com.rtbishop.look4sat.domain.model.SatItem
 import com.rtbishop.look4sat.framework.PreferencesSource
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineExceptionHandler
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.util.*
@@ -93,6 +92,10 @@ class EntriesViewModel @Inject constructor(
         preferences.saveModesSelection(modes)
     }
 
+    fun setQuery(query: String) {
+        currentQuery.value = query
+    }
+
     override fun onQueryTextSubmit(query: String): Boolean {
         return true
     }
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt
index 9e149e8f..55b4fd86 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt
@@ -67,7 +67,7 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC
                 isVerticalScrollBarEnabled = false
                 layoutManager = LinearLayoutManager(context)
                 (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
-                addItemDecoration(ItemDivider(R.drawable.rec_divider_dark))
+                addItemDecoration(ItemDivider(R.drawable.divider_dark))
                 addOnScrollListener(object : RecyclerView.OnScrollListener() {
                     override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                         if (dy > 0 && passesFab.visibility == View.VISIBLE) passesFab.hide()
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt
index 157592ae..0863e9cd 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt
@@ -54,7 +54,7 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {
                 isVerticalScrollBarEnabled = false
                 layoutManager = LinearLayoutManager(context)
                 (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
-                addItemDecoration(ItemDivider(R.drawable.rec_divider_dark))
+                addItemDecoration(ItemDivider(R.drawable.divider_dark))
             }
             setupObservers(transAdapter, this)
         }
@@ -135,7 +135,6 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {
                     binding.radarTimer.text = 0L.toTimerString()
 //                    findNavController().navigateSafe(R.id.action_radar_to_passes)
                     findNavController().popBackStack(R.id.nav_passes, true)
-//                    requireActivity().onNavigateUp()
                 }
             }
         } else {
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/prefsScreen/PrefsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt
similarity index 94%
rename from app/src/main/java/com/rtbishop/look4sat/presentation/prefsScreen/PrefsFragment.kt
rename to app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt
index dd380ae6..c2676f23 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/prefsScreen/PrefsFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.presentation.prefsScreen
+package com.rtbishop.look4sat.presentation.settingsScreen
 
 import android.Manifest
 import android.content.Intent
@@ -35,19 +35,19 @@ import androidx.navigation.fragment.findNavController
 import com.google.android.material.snackbar.Snackbar
 import com.rtbishop.look4sat.BuildConfig
 import com.rtbishop.look4sat.R
-import com.rtbishop.look4sat.databinding.FragmentPrefsBinding
+import com.rtbishop.look4sat.databinding.FragmentSettingsBinding
 import com.rtbishop.look4sat.framework.PreferencesSource
 import com.rtbishop.look4sat.presentation.*
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class PrefsFragment : Fragment(R.layout.fragment_prefs) {
+class SettingsFragment : Fragment(R.layout.fragment_settings) {
 
     @Inject
     lateinit var preferences: PreferencesSource
 
-    private val viewModel: PrefsViewModel by viewModels()
+    private val viewModel: SettingsViewModel by viewModels()
     private val locPermFine = Manifest.permission.ACCESS_FINE_LOCATION
     private val locPermCoarse = Manifest.permission.ACCESS_COARSE_LOCATION
     private val contentContract = ActivityResultContracts.GetContent()
@@ -62,17 +62,18 @@ class PrefsFragment : Fragment(R.layout.fragment_prefs) {
             else -> showSnack(getString(R.string.pref_pos_gps_error))
         }
     }
-    private var _binding: FragmentPrefsBinding? = null
+    private var _binding: FragmentSettingsBinding? = null
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentPrefsBinding.bind(view)
+        _binding = FragmentSettingsBinding.bind(view)
+        _binding?.prefsBack?.setOnClickListener { findNavController().navigateUp() }
         setupAboutCard()
         setupDataCard()
         setupLocationCard()
-        setupWarrantyCard()
-        setupOtherCard()
         setupTrackingCard()
+        setupOtherCard()
+        setupWarrantyCard()
     }
 
     private fun setupAboutCard() {
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/prefsScreen/PrefsViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt
similarity index 95%
rename from app/src/main/java/com/rtbishop/look4sat/presentation/prefsScreen/PrefsViewModel.kt
rename to app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt
index ec7f088f..19c5e03f 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/prefsScreen/PrefsViewModel.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.presentation.prefsScreen
+package com.rtbishop.look4sat.presentation.settingsScreen
 
 import android.content.ContentResolver
 import android.net.Uri
@@ -29,7 +29,7 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class PrefsViewModel @Inject constructor(
+class SettingsViewModel @Inject constructor(
     private val preferences: PreferencesSource,
     private val resolver: ContentResolver,
     private val dataRepository: DataRepository
diff --git a/app/src/main/res/drawable/rec_divider_dark.xml b/app/src/main/res/drawable/divider_dark.xml
similarity index 100%
rename from app/src/main/res/drawable/rec_divider_dark.xml
rename to app/src/main/res/drawable/divider_dark.xml
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index 185e6535..0553ae30 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/themeAccent"
+        android:fillColor="@android:color/white"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow.xml b/app/src/main/res/drawable/ic_arrow.xml
index c44987f0..da896608 100644
--- a/app/src/main/res/drawable/ic_arrow.xml
+++ b/app/src/main/res/drawable/ic_arrow.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/themeAccent"
+        android:fillColor="@android:color/white"
         android:pathData="M8,5v14l11,-7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
index d4acd0a8..c9d2255e 100644
--- a/app/src/main/res/drawable/ic_back.xml
+++ b/app/src/main/res/drawable/ic_back.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_bmc.xml b/app/src/main/res/drawable/ic_bmc.xml
index d7820ca1..6a057834 100644
--- a/app/src/main/res/drawable/ic_bmc.xml
+++ b/app/src/main/res/drawable/ic_bmc.xml
@@ -1,11 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:width="16dp"
     android:height="24dp"
     android:viewportWidth="233.76132"
     android:viewportHeight="338.40268">
-  <path
-      android:pathData="m113.404,0c-10.877,-0.015 -21.753,0.458 -32.594,1.417 -12.911,1.175 -26.51,2.595 -38.779,7.061 -4.484,1.634 -9.105,3.597 -12.514,7.061 -4.184,4.257 -5.55,10.84 -2.495,16.148 2.172,3.77 5.85,6.432 9.752,8.194 5.082,2.27 10.389,3.998 15.834,5.154 15.16,3.351 30.861,4.666 46.349,5.227 17.166,0.693 34.36,0.131 51.444,-1.68 4.225,-0.464 8.442,-1.021 12.651,-1.671 4.958,-0.76 8.14,-7.243 6.679,-11.759 -1.748,-5.399 -6.446,-7.493 -11.759,-6.678 -0.783,0.123 -1.561,0.236 -2.345,0.35l-0.564,0.082c-1.8,0.228 -3.6,0.44 -5.4,0.638 -3.718,0.401 -7.445,0.728 -11.181,0.983 -8.368,0.583 -16.758,0.851 -25.144,0.865 -8.24,0 -16.485,-0.232 -24.707,-0.774 -3.751,-0.246 -7.493,-0.559 -11.226,-0.938 -1.698,-0.178 -3.392,-0.364 -5.085,-0.574l-1.612,-0.205 -0.35,-0.05 -1.671,-0.241c-3.414,-0.515 -6.829,-1.106 -10.207,-1.821 -0.341,-0.076 -0.646,-0.266 -0.865,-0.538 -0.219,-0.272 -0.337,-0.611 -0.337,-0.96 0,-0.349 0.119,-0.688 0.337,-0.96 0.219,-0.272 0.524,-0.462 0.865,-0.537l0.064,0c2.927,-0.624 5.877,-1.156 8.836,-1.621 0.987,-0.155 1.976,-0.307 2.968,-0.455l0.027,0c1.853,-0.123 3.715,-0.455 5.559,-0.674 16.042,-1.669 32.178,-2.238 48.298,-1.703 7.826,0.228 15.647,0.687 23.436,1.479 1.675,0.173 3.342,0.355 5.008,0.56 0.637,0.077 1.279,0.169 1.921,0.246l1.293,0.187c3.77,0.561 7.519,1.243 11.249,2.044 5.527,1.202 12.625,1.594 15.083,7.649 0.783,1.921 1.138,4.056 1.57,6.072l0.551,2.572c0.015,0.046 0.025,0.093 0.032,0.141 1.302,6.07 2.605,12.14 3.91,18.21 0.096,0.448 0.098,0.912 0.007,1.361 -0.091,0.45 -0.274,0.875 -0.537,1.251 -0.263,0.375 -0.601,0.693 -0.992,0.932 -0.391,0.239 -0.827,0.395 -1.282,0.458l-0.037,0l-0.797,0.109 -0.787,0.105c-2.495,0.325 -4.993,0.628 -7.494,0.911 -4.926,0.561 -9.86,1.047 -14.801,1.457 -9.818,0.816 -19.656,1.352 -29.514,1.607 -5.023,0.133 -10.044,0.196 -15.064,0.187 -19.981,-0.016 -39.945,-1.177 -59.793,-3.478 -2.149,-0.255 -4.298,-0.528 -6.447,-0.806 1.666,0.214 -1.211,-0.164 -1.793,-0.246 -1.366,-0.191 -2.732,-0.39 -4.098,-0.596 -4.584,-0.688 -9.142,-1.534 -13.717,-2.276 -5.531,-0.91 -10.821,-0.455 -15.824,2.276 -4.107,2.247 -7.431,5.694 -9.529,9.879 -2.158,4.461 -2.799,9.319 -3.765,14.113 -0.965,4.794 -2.468,9.952 -1.899,14.873 1.225,10.621 8.65,19.252 19.33,21.183 10.047,1.821 20.149,3.296 30.279,4.553 39.791,4.873 79.99,5.456 119.905,1.739 3.25,-0.303 6.496,-0.634 9.738,-0.992 1.013,-0.111 2.037,0.005 2.998,0.341 0.962,0.336 1.836,0.883 2.558,1.6 0.723,0.718 1.276,1.588 1.619,2.547 0.343,0.959 0.467,1.983 0.363,2.996l-1.011,9.824c-2.037,19.852 -4.073,39.703 -6.11,59.552 -2.124,20.845 -4.263,41.687 -6.415,62.527 -0.607,5.871 -1.214,11.74 -1.821,17.606 -0.583,5.778 -0.665,11.737 -1.762,17.446 -1.73,8.977 -7.807,14.491 -16.675,16.508 -8.125,1.849 -16.425,2.82 -24.757,2.894 -9.237,0.05 -18.469,-0.36 -27.706,-0.31 -9.861,0.056 -21.939,-0.854 -29.551,-8.194 -6.688,-6.445 -7.612,-16.539 -8.522,-25.268 -1.214,-11.554 -2.417,-23.107 -3.61,-34.658L52.284,188.281 47.954,146.722c-0.073,-0.687 -0.146,-1.366 -0.214,-2.058 -0.519,-4.957 -4.029,-9.81 -9.561,-9.56 -4.734,0.209 -10.116,4.234 -9.56,9.56l3.209,30.812 6.638,63.735c1.891,18.104 3.777,36.21 5.659,54.321 0.364,3.469 0.705,6.948 1.088,10.416 2.081,18.957 16.558,29.173 34.486,32.049 10.471,1.685 21.196,2.032 31.822,2.204 13.621,0.22 27.379,0.744 40.777,-1.725 19.854,-3.643 34.749,-16.899 36.875,-37.462 0.607,-5.937 1.214,-11.875 1.821,-17.814 2.018,-19.643 4.034,-39.288 6.046,-58.933l6.583,-64.19 3.018,-29.418c0.15,-1.459 0.766,-2.831 1.756,-3.912 0.99,-1.081 2.303,-1.816 3.742,-2.093 5.677,-1.106 11.104,-2.995 15.142,-7.316 6.428,-6.879 7.707,-15.847 5.435,-24.888l-1.862,-9.392C229.186,72.629 225.394,64.666 216.744,61.621 213.971,60.646 210.825,60.228 208.699,58.211c-2.126,-2.017 -2.754,-5.149 -3.246,-8.053 -0.911,-5.331 -1.766,-10.667 -2.7,-15.989 -0.806,-4.575 -1.443,-9.715 -3.542,-13.912 -2.732,-5.636 -8.4,-8.932 -14.036,-11.113 -2.888,-1.078 -5.835,-1.99 -8.827,-2.731 -14.081,-3.715 -28.886,-5.081 -43.373,-5.86 -6.52,-0.36 -13.047,-0.544 -19.573,-0.552zM29.029,78.272c6.185,0.029 12.996,2.347 18.907,3.243 8.134,1.241 16.298,2.235 24.492,2.982 34.973,3.187 70.533,2.691 105.351,-1.971 6.346,-0.853 12.67,-1.844 18.97,-2.973 5.613,-1.006 11.837,-2.895 15.229,2.918 2.326,3.961 2.635,9.26 2.276,13.735 -0.111,1.95 -0.963,3.783 -2.381,5.126l0.004,0c-2.039,1.939 -5.112,2.841 -8.149,3.292 -34.053,5.053 -68.602,7.612 -103.028,6.483 -24.638,-0.842 -49.017,-3.578 -73.409,-7.024 -2.39,-0.337 -4.981,-0.774 -6.624,-2.536C17.57,98.223 19.091,91.531 19.896,87.515 20.634,83.837 22.046,78.934 26.421,78.411c0.854,-0.1 1.725,-0.143 2.608,-0.138zM19.164,96.794c-0.127,0.059 -0.155,0.523 -0.141,1.047 0.068,-0.346 0.228,-1.088 0.141,-1.047zM19.736,101.053c0.059,0.016 0.179,0.18 0.302,0.371 -0.214,-0.201 -0.351,-0.351 -0.328,-0.369l0.005,0c0.006,-0.004 0.013,-0.004 0.021,-0.002zM21.34,102.652l0.005,0 0.027,0c0,0.032 0.05,0.064 0.068,0.096 -0.03,-0.035 -0.064,-0.068 -0.1,-0.096zM156.916,147.68c-11.645,-0.005 -21.028,4.006 -31.868,8.645 -12.155,5.204 -25.949,11.104 -43.827,11.104 -7.479,-0.015 -14.921,-1.041 -22.125,-3.05l12.365,126.949c0.438,5.305 2.855,10.253 6.772,13.859 3.917,3.606 9.046,5.606 14.37,5.606 0,0 17.532,0.91 23.382,0.91 6.296,0 25.175,-0.91 25.175,-0.91 5.323,0 10.452,-2.003 14.368,-5.609 3.916,-3.606 6.333,-8.551 6.77,-13.856l13.243,-140.283c-5.918,-2.021 -11.891,-3.364 -18.624,-3.364zM113.776,313.843c-0.306,0.132 -0.573,0.339 -0.779,0.6l0.241,-0.153c0.164,-0.151 0.396,-0.328 0.537,-0.448z"
-      android:fillColor="@color/themeAccent"
-      tools:ignore="VectorPath" />
+    <path
+        android:fillColor="@color/themeAccent"
+        android:pathData="m113.404,0c-10.877,-0.015 -21.753,0.458 -32.594,1.417 -12.911,1.175 -26.51,2.595 -38.779,7.061 -4.484,1.634 -9.105,3.597 -12.514,7.061 -4.184,4.257 -5.55,10.84 -2.495,16.148 2.172,3.77 5.85,6.432 9.752,8.194 5.082,2.27 10.389,3.998 15.834,5.154 15.16,3.351 30.861,4.666 46.349,5.227 17.166,0.693 34.36,0.131 51.444,-1.68 4.225,-0.464 8.442,-1.021 12.651,-1.671 4.958,-0.76 8.14,-7.243 6.679,-11.759 -1.748,-5.399 -6.446,-7.493 -11.759,-6.678 -0.783,0.123 -1.561,0.236 -2.345,0.35l-0.564,0.082c-1.8,0.228 -3.6,0.44 -5.4,0.638 -3.718,0.401 -7.445,0.728 -11.181,0.983 -8.368,0.583 -16.758,0.851 -25.144,0.865 -8.24,0 -16.485,-0.232 -24.707,-0.774 -3.751,-0.246 -7.493,-0.559 -11.226,-0.938 -1.698,-0.178 -3.392,-0.364 -5.085,-0.574l-1.612,-0.205 -0.35,-0.05 -1.671,-0.241c-3.414,-0.515 -6.829,-1.106 -10.207,-1.821 -0.341,-0.076 -0.646,-0.266 -0.865,-0.538 -0.219,-0.272 -0.337,-0.611 -0.337,-0.96 0,-0.349 0.119,-0.688 0.337,-0.96 0.219,-0.272 0.524,-0.462 0.865,-0.537l0.064,0c2.927,-0.624 5.877,-1.156 8.836,-1.621 0.987,-0.155 1.976,-0.307 2.968,-0.455l0.027,0c1.853,-0.123 3.715,-0.455 5.559,-0.674 16.042,-1.669 32.178,-2.238 48.298,-1.703 7.826,0.228 15.647,0.687 23.436,1.479 1.675,0.173 3.342,0.355 5.008,0.56 0.637,0.077 1.279,0.169 1.921,0.246l1.293,0.187c3.77,0.561 7.519,1.243 11.249,2.044 5.527,1.202 12.625,1.594 15.083,7.649 0.783,1.921 1.138,4.056 1.57,6.072l0.551,2.572c0.015,0.046 0.025,0.093 0.032,0.141 1.302,6.07 2.605,12.14 3.91,18.21 0.096,0.448 0.098,0.912 0.007,1.361 -0.091,0.45 -0.274,0.875 -0.537,1.251 -0.263,0.375 -0.601,0.693 -0.992,0.932 -0.391,0.239 -0.827,0.395 -1.282,0.458l-0.037,0l-0.797,0.109 -0.787,0.105c-2.495,0.325 -4.993,0.628 -7.494,0.911 -4.926,0.561 -9.86,1.047 -14.801,1.457 -9.818,0.816 -19.656,1.352 -29.514,1.607 -5.023,0.133 -10.044,0.196 -15.064,0.187 -19.981,-0.016 -39.945,-1.177 -59.793,-3.478 -2.149,-0.255 -4.298,-0.528 -6.447,-0.806 1.666,0.214 -1.211,-0.164 -1.793,-0.246 -1.366,-0.191 -2.732,-0.39 -4.098,-0.596 -4.584,-0.688 -9.142,-1.534 -13.717,-2.276 -5.531,-0.91 -10.821,-0.455 -15.824,2.276 -4.107,2.247 -7.431,5.694 -9.529,9.879 -2.158,4.461 -2.799,9.319 -3.765,14.113 -0.965,4.794 -2.468,9.952 -1.899,14.873 1.225,10.621 8.65,19.252 19.33,21.183 10.047,1.821 20.149,3.296 30.279,4.553 39.791,4.873 79.99,5.456 119.905,1.739 3.25,-0.303 6.496,-0.634 9.738,-0.992 1.013,-0.111 2.037,0.005 2.998,0.341 0.962,0.336 1.836,0.883 2.558,1.6 0.723,0.718 1.276,1.588 1.619,2.547 0.343,0.959 0.467,1.983 0.363,2.996l-1.011,9.824c-2.037,19.852 -4.073,39.703 -6.11,59.552 -2.124,20.845 -4.263,41.687 -6.415,62.527 -0.607,5.871 -1.214,11.74 -1.821,17.606 -0.583,5.778 -0.665,11.737 -1.762,17.446 -1.73,8.977 -7.807,14.491 -16.675,16.508 -8.125,1.849 -16.425,2.82 -24.757,2.894 -9.237,0.05 -18.469,-0.36 -27.706,-0.31 -9.861,0.056 -21.939,-0.854 -29.551,-8.194 -6.688,-6.445 -7.612,-16.539 -8.522,-25.268 -1.214,-11.554 -2.417,-23.107 -3.61,-34.658L52.284,188.281 47.954,146.722c-0.073,-0.687 -0.146,-1.366 -0.214,-2.058 -0.519,-4.957 -4.029,-9.81 -9.561,-9.56 -4.734,0.209 -10.116,4.234 -9.56,9.56l3.209,30.812 6.638,63.735c1.891,18.104 3.777,36.21 5.659,54.321 0.364,3.469 0.705,6.948 1.088,10.416 2.081,18.957 16.558,29.173 34.486,32.049 10.471,1.685 21.196,2.032 31.822,2.204 13.621,0.22 27.379,0.744 40.777,-1.725 19.854,-3.643 34.749,-16.899 36.875,-37.462 0.607,-5.937 1.214,-11.875 1.821,-17.814 2.018,-19.643 4.034,-39.288 6.046,-58.933l6.583,-64.19 3.018,-29.418c0.15,-1.459 0.766,-2.831 1.756,-3.912 0.99,-1.081 2.303,-1.816 3.742,-2.093 5.677,-1.106 11.104,-2.995 15.142,-7.316 6.428,-6.879 7.707,-15.847 5.435,-24.888l-1.862,-9.392C229.186,72.629 225.394,64.666 216.744,61.621 213.971,60.646 210.825,60.228 208.699,58.211c-2.126,-2.017 -2.754,-5.149 -3.246,-8.053 -0.911,-5.331 -1.766,-10.667 -2.7,-15.989 -0.806,-4.575 -1.443,-9.715 -3.542,-13.912 -2.732,-5.636 -8.4,-8.932 -14.036,-11.113 -2.888,-1.078 -5.835,-1.99 -8.827,-2.731 -14.081,-3.715 -28.886,-5.081 -43.373,-5.86 -6.52,-0.36 -13.047,-0.544 -19.573,-0.552zM29.029,78.272c6.185,0.029 12.996,2.347 18.907,3.243 8.134,1.241 16.298,2.235 24.492,2.982 34.973,3.187 70.533,2.691 105.351,-1.971 6.346,-0.853 12.67,-1.844 18.97,-2.973 5.613,-1.006 11.837,-2.895 15.229,2.918 2.326,3.961 2.635,9.26 2.276,13.735 -0.111,1.95 -0.963,3.783 -2.381,5.126l0.004,0c-2.039,1.939 -5.112,2.841 -8.149,3.292 -34.053,5.053 -68.602,7.612 -103.028,6.483 -24.638,-0.842 -49.017,-3.578 -73.409,-7.024 -2.39,-0.337 -4.981,-0.774 -6.624,-2.536C17.57,98.223 19.091,91.531 19.896,87.515 20.634,83.837 22.046,78.934 26.421,78.411c0.854,-0.1 1.725,-0.143 2.608,-0.138zM19.164,96.794c-0.127,0.059 -0.155,0.523 -0.141,1.047 0.068,-0.346 0.228,-1.088 0.141,-1.047zM19.736,101.053c0.059,0.016 0.179,0.18 0.302,0.371 -0.214,-0.201 -0.351,-0.351 -0.328,-0.369l0.005,0c0.006,-0.004 0.013,-0.004 0.021,-0.002zM21.34,102.652l0.005,0 0.027,0c0,0.032 0.05,0.064 0.068,0.096 -0.03,-0.035 -0.064,-0.068 -0.1,-0.096zM156.916,147.68c-11.645,-0.005 -21.028,4.006 -31.868,8.645 -12.155,5.204 -25.949,11.104 -43.827,11.104 -7.479,-0.015 -14.921,-1.041 -22.125,-3.05l12.365,126.949c0.438,5.305 2.855,10.253 6.772,13.859 3.917,3.606 9.046,5.606 14.37,5.606 0,0 17.532,0.91 23.382,0.91 6.296,0 25.175,-0.91 25.175,-0.91 5.323,0 10.452,-2.003 14.368,-5.609 3.916,-3.606 6.333,-8.551 6.77,-13.856l13.243,-140.283c-5.918,-2.021 -11.891,-3.364 -18.624,-3.364zM113.776,313.843c-0.306,0.132 -0.573,0.339 -0.779,0.6l0.241,-0.153c0.164,-0.151 0.396,-0.328 0.537,-0.448z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_fdroid.xml b/app/src/main/res/drawable/ic_fdroid.xml
index 3a910813..1637f933 100644
--- a/app/src/main/res/drawable/ic_fdroid.xml
+++ b/app/src/main/res/drawable/ic_fdroid.xml
@@ -1,5 +1,4 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="48"
@@ -10,14 +9,12 @@
         android:strokeWidth="2"
         android:strokeColor="#00000000"
         android:strokeLineCap="round"
-        android:strokeLineJoin="miter"
-        tools:ignore="VectorPath" />
+        android:strokeLineJoin="miter" />
     <path
         android:fillColor="@color/themeAccent"
         android:pathData="M2.3379,1.5254C1.8997,1.5254 1.378,1.6672 1.5137,2.3242C1.6007,2.7458 4.4144,6.2239 5.4434,7.4902C5.2677,7.7794 5.1304,8.0942 5.0605,8.4375C5.0207,8.6331 5,8.8372 5,9.0449L5,9.582L5,12.0449L5,13.0449L5,15.5059L5,16.0449C5,16.6682 5.1889,17.246 5.5117,17.7246C6.0498,18.5224 6.9612,19.0449 8,19.0449L40,19.0449C41.0387,19.0449 41.9502,18.5224 42.4883,17.7246C42.5959,17.5651 42.6899,17.3944 42.7656,17.2148C42.8413,17.0353 42.8996,16.846 42.9395,16.6504C42.9793,16.4547 43,16.2527 43,16.0449L43,15.5059L43,13.0449L43,12.0449L43,9.582L43,9.0449C43,8.8372 42.9793,8.6331 42.9395,8.4375C42.8696,8.0942 42.7323,7.7794 42.5566,7.4902C43.5856,6.2239 46.3993,2.7458 46.4863,2.3242C46.622,1.6672 46.1003,1.5254 45.6621,1.5254C45.1945,1.5396 44.8462,1.9932 44.5859,2.2832L41.3984,6.4023C40.9796,6.1808 40.5086,6.0449 40,6.0449L8,6.0449C7.7923,6.0449 7.5902,6.0656 7.3945,6.1055C7.1989,6.1453 7.0097,6.2036 6.8301,6.2793C6.7496,6.3132 6.6782,6.3618 6.6016,6.4023L3.4141,2.2832C3.1538,1.9932 2.8055,1.5396 2.3379,1.5254zM14.375,9.75A3.375,3.375 0,0 1,17.75 13.125A3.375,3.375 0,0 1,14.375 16.5A3.375,3.375 0,0 1,11 13.125A3.375,3.375 0,0 1,14.375 9.75zM33.875,9.75A3.375,3.375 0,0 1,37.25 13.125A3.375,3.375 0,0 1,33.875 16.5A3.375,3.375 0,0 1,30.5 13.125A3.375,3.375 0,0 1,33.875 9.75z"
         android:strokeWidth="2"
         android:strokeColor="#00000000"
         android:strokeLineCap="round"
-        android:strokeLineJoin="miter"
-        tools:ignore="VectorPath" />
+        android:strokeLineJoin="miter" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml
index ced58887..52d95909 100644
--- a/app/src/main/res/drawable/ic_filter.xml
+++ b/app/src/main/res/drawable/ic_filter.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml
index a81afec2..bfa40787 100644
--- a/app/src/main/res/drawable/ic_github.xml
+++ b/app/src/main/res/drawable/ic_github.xml
@@ -1,11 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
         android:fillColor="@color/themeAccent"
-        android:pathData="M12,0.297c-6.63,0 -12,5.373 -12,12 0,5.303 3.438,9.8 8.205,11.385 0.6,0.113 0.82,-0.258 0.82,-0.577 0,-0.285 -0.01,-1.04 -0.015,-2.04 -3.338,0.724 -4.042,-1.61 -4.042,-1.61C4.422,18.07 3.633,17.7 3.633,17.7c-1.087,-0.744 0.084,-0.729 0.084,-0.729 1.205,0.084 1.838,1.236 1.838,1.236 1.07,1.835 2.809,1.305 3.495,0.998 0.108,-0.776 0.417,-1.305 0.76,-1.605 -2.665,-0.3 -5.466,-1.332 -5.466,-5.93 0,-1.31 0.465,-2.38 1.235,-3.22 -0.135,-0.303 -0.54,-1.523 0.105,-3.176 0,0 1.005,-0.322 3.3,1.23 0.96,-0.267 1.98,-0.399 3,-0.405 1.02,0.006 2.04,0.138 3,0.405 2.28,-1.552 3.285,-1.23 3.285,-1.23 0.645,1.653 0.24,2.873 0.12,3.176 0.765,0.84 1.23,1.91 1.23,3.22 0,4.61 -2.805,5.625 -5.475,5.92 0.42,0.36 0.81,1.096 0.81,2.22 0,1.606 -0.015,2.896 -0.015,3.286 0,0.315 0.21,0.69 0.825,0.57C20.565,22.092 24,17.592 24,12.297c0,-6.627 -5.373,-12 -12,-12"
-        tools:ignore="VectorPath" />
+        android:pathData="M12,0.297c-6.63,0 -12,5.373 -12,12 0,5.303 3.438,9.8 8.205,11.385 0.6,0.113 0.82,-0.258 0.82,-0.577 0,-0.285 -0.01,-1.04 -0.015,-2.04 -3.338,0.724 -4.042,-1.61 -4.042,-1.61C4.422,18.07 3.633,17.7 3.633,17.7c-1.087,-0.744 0.084,-0.729 0.084,-0.729 1.205,0.084 1.838,1.236 1.838,1.236 1.07,1.835 2.809,1.305 3.495,0.998 0.108,-0.776 0.417,-1.305 0.76,-1.605 -2.665,-0.3 -5.466,-1.332 -5.466,-5.93 0,-1.31 0.465,-2.38 1.235,-3.22 -0.135,-0.303 -0.54,-1.523 0.105,-3.176 0,0 1.005,-0.322 3.3,1.23 0.96,-0.267 1.98,-0.399 3,-0.405 1.02,0.006 2.04,0.138 3,0.405 2.28,-1.552 3.285,-1.23 3.285,-1.23 0.645,1.653 0.24,2.873 0.12,3.176 0.765,0.84 1.23,1.91 1.23,3.22 0,4.61 -2.805,5.625 -5.475,5.92 0.42,0.36 0.81,1.096 0.81,2.22 0,1.606 -0.015,2.896 -0.015,3.286 0,0.315 0.21,0.69 0.825,0.57C20.565,22.092 24,17.592 24,12.297c0,-6.627 -5.373,-12 -12,-12" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index 52f9c9aa..69b951c1 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,6 +1,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient
-        android:endColor="@color/surfaceBg"
-        android:startColor="@color/surfaceBg" />
+    <solid android:color="@color/surfaceBg" />
 </shape>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 87614cfd..10415c75 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,5 +1,4 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="271.2439"
@@ -15,8 +14,7 @@
                 android:pathData="m96.642,31.504c7.911,7.997 17.143,13.584 25.365,15.581l1.754,-3.997C123.78,43.048 123.786,43.005 123.802,42.965 125.834,38.995 127,34.495 127,29.715 127,13.881 114.379,1 98.867,1c-5.125,0 -9.92,1.429 -14.064,3.884l-3.398,1.598c0.08,0.306 0.133,0.599 0.221,0.91 2.32,8.104 7.652,16.667 15.016,24.112z" />
             <path
                 android:fillColor="@color/themeAccent"
-                android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z"
-                tools:ignore="VectorPath" />
+                android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z" />
         </group>
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml
index 7a1ab400..2c9d4e34 100644
--- a/app/src/main/res/drawable/ic_map.xml
+++ b/app/src/main/res/drawable/ic_map.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_prefs.xml b/app/src/main/res/drawable/ic_prefs.xml
index 97cb7ab9..c4149ea4 100644
--- a/app/src/main/res/drawable/ic_prefs.xml
+++ b/app/src/main/res/drawable/ic_prefs.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_satellite.xml b/app/src/main/res/drawable/ic_satellite.xml
index 6e600a38..6d2743f7 100644
--- a/app/src/main/res/drawable/ic_satellite.xml
+++ b/app/src/main/res/drawable/ic_satellite.xml
@@ -1,23 +1,22 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="128"
     android:viewportHeight="128">
     <path
-        android:fillColor="@color/themeAccent"
-        android:pathData="m105.138,114.121a2.864,2.864 90,0 0,1.701 -0.85l19.334,-19.331a2.864,2.864 90,0 0,-0 -4.027l-26.584,-26.625a2.864,2.864 90,0 0,-1.835 -0.805l-7.922,-0.626 5.773,-5.772a2.864,2.864 90,0 0,-0 -4.027l-19.602,-19.644a2.864,2.864 90,0 0,-4.073 -0l-5.773,5.772 -0.627,-7.92a2.864,2.864 90,0 0,-0.805 -1.835l-26.629,-26.58a2.864,2.864 90,0 0,-4.073 -0l-19.289,19.286a2.864,2.864 90,0 0,-0 4.072l26.584,26.625a2.864,2.864 90,0 0,1.835 0.805l7.922,0.626 -5.773,5.772a2.864,2.864 90,0 0,-0 4.072l19.603,19.599a2.864,2.864 90,0 0,4.073 -0l5.773,-5.772 0.626,7.92a2.864,2.864 90,0 0,0.806 1.835l26.629,26.58a2.864,2.864 90,0 0,2.059 0.85,2.864 2.864,90 0,0 0.269,-0zM104.825,107.23 L80.97,83.38 80.165,72.685 85.58,67.271 96.276,68.121 120.13,91.926zM55.326,47.85 L44.629,47 20.775,23.194 36.081,7.891 59.891,31.741 60.741,42.436z"
-        tools:ignore="VectorPath" />
+        android:fillColor="@android:color/white"
+        android:pathData="m105.138,114.121a2.864,2.864 90,0 0,1.701 -0.85l19.334,-19.331a2.864,2.864 90,0 0,-0 -4.027l-26.584,-26.625a2.864,2.864 90,0 0,-1.835 -0.805l-7.922,-0.626 5.773,-5.772a2.864,2.864 90,0 0,-0 -4.027l-19.602,-19.644a2.864,2.864 90,0 0,-4.073 -0l-5.773,5.772 -0.627,-7.92a2.864,2.864 90,0 0,-0.805 -1.835l-26.629,-26.58a2.864,2.864 90,0 0,-4.073 -0l-19.289,19.286a2.864,2.864 90,0 0,-0 4.072l26.584,26.625a2.864,2.864 90,0 0,1.835 0.805l7.922,0.626 -5.773,5.772a2.864,2.864 90,0 0,-0 4.072l19.603,19.599a2.864,2.864 90,0 0,4.073 -0l5.773,-5.772 0.626,7.92a2.864,2.864 90,0 0,0.806 1.835l26.629,26.58a2.864,2.864 90,0 0,2.059 0.85,2.864 2.864,90 0,0 0.269,-0zM104.825,107.23 L80.97,83.38 80.165,72.685 85.58,67.271 96.276,68.121 120.13,91.926zM55.326,47.85 L44.629,47 20.775,23.194 36.081,7.891 59.891,31.741 60.741,42.436z" />
     <path
-        android:fillColor="@color/themeAccent"
+        android:fillColor="@android:color/white"
         android:pathData="m62.653,115.806a2.864,2.864 90,1 0,-0 -5.727c-11.457,-0 -22.876,-4.351 -31.634,-13.107 -8.741,-8.74 -13.095,-20.174 -13.095,-31.614a2.864,2.864 90,1 0,-5.728 -0c-0,12.897 4.935,25.829 14.773,35.664 9.85,9.848 22.772,14.785 35.684,14.785z" />
     <path
-        android:fillColor="@color/themeAccent"
+        android:fillColor="@android:color/white"
         android:pathData="m62.653,127a2.864,2.864 90,1 0,-0 -5.727c-14.325,-0 -28.612,-5.441 -39.547,-16.375 -10.935,-10.933 -16.378,-25.233 -16.378,-39.541a2.864,2.864 90,1 0,-5.728 -0c-0,15.763 6.025,31.562 18.055,43.59 12.029,12.028 27.818,18.052 43.597,18.052z" />
     <path
-        android:fillColor="@color/themeAccent"
+        android:fillColor="@android:color/white"
         android:pathData="m62.653,104.698a2.864,2.864 90,1 0,-0 -5.727c-8.62,-0 -17.201,-3.263 -23.778,-9.839 -6.577,-6.576 -9.855,-15.174 -9.855,-23.774a2.864,2.864 90,1 0,-5.728 -0c-0,10.061 3.861,20.153 11.533,27.824 7.672,7.671 17.756,11.517 27.829,11.517z" />
     <path
-        android:fillColor="@color/themeAccent"
+        android:fillColor="@android:color/white"
         android:pathData="m62.653,93.475a2.864,2.864 90,1 0,-0 -5.727c-5.737,-0 -11.453,-2.174 -15.836,-6.557 -4.384,-4.383 -6.558,-10.098 -6.558,-15.834a2.864,2.864 90,1 0,-5.728 -0c-0,7.192 2.757,14.406 8.236,19.883 5.479,5.478 12.693,8.234 19.887,8.234z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_select_all.xml b/app/src/main/res/drawable/ic_select_all.xml
deleted file mode 100644
index 01948a0e..00000000
--- a/app/src/main/res/drawable/ic_select_all.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/themeAccent"
-        android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_splash_drawable.xml b/app/src/main/res/drawable/ic_splash_drawable.xml
index 7551c255..29db487d 100644
--- a/app/src/main/res/drawable/ic_splash_drawable.xml
+++ b/app/src/main/res/drawable/ic_splash_drawable.xml
@@ -1,11 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:width="192dp"
     android:height="200dp"
     android:viewportWidth="105.83323"
     android:viewportHeight="114.01299">
     <path
         android:fillColor="@color/themeAccent"
-        android:pathData="m104.005,111.936q0.504,0 0.958,-0.063 0.467,-0.076 0.87,-0.176l0,1.674q-0.202,0.101 -0.555,0.214 -0.34,0.113 -0.807,0.201 -0.454,0.101 -1.034,0.164 -0.58,0.063 -1.261,0.063 -0.87,0 -1.576,-0.214 -0.706,-0.201 -1.198,-0.68 -0.492,-0.491 -0.757,-1.259 -0.265,-0.78 -0.265,-1.913l0,-8.244l-1.942,0l0,-1.322q0.832,0 1.488,-0.327 0.656,-0.327 1.047,-0.755 0.794,-0.831 1.185,-2.555l2.144,0l0,3.197l3.304,0l0,1.762l-3.304,0l0,7.98q0,1.171 0.391,1.712 0.404,0.541 1.311,0.541zM85.595,109.922q0,1.108 0.353,1.661 0.353,0.554 1.11,0.554 0.555,0 0.996,-0.227 0.454,-0.239 0.769,-0.667 0.328,-0.428 0.492,-1.032 0.177,-0.617 0.177,-1.372l0,-1.938l-1.16,0.076q-0.769,0.038 -1.299,0.252 -0.53,0.201 -0.845,0.566 -0.315,0.365 -0.454,0.894 -0.139,0.529 -0.139,1.233zM87.89,101.188q-0.492,0 -0.832,0.214 -0.328,0.201 -0.53,0.579 -0.202,0.365 -0.29,0.881 -0.076,0.503 -0.076,1.108 -1.74,0 -2.623,-0.39 -0.87,-0.39 -0.87,-1.334 0,-0.705 0.416,-1.208 0.429,-0.503 1.147,-0.818 0.731,-0.315 1.69,-0.453 0.971,-0.151 2.068,-0.151 1.362,0 2.371,0.239 1.021,0.227 1.69,0.743 0.681,0.516 1.021,1.359 0.34,0.831 0.34,2.039l0,6.57q0,0.529 0.076,0.881 0.088,0.352 0.265,0.566 0.177,0.201 0.479,0.289 0.303,0.088 0.731,0.088l0.101,0l0,1.372l-4.804,0l-0.542,-1.775l-0.227,0q-0.429,0.516 -0.807,0.906 -0.378,0.378 -0.807,0.629 -0.429,0.252 -0.971,0.365 -0.53,0.126 -1.261,0.126 -0.857,0 -1.601,-0.252 -0.731,-0.252 -1.286,-0.768 -0.542,-0.529 -0.857,-1.309 -0.315,-0.793 -0.315,-1.863 0,-2.102 1.438,-3.109 1.45,-1.007 4.35,-1.095l2.118,-0.076l0,-1.422q0,-0.642 -0.05,-1.183 -0.05,-0.541 -0.214,-0.931 -0.164,-0.39 -0.492,-0.604 -0.315,-0.214 -0.845,-0.214zM72.115,114.013q-1.74,0 -2.9,-0.327 -1.16,-0.327 -1.866,-0.843 -0.694,-0.516 -0.996,-1.158 -0.29,-0.642 -0.29,-1.271 0,-0.667 0.24,-1.12 0.252,-0.453 0.656,-0.743 0.416,-0.289 0.933,-0.415 0.53,-0.126 1.097,-0.126 0,1.108 0.265,1.951 0.265,0.831 0.731,1.397 0.467,0.554 1.11,0.843 0.656,0.277 1.425,0.277 0.757,0 1.349,-0.214 0.593,-0.214 1.009,-0.592 0.416,-0.378 0.63,-0.881 0.214,-0.516 0.214,-1.108 0,-0.654 -0.265,-1.158 -0.265,-0.516 -0.807,-0.944 -0.53,-0.441 -1.349,-0.831 -0.807,-0.403 -1.891,-0.856 -1.349,-0.554 -2.282,-1.133 -0.921,-0.592 -1.488,-1.271 -0.567,-0.68 -0.82,-1.473 -0.24,-0.793 -0.24,-1.737 0,-1.183 0.479,-2.14 0.479,-0.957 1.324,-1.636 0.845,-0.68 2.005,-1.045 1.16,-0.365 2.522,-0.365 1.425,0 2.459,0.239 1.034,0.227 1.702,0.629 0.681,0.403 1.009,0.957 0.328,0.541 0.328,1.171 0,0.453 -0.202,0.843 -0.189,0.39 -0.593,0.68 -0.391,0.289 -0.996,0.453 -0.593,0.164 -1.387,0.164 0,-0.541 -0.151,-1.158 -0.139,-0.629 -0.467,-1.158 -0.328,-0.541 -0.857,-0.894 -0.517,-0.352 -1.261,-0.352 -0.517,0 -0.984,0.151 -0.467,0.151 -0.82,0.453 -0.34,0.302 -0.542,0.755 -0.202,0.441 -0.202,1.019 0,0.541 0.177,1.019 0.177,0.478 0.643,0.944 0.479,0.453 1.299,0.919 0.832,0.453 2.144,0.982 1.324,0.541 2.257,1.108 0.933,0.566 1.526,1.221 0.605,0.642 0.87,1.422 0.277,0.768 0.277,1.712 0,1.246 -0.492,2.291 -0.492,1.032 -1.412,1.775 -0.921,0.743 -2.219,1.158 -1.286,0.415 -2.9,0.415zM62.115,108.966l0,1.573q0,0.604 0.164,0.969 0.177,0.365 0.454,0.566 0.29,0.189 0.681,0.252 0.391,0.063 0.82,0.063l0.328,0l0,1.372l-9.054,0l0,-1.372l0.719,0q0.441,0 0.82,-0.063 0.391,-0.063 0.668,-0.252 0.29,-0.201 0.454,-0.566 0.177,-0.365 0.177,-0.969l0,-1.573l-7.15,0l0,-1.573l7.326,-12.032l3.594,0l0,11.906l2.686,0l0,1.699zM58.345,102.761q0,-1.133 0.038,-2.442 0.038,-1.309 0.139,-2.517 -0.126,0.302 -0.404,0.831 -0.277,0.529 -0.593,1.095 -0.315,0.554 -0.605,1.057 -0.29,0.491 -0.441,0.73l-3.48,5.752l5.347,0zM50.855,113.761l-0.366,0q-1.412,0 -2.371,-0.063 -0.958,-0.063 -1.652,-0.289 -0.694,-0.227 -1.198,-0.68 -0.504,-0.466 -1.009,-1.259l-2.295,-3.612 -1.034,0.768l0,2.089q0,0.554 0.177,0.881 0.189,0.327 0.454,0.503 0.277,0.176 0.605,0.239 0.328,0.05 0.605,0.05l0.303,0l0,1.372L34.866,113.761l0,-1.372l0.303,0q0.29,0 0.605,-0.05 0.328,-0.063 0.593,-0.239 0.277,-0.176 0.454,-0.503 0.189,-0.327 0.189,-0.881l0,-13.606q0,-0.516 -0.189,-0.818 -0.177,-0.315 -0.454,-0.478 -0.277,-0.176 -0.605,-0.227 -0.315,-0.05 -0.593,-0.05l-0.303,0l0,-1.359l6.065,0l0,9.943q0,0.352 -0.025,0.818 -0.013,0.453 -0.038,0.868 -0.038,0.491 -0.063,0.994l3.253,-3.637q0.429,-0.478 0.555,-0.755 0.139,-0.289 0.139,-0.478 0,-0.327 -0.353,-0.503 -0.34,-0.189 -0.984,-0.189l0,-1.296l6.507,0l0,1.296q-0.895,0 -1.765,0.529 -0.857,0.516 -1.879,1.661l-1.627,1.85 3.43,5.11q0.681,1.019 1.374,1.51 0.694,0.491 1.311,0.491l0.088,0zM33.517,106.31q0,1.007 -0.29,1.901 -0.29,0.894 -0.82,1.573 -0.517,0.667 -1.261,1.057 -0.731,0.39 -1.627,0.39 -1.198,0 -2.333,-0.73 -1.122,-0.743 -2.055,-2.417 -0.794,1.523 -1.828,2.303 -1.034,0.768 -2.181,0.768 -0.883,0 -1.627,-0.34 -0.744,-0.352 -1.286,-0.982 -0.542,-0.642 -0.845,-1.548 -0.29,-0.919 -0.29,-2.052 0,-1.032 0.29,-1.926 0.29,-0.906 0.82,-1.561 0.53,-0.667 1.274,-1.045 0.744,-0.39 1.664,-0.39 0.593,0 1.173,0.176 0.593,0.164 1.147,0.541 0.567,0.365 1.072,0.944 0.517,0.579 0.946,1.41 0.794,-1.498 1.791,-2.24 0.996,-0.755 2.295,-0.755 0.883,0 1.614,0.352 0.731,0.352 1.248,0.994 0.53,0.642 0.82,1.548 0.29,0.906 0.29,2.026zM29.418,103.113q-0.921,0 -1.652,0.793 -0.731,0.78 -1.475,2.404 0.668,1.598 1.412,2.404 0.744,0.793 1.74,0.793 0.555,0 0.996,-0.252 0.454,-0.252 0.769,-0.692 0.315,-0.441 0.479,-1.019 0.177,-0.592 0.177,-1.259 0,-0.667 -0.177,-1.246 -0.177,-0.579 -0.504,-1.007 -0.315,-0.428 -0.769,-0.667 -0.441,-0.252 -0.996,-0.252zM21.172,109.432q0.87,0 1.639,-0.78 0.769,-0.78 1.488,-2.417 -0.668,-1.598 -1.425,-2.391 -0.757,-0.806 -1.753,-0.806 -0.542,0 -0.984,0.252 -0.429,0.252 -0.744,0.692 -0.303,0.441 -0.479,1.032 -0.164,0.579 -0.164,1.246 0,0.642 0.139,1.221 0.151,0.566 0.454,1.007 0.303,0.428 0.757,0.692 0.454,0.252 1.072,0.252zM0,113.761l0,-1.372l1.084,0q0.29,0 0.53,-0.05 0.24,-0.063 0.416,-0.239 0.177,-0.176 0.277,-0.503 0.101,-0.327 0.101,-0.881l0,-12.322q0,-0.554 -0.101,-0.881 -0.101,-0.327 -0.277,-0.503 -0.177,-0.176 -0.416,-0.227 -0.24,-0.063 -0.53,-0.063l-1.084,0l0,-1.359l8.915,0l0,1.359l-1.084,0q-0.265,0 -0.517,0.063 -0.24,0.05 -0.416,0.214 -0.177,0.164 -0.29,0.478 -0.101,0.302 -0.101,0.818l0,13.895l4.804,0q0.908,0 1.412,-0.566 0.504,-0.579 0.731,-1.674l0.416,-1.938l1.45,0l-0.189,5.752zM72.992,22.376c-5.257,-5.314 -9.076,-11.473 -10.756,-17.343 -0.02,-0.07 -0.035,-0.137 -0.055,-0.207l-50.504,23.741c-0.944,0.444 -1.357,1.584 -0.922,2.548 0.317,0.703 0.998,1.118 1.71,1.118 0.263,0 0.531,-0.057 0.786,-0.177l46.414,-21.818c-1.259,2.404 -2.014,5.114 -2.169,7.986l-23.687,15.866c-0.869,0.582 -1.111,1.773 -0.541,2.659 0.361,0.562 0.961,0.867 1.575,0.867 0.354,0 0.712,-0.102 1.03,-0.315l21.873,-14.652c0.941,5.449 4.122,10.109 8.544,12.959l-36.92,45.919c-0.659,0.82 -0.543,2.03 0.261,2.703 0.35,0.294 0.772,0.436 1.193,0.436 0.544,0 1.083,-0.24 1.455,-0.702l37.474,-46.607c2.056,0.785 4.272,1.235 6.593,1.235 3.314,0 6.428,-0.882 9.139,-2.417l-18.725,42.66c-0.425,0.968 0,2.104 0.947,2.538 0.25,0.114 0.511,0.168 0.769,0.168 0.719,0 1.405,-0.423 1.718,-1.136l20.622,-46.983c-5.886,-1.561 -12.337,-5.499 -17.824,-11.047zM74.851,20.498c5.316,5.374 11.519,9.128 17.044,10.47l1.179,-2.686c0.012,-0.027 0.016,-0.056 0.027,-0.083 1.365,-2.668 2.149,-5.691 2.149,-8.903 0,-10.64 -8.481,-19.295 -18.904,-19.295 -3.444,0 -6.666,0.96 -9.451,2.61l-2.283,1.074c0.054,0.205 0.089,0.402 0.149,0.612 1.559,5.446 5.142,11.199 10.09,16.202z"
-        tools:ignore="VectorPath" />
+        android:pathData="m104.005,111.936q0.504,0 0.958,-0.063 0.467,-0.076 0.87,-0.176l0,1.674q-0.202,0.101 -0.555,0.214 -0.34,0.113 -0.807,0.201 -0.454,0.101 -1.034,0.164 -0.58,0.063 -1.261,0.063 -0.87,0 -1.576,-0.214 -0.706,-0.201 -1.198,-0.68 -0.492,-0.491 -0.757,-1.259 -0.265,-0.78 -0.265,-1.913l0,-8.244l-1.942,0l0,-1.322q0.832,0 1.488,-0.327 0.656,-0.327 1.047,-0.755 0.794,-0.831 1.185,-2.555l2.144,0l0,3.197l3.304,0l0,1.762l-3.304,0l0,7.98q0,1.171 0.391,1.712 0.404,0.541 1.311,0.541zM85.595,109.922q0,1.108 0.353,1.661 0.353,0.554 1.11,0.554 0.555,0 0.996,-0.227 0.454,-0.239 0.769,-0.667 0.328,-0.428 0.492,-1.032 0.177,-0.617 0.177,-1.372l0,-1.938l-1.16,0.076q-0.769,0.038 -1.299,0.252 -0.53,0.201 -0.845,0.566 -0.315,0.365 -0.454,0.894 -0.139,0.529 -0.139,1.233zM87.89,101.188q-0.492,0 -0.832,0.214 -0.328,0.201 -0.53,0.579 -0.202,0.365 -0.29,0.881 -0.076,0.503 -0.076,1.108 -1.74,0 -2.623,-0.39 -0.87,-0.39 -0.87,-1.334 0,-0.705 0.416,-1.208 0.429,-0.503 1.147,-0.818 0.731,-0.315 1.69,-0.453 0.971,-0.151 2.068,-0.151 1.362,0 2.371,0.239 1.021,0.227 1.69,0.743 0.681,0.516 1.021,1.359 0.34,0.831 0.34,2.039l0,6.57q0,0.529 0.076,0.881 0.088,0.352 0.265,0.566 0.177,0.201 0.479,0.289 0.303,0.088 0.731,0.088l0.101,0l0,1.372l-4.804,0l-0.542,-1.775l-0.227,0q-0.429,0.516 -0.807,0.906 -0.378,0.378 -0.807,0.629 -0.429,0.252 -0.971,0.365 -0.53,0.126 -1.261,0.126 -0.857,0 -1.601,-0.252 -0.731,-0.252 -1.286,-0.768 -0.542,-0.529 -0.857,-1.309 -0.315,-0.793 -0.315,-1.863 0,-2.102 1.438,-3.109 1.45,-1.007 4.35,-1.095l2.118,-0.076l0,-1.422q0,-0.642 -0.05,-1.183 -0.05,-0.541 -0.214,-0.931 -0.164,-0.39 -0.492,-0.604 -0.315,-0.214 -0.845,-0.214zM72.115,114.013q-1.74,0 -2.9,-0.327 -1.16,-0.327 -1.866,-0.843 -0.694,-0.516 -0.996,-1.158 -0.29,-0.642 -0.29,-1.271 0,-0.667 0.24,-1.12 0.252,-0.453 0.656,-0.743 0.416,-0.289 0.933,-0.415 0.53,-0.126 1.097,-0.126 0,1.108 0.265,1.951 0.265,0.831 0.731,1.397 0.467,0.554 1.11,0.843 0.656,0.277 1.425,0.277 0.757,0 1.349,-0.214 0.593,-0.214 1.009,-0.592 0.416,-0.378 0.63,-0.881 0.214,-0.516 0.214,-1.108 0,-0.654 -0.265,-1.158 -0.265,-0.516 -0.807,-0.944 -0.53,-0.441 -1.349,-0.831 -0.807,-0.403 -1.891,-0.856 -1.349,-0.554 -2.282,-1.133 -0.921,-0.592 -1.488,-1.271 -0.567,-0.68 -0.82,-1.473 -0.24,-0.793 -0.24,-1.737 0,-1.183 0.479,-2.14 0.479,-0.957 1.324,-1.636 0.845,-0.68 2.005,-1.045 1.16,-0.365 2.522,-0.365 1.425,0 2.459,0.239 1.034,0.227 1.702,0.629 0.681,0.403 1.009,0.957 0.328,0.541 0.328,1.171 0,0.453 -0.202,0.843 -0.189,0.39 -0.593,0.68 -0.391,0.289 -0.996,0.453 -0.593,0.164 -1.387,0.164 0,-0.541 -0.151,-1.158 -0.139,-0.629 -0.467,-1.158 -0.328,-0.541 -0.857,-0.894 -0.517,-0.352 -1.261,-0.352 -0.517,0 -0.984,0.151 -0.467,0.151 -0.82,0.453 -0.34,0.302 -0.542,0.755 -0.202,0.441 -0.202,1.019 0,0.541 0.177,1.019 0.177,0.478 0.643,0.944 0.479,0.453 1.299,0.919 0.832,0.453 2.144,0.982 1.324,0.541 2.257,1.108 0.933,0.566 1.526,1.221 0.605,0.642 0.87,1.422 0.277,0.768 0.277,1.712 0,1.246 -0.492,2.291 -0.492,1.032 -1.412,1.775 -0.921,0.743 -2.219,1.158 -1.286,0.415 -2.9,0.415zM62.115,108.966l0,1.573q0,0.604 0.164,0.969 0.177,0.365 0.454,0.566 0.29,0.189 0.681,0.252 0.391,0.063 0.82,0.063l0.328,0l0,1.372l-9.054,0l0,-1.372l0.719,0q0.441,0 0.82,-0.063 0.391,-0.063 0.668,-0.252 0.29,-0.201 0.454,-0.566 0.177,-0.365 0.177,-0.969l0,-1.573l-7.15,0l0,-1.573l7.326,-12.032l3.594,0l0,11.906l2.686,0l0,1.699zM58.345,102.761q0,-1.133 0.038,-2.442 0.038,-1.309 0.139,-2.517 -0.126,0.302 -0.404,0.831 -0.277,0.529 -0.593,1.095 -0.315,0.554 -0.605,1.057 -0.29,0.491 -0.441,0.73l-3.48,5.752l5.347,0zM50.855,113.761l-0.366,0q-1.412,0 -2.371,-0.063 -0.958,-0.063 -1.652,-0.289 -0.694,-0.227 -1.198,-0.68 -0.504,-0.466 -1.009,-1.259l-2.295,-3.612 -1.034,0.768l0,2.089q0,0.554 0.177,0.881 0.189,0.327 0.454,0.503 0.277,0.176 0.605,0.239 0.328,0.05 0.605,0.05l0.303,0l0,1.372L34.866,113.761l0,-1.372l0.303,0q0.29,0 0.605,-0.05 0.328,-0.063 0.593,-0.239 0.277,-0.176 0.454,-0.503 0.189,-0.327 0.189,-0.881l0,-13.606q0,-0.516 -0.189,-0.818 -0.177,-0.315 -0.454,-0.478 -0.277,-0.176 -0.605,-0.227 -0.315,-0.05 -0.593,-0.05l-0.303,0l0,-1.359l6.065,0l0,9.943q0,0.352 -0.025,0.818 -0.013,0.453 -0.038,0.868 -0.038,0.491 -0.063,0.994l3.253,-3.637q0.429,-0.478 0.555,-0.755 0.139,-0.289 0.139,-0.478 0,-0.327 -0.353,-0.503 -0.34,-0.189 -0.984,-0.189l0,-1.296l6.507,0l0,1.296q-0.895,0 -1.765,0.529 -0.857,0.516 -1.879,1.661l-1.627,1.85 3.43,5.11q0.681,1.019 1.374,1.51 0.694,0.491 1.311,0.491l0.088,0zM33.517,106.31q0,1.007 -0.29,1.901 -0.29,0.894 -0.82,1.573 -0.517,0.667 -1.261,1.057 -0.731,0.39 -1.627,0.39 -1.198,0 -2.333,-0.73 -1.122,-0.743 -2.055,-2.417 -0.794,1.523 -1.828,2.303 -1.034,0.768 -2.181,0.768 -0.883,0 -1.627,-0.34 -0.744,-0.352 -1.286,-0.982 -0.542,-0.642 -0.845,-1.548 -0.29,-0.919 -0.29,-2.052 0,-1.032 0.29,-1.926 0.29,-0.906 0.82,-1.561 0.53,-0.667 1.274,-1.045 0.744,-0.39 1.664,-0.39 0.593,0 1.173,0.176 0.593,0.164 1.147,0.541 0.567,0.365 1.072,0.944 0.517,0.579 0.946,1.41 0.794,-1.498 1.791,-2.24 0.996,-0.755 2.295,-0.755 0.883,0 1.614,0.352 0.731,0.352 1.248,0.994 0.53,0.642 0.82,1.548 0.29,0.906 0.29,2.026zM29.418,103.113q-0.921,0 -1.652,0.793 -0.731,0.78 -1.475,2.404 0.668,1.598 1.412,2.404 0.744,0.793 1.74,0.793 0.555,0 0.996,-0.252 0.454,-0.252 0.769,-0.692 0.315,-0.441 0.479,-1.019 0.177,-0.592 0.177,-1.259 0,-0.667 -0.177,-1.246 -0.177,-0.579 -0.504,-1.007 -0.315,-0.428 -0.769,-0.667 -0.441,-0.252 -0.996,-0.252zM21.172,109.432q0.87,0 1.639,-0.78 0.769,-0.78 1.488,-2.417 -0.668,-1.598 -1.425,-2.391 -0.757,-0.806 -1.753,-0.806 -0.542,0 -0.984,0.252 -0.429,0.252 -0.744,0.692 -0.303,0.441 -0.479,1.032 -0.164,0.579 -0.164,1.246 0,0.642 0.139,1.221 0.151,0.566 0.454,1.007 0.303,0.428 0.757,0.692 0.454,0.252 1.072,0.252zM0,113.761l0,-1.372l1.084,0q0.29,0 0.53,-0.05 0.24,-0.063 0.416,-0.239 0.177,-0.176 0.277,-0.503 0.101,-0.327 0.101,-0.881l0,-12.322q0,-0.554 -0.101,-0.881 -0.101,-0.327 -0.277,-0.503 -0.177,-0.176 -0.416,-0.227 -0.24,-0.063 -0.53,-0.063l-1.084,0l0,-1.359l8.915,0l0,1.359l-1.084,0q-0.265,0 -0.517,0.063 -0.24,0.05 -0.416,0.214 -0.177,0.164 -0.29,0.478 -0.101,0.302 -0.101,0.818l0,13.895l4.804,0q0.908,0 1.412,-0.566 0.504,-0.579 0.731,-1.674l0.416,-1.938l1.45,0l-0.189,5.752zM72.992,22.376c-5.257,-5.314 -9.076,-11.473 -10.756,-17.343 -0.02,-0.07 -0.035,-0.137 -0.055,-0.207l-50.504,23.741c-0.944,0.444 -1.357,1.584 -0.922,2.548 0.317,0.703 0.998,1.118 1.71,1.118 0.263,0 0.531,-0.057 0.786,-0.177l46.414,-21.818c-1.259,2.404 -2.014,5.114 -2.169,7.986l-23.687,15.866c-0.869,0.582 -1.111,1.773 -0.541,2.659 0.361,0.562 0.961,0.867 1.575,0.867 0.354,0 0.712,-0.102 1.03,-0.315l21.873,-14.652c0.941,5.449 4.122,10.109 8.544,12.959l-36.92,45.919c-0.659,0.82 -0.543,2.03 0.261,2.703 0.35,0.294 0.772,0.436 1.193,0.436 0.544,0 1.083,-0.24 1.455,-0.702l37.474,-46.607c2.056,0.785 4.272,1.235 6.593,1.235 3.314,0 6.428,-0.882 9.139,-2.417l-18.725,42.66c-0.425,0.968 0,2.104 0.947,2.538 0.25,0.114 0.511,0.168 0.769,0.168 0.719,0 1.405,-0.423 1.718,-1.136l20.622,-46.983c-5.886,-1.561 -12.337,-5.499 -17.824,-11.047zM74.851,20.498c5.316,5.374 11.519,9.128 17.044,10.47l1.179,-2.686c0.012,-0.027 0.016,-0.056 0.027,-0.083 1.365,-2.668 2.149,-5.691 2.149,-8.903 0,-10.64 -8.481,-19.295 -18.904,-19.295 -3.444,0 -6.666,0.96 -9.451,2.61l-2.283,1.074c0.054,0.205 0.089,0.402 0.149,0.612 1.559,5.446 5.142,11.199 10.09,16.202z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_sputnik.xml b/app/src/main/res/drawable/ic_sputnik.xml
index 66d61d98..5e7843fa 100644
--- a/app/src/main/res/drawable/ic_sputnik.xml
+++ b/app/src/main/res/drawable/ic_sputnik.xml
@@ -1,5 +1,4 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="128"
@@ -9,6 +8,5 @@
         android:pathData="m96.642,31.504c7.911,7.997 17.143,13.584 25.365,15.581l1.754,-3.997C123.78,43.048 123.786,43.005 123.802,42.965 125.834,38.995 127,34.495 127,29.715 127,13.881 114.379,1 98.867,1c-5.125,0 -9.92,1.429 -14.064,3.884l-3.398,1.598c0.08,0.306 0.133,0.599 0.221,0.91 2.32,8.104 7.652,16.667 15.016,24.112z" />
     <path
         android:fillColor="@color/themeAccent"
-        android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z"
-        tools:ignore="VectorPath" />
+        android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_sputnik_dark.xml b/app/src/main/res/drawable/ic_sputnik_dark.xml
deleted file mode 100644
index d06a6cd8..00000000
--- a/app/src/main/res/drawable/ic_sputnik_dark.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="128"
-    android:viewportHeight="128">
-    <path
-        android:fillColor="@color/surfaceBg"
-        android:pathData="m96.642,31.504c7.911,7.997 17.143,13.584 25.365,15.581l1.754,-3.997C123.78,43.048 123.786,43.005 123.802,42.965 125.834,38.995 127,34.495 127,29.715 127,13.881 114.379,1 98.867,1c-5.125,0 -9.92,1.429 -14.064,3.884l-3.398,1.598c0.08,0.306 0.133,0.599 0.221,0.91 2.32,8.104 7.652,16.667 15.016,24.112z" />
-    <path
-        android:fillColor="@color/surfaceBg"
-        android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z"
-        tools:ignore="VectorPath" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/map_info_rounded.xml b/app/src/main/res/drawable/map_info_rounded.xml
deleted file mode 100644
index 5738f262..00000000
--- a/app/src/main/res/drawable/map_info_rounded.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke
-        android:width="0dp"
-        android:color="@color/mapInfoLayout" />
-    <solid android:color="@color/mapInfoLayout" />
-    <corners android:radius="8dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_prefs_about.xml b/app/src/main/res/layout/card_prefs_about.xml
index d9b0f603..49b28fb8 100644
--- a/app/src/main/res/layout/card_prefs_about.xml
+++ b/app/src/main/res/layout/card_prefs_about.xml
@@ -55,7 +55,7 @@
 
     <Button
         android:id="@+id/about_btn_github"
-        style="@style/InfoButton"
+        style="@style/AppButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
@@ -71,7 +71,7 @@
 
     <Button
         android:id="@+id/about_btn_donate"
-        style="@style/InfoButton"
+        style="@style/AppButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawableStart="@drawable/ic_bmc"
@@ -82,7 +82,7 @@
 
     <Button
         android:id="@+id/about_btn_fdroid"
-        style="@style/InfoButton"
+        style="@style/AppButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="4dp"
diff --git a/app/src/main/res/layout/card_prefs_location.xml b/app/src/main/res/layout/card_prefs_location.xml
index 181f6c48..3e9f6eab 100644
--- a/app/src/main/res/layout/card_prefs_location.xml
+++ b/app/src/main/res/layout/card_prefs_location.xml
@@ -17,7 +17,7 @@
 
     <Button
         android:id="@+id/location_btn_gps"
-        style="@style/InfoButton"
+        style="@style/AppButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
@@ -34,7 +34,7 @@
 
     <Button
         android:id="@+id/location_btn_qth"
-        style="@style/InfoButton"
+        style="@style/AppButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="4dp"
diff --git a/app/src/main/res/layout/card_prefs_other.xml b/app/src/main/res/layout/card_prefs_other.xml
index db1da0ae..09455b18 100644
--- a/app/src/main/res/layout/card_prefs_other.xml
+++ b/app/src/main/res/layout/card_prefs_other.xml
@@ -10,6 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginTop="8dp"
+        android:textSize="16sp"
         android:text="@string/other_title"
         android:textColor="@color/themeAccent"
         app:layout_constraintStart_toStartOf="parent"
@@ -23,6 +24,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="4dp"
         android:minHeight="48dp"
+        android:textSize="16sp"
         android:text="@string/other_switch_utc"
         android:textColor="@color/themeLight"
         app:layout_constraintEnd_toEndOf="parent"
@@ -34,6 +36,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:minHeight="48dp"
+        android:textSize="16sp"
         android:text="@string/other_switch_sweep"
         android:textColor="@color/themeLight"
         app:layout_constraintEnd_toEndOf="@+id/other_switch_utc"
@@ -46,6 +49,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
         android:minHeight="48dp"
+        android:textSize="16sp"
         android:text="@string/other_switch_sensors"
         android:textColor="@color/themeLight"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/card_prefs_tracking.xml b/app/src/main/res/layout/card_prefs_tracking.xml
index d703ad16..4fbdec49 100644
--- a/app/src/main/res/layout/card_prefs_tracking.xml
+++ b/app/src/main/res/layout/card_prefs_tracking.xml
@@ -10,6 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginTop="8dp"
+        android:textSize="16sp"
         android:text="@string/tracking_title"
         android:textColor="@color/themeAccent"
         app:layout_constraintStart_toStartOf="parent"
@@ -22,6 +23,7 @@
         android:layout_marginStart="10dp"
         android:layout_marginEnd="4dp"
         android:minHeight="48dp"
+        android:textSize="16sp"
         android:text="@string/tracking_switch"
         android:textColor="@color/themeLight"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/card_prefs_update.xml b/app/src/main/res/layout/card_prefs_update.xml
index 65061b37..c065a262 100644
--- a/app/src/main/res/layout/card_prefs_update.xml
+++ b/app/src/main/res/layout/card_prefs_update.xml
@@ -10,6 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginTop="8dp"
+        android:textSize="16sp"
         android:text="@string/update_title"
         android:textColor="@color/themeAccent"
         app:layout_constraintStart_toStartOf="parent"
@@ -17,7 +18,7 @@
 
     <Button
         android:id="@+id/update_btn_web"
-        style="@style/InfoButton"
+        style="@style/AppButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="4dp"
@@ -31,7 +32,7 @@
 
     <Button
         android:id="@+id/update_btn_file"
-        style="@style/InfoButton"
+        style="@style/AppButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
diff --git a/app/src/main/res/layout/card_prefs_warranty.xml b/app/src/main/res/layout/card_prefs_warranty.xml
index d453a1df..547adcd8 100644
--- a/app/src/main/res/layout/card_prefs_warranty.xml
+++ b/app/src/main/res/layout/card_prefs_warranty.xml
@@ -12,7 +12,7 @@
         android:layout_marginTop="8dp"
         android:text="@string/warranty_title"
         android:textColor="@color/themeAccent"
-        android:textSize="15sp"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -25,7 +25,7 @@
         android:layout_marginEnd="8dp"
         android:text="@string/warranty_thanks"
         android:textColor="@color/themeLight"
-        android:textSize="15sp"
+        android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/warranty_title" />
@@ -38,7 +38,7 @@
         android:layout_marginBottom="8dp"
         android:text="@string/warranty_license"
         android:textColor="@color/themeLight"
-        android:textSize="15sp"
+        android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/warranty_thanks"
         app:layout_constraintStart_toStartOf="@+id/warranty_thanks"
diff --git a/app/src/main/res/layout/dialog_passes.xml b/app/src/main/res/layout/dialog_passes.xml
index 1933c92e..dc6b1b3f 100644
--- a/app/src/main/res/layout/dialog_passes.xml
+++ b/app/src/main/res/layout/dialog_passes.xml
@@ -86,7 +86,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:backgroundTint="@color/surfaceToolbar"
-        android:text="@string/btn_update"
+        android:text="@string/btn_accept"
         android:textAllCaps="false"
         android:textColor="@color/themeAccent"
         app:layout_constraintBaseline_toBaselineOf="@+id/pass_pref_btn_neg"
diff --git a/app/src/main/res/layout/dialog_sources.xml b/app/src/main/res/layout/dialog_sources.xml
index 675380ad..71355285 100644
--- a/app/src/main/res/layout/dialog_sources.xml
+++ b/app/src/main/res/layout/dialog_sources.xml
@@ -35,7 +35,6 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:backgroundTint="@color/surfaceToolbar"
-        android:contentDescription="@string/placeholder"
         android:src="@drawable/ic_add"
         app:layout_constraintBottom_toBottomOf="@+id/sources_warning"
         app:layout_constraintDimensionRatio="h,1:1"
@@ -76,7 +75,7 @@
         android:layout_marginEnd="4dp"
         android:layout_marginBottom="4dp"
         android:backgroundTint="@color/surfaceToolbar"
-        android:text="@string/btn_update"
+        android:text="@string/btn_accept"
         android:textAllCaps="false"
         android:textColor="@color/themeAccent"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xml
index eb8f2ae5..d37d1888 100644
--- a/app/src/main/res/layout/fragment_entries.xml
+++ b/app/src/main/res/layout/fragment_entries.xml
@@ -22,48 +22,43 @@
         app:layout_constraintStart_toStartOf="@+id/entries_toolbar"
         app:layout_constraintTop_toTopOf="@+id/entries_toolbar" />
 
-    <SearchView
-        android:id="@+id/entries_search_bar"
+    <EditText
+        android:id="@+id/entries_search"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:elevation="16dp"
-        android:iconifiedByDefault="false"
-        android:queryHint="@string/entries_search_hint"
+        android:layout_height="0dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="4dp"
+        android:background="@android:color/transparent"
+        android:elevation="8dp"
+        android:hint="@string/entries_search_hint"
+        android:importantForAutofill="no"
+        android:includeFontPadding="false"
+        android:inputType="text"
+        android:textColor="@color/themeAccent"
+        android:textColorHint="@color/themeAccent"
+        android:textSize="20sp"
         app:layout_constraintBottom_toBottomOf="@+id/entries_toolbar"
-        app:layout_constraintEnd_toStartOf="@+id/entries_select_mode"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/entries_mode"
+        app:layout_constraintStart_toEndOf="@+id/entries_back"
         app:layout_constraintTop_toTopOf="@+id/entries_toolbar" />
 
     <ImageButton
-        android:id="@+id/entries_select_mode"
-        android:layout_width="64dp"
-        android:layout_height="48dp"
-        android:elevation="16dp"
-        android:backgroundTint="@color/surfaceToolbar"
-        android:contentDescription="@string/placeholder"
+        android:id="@+id/entries_mode"
+        style="@style/ToolbarButton"
+        android:layout_marginEnd="4dp"
         android:src="@drawable/ic_satellite"
         app:layout_constraintBottom_toBottomOf="@+id/entries_toolbar"
-        app:layout_constraintEnd_toStartOf="@+id/entries_select_all"
+        app:layout_constraintEnd_toEndOf="@+id/entries_toolbar"
         app:layout_constraintTop_toTopOf="@+id/entries_toolbar" />
 
-    <ImageButton
-        android:id="@+id/entries_select_all"
-        android:layout_width="64dp"
-        android:layout_height="48dp"
-        android:backgroundTint="@color/surfaceToolbar"
-        android:contentDescription="@string/placeholder"
-        android:elevation="16dp"
-        android:src="@drawable/ic_select_all"
-        app:layout_constraintBottom_toBottomOf="@+id/entries_select_mode"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/entries_select_mode" />
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/entries_recycler"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="2dp"
+        app:layout_constraintBottom_toTopOf="@+id/entries_cancel"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/entries_toolbar" />
@@ -73,9 +68,46 @@
         style="@android:style/Widget.DeviceDefault.Light.ProgressBar.Large"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/entries_recycler"
+        app:layout_constraintEnd_toEndOf="@+id/entries_recycler"
+        app:layout_constraintStart_toStartOf="@+id/entries_recycler"
         app:layout_constraintTop_toBottomOf="@+id/entries_toolbar" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <Button
+        android:id="@+id/entries_cancel"
+        style="@style/AppButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginBottom="2dp"
+        android:text="@string/btn_cancel"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/entries_select_all"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_chainStyle="spread"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/entries_select_all"
+        style="@style/AppButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/entries_select_all"
+        app:layout_constraintBaseline_toBaselineOf="@+id/entries_cancel"
+        app:layout_constraintEnd_toStartOf="@+id/entries_accept"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/entries_cancel" />
+
+    <Button
+        android:id="@+id/entries_accept"
+        style="@style/AppButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="4dp"
+        android:text="@string/btn_accept"
+        app:layout_constraintBaseline_toBaselineOf="@+id/entries_cancel"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/entries_select_all" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
index da8ddca9..dc7f8069 100644
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -26,7 +26,7 @@
     <TextView
         android:id="@+id/map_title"
         style="@style/ToolbarText"
-        android:text="TextView"
+        android:text="@string/map_title"
         app:layout_constraintBottom_toBottomOf="@+id/map_toolbar"
         app:layout_constraintEnd_toEndOf="@+id/map_toolbar"
         app:layout_constraintHorizontal_bias="0.32"
@@ -46,24 +46,20 @@
         android:id="@+id/map_data_root"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginEnd="4dp"
-        android:background="@drawable/map_info_rounded"
+        android:background="@color/mapInfoLayout"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/map_toolbar">
+        app:layout_constraintStart_toStartOf="parent">
 
         <TextView
             android:id="@+id/map_data_lat"
             style="@style/MapInfoText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="2dp"
             android:text="@string/pat_osm_lat"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintStart_toStartOf="@+id/map_data_name"
+            app:layout_constraintTop_toBottomOf="@+id/map_data_name" />
 
         <TextView
             android:id="@+id/map_data_lon"
@@ -81,7 +77,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
             android:text="@string/map_qth"
+            app:layout_constraintBottom_toTopOf="@+id/map_copyright"
             app:layout_constraintStart_toStartOf="@+id/map_data_lon"
             app:layout_constraintTop_toBottomOf="@+id/map_data_lon" />
 
@@ -90,10 +88,9 @@
             style="@style/MapInfoText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
             android:text="@string/pat_altitude"
             app:layout_constraintBaseline_toBaselineOf="@+id/map_data_lat"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="@+id/map_data_name" />
 
         <TextView
             android:id="@+id/map_data_dst"
@@ -116,50 +113,60 @@
         <TextView
             android:id="@+id/map_data_name"
             style="@style/MapInfoText"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="8dp"
+            android:ellipsize="end"
+            android:gravity="center_horizontal"
+            android:maxLines="1"
             android:text="@string/pat_osm_idName"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/map_data_qth" />
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/map_copyright"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="6dp"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="1"
+            android:text="@string/map_copyright"
+            android:textColor="@color/themeLight"
+            android:textSize="13sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/map_data_vel"
+            app:layout_constraintStart_toStartOf="@+id/map_data_qth" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <ImageButton
         android:id="@+id/map_btn_prev"
-        android:layout_width="52dp"
-        android:layout_height="52dp"
-        android:layout_marginStart="48dp"
-        android:layout_marginBottom="48dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginBottom="4dp"
         android:backgroundTint="@color/surfaceToolbar"
         android:rotation="180"
         android:src="@drawable/ic_arrow"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:tint="@color/themeLight"
+        app:layout_constraintBottom_toTopOf="@+id/map_data_root"
         app:layout_constraintStart_toStartOf="parent"
         tools:ignore="DuplicateSpeakableTextCheck" />
 
     <ImageButton
         android:id="@+id/map_btn_next"
-        android:layout_width="52dp"
-        android:layout_height="52dp"
-        android:layout_marginEnd="48dp"
-        android:layout_marginBottom="48dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginEnd="4dp"
+        android:layout_marginBottom="4dp"
         android:backgroundTint="@color/surfaceToolbar"
         android:src="@drawable/ic_arrow"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:tint="@color/themeLight"
+        app:layout_constraintBottom_toTopOf="@+id/map_data_root"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <TextView
-        android:id="@+id/map_copyright"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="@string/map_copyright"
-        android:textColor="@color/themeAccent"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xml
index c86a64a1..eec53d62 100644
--- a/app/src/main/res/layout/fragment_passes.xml
+++ b/app/src/main/res/layout/fragment_passes.xml
@@ -84,7 +84,8 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:src="@drawable/ic_sputnik_dark"
+        android:src="@drawable/ic_satellite"
+        android:tint="@color/surfaceBg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/app/src/main/res/layout/fragment_radar.xml b/app/src/main/res/layout/fragment_radar.xml
index 4d44510a..fe19770c 100644
--- a/app/src/main/res/layout/fragment_radar.xml
+++ b/app/src/main/res/layout/fragment_radar.xml
@@ -116,7 +116,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="0dp"
         android:gravity="center"
-        android:text="@string/placeholder"
         android:textSize="15sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
diff --git a/app/src/main/res/layout/fragment_prefs.xml b/app/src/main/res/layout/fragment_settings.xml
similarity index 92%
rename from app/src/main/res/layout/fragment_prefs.xml
rename to app/src/main/res/layout/fragment_settings.xml
index b2f36005..76053d3f 100644
--- a/app/src/main/res/layout/fragment_prefs.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -28,16 +28,16 @@
         <TextView
             android:id="@+id/prefs_title"
             style="@style/ToolbarText"
-            android:text="TextView"
+            android:text="@string/settings_title"
             app:layout_constraintBottom_toBottomOf="@+id/prefs_toolbar"
             app:layout_constraintEnd_toEndOf="@+id/prefs_toolbar"
-            app:layout_constraintHorizontal_bias="0.32"
+            app:layout_constraintHorizontal_bias="0.25"
             app:layout_constraintStart_toStartOf="@+id/prefs_toolbar"
             app:layout_constraintTop_toTopOf="@+id/prefs_toolbar" />
 
         <androidx.cardview.widget.CardView
             android:id="@+id/card_prefs_info"
-            style="@style/CardPreferences"
+            style="@style/SettingsCard"
             android:layout_marginTop="8dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -51,7 +51,7 @@
 
         <androidx.cardview.widget.CardView
             android:id="@+id/card_prefs_data"
-            style="@style/CardPreferences"
+            style="@style/SettingsCard"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/card_prefs_info">
@@ -64,7 +64,7 @@
 
         <androidx.cardview.widget.CardView
             android:id="@+id/card_prefs_location"
-            style="@style/CardPreferences"
+            style="@style/SettingsCard"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/card_prefs_data">
@@ -77,7 +77,7 @@
 
         <androidx.cardview.widget.CardView
             android:id="@+id/card_prefs_tracking"
-            style="@style/CardPreferences"
+            style="@style/SettingsCard"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/card_prefs_location">
@@ -90,7 +90,7 @@
 
         <androidx.cardview.widget.CardView
             android:id="@+id/card_prefs_other"
-            style="@style/CardPreferences"
+            style="@style/SettingsCard"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/card_prefs_tracking">
@@ -103,7 +103,7 @@
 
         <androidx.cardview.widget.CardView
             android:id="@+id/card_prefs_warranty"
-            style="@style/CardPreferences"
+            style="@style/SettingsCard"
             android:layout_marginBottom="8dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_entry.xml b/app/src/main/res/layout/item_entry.xml
index 5415d43c..acc54688 100644
--- a/app/src/main/res/layout/item_entry.xml
+++ b/app/src/main/res/layout/item_entry.xml
@@ -2,10 +2,10 @@
 <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/entry_checkbox"
     android:layout_width="match_parent"
-    android:layout_height="36dp"
+    android:layout_height="31dp"
     android:background="@color/surfaceCard"
     android:ellipsize="end"
+    android:layout_margin="6dp"
     android:lines="1"
-    android:text="@string/placeholder"
     android:textColor="@color/themeLight"
     android:textSize="16sp" />
diff --git a/app/src/main/res/layout/item_trans.xml b/app/src/main/res/layout/item_trans.xml
index 39ffcb16..da790ed0 100644
--- a/app/src/main/res/layout/item_trans.xml
+++ b/app/src/main/res/layout/item_trans.xml
@@ -4,7 +4,7 @@
     android:id="@+id/trans_card"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardBackgroundColor="@color/surfaceToolbar"
+    app:cardBackgroundColor="@color/surfaceCard"
     app:cardCornerRadius="0dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -41,7 +41,6 @@
             android:layout_width="18dp"
             android:layout_height="18dp"
             android:layout_marginStart="4dp"
-            android:contentDescription="@string/placeholder"
             android:rotation="90"
             app:layout_constraintBottom_toBottomOf="@+id/trans_desc"
             app:layout_constraintStart_toStartOf="parent"
@@ -64,7 +63,6 @@
             android:layout_width="18dp"
             android:layout_height="18dp"
             android:layout_marginEnd="4dp"
-            android:contentDescription="@string/placeholder"
             android:rotation="270"
             app:layout_constraintBottom_toBottomOf="@+id/trans_desc"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index aad44ef1..1d28eec1 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -45,8 +45,8 @@
         tools:layout="@layout/fragment_map" />
     <fragment
         android:id="@+id/nav_prefs"
-        android:name="com.rtbishop.look4sat.presentation.prefsScreen.PrefsFragment"
-        tools:layout="@layout/fragment_prefs">
+        android:name="com.rtbishop.look4sat.presentation.settingsScreen.SettingsFragment"
+        tools:layout="@layout/fragment_settings">
         <action
             android:id="@+id/action_prefs_to_sources"
             app:destination="@id/nav_sources" />
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8fa75a2f..ea2ecb27 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -3,21 +3,17 @@
     <string name="yes">Да</string>
     <string name="no">Нет</string>
     <string name="btn_cancel">Отмена</string>
-    <string name="btn_update">Обновить</string>
-
-    <string name="menu_entries">Спутники</string>
-    <string name="menu_passes">Пролеты</string>
-    <string name="menu_map">Карта</string>
-    <string name="menu_prefs">Настройки</string>
-    <string name="menu_about">Инфо</string>
+    <string name="btn_accept">Принять</string>
 
     <string name="sources_title">Управление TLE</string>
     <string name="sources_hint">URL источника</string>
     <string name="sources_https">Только протокол HTTPS</string>
     <string name="sources_error">Пожалуйста, проверьте URL</string>
 
+    <string name="entries_title">Спутники</string>
     <string name="entries_update">Обновить спутники:</string>
     <string name="entries_search_hint">Поиск по Имени / Id</string>
+    <string name="entries_select_all">Выбрать Все/Нет</string>
     <string name="entries_update_error">Ошибка обновления спутников</string>
 
     <string name="modes_title">Выберите модуляцию трансивера</string>
@@ -34,6 +30,7 @@
     <string name="trans_inverted">Инверсия: %s</string>
     <string name="trans_no_data">Не найдены трансиверы для этого спутника</string>
 
+    <string name="map_title">Карта Мира</string>
     <string name="map_qth">QTH Локатор: %s</string>
     <string name="map_coverage">Покрытие: %.0fкм</string>
 
@@ -71,6 +68,8 @@
     <string name="pref_min_el_summary">Показать пролеты с элевацией более</string>
     <string name="pref_min_el_input_error">Введите значение между 0° и 90°</string>
 
+    <string name="settings_title">Настройки</string>
+
     <string name="about_version">Версия: %s</string>
     <string name="about_subtitle">Трекер спутников для Android</string>
     <string name="about_support">Поддержать</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 80fb0150..e0d52d6f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="themeAccent">#FFE082</color>
-    <color name="themeIcon">#FFFFFF</color>
     <color name="themeLight">#D0D0D0</color>
     <color name="surfaceButton">#242424</color>
     <color name="surfaceStatusbar">#1A1A1A</color>
     <color name="surfaceToolbar">#202020</color>
     <color name="surfaceCard">#181818</color>
     <color name="surfaceBg">#121212</color>
-    <color name="mapInfoLayout">#99000000</color>
+    <color name="mapInfoLayout">#B3181818</color>
     <color name="mtrl_textinput_disabled_color">@color/surfaceButton</color>
     <color name="mtrl_textinput_default_box_stroke_color">@color/themeLight</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 63cfa1f6..00000000
--- a/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <dimen name="design_bottom_navigation_text_size" tools:override="true">12sp</dimen>
-    <dimen name="design_bottom_navigation_active_text_size" tools:override="true">12sp</dimen>
-</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 06e0868b..7fd1cd16 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,32 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name" translatable="false">Look4Sat</string>
-    <string name="placeholder" translatable="false">dummy</string>
 
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="btn_cancel">Cancel</string>
-    <string name="btn_update">Update</string>
-
-    <string name="menu_entries">Satellites</string>
-    <string name="menu_passes">Passes</string>
-    <string name="menu_map">World Map</string>
-    <string name="menu_prefs">Settings</string>
-    <string name="menu_about">Info</string>
-
-    <string name="notification_title" translatable="false">Set notification</string>
-    <string name="notification_on_start_pass" translatable="false">On pass start</string>
-    <string name="notification_5_min_before" translatable="false">5 minutes before pass</string>
-    <string name="notification_10_min_before" translatable="false">10 minutes before pass</string>
-    <string name="notification_15_min_before" translatable="false">15 minutes before pass</string>
+    <string name="btn_accept">Accept</string>
 
     <string name="sources_title">Manage TLE sources</string>
     <string name="sources_hint">Source URL</string>
     <string name="sources_https">Protocol HTTPS only</string>
     <string name="sources_error">Please check the entered URL</string>
 
+    <string name="entries_title">Satellites</string>
     <string name="entries_update">TLE data update:</string>
     <string name="entries_search_hint">Search by Name / Id</string>
+    <string name="entries_select_all">Select All/None</string>
     <string name="entries_update_error">Error importing satellite data</string>
 
     <string name="modes_title">Choose transceiver mode</string>
@@ -54,6 +43,7 @@
     <string name="trans_link_lowHigh" translatable="false">%.4f - %.4f</string>
     <string name="trans_no_data">No transceivers found for this satellite</string>
 
+    <string name="map_title">World Map</string>
     <string name="map_qth">QTH Locator: %s</string>
     <string name="map_coverage">Coverage: %.0f km</string>
     <string name="map_copyright" translatable="false">Wikimedia maps | Map data © OpenStreetMap contributors</string>
@@ -62,7 +52,7 @@
     <string name="pat_elevation">Elevation: %.1f°</string>
     <string name="pat_distance">Range: %.0f km</string>
     <string name="pat_altitude">Altitude: %.0f km</string>
-    <string name="pat_osm_idName" translatable="false">Id:%s / %s</string>
+    <string name="pat_osm_idName" translatable="false">%s : %s</string>
     <string name="pat_osm_lat">Latitude: %.1f°</string>
     <string name="pat_osm_lon">Longitude: %.1f°</string>
     <string name="pat_osm_vel">Velocity: %.2f km/s</string>
@@ -95,6 +85,8 @@
     <string name="pref_min_el_summary">Show passes with max elevation above</string>
     <string name="pref_min_el_input_error">Set the value between 0° and 90°</string>
 
+    <string name="settings_title">Settings</string>
+
     <string name="about_version">Version: %s</string>
     <string name="about_subtitle">Satellite tracker and pass predictor</string>
     <string name="about_github" translatable="false">GitHub</string>
@@ -126,17 +118,17 @@
     <string name="update_file">From File</string>
     <string name="update_error">Update completed with errors</string>
 
-    <string name="warranty_title">I would like to say thank you:</string>
-    <string name="warranty_thanks"> • To You for downloading and using Look4Sat! \nMay your sky always be clear!
-        \n • To <a href="https://github.com/g4dpz">David A. B. Johnson</a>
+    <string name="warranty_title">I would like to say thanks to:</string>
+    <string name="warranty_thanks"> • You for downloading and using Look4Sat! \nMay your sky always be clear!
+        \n • <a href="https://github.com/g4dpz">David A. B. Johnson</a>
         and <a href="https://github.com/davidmoten">Dave Moten</a> for creating predict4java lib
-        under the <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a> license.
-        \n • To <a href="https://github.com/csete">Alexandru Csete</a> for creating Gpredict
-        satellite tracker that inspired the creation of Look4Sat.
-        \n • To <a href="https://celestrak.com/webmaster.php">Dr T.S. Kelso</a> for maintaining his
-        <a href="https://celestrak.com/">Celestrak</a> website that provides access to the TLE data.
-        \n • To <a href="https://libre.space/">Libre Space Foundation</a> for their
-        <a href="https://db.satnogs.org/">SatNOGS</a> API and DB providing a huge amount of satellite data.
+        under the <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a>
+        \n • <a href="https://github.com/csete">Alexandru Csete</a> for creating Gpredict
+        satellite tracker that inspired the creation of Look4Sat
+        \n • <a href="https://celestrak.com/webmaster.php">Dr T.S. Kelso</a> for maintaining his
+        <a href="https://celestrak.com/">Celestrak</a> website that provides access to the TLE data
+        \n • <a href="https://libre.space/">Libre Space Foundation</a> for their
+        <a href="https://db.satnogs.org/">SatNOGS</a> API and DB providing a huge amount of satellite data
     </string>
     <string name="warranty_license"><a href="https://sites.google.com/view/look4sat-privacy-policy/home">Privacy Policy.</a>
         The app comes with no warranty. \nSee the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU GPLv3</a> license for details.
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index acfb6bcb..7d57b8a3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,6 +18,23 @@
         <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
     </style>
 
+    <style name="AppButton">
+        <item name="android:backgroundTint">@color/surfaceButton</item>
+        <item name="android:drawablePadding">4dp</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">@color/themeLight</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="DialogText">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">@color/themeAccent</item>
+        <item name="android:textSize">17sp</item>
+    </style>
+
     <style name="Toolbar">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">?actionBarSize</item>
@@ -31,6 +48,7 @@
         <item name="android:layout_height">48dp</item>
         <item name="android:background">?actionBarItemBackground</item>
         <item name="android:elevation">8dp</item>
+        <item name="android:tint">@color/themeLight</item>
     </style>
 
     <style name="ToolbarText">
@@ -38,8 +56,8 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:elevation">8dp</item>
         <item name="android:includeFontPadding">false</item>
-        <item name="android:textColor">@color/themeAccent</item>
-        <item name="android:textSize">21sp</item>
+        <item name="android:textColor">@color/themeLight</item>
+        <item name="android:textSize">20sp</item>
     </style>
 
     <style name="ToolbarTimer">
@@ -53,23 +71,12 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="DialogText">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">@color/themeAccent</item>
-        <item name="android:textSize">17sp</item>
+    <style name="MapInfoText">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/themeLight</item>
     </style>
 
-    <style name="InfoButton">
-        <item name="android:backgroundTint">@color/surfaceButton</item>
-        <item name="android:textColor">@color/themeAccent</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:drawablePadding">4dp</item>
-        <item name="iconTint">@color/themeAccent</item>
-        <item name="textAllCaps">false</item>
-    </style>
-
-    <style name="CardPreferences">
+    <style name="SettingsCard">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginStart">8dp</item>
@@ -79,9 +86,4 @@
         <item name="cardCornerRadius">8dp</item>
     </style>
 
-    <style name="MapInfoText">
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">@color/themeAccent</item>
-    </style>
-
 </resources>
\ No newline at end of file