diff --git a/README.md b/README.md
index c79a2e625..41728c45c 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ Feel free to contribute with [issues](https://github.com/lucasnlm/antimine-andro
 ## Features
 
 - Support to [Android Wear OS](https://developer.android.com/wear)
+- Support to [Android Auto](https://www.android.com/auto/)
 - No guessing algorithm
 - Multiple themes colors (including dynamic colors and AMOLED)
 - Multiple skins (including the classic)
diff --git a/about/src/main/res/layout/activity_container.xml b/about/src/main/res/layout/activity_container.xml
index 5a9c9703a..b3a2ce971 100644
--- a/about/src/main/res/layout/activity_container.xml
+++ b/about/src/main/res/layout/activity_container.xml
@@ -3,6 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingVertical="@dimen/root_vertical_spacing"
+    android:paddingHorizontal="@dimen/root_horizontal_spacing"
     android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.MaterialToolbar
diff --git a/about/src/main/res/layout/fragment_about_info.xml b/about/src/main/res/layout/fragment_about_info.xml
index a2ac12ac6..0a39793bc 100644
--- a/about/src/main/res/layout/fragment_about_info.xml
+++ b/about/src/main/res/layout/fragment_about_info.xml
@@ -5,16 +5,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    android:paddingHorizontal="@dimen/main_activity_padding"
+    android:paddingHorizontal="@dimen/root_horizontal_spacing"
     tools:context="dev.lucasnlm.antimine.about.AboutActivity">
 
     <LinearLayout
         android:id="@+id/version_layout"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
+        android:layout_height="0dp"
+        android:gravity="center"
         android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/buttons"
+        app:layout_constraintBottom_toTopOf="@+id/musicCard"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
@@ -39,6 +39,7 @@
             android:textAllCaps="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="?android:attr/textColorPrimary"
+            android:textSize="@dimen/base_font_size"
             android:textStyle="bold" />
 
         <TextView
@@ -47,6 +48,7 @@
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="?android:attr/textColorPrimary"
+            android:textSize="@dimen/base_font_size"
             tools:text="Version 7.1.0" />
 
         <TextView
@@ -55,6 +57,7 @@
             android:layout_height="wrap_content"
             android:text="Instant Build"
             android:textColor="?android:attr/textColorSecondary"
+            android:textSize="@dimen/base_font_size"
             tools:ignore="HardcodedText" />
     </LinearLayout>
 
diff --git a/about/src/main/res/layout/fragment_licenses.xml b/about/src/main/res/layout/fragment_licenses.xml
index 5cd110787..a88ff58d7 100644
--- a/about/src/main/res/layout/fragment_licenses.xml
+++ b/about/src/main/res/layout/fragment_licenses.xml
@@ -5,6 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="false"
+    android:paddingVertical="@dimen/root_vertical_spacing"
+    android:paddingHorizontal="@dimen/root_horizontal_spacing"
     tools:context="dev.lucasnlm.antimine.licenses.LicenseActivity">
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/about/src/main/res/layout/view_third_party.xml b/about/src/main/res/layout/view_third_party.xml
index ed6299564..83180def9 100644
--- a/about/src/main/res/layout/view_third_party.xml
+++ b/about/src/main/res/layout/view_third_party.xml
@@ -14,6 +14,7 @@
         android:padding="16dp"
         android:textColor="?android:attr/textColorSecondary"
         android:textStyle="bold"
+        android:textSize="@dimen/base_font_size"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 985898f74..9d4a742c3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,8 +13,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode = 1706001
-        versionName = "17.6.0"
+        versionCode = 1706031
+        versionName = "17.6.3"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
         compileSdk = libs.versions.compileSdk.get().toInt()
@@ -90,7 +90,7 @@ android {
         }
 
         create("googleInstant") {
-            versionCode = 163
+            versionCode = 164
             dimension = "version"
             applicationId = "dev.lucasnlm.antimine"
             versionNameSuffix = " I"
@@ -100,6 +100,17 @@ android {
             }
         }
 
+        create("auto") {
+            dimension = "version"
+            applicationId = "dev.lucasnlm.antimine"
+            versionNameSuffix = " C"
+
+            if (isGoogleBuild) {
+                plugins.apply("com.google.gms.google-services")
+                plugins.apply("com.bugsnag.android.gradle")
+            }
+        }
+
         create("foss") {
             dimension = "version"
             // There"s a typo on F-Droid release :(
@@ -114,6 +125,7 @@ android {
 }
 
 val googleImplementation by configurations
+val autoImplementation by configurations
 val googleInstantImplementation by configurations
 val fossImplementation by configurations
 
@@ -131,11 +143,14 @@ dependencies {
     implementation(project(":gdx"))
 
     googleImplementation(project(":proprietary"))
+    autoImplementation(project(":proprietary"))
     googleInstantImplementation(project(":proprietary"))
     googleInstantImplementation(project(":instant"))
     fossImplementation(project(":foss"))
     fossImplementation(project(":donation"))
 
+    autoImplementation(project(":audio"))
+    autoImplementation(project(":auto"))
     googleImplementation(project(":audio"))
     fossImplementation(project(":audio"))
     googleInstantImplementation(project(":audio-low"))
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 09953eeec..6abf0374d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,6 +38,7 @@
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:isGame="true"
+        android:appCategory="game"
         android:label="@string/app_name"
         android:localeConfig="@xml/locales_config"
         android:roundIcon="@mipmap/ic_launcher_round"
diff --git a/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
index 2fc38659f..689edf343 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
@@ -22,6 +22,7 @@ import androidx.lifecycle.lifecycleScope
 import com.badlogic.gdx.backends.android.AndroidFragmentApplication
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
+import dev.lucasnlm.antimine.common.auto.AutoExt.isAndroidAuto
 import dev.lucasnlm.antimine.common.level.view.GameRenderFragment
 import dev.lucasnlm.antimine.common.level.viewmodel.GameEvent
 import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModel
@@ -789,7 +790,7 @@ class GameActivity :
         }
 
         lifecycleScope.launch {
-            if (preferencesRepository.showTutorialDialog()) {
+            if (preferencesRepository.showTutorialDialog() && !isAndroidAuto()) {
                 val firstLocale = ConfigurationCompat.getLocales(resources.configuration).get(0)
                 val lang = firstLocale?.language
 
diff --git a/app/src/main/java/dev/lucasnlm/antimine/MainApplication.kt b/app/src/main/java/dev/lucasnlm/antimine/MainApplication.kt
index ac92837e9..3f63aa0f8 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/MainApplication.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/MainApplication.kt
@@ -3,6 +3,7 @@ package dev.lucasnlm.antimine
 import androidx.multidex.MultiDexApplication
 import com.badlogic.gdx.utils.GdxNativesLoader
 import com.google.android.material.color.DynamicColors
+import dev.lucasnlm.antimine.common.auto.AutoExt.isAndroidAuto
 import dev.lucasnlm.antimine.common.io.di.CommonIoModule
 import dev.lucasnlm.antimine.common.level.di.LevelModule
 import dev.lucasnlm.antimine.core.di.CommonModule
@@ -55,7 +56,11 @@ open class MainApplication : MultiDexApplication() {
         if (featureFlagManager.isFoss) {
             preferencesRepository.setPremiumFeatures(true)
         } else {
-            adsManager.start(this)
+            if (applicationContext.isAndroidAuto()) {
+                preferencesRepository.setPremiumFeatures(true)
+            } else {
+                adsManager.start(this)
+            }
         }
 
         val lastAppVersion = preferencesRepository.lastAppVersion()
diff --git a/app/src/main/java/dev/lucasnlm/antimine/main/MainActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/main/MainActivity.kt
index 1a96ae22c..af6f9326a 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/main/MainActivity.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/main/MainActivity.kt
@@ -12,6 +12,7 @@ import androidx.lifecycle.lifecycleScope
 import dev.lucasnlm.antimine.GameActivity
 import dev.lucasnlm.antimine.R
 import dev.lucasnlm.antimine.about.AboutActivity
+import dev.lucasnlm.antimine.common.auto.AutoExt.isAndroidAuto
 import dev.lucasnlm.antimine.common.io.models.SaveStatus
 import dev.lucasnlm.antimine.common.level.repository.MinefieldRepository
 import dev.lucasnlm.antimine.common.level.repository.SavesRepository
@@ -284,7 +285,7 @@ class MainActivity : ThemedActivity() {
             startActivity(intent)
         }
 
-        if (playGamesManager.hasGooglePlayGames()) {
+        if (playGamesManager.hasGooglePlayGames() && !isAndroidAuto()) {
             binding.playGames.setOnClickListener {
                 soundManager.playClickSound()
                 analyticsManager.sentEvent(Analytics.OpenGooglePlayGames)
@@ -384,7 +385,8 @@ class MainActivity : ThemedActivity() {
     private fun launchGooglePlayGames() {
         if (playGamesManager.hasGooglePlayGames() &&
             playGamesManager.shouldRequestLogin() &&
-            preferenceRepository.keepRequestPlayGames()
+            preferenceRepository.keepRequestPlayGames() &&
+            !isAndroidAuto()
         ) {
             playGamesManager.keepRequestingLogin(false)
 
diff --git a/app/src/main/java/dev/lucasnlm/antimine/playgames/view/PlayGamesButtonView.kt b/app/src/main/java/dev/lucasnlm/antimine/playgames/view/PlayGamesButtonView.kt
index bc59efb78..156da30fe 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/playgames/view/PlayGamesButtonView.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/playgames/view/PlayGamesButtonView.kt
@@ -11,10 +11,10 @@ class PlayGamesButtonView : FrameLayout {
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
     constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
 
+    val binding: ViewPlayGamesButtonBinding
+
     init {
         val layoutInflater = LayoutInflater.from(context)
         binding = ViewPlayGamesButtonBinding.inflate(layoutInflater, this, true)
     }
-
-    val binding: ViewPlayGamesButtonBinding
 }
diff --git a/app/src/main/java/dev/lucasnlm/antimine/preferences/PreferencesActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/preferences/PreferencesActivity.kt
index 2ba76e420..bc31d8cd2 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/preferences/PreferencesActivity.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/preferences/PreferencesActivity.kt
@@ -13,6 +13,7 @@ import androidx.core.view.isVisible
 import androidx.preference.PreferenceManager
 import com.google.android.material.materialswitch.MaterialSwitch
 import dev.lucasnlm.antimine.R
+import dev.lucasnlm.antimine.common.auto.AutoExt.isAndroidAuto
 import dev.lucasnlm.antimine.core.audio.GameAudioManager
 import dev.lucasnlm.antimine.core.cloud.CloudSaveManager
 import dev.lucasnlm.antimine.databinding.ActivityPreferencesBinding
@@ -223,42 +224,48 @@ class PreferencesActivity :
             binding.playGames.isVisible = false
         }
 
-        binding.exportSettings.setOnClickListener {
-            val exportIntent =
-                Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
-                    addCategory(Intent.CATEGORY_OPENABLE)
-                    putExtra(Intent.EXTRA_TITLE, SettingsBackupManager.FILE_NAME)
-                    type = "application/json"
-
-                    androidOreo {
-                        val documentsDir =
-                            Environment.getExternalStoragePublicDirectory(
-                                Environment.DIRECTORY_DOCUMENTS,
-                            )
-                        putExtra(DocumentsContract.EXTRA_INITIAL_URI, documentsDir.toUri())
+        binding.exportSettings.apply {
+            isVisible = !isAndroidAuto()
+            setOnClickListener {
+                val exportIntent =
+                    Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
+                        addCategory(Intent.CATEGORY_OPENABLE)
+                        putExtra(Intent.EXTRA_TITLE, SettingsBackupManager.FILE_NAME)
+                        type = "application/json"
+
+                        androidOreo {
+                            val documentsDir =
+                                Environment.getExternalStoragePublicDirectory(
+                                    Environment.DIRECTORY_DOCUMENTS,
+                                )
+                            putExtra(DocumentsContract.EXTRA_INITIAL_URI, documentsDir.toUri())
+                        }
                     }
-                }
 
-            exportResultLauncher.launch(exportIntent)
+                exportResultLauncher.launch(exportIntent)
+            }
         }
 
-        binding.importSettings.setOnClickListener {
-            val exportIntent =
-                Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-                    addCategory(Intent.CATEGORY_OPENABLE)
-                    putExtra(Intent.EXTRA_TITLE, SettingsBackupManager.FILE_NAME)
-                    type = "application/json"
-
-                    androidOreo {
-                        val documentsDir =
-                            Environment.getExternalStoragePublicDirectory(
-                                Environment.DIRECTORY_DOCUMENTS,
-                            )
-                        putExtra(DocumentsContract.EXTRA_INITIAL_URI, documentsDir.toUri())
+        binding.importSettings.apply {
+            isVisible = !isAndroidAuto()
+            setOnClickListener {
+                val exportIntent =
+                    Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+                        addCategory(Intent.CATEGORY_OPENABLE)
+                        putExtra(Intent.EXTRA_TITLE, SettingsBackupManager.FILE_NAME)
+                        type = "application/json"
+
+                        androidOreo {
+                            val documentsDir =
+                                Environment.getExternalStoragePublicDirectory(
+                                    Environment.DIRECTORY_DOCUMENTS,
+                                )
+                            putExtra(DocumentsContract.EXTRA_INITIAL_URI, documentsDir.toUri())
+                        }
                     }
-                }
 
-            importResultLauncher.launch(exportIntent)
+                importResultLauncher.launch(exportIntent)
+            }
         }
     }
 
diff --git a/app/src/main/res/layout-land/activity_game.xml b/app/src/main/res/layout-land/activity_game.xml
index 4f83a682e..c818bb3cf 100644
--- a/app/src/main/res/layout-land/activity_game.xml
+++ b/app/src/main/res/layout-land/activity_game.xml
@@ -29,6 +29,7 @@
         android:text="@string/loading"
         android:textAllCaps="true"
         android:textStyle="bold"
+        android:textSize="@dimen/base_font_size"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -46,6 +47,7 @@
         android:paddingVertical="8dp"
         android:textAllCaps="true"
         android:textStyle="bold"
+        android:textSize="@dimen/base_font_size"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -70,10 +72,10 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/back"
-                android:layout_width="?attr/actionBarSize"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_width="@dimen/base_icon_bar_size"
+                android:layout_height="@dimen/base_icon_bar_size"
                 android:contentDescription="@string/back"
-                android:padding="20dp"
+                android:padding="16dp"
                 app:srcCompat="@drawable/arrow_left" />
 
             <LinearLayout
@@ -140,13 +142,13 @@
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/shortcutIcon"
-                    android:layout_width="?attr/actionBarSize"
-                    android:layout_height="?attr/actionBarSize"
+                    android:layout_width="@dimen/base_icon_bar_size"
+                    android:layout_height="@dimen/base_icon_bar_size"
                     android:layout_gravity="center_horizontal"
                     android:alpha="0.0"
                     android:clickable="false"
                     android:contentDescription="@string/new_game"
-                    android:padding="20dp"
+                    android:padding="16dp"
                     app:srcCompat="@drawable/retry"
                     tools:alpha="1.0" />
 
diff --git a/app/src/main/res/layout/activity_game.xml b/app/src/main/res/layout/activity_game.xml
index e617a89cd..25152f1f2 100644
--- a/app/src/main/res/layout/activity_game.xml
+++ b/app/src/main/res/layout/activity_game.xml
@@ -30,6 +30,7 @@
         android:text="@string/loading"
         android:textAllCaps="true"
         android:textStyle="bold"
+        android:textSize="@dimen/base_font_size"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -72,10 +73,10 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/back"
-                android:layout_width="?attr/actionBarSize"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_width="@dimen/base_icon_bar_size"
+                android:layout_height="match_parent"
                 android:contentDescription="@string/back"
-                android:padding="20dp"
+                android:padding="12dp"
                 app:srcCompat="@drawable/arrow_left" />
 
             <LinearLayout
@@ -143,12 +144,12 @@
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/shortcutIcon"
-                    android:layout_width="?attr/actionBarSize"
-                    android:layout_height="?attr/actionBarSize"
+                    android:layout_width="@dimen/base_icon_bar_size"
+                    android:layout_height="match_parent"
                     android:alpha="0.0"
                     android:clickable="false"
                     android:contentDescription="@string/new_game"
-                    android:padding="20dp"
+                    android:padding="12dp"
                     app:srcCompat="@drawable/retry"
                     tools:alpha="1.0" />
 
@@ -157,7 +158,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:layout_marginEnd="20dp"
+                    android:layout_marginEnd="24dp"
                     android:textSize="12sp"
                     android:textStyle="bold"
                     android:visibility="gone"
diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml
index c200a5016..3f4f4cbe2 100644
--- a/app/src/main/res/layout/activity_history.xml
+++ b/app/src/main/res/layout/activity_history.xml
@@ -21,6 +21,8 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:clipToPadding="false"
+        android:paddingVertical="@dimen/root_horizontal_spacing"
+        android:paddingHorizontal="@dimen/root_horizontal_spacing"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_localization.xml b/app/src/main/res/layout/activity_localization.xml
index 9a0f6339e..30e6b1e97 100644
--- a/app/src/main/res/layout/activity_localization.xml
+++ b/app/src/main/res/layout/activity_localization.xml
@@ -21,7 +21,13 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:clipToPadding="false"
-        android:paddingBottom="16dp"
+        android:paddingHorizontal="@dimen/root_horizontal_spacing"
+        android:paddingVertical="@dimen/root_vertical_spacing"
+        android:scrollbarSize="@dimen/base_scrollbar_size"
+        android:scrollbarStyle="outsideInset"
+        android:scrollbarAlwaysDrawVerticalTrack="true"
+        android:scrollbars="vertical"
+        android:fadeScrollbars="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5d6f1da1d..bff7c6e41 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -25,7 +25,7 @@
             android:layout_height="wrap_content"
             android:animateLayoutChanges="true"
             android:orientation="vertical"
-            android:paddingHorizontal="@dimen/main_activity_padding"
+            android:paddingHorizontal="@dimen/root_horizontal_spacing"
             android:paddingTop="32dp"
             android:paddingBottom="48dp">
 
@@ -110,9 +110,12 @@
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:gravity="start|center_vertical"
-                                    android:paddingHorizontal="18dp"
+                                    android:paddingStart="9dp"
+                                    android:paddingEnd="18dp"
                                     android:text="@string/progressive"
-                                    app:icon="@drawable/progressive" />
+                                    app:icon="@drawable/progressive"
+                                    app:iconSize="@dimen/base_icon_size"
+                                    app:iconPadding="8dp" />
 
                                 <com.google.android.material.textview.MaterialTextView
                                     android:id="@+id/standardSize"
@@ -136,9 +139,12 @@
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:gravity="start|center_vertical"
-                                    android:paddingHorizontal="18dp"
+                                    android:paddingStart="9dp"
+                                    android:paddingEnd="18dp"
                                     android:text="@string/fixed_size"
-                                    app:icon="@drawable/fixed_size" />
+                                    app:icon="@drawable/fixed_size"
+                                    app:iconSize="@dimen/base_icon_size"
+                                    app:iconPadding="8dp" />
 
                                 <com.google.android.material.textview.MaterialTextView
                                     android:id="@+id/fixedSizeSize"
@@ -295,9 +301,12 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:gravity="center_vertical"
-                                android:paddingHorizontal="18dp"
+                                android:paddingStart="9dp"
+                                android:paddingEnd="18dp"
                                 android:text="@string/custom"
-                                app:icon="@drawable/custom" />
+                                app:icon="@drawable/custom"
+                                app:iconSize="@dimen/base_icon_size"
+                                app:iconPadding="8dp" />
 
                         </LinearLayout>
                     </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml
index 7c6be351b..51c5814c2 100644
--- a/app/src/main/res/layout/activity_preferences.xml
+++ b/app/src/main/res/layout/activity_preferences.xml
@@ -29,7 +29,9 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="@dimen/root_horizontal_spacing"
+            android:paddingVertical="@dimen/root_vertical_spacing">
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/generalSettings"
@@ -65,6 +67,7 @@
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
                         android:text="@string/vibration"
+                        android:textSize="@dimen/base_font_size"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/general_label" />
@@ -74,6 +77,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/sound_effects" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -81,6 +85,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/music" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -88,6 +93,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/show_windows" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -95,6 +101,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/open_on_game" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -102,6 +109,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/google_play_games" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -109,6 +117,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/immersive_mode" />
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
@@ -137,6 +146,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingVertical="8dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/settings_gameplay"
                         tools:text="Gameplay" />
 
@@ -145,6 +155,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/use_question_mark" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -152,6 +163,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/enable_automatic_flags" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -159,6 +171,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/click_numbers" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -166,6 +179,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/flag_when_tap_numbers" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -173,6 +187,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/help" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -180,6 +195,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/highlight_unsolved_numbers" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -187,6 +203,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/show_clock" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -194,6 +211,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingVertical="16dp"
+                        android:textSize="@dimen/base_font_size"
                         android:text="@string/no_guessing_mode" />
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
@@ -214,7 +232,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingVertical="16dp"
+                    android:textSize="@dimen/base_font_size"
                     android:text="@string/export_settings"
+                    app:iconSize="@dimen/base_icon_size"
                     app:icon="@drawable/export_file"
                     app:iconGravity="end" />
 
@@ -223,7 +243,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingVertical="16dp"
+                    android:textSize="@dimen/base_font_size"
                     android:text="@string/import_settings"
+                    app:iconSize="@dimen/base_icon_size"
                     app:icon="@drawable/import_file"
                     app:iconGravity="end" />
             </LinearLayout>
diff --git a/app/src/main/res/layout/activity_stats.xml b/app/src/main/res/layout/activity_stats.xml
index b4944f04f..dfbced184 100644
--- a/app/src/main/res/layout/activity_stats.xml
+++ b/app/src/main/res/layout/activity_stats.xml
@@ -21,7 +21,8 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:clipToPadding="false"
-        android:paddingBottom="16dp"
+        android:paddingVertical="@dimen/root_vertical_spacing"
+        android:paddingHorizontal="@dimen/root_horizontal_spacing"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
diff --git a/app/src/main/res/layout/dialog_custom_game.xml b/app/src/main/res/layout/dialog_custom_game.xml
index cb698dabd..ca15a0301 100644
--- a/app/src/main/res/layout/dialog_custom_game.xml
+++ b/app/src/main/res/layout/dialog_custom_game.xml
@@ -27,13 +27,14 @@
                 android:id="@+id/map_width"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:digits="0123456789"
                 android:gravity="center_horizontal"
                 android:hint="@string/width"
                 android:importantForAutofill="no"
                 android:inputType="number"
-                android:digits="0123456789"
                 android:minEms="3"
                 android:text="9"
+                android:textSize="@dimen/base_font_size"
                 tools:ignore="HardcodedText" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -46,6 +47,7 @@
             android:gravity="center"
             android:includeFontPadding="false"
             android:text="x"
+            android:textSize="@dimen/base_font_size"
             tools:ignore="HardcodedText" />
 
         <com.google.android.material.textfield.TextInputLayout
@@ -58,13 +60,14 @@
                 android:id="@+id/map_height"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:digits="0123456789"
                 android:gravity="center_horizontal"
                 android:hint="@string/height"
                 android:importantForAutofill="no"
                 android:inputType="number"
-                android:digits="0123456789"
                 android:minEms="3"
                 android:text="9"
+                android:textSize="@dimen/base_font_size"
                 tools:ignore="HardcodedText" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -93,13 +96,14 @@
                 android:id="@+id/map_mines"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:digits="0123456789"
                 android:gravity="center_horizontal"
                 android:hint="@string/mines"
                 android:importantForAutofill="no"
                 android:inputType="number"
-                android:digits="0123456789"
                 android:minEms="3"
                 android:text="9"
+                android:textSize="@dimen/base_font_size"
                 tools:ignore="HardcodedText" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -112,6 +116,7 @@
             android:gravity="center"
             android:includeFontPadding="false"
             android:text=" "
+            android:textSize="@dimen/base_font_size"
             tools:ignore="HardcodedText" />
 
         <com.google.android.material.textfield.TextInputLayout
@@ -124,13 +129,14 @@
                 android:id="@+id/seed"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:digits="0123456789"
                 android:gravity="center_horizontal"
                 android:hint="@string/seed"
                 android:importantForAutofill="no"
                 android:inputType="number"
-                android:digits="0123456789"
                 android:minEms="3"
                 android:text=""
+                android:textSize="@dimen/base_font_size"
                 tools:ignore="HardcodedText" />
 
         </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/donation_request.xml b/app/src/main/res/layout/donation_request.xml
index 845a4e7a1..d06acde05 100644
--- a/app/src/main/res/layout/donation_request.xml
+++ b/app/src/main/res/layout/donation_request.xml
@@ -3,9 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
     android:clickable="true"
     android:contentDescription="@string/donation"
-    android:background="?selectableItemBackground"
     android:focusable="true"
     android:padding="16dp">
 
@@ -36,14 +36,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/donate_request"
-            android:textColor="?colorOnBackground" />
+            android:textColor="?colorOnBackground"
+            android:textSize="@dimen/base_font_size" />
 
         <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/donate_help"
-            android:textStyle="bold"
-            android:textColor="?colorOnBackground" />
+            android:textColor="?colorOnBackground"
+            android:textSize="@dimen/base_font_size"
+            android:textStyle="bold" />
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/game_over_dialog.xml b/app/src/main/res/layout/game_over_dialog.xml
index 25b001bed..5bb9a5899 100644
--- a/app/src/main/res/layout/game_over_dialog.xml
+++ b/app/src/main/res/layout/game_over_dialog.xml
@@ -40,6 +40,7 @@
             android:gravity="center_horizontal"
             android:textAlignment="center"
             android:textAllCaps="true"
+            android:textSize="@dimen/base_font_size"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -54,6 +55,7 @@
             android:gravity="center_horizontal"
             android:text="@string/you_lost"
             android:textAlignment="center"
+            android:textSize="@dimen/base_font_size"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/title"
@@ -65,11 +67,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="?selectableItemBackgroundBorderless"
-            android:tooltipText="@string/close"
             android:contentDescription="@string/cancel"
             android:importantForAccessibility="no"
             android:padding="8dp"
+            android:tooltipText="@string/close"
             app:icon="@drawable/close"
+            app:iconSize="@dimen/base_icon_size"
             app:iconTint="?colorOnBackground"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -85,6 +88,7 @@
             android:padding="8dp"
             android:tooltipText="@string/settings"
             app:icon="@drawable/settings"
+            app:iconSize="@dimen/base_icon_size"
             app:iconTint="?colorOnBackground"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -111,6 +115,7 @@
                     android:text="@string/continue_game"
                     android:textAllCaps="true"
                     android:textColor="?colorSurfaceVariant"
+                    android:textSize="@dimen/base_font_size"
                     app:backgroundTint="?colorAccent"
                     app:iconPadding="0dp"
                     app:iconTint="?colorSurfaceVariant"
@@ -124,6 +129,7 @@
                     android:paddingHorizontal="16dp"
                     android:paddingVertical="4dp"
                     android:textColor="?colorSurfaceVariant"
+                    android:textSize="@dimen/base_font_size"
                     android:textStyle="bold"
                     android:visibility="gone"
                     tools:text="10"
@@ -137,6 +143,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/new_game"
                 android:textAllCaps="true"
+                android:textSize="@dimen/base_font_size"
                 app:strokeWidth="0dp">
 
                 <requestFocus />
@@ -149,6 +156,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/remove_ad"
                 android:textAllCaps="true"
+                android:textSize="@dimen/base_font_size"
                 android:visibility="gone"
                 app:strokeWidth="0dp"
                 tools:visibility="visible" />
@@ -160,6 +168,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/tutorial"
                 android:textAllCaps="true"
+                android:textSize="@dimen/base_font_size"
                 android:visibility="gone"
                 app:strokeWidth="0dp"
                 tools:visibility="visible" />
@@ -175,8 +184,8 @@
         android:gravity="center"
         android:minHeight="50dp"
         android:visibility="gone"
-        app:layout_constraintStart_toStartOf="@+id/dialog"
         app:layout_constraintEnd_toEndOf="@+id/dialog"
+        app:layout_constraintStart_toStartOf="@+id/dialog"
         app:layout_constraintTop_toBottomOf="@+id/dialog" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/music_link.xml b/app/src/main/res/layout/music_link.xml
index 351bd4451..715b9beb3 100644
--- a/app/src/main/res/layout/music_link.xml
+++ b/app/src/main/res/layout/music_link.xml
@@ -38,6 +38,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/check_music"
+            android:textSize="@dimen/base_font_size"
             android:textStyle="bold"
             tools:textColor="?colorOnBackground" />
 
@@ -46,6 +47,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/music_by"
+            android:textSize="@dimen/base_font_size"
             tools:textColor="?colorOnBackground" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/view_stats_item.xml b/app/src/main/res/layout/view_stats_item.xml
index 3d628a874..0fa13f293 100644
--- a/app/src/main/res/layout/view_stats_item.xml
+++ b/app/src/main/res/layout/view_stats_item.xml
@@ -44,6 +44,7 @@
                     android:paddingHorizontal="16dp"
                     android:paddingVertical="8dp"
                     android:text="@string/games"
+                    android:textSize="@dimen/base_font_size"
                     android:textStyle="bold" />
 
                 <com.google.android.material.textview.MaterialTextView
@@ -53,6 +54,7 @@
                     android:paddingVertical="8dp"
                     android:text="0"
                     android:textColor="?colorTertiary"
+                    android:textSize="@dimen/base_font_size"
                     tools:ignore="HardcodedText" />
             </TableRow>
 
@@ -62,6 +64,7 @@
                     android:paddingHorizontal="16dp"
                     android:paddingVertical="8dp"
                     android:text="@string/mines"
+                    android:textSize="@dimen/base_font_size"
                     android:textStyle="bold" />
 
                 <com.google.android.material.textview.MaterialTextView
@@ -71,6 +74,7 @@
                     android:paddingVertical="8dp"
                     android:text="-"
                     android:textColor="?colorTertiary"
+                    android:textSize="@dimen/base_font_size"
                     tools:ignore="HardcodedText" />
             </TableRow>
 
@@ -80,6 +84,7 @@
                     android:paddingHorizontal="16dp"
                     android:paddingVertical="8dp"
                     android:text="@string/total_time"
+                    android:textSize="@dimen/base_font_size"
                     android:textStyle="bold" />
 
                 <com.google.android.material.textview.MaterialTextView
@@ -89,6 +94,7 @@
                     android:paddingVertical="8dp"
                     android:text="-"
                     android:textColor="?colorTertiary"
+                    android:textSize="@dimen/base_font_size"
                     tools:ignore="HardcodedText" />
             </TableRow>
 
@@ -98,6 +104,7 @@
                     android:paddingHorizontal="16dp"
                     android:paddingVertical="8dp"
                     android:text="@string/average_time"
+                    android:textSize="@dimen/base_font_size"
                     android:textStyle="bold" />
 
                 <com.google.android.material.textview.MaterialTextView
@@ -107,6 +114,7 @@
                     android:paddingVertical="8dp"
                     android:text="-"
                     android:textColor="?colorTertiary"
+                    android:textSize="@dimen/base_font_size"
                     tools:ignore="HardcodedText" />
             </TableRow>
 
@@ -116,6 +124,7 @@
                     android:paddingHorizontal="16dp"
                     android:paddingVertical="8dp"
                     android:text="@string/shortest_time"
+                    android:textSize="@dimen/base_font_size"
                     android:textStyle="bold" />
 
                 <com.google.android.material.textview.MaterialTextView
@@ -125,6 +134,7 @@
                     android:paddingVertical="8dp"
                     android:text="-"
                     android:textColor="?colorTertiary"
+                    android:textSize="@dimen/base_font_size"
                     tools:ignore="HardcodedText" />
             </TableRow>
 
@@ -134,6 +144,7 @@
                     android:paddingHorizontal="16dp"
                     android:paddingVertical="8dp"
                     android:text="@string/open_areas"
+                    android:textSize="@dimen/base_font_size"
                     android:textStyle="bold" />
 
                 <com.google.android.material.textview.MaterialTextView
@@ -143,6 +154,7 @@
                     android:paddingVertical="8dp"
                     android:text="-"
                     android:textColor="?colorTertiary"
+                    android:textSize="@dimen/base_font_size"
                     tools:ignore="HardcodedText" />
             </TableRow>
 
@@ -152,6 +164,7 @@
                     android:paddingHorizontal="16dp"
                     android:paddingVertical="8dp"
                     android:text="@string/performance"
+                    android:textSize="@dimen/base_font_size"
                     android:textStyle="bold" />
 
                 <com.google.android.material.textview.MaterialTextView
@@ -161,6 +174,7 @@
                     android:paddingVertical="8dp"
                     android:text="-"
                     android:textColor="?colorTertiary"
+                    android:textSize="@dimen/base_font_size"
                     tools:ignore="HardcodedText" />
             </TableRow>
 
@@ -170,6 +184,7 @@
                     android:paddingHorizontal="16dp"
                     android:paddingVertical="8dp"
                     android:text="@string/victories"
+                    android:textSize="@dimen/base_font_size"
                     android:textStyle="bold" />
 
                 <com.google.android.material.textview.MaterialTextView
@@ -179,6 +194,7 @@
                     android:paddingVertical="8dp"
                     android:text="-"
                     android:textColor="?colorTertiary"
+                    android:textSize="@dimen/base_font_size"
                     tools:ignore="HardcodedText" />
             </TableRow>
 
@@ -188,6 +204,7 @@
                     android:paddingHorizontal="16dp"
                     android:paddingVertical="8dp"
                     android:text="@string/defeats"
+                    android:textSize="@dimen/base_font_size"
                     android:textStyle="bold" />
 
                 <com.google.android.material.textview.MaterialTextView
@@ -197,6 +214,7 @@
                     android:paddingVertical="8dp"
                     android:text="-"
                     android:textColor="?colorTertiary"
+                    android:textSize="@dimen/base_font_size"
                     tools:ignore="HardcodedText" />
             </TableRow>
         </TableLayout>
diff --git a/app/src/main/res/layout/win_dialog.xml b/app/src/main/res/layout/win_dialog.xml
index c115bd002..a42b39414 100644
--- a/app/src/main/res/layout/win_dialog.xml
+++ b/app/src/main/res/layout/win_dialog.xml
@@ -40,6 +40,7 @@
             android:gravity="center_horizontal"
             android:textAlignment="center"
             android:textAllCaps="true"
+            android:textSize="@dimen/base_font_size"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -54,6 +55,7 @@
             android:gravity="center_horizontal"
             android:text="@string/you_lost"
             android:textAlignment="center"
+            android:textSize="@dimen/base_font_size"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/title"
@@ -67,6 +69,7 @@
             android:gravity="center"
             android:text="@string/you_have_received"
             android:textAlignment="center"
+            android:textSize="@dimen/base_font_size"
             android:visibility="gone"
             app:drawableEndCompat="@drawable/hint"
             app:drawableTint="?colorSecondaryVariant"
@@ -81,11 +84,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="?selectableItemBackgroundBorderless"
-            android:tooltipText="@string/close"
             android:contentDescription="@string/cancel"
             android:importantForAccessibility="no"
             android:padding="8dp"
+            android:tooltipText="@string/close"
             app:icon="@drawable/close"
+            app:iconSize="@dimen/base_icon_size"
             app:iconTint="?colorOnBackground"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -96,11 +100,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="?selectableItemBackgroundBorderless"
-            android:tooltipText="@string/settings"
             android:contentDescription="@string/settings"
             android:importantForAccessibility="no"
             android:padding="8dp"
+            android:tooltipText="@string/settings"
             app:icon="@drawable/settings"
+            app:iconSize="@dimen/base_icon_size"
             app:iconTint="?colorOnBackground"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -123,9 +128,10 @@
                 android:text="@string/new_game"
                 android:textAllCaps="true"
                 android:textColor="?colorSurfaceVariant"
+                android:textSize="@dimen/base_font_size"
+                app:backgroundTint="?colorAccent"
                 app:iconTint="?colorSurfaceVariant"
-                app:iconTintMode="multiply"
-                app:backgroundTint="?colorAccent">
+                app:iconTintMode="multiply">
 
                 <requestFocus />
             </com.google.android.material.button.MaterialButton>
@@ -137,6 +143,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/events"
                 android:textAllCaps="true"
+                android:textSize="@dimen/base_font_size"
                 android:visibility="gone"
                 app:strokeWidth="0dp"
                 tools:visibility="visible" />
@@ -148,6 +155,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/remove_ad"
                 android:textAllCaps="true"
+                android:textSize="@dimen/base_font_size"
                 android:visibility="gone"
                 app:strokeWidth="0dp"
                 tools:visibility="visible" />
@@ -163,7 +171,7 @@
         android:gravity="center"
         android:minHeight="50dp"
         android:visibility="gone"
-        app:layout_constraintStart_toStartOf="@+id/dialog"
         app:layout_constraintEnd_toEndOf="@+id/dialog"
+        app:layout_constraintStart_toStartOf="@+id/dialog"
         app:layout_constraintTop_toBottomOf="@+id/dialog" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/test/java/dev/lucasnlm/antimine/mocks/FixedDimensionRepository.kt b/app/src/test/java/dev/lucasnlm/antimine/mocks/FixedDimensionRepository.kt
index bf65f23a6..38e6266f4 100644
--- a/app/src/test/java/dev/lucasnlm/antimine/mocks/FixedDimensionRepository.kt
+++ b/app/src/test/java/dev/lucasnlm/antimine/mocks/FixedDimensionRepository.kt
@@ -1,6 +1,6 @@
 package dev.lucasnlm.antimine.mocks
 
-import dev.lucasnlm.antimine.core.models.MinefieldSize
+import android.util.DisplayMetrics
 import dev.lucasnlm.antimine.core.repository.DimensionRepository
 
 class FixedDimensionRepository : DimensionRepository {
@@ -12,7 +12,12 @@ class FixedDimensionRepository : DimensionRepository {
 
     override fun areaSeparator(): Float = 1.0f
 
-    override fun displaySize(): MinefieldSize = MinefieldSize(50 * 15, 50 * 30)
+    override fun displayMetrics(): DisplayMetrics {
+        return DisplayMetrics().apply {
+            widthPixels = 50 * 15
+            heightPixels = 50 * 30
+        }
+    }
 
     override fun actionBarSizeWithStatus(): Int = 50
 
diff --git a/auto/.gitignore b/auto/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/auto/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/auto/build.gradle.kts b/auto/build.gradle.kts
new file mode 100644
index 000000000..01f7ecd11
--- /dev/null
+++ b/auto/build.gradle.kts
@@ -0,0 +1,34 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+}
+
+android {
+    namespace = "dev.lucasnlm.antimine.auto"
+
+    defaultConfig {
+        minSdk = libs.versions.minSdk.get().toInt()
+        compileSdk = libs.versions.compileSdk.get().toInt()
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"))
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+
+    buildFeatures {
+        buildConfig = true
+        viewBinding = true
+    }
+}
diff --git a/auto/consumer-rules.pro b/auto/consumer-rules.pro
new file mode 100644
index 000000000..e69de29bb
diff --git a/auto/proguard-rules.pro b/auto/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/auto/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/auto/src/main/AndroidManifest.xml b/auto/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..2cb7bd422
--- /dev/null
+++ b/auto/src/main/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-feature
+        android:name="android.hardware.type.automotive"
+        android:required="true" />
+    <uses-feature
+        android:name="android.hardware.wifi"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.screen.portrait"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.screen.landscape"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.gamepad"
+        android:required="false"/>
+</manifest>
\ No newline at end of file
diff --git a/common/src/main/java/dev/lucasnlm/antimine/common/auto/AutoExt.kt b/common/src/main/java/dev/lucasnlm/antimine/common/auto/AutoExt.kt
new file mode 100644
index 000000000..9d5e8759e
--- /dev/null
+++ b/common/src/main/java/dev/lucasnlm/antimine/common/auto/AutoExt.kt
@@ -0,0 +1,18 @@
+package dev.lucasnlm.antimine.common.auto
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.annotation.RequiresApi
+import dev.lucasnlm.antimine.utils.BuildExt.androidMarshmallow
+
+object AutoExt {
+    fun Context.isAndroidAuto(): Boolean {
+        return androidMarshmallow() && featureAutomotive()
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private fun Context.featureAutomotive(): Boolean {
+        return packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)
+    }
+}
diff --git a/common/src/main/java/dev/lucasnlm/antimine/common/level/repository/MinefieldRepositoryImpl.kt b/common/src/main/java/dev/lucasnlm/antimine/common/level/repository/MinefieldRepositoryImpl.kt
index af476d3bc..8189489e0 100644
--- a/common/src/main/java/dev/lucasnlm/antimine/common/level/repository/MinefieldRepositoryImpl.kt
+++ b/common/src/main/java/dev/lucasnlm/antimine/common/level/repository/MinefieldRepositoryImpl.kt
@@ -24,9 +24,9 @@ class MinefieldRepositoryImpl : MinefieldRepository {
                 VERTICAL_STANDARD_GAP_WITHOUT_BOTTOM
             }
 
-        val display = dimensionRepository.displaySize()
-        val width = display.width
-        val height = display.height
+        val display = dimensionRepository.displayMetrics()
+        val width = display.widthPixels
+        val height = display.heightPixels
 
         val calculatedWidth = ((width / fieldSize).toInt() - horizontalGap)
         val calculatedHeight = ((height / fieldSize).toInt() - verticalGap)
diff --git a/common/src/main/java/dev/lucasnlm/antimine/common/level/view/GameRenderFragment.kt b/common/src/main/java/dev/lucasnlm/antimine/common/level/view/GameRenderFragment.kt
index 0205c510a..b37028203 100644
--- a/common/src/main/java/dev/lucasnlm/antimine/common/level/view/GameRenderFragment.kt
+++ b/common/src/main/java/dev/lucasnlm/antimine/common/level/view/GameRenderFragment.kt
@@ -19,6 +19,7 @@ import androidx.lifecycle.lifecycleScope
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration
 import com.badlogic.gdx.backends.android.AndroidFragmentApplication
+import dev.lucasnlm.antimine.common.auto.AutoExt.isAndroidAuto
 import dev.lucasnlm.antimine.common.level.logic.VisibleMineStream
 import dev.lucasnlm.antimine.common.level.viewmodel.GameEvent
 import dev.lucasnlm.antimine.common.level.viewmodel.GameState
@@ -279,8 +280,14 @@ open class GameRenderFragment : AndroidFragmentApplication() {
                     } else {
                         context.dpToPx(BOTTOM_MARGIN_WITH_NAV_DP)
                     }
+                val autoBottomMargin =
+                    if (context.isAndroidAuto()) {
+                        bottomMargin * 1.5
+                    } else {
+                        bottomMargin
+                    }.toInt()
                 gravity = Gravity.CENTER_HORIZONTAL or Gravity.BOTTOM
-                setMargins(0, 0, 0, bottomMargin)
+                setMargins(0, 0, 0, autoBottomMargin)
             } else {
                 val rightMargin = context.dpToPx(RIGHT_MARGIN_DP)
                 gravity = Gravity.END or Gravity.CENTER_VERTICAL
diff --git a/common/src/test/java/dev/lucasnlm/antimine/common/level/logic/MinefieldFactoryTest.kt b/common/src/test/java/dev/lucasnlm/antimine/common/level/logic/MinefieldFactoryTest.kt
index aa2abda5f..1ab6bb3b6 100644
--- a/common/src/test/java/dev/lucasnlm/antimine/common/level/logic/MinefieldFactoryTest.kt
+++ b/common/src/test/java/dev/lucasnlm/antimine/common/level/logic/MinefieldFactoryTest.kt
@@ -1,10 +1,10 @@
 package dev.lucasnlm.antimine.common.level.logic
 
+import android.util.DisplayMetrics
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import dev.lucasnlm.antimine.common.level.repository.MinefieldRepositoryImpl
 import dev.lucasnlm.antimine.core.models.Difficulty
-import dev.lucasnlm.antimine.core.models.MinefieldSize
 import dev.lucasnlm.antimine.core.repository.DimensionRepository
 import dev.lucasnlm.antimine.preferences.PreferencesRepository
 import dev.lucasnlm.antimine.preferences.models.Minefield
@@ -83,7 +83,11 @@ class MinefieldFactoryTest {
             mock {
                 on { areaSize() } doReturn 10.0f
                 on { actionBarSizeWithStatus() } doReturn 10
-                on { displaySize() } doReturn MinefieldSize(500, 1000)
+                on { displayMetrics() } doReturn
+                    DisplayMetrics().apply {
+                        widthPixels = 500
+                        heightPixels = 1000
+                    }
             }
 
         MinefieldRepositoryImpl().fromDifficulty(
diff --git a/common/src/test/java/dev/lucasnlm/antimine/common/level/mocks/FixedDimensionRepository.kt b/common/src/test/java/dev/lucasnlm/antimine/common/level/mocks/FixedDimensionRepository.kt
index 330b32e46..b0ba17994 100644
--- a/common/src/test/java/dev/lucasnlm/antimine/common/level/mocks/FixedDimensionRepository.kt
+++ b/common/src/test/java/dev/lucasnlm/antimine/common/level/mocks/FixedDimensionRepository.kt
@@ -1,6 +1,6 @@
 package dev.lucasnlm.antimine.common.level.mocks
 
-import dev.lucasnlm.antimine.core.models.MinefieldSize
+import android.util.DisplayMetrics
 import dev.lucasnlm.antimine.core.repository.DimensionRepository
 
 class FixedDimensionRepository : DimensionRepository {
@@ -12,7 +12,12 @@ class FixedDimensionRepository : DimensionRepository {
 
     override fun areaSeparator(): Float = 1.0f
 
-    override fun displaySize(): MinefieldSize = MinefieldSize(50 * 15, 50 * 30)
+    override fun displayMetrics(): DisplayMetrics {
+        return DisplayMetrics().apply {
+            widthPixels = 50 * 15
+            heightPixels = 50 * 30
+        }
+    }
 
     override fun actionBarSizeWithStatus(): Int = 55
 
diff --git a/common/src/test/java/dev/lucasnlm/antimine/common/level/repository/MinefieldRepositoryTest.kt b/common/src/test/java/dev/lucasnlm/antimine/common/level/repository/MinefieldRepositoryTest.kt
index b92bbeecd..b3ae7d6d2 100644
--- a/common/src/test/java/dev/lucasnlm/antimine/common/level/repository/MinefieldRepositoryTest.kt
+++ b/common/src/test/java/dev/lucasnlm/antimine/common/level/repository/MinefieldRepositoryTest.kt
@@ -1,7 +1,7 @@
 package dev.lucasnlm.antimine.common.level.repository
 
+import android.util.DisplayMetrics
 import dev.lucasnlm.antimine.core.models.Difficulty
-import dev.lucasnlm.antimine.core.models.MinefieldSize
 import dev.lucasnlm.antimine.core.repository.DimensionRepository
 import dev.lucasnlm.antimine.preferences.PreferencesRepository
 import dev.lucasnlm.antimine.preferences.models.Minefield
@@ -29,7 +29,11 @@ class MinefieldRepositoryTest {
             mockk<DimensionRepository>(relaxed = true) {
                 every { areaSize() } returns 10.0f
                 every { verticalNavigationBarHeight() } returns 0
-                every { displaySize() } returns MinefieldSize(1000, 1000)
+                every { displayMetrics() } returns
+                    DisplayMetrics().apply {
+                        widthPixels = 1000
+                        heightPixels = 1000
+                    }
             }
 
         val minefield =
@@ -53,7 +57,11 @@ class MinefieldRepositoryTest {
             mockk<DimensionRepository>(relaxed = true) {
                 every { areaSize() } returns 10.0f
                 every { verticalNavigationBarHeight() } returns 100
-                every { displaySize() } returns MinefieldSize(1000, 1000)
+                every { displayMetrics() } returns
+                    DisplayMetrics().apply {
+                        widthPixels = 1000
+                        heightPixels = 1000
+                    }
             }
 
         val minefield =
@@ -77,7 +85,11 @@ class MinefieldRepositoryTest {
             mockk<DimensionRepository>(relaxed = true) {
                 every { areaSize() } returns 10.0f
                 every { verticalNavigationBarHeight() } returns 100
-                every { displaySize() } returns MinefieldSize(1000, 1000)
+                every { displayMetrics() } returns
+                    DisplayMetrics().apply {
+                        widthPixels = 1000
+                        heightPixels = 1000
+                    }
             }
 
         val minefield =
@@ -101,7 +113,11 @@ class MinefieldRepositoryTest {
             mockk<DimensionRepository>(relaxed = true) {
                 every { areaSize() } returns 10.0f
                 every { verticalNavigationBarHeight() } returns 100
-                every { displaySize() } returns MinefieldSize(1000, 1000)
+                every { displayMetrics() } returns
+                    DisplayMetrics().apply {
+                        widthPixels = 1000
+                        heightPixels = 1000
+                    }
             }
 
         val minefield =
diff --git a/control/src/main/res/layout/activity_control.xml b/control/src/main/res/layout/activity_control.xml
index 1b5f8fd3d..1002c42c4 100644
--- a/control/src/main/res/layout/activity_control.xml
+++ b/control/src/main/res/layout/activity_control.xml
@@ -29,8 +29,8 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingHorizontal="@dimen/main_activity_padding"
-            android:paddingVertical="8dp">
+            android:paddingHorizontal="@dimen/root_horizontal_spacing"
+            android:paddingVertical="@dimen/root_vertical_spacing">
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/control_styles"
@@ -54,7 +54,7 @@
                         android:layout_height="wrap_content"
                         android:paddingHorizontal="16dp"
                         android:paddingTop="12dp"
-                        android:paddingBottom="8dp"
+                        android:paddingBottom="@dimen/base_spacing"
                         android:text="@string/control_types" />
 
                     <androidx.recyclerview.widget.RecyclerView
@@ -116,22 +116,24 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:paddingHorizontal="8dp"
-                            android:text="@string/touch_sensibility" />
+                            android:text="@string/touch_sensibility"
+                            android:textSize="@dimen/base_font_size" />
 
                         <com.google.android.material.slider.Slider
                             android:id="@+id/touchSensibility"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:max="15"
+                            android:paddingVertical="@dimen/base_spacing"
                             android:stepSize="1"
                             android:value="1"
                             android:valueFrom="0"
                             android:valueTo="15"
-                            app:tickVisible="false"
-                            app:trackHeight="24dp"
-                            app:thumbElevation="0dp"
                             app:thumbColor="?colorOnPrimary"
-                            app:trackColorInactive="?colorOnSurfaceVariant" />
+                            app:thumbElevation="0dp"
+                            app:tickVisible="false"
+                            app:trackColorInactive="?colorOnSurfaceVariant"
+                            app:trackHeight="@dimen/base_icon_size" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -146,22 +148,24 @@
                             android:layout_height="wrap_content"
                             android:paddingHorizontal="8dp"
                             android:text="@string/vibration"
-                            android:textColor="?colorOnSurfaceVariant" />
+                            android:textColor="?colorOnSurfaceVariant"
+                            android:textSize="@dimen/base_font_size" />
 
                         <com.google.android.material.slider.Slider
                             android:id="@+id/hapticLevel"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:max="15"
+                            android:paddingVertical="@dimen/base_spacing"
                             android:stepSize="1"
                             android:value="100"
                             android:valueFrom="0"
                             android:valueTo="200"
-                            app:tickVisible="false"
-                            app:trackHeight="24dp"
-                            app:thumbElevation="0dp"
                             app:thumbColor="?colorOnPrimary"
-                            app:trackColorInactive="?colorOnSurfaceVariant" />
+                            app:thumbElevation="0dp"
+                            app:tickVisible="false"
+                            app:trackColorInactive="?colorOnSurfaceVariant"
+                            app:trackHeight="@dimen/base_icon_size" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -176,21 +180,23 @@
                             android:layout_height="wrap_content"
                             android:paddingHorizontal="8dp"
                             android:text="@string/long_press"
-                            android:textColor="?colorOnSurfaceVariant" />
+                            android:textColor="?colorOnSurfaceVariant"
+                            android:textSize="@dimen/base_font_size" />
 
                         <com.google.android.material.slider.Slider
                             android:id="@+id/longPress"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:paddingVertical="@dimen/base_spacing"
                             android:stepSize="5"
                             android:value="500"
                             android:valueFrom="0"
                             android:valueTo="2000"
-                            app:tickVisible="false"
-                            app:trackHeight="24dp"
-                            app:thumbElevation="0dp"
                             app:thumbColor="?colorOnPrimary"
-                            app:trackColorInactive="?colorOnSurfaceVariant" />
+                            app:thumbElevation="0dp"
+                            app:tickVisible="false"
+                            app:trackColorInactive="?colorOnSurfaceVariant"
+                            app:trackHeight="@dimen/base_icon_size" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -205,21 +211,23 @@
                             android:layout_height="wrap_content"
                             android:paddingHorizontal="8dp"
                             android:text="@string/double_click"
-                            android:textColor="?colorOnSurfaceVariant" />
+                            android:textColor="?colorOnSurfaceVariant"
+                            android:textSize="@dimen/base_font_size" />
 
                         <com.google.android.material.slider.Slider
                             android:id="@+id/doubleClick"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:paddingVertical="@dimen/base_spacing"
                             android:stepSize="5"
                             android:value="250"
                             android:valueFrom="100"
                             android:valueTo="700"
-                            app:trackHeight="24dp"
-                            app:tickVisible="false"
-                            app:thumbElevation="0dp"
                             app:thumbColor="?colorOnPrimary"
-                            app:trackColorInactive="?colorOnSurfaceVariant" />
+                            app:thumbElevation="0dp"
+                            app:tickVisible="false"
+                            app:trackColorInactive="?colorOnSurfaceVariant"
+                            app:trackHeight="@dimen/base_icon_size" />
                     </LinearLayout>
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
@@ -255,19 +263,20 @@
                         android:paddingHorizontal="16dp"
                         android:paddingTop="12dp"
                         android:paddingBottom="20dp"
-                        android:text="@string/default_button" />
+                        android:text="@string/default_button"
+                        android:textSize="@dimen/base_font_size" />
 
                     <FrameLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingBottom="16dp"
-                        android:layout_gravity="center">
+                        android:layout_gravity="center"
+                        android:paddingBottom="16dp">
 
                         <dev.lucasnlm.antimine.control.SwitchButtonView
                             android:id="@+id/switch_button_view"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"/>
+                            android:layout_gravity="center_horizontal" />
 
                     </FrameLayout>
 
diff --git a/control/src/main/res/layout/switch_button.xml b/control/src/main/res/layout/switch_button.xml
index b353ca3eb..0903e7281 100644
--- a/control/src/main/res/layout/switch_button.xml
+++ b/control/src/main/res/layout/switch_button.xml
@@ -35,11 +35,14 @@
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/questionButton"
                     style="@style/Widget.App.Button.OutlinedButton.IconOnly"
-                    android:layout_width="52dp"
-                    android:layout_height="52dp"
-                    android:layout_gravity="center"
+                    android:layout_width="@dimen/base_switch_button_size"
+                    android:layout_height="@dimen/base_switch_button_size"
+                    android:padding="0dp"
                     android:visibility="gone"
                     app:icon="@drawable/question"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="@dimen/base_icon_control_size"
                     app:strokeWidth="0dp"
                     tools:visibility="visible" />
             </com.google.android.material.card.MaterialCardView>
@@ -57,10 +60,13 @@
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/flagButton"
                     style="@style/Widget.App.Button.OutlinedButton.IconOnly"
-                    android:layout_width="52dp"
-                    android:layout_height="52dp"
-                    android:layout_gravity="center"
+                    android:layout_width="@dimen/base_switch_button_size"
+                    android:layout_height="@dimen/base_switch_button_size"
+                    android:padding="0dp"
                     app:icon="@drawable/flag"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="@dimen/base_icon_control_size"
                     app:strokeWidth="0dp" />
 
             </com.google.android.material.card.MaterialCardView>
@@ -78,10 +84,13 @@
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/openButton"
                     style="@style/Widget.App.Button.OutlinedButton.IconOnly"
-                    android:layout_width="52dp"
-                    android:layout_height="52dp"
-                    android:layout_gravity="center"
+                    android:layout_width="@dimen/base_switch_button_size"
+                    android:layout_height="@dimen/base_switch_button_size"
+                    android:padding="0dp"
                     app:icon="@drawable/touch"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="@dimen/base_icon_control_size"
                     app:strokeWidth="0dp" />
             </com.google.android.material.card.MaterialCardView>
         </LinearLayout>
diff --git a/control/src/main/res/layout/view_control_item.xml b/control/src/main/res/layout/view_control_item.xml
index 4e641d03d..54be3926d 100644
--- a/control/src/main/res/layout/view_control_item.xml
+++ b/control/src/main/res/layout/view_control_item.xml
@@ -43,6 +43,7 @@
                     android:alpha="1.0"
                     android:gravity="center_horizontal"
                     android:textColor="?colorOnSurfaceVariant"
+                    android:textSize="@dimen/base_font_size"
                     android:textStyle="bold"
                     app:layout_constraintStart_toEndOf="@id/radio"
                     app:layout_constraintTop_toTopOf="parent"
@@ -54,6 +55,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
                     android:textColor="?colorOnSurfaceVariant"
+                    android:textSize="@dimen/base_font_size"
                     app:layout_constraintBottom_toBottomOf="@id/firstAction"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/firstAction"
@@ -79,6 +81,7 @@
                     android:alpha="1.0"
                     android:gravity="center_horizontal"
                     android:textColor="?colorOnSurfaceVariant"
+                    android:textSize="@dimen/base_font_size"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toEndOf="@id/radio"
@@ -91,6 +94,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
                     android:textColor="?colorOnSurfaceVariant"
+                    android:textSize="@dimen/base_font_size"
                     app:layout_constraintBottom_toBottomOf="@id/secondAction"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/secondAction"
diff --git a/control/src/main/res/layout/view_control_item_simple.xml b/control/src/main/res/layout/view_control_item_simple.xml
index 50e2c643f..230bde9c4 100644
--- a/control/src/main/res/layout/view_control_item_simple.xml
+++ b/control/src/main/res/layout/view_control_item_simple.xml
@@ -20,7 +20,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:strokeColor="?colorControlNormal">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
@@ -34,12 +34,13 @@
                 android:paddingVertical="20dp"
                 android:textColor="?colorOnSurfaceVariant"
                 android:textStyle="bold"
+                android:textSize="@dimen/base_font_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="First Action" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </FrameLayout>
     </com.google.android.material.card.MaterialCardView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/core/src/main/java/dev/lucasnlm/antimine/core/repository/DimensionRepository.kt b/core/src/main/java/dev/lucasnlm/antimine/core/repository/DimensionRepository.kt
index 93e6e30f5..d0178bc51 100644
--- a/core/src/main/java/dev/lucasnlm/antimine/core/repository/DimensionRepository.kt
+++ b/core/src/main/java/dev/lucasnlm/antimine/core/repository/DimensionRepository.kt
@@ -1,6 +1,6 @@
 package dev.lucasnlm.antimine.core.repository
 
-import dev.lucasnlm.antimine.core.models.MinefieldSize
+import android.util.DisplayMetrics
 
 interface DimensionRepository {
     fun areaSize(): Float
@@ -9,7 +9,7 @@ interface DimensionRepository {
 
     fun areaSeparator(): Float
 
-    fun displaySize(): MinefieldSize
+    fun displayMetrics(): DisplayMetrics
 
     fun actionBarSizeWithStatus(): Int
 
diff --git a/core/src/main/java/dev/lucasnlm/antimine/core/repository/DimensionRepositoryImpl.kt b/core/src/main/java/dev/lucasnlm/antimine/core/repository/DimensionRepositoryImpl.kt
index 29cf9763c..03620a8c5 100644
--- a/core/src/main/java/dev/lucasnlm/antimine/core/repository/DimensionRepositoryImpl.kt
+++ b/core/src/main/java/dev/lucasnlm/antimine/core/repository/DimensionRepositoryImpl.kt
@@ -5,11 +5,12 @@ import android.content.res.Configuration
 import android.content.res.Resources
 import android.content.res.TypedArray
 import android.os.Build
+import android.util.DisplayMetrics
 import android.view.KeyCharacterMap
 import android.view.KeyEvent
 import android.view.ViewConfiguration
 import dev.lucasnlm.antimine.core.R
-import dev.lucasnlm.antimine.core.models.MinefieldSize
+import kotlin.math.min
 
 class DimensionRepositoryImpl(
     private val context: Context,
@@ -28,7 +29,13 @@ class DimensionRepositoryImpl(
     }
 
     override fun areaSize(): Float {
-        return displaySize().width / 11.0f
+        val displayMetrics = displayMetrics()
+        val minSide =
+            min(
+                displayMetrics.widthPixels,
+                displayMetrics.heightPixels,
+            )
+        return minSide / 11.0f
     }
 
     override fun areaSeparator(): Float {
@@ -39,10 +46,9 @@ class DimensionRepositoryImpl(
         return areaSize() + 2 * areaSeparator()
     }
 
-    override fun displaySize(): MinefieldSize =
-        with(Resources.getSystem().displayMetrics) {
-            return MinefieldSize(this.widthPixels, this.heightPixels)
-        }
+    override fun displayMetrics(): DisplayMetrics {
+        return Resources.getSystem().displayMetrics
+    }
 
     override fun actionBarSizeWithStatus(): Int {
         val styledAttributes: TypedArray =
diff --git a/core/src/main/java/dev/lucasnlm/antimine/core/repository/WearDimensionRepositoryImpl.kt b/core/src/main/java/dev/lucasnlm/antimine/core/repository/WearDimensionRepositoryImpl.kt
index 528f97c5e..298a855fa 100644
--- a/core/src/main/java/dev/lucasnlm/antimine/core/repository/WearDimensionRepositoryImpl.kt
+++ b/core/src/main/java/dev/lucasnlm/antimine/core/repository/WearDimensionRepositoryImpl.kt
@@ -2,15 +2,15 @@ package dev.lucasnlm.antimine.core.repository
 
 import android.content.Context
 import android.content.res.Resources
+import android.util.DisplayMetrics
 import dev.lucasnlm.antimine.core.R
-import dev.lucasnlm.antimine.core.models.MinefieldSize
 
 class WearDimensionRepositoryImpl(
     private val context: Context,
 ) : DimensionRepository {
 
     override fun areaSize(): Float {
-        return displaySize().width / 5.0f
+        return displayMetrics().widthPixels / 5.0f
     }
 
     override fun areaSeparator(): Float {
@@ -21,10 +21,9 @@ class WearDimensionRepositoryImpl(
         return areaSize() + 2 * areaSeparator()
     }
 
-    override fun displaySize(): MinefieldSize =
-        with(Resources.getSystem().displayMetrics) {
-            return MinefieldSize(this.widthPixels, this.heightPixels)
-        }
+    override fun displayMetrics(): DisplayMetrics {
+        return Resources.getSystem().displayMetrics
+    }
 
     override fun actionBarSizeWithStatus(): Int {
         return 0
diff --git a/core/src/main/res/values-land/dimens.xml b/core/src/main/res/values-land/dimens.xml
index 534dc8017..90c27d52c 100644
--- a/core/src/main/res/values-land/dimens.xml
+++ b/core/src/main/res/values-land/dimens.xml
@@ -1,3 +1,4 @@
 <resources>
-    <dimen name="main_activity_padding">96dp</dimen>
+    <dimen name="root_vertical_spacing">16dp</dimen>
+    <dimen name="root_horizontal_spacing">96dp</dimen>
 </resources>
diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
index 296af9883..402ac18a3 100644
--- a/core/src/main/res/values/dimens.xml
+++ b/core/src/main/res/values/dimens.xml
@@ -1,5 +1,6 @@
 <resources>
-    <dimen name="main_activity_padding">16dp</dimen>
+    <dimen name="root_vertical_spacing">4dp</dimen>
+    <dimen name="root_horizontal_spacing">16dp</dimen>
 
     <dimen name="field_size">38dp</dimen>
     <dimen name="field_radius">1.5dp</dimen>
diff --git a/donation/src/main/res/layout/activity_donation.xml b/donation/src/main/res/layout/activity_donation.xml
index 91a9a14b8..798b4f5c1 100644
--- a/donation/src/main/res/layout/activity_donation.xml
+++ b/donation/src/main/res/layout/activity_donation.xml
@@ -21,7 +21,7 @@
         style="?attr/materialCardViewFilledStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/main_activity_padding"
+        android:layout_marginHorizontal="@dimen/root_horizontal_spacing"
         android:layout_marginBottom="12dp"
         app:contentPadding="16dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -57,7 +57,7 @@
         style="?attr/materialCardViewFilledStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/main_activity_padding"
+        android:layout_marginHorizontal="@dimen/root_horizontal_spacing"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="12dp"
         app:contentPadding="16dp"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 88f4ea1d4..117b8b5f3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,10 +6,10 @@ wearMinSdk = "25"
 compileSdk = "34"
 
 acra = "5.11.2"
-activityKtx = "1.8.0"
+activityKtx = "1.8.1"
 amplitude = "2.32.1"
 appcompat = "1.6.1"
-billingKtx = "6.0.1"
+billingKtx = "6.1.0"
 bugsnagAndroid = "5.31.2"
 constraintlayout = "2.1.4"
 coreKtx = "1.12.0"
@@ -42,9 +42,8 @@ robolectric = "4.5.1"
 runner = "1.5.2"
 
 # Plugins
-bugsnag = "8.1.0"
-android = "8.1.3"
-kotlin = "1.9.10"
+android = "8.1.4"
+kotlin = "1.9.20"
 googleServices = "4.4.0"
 wear = "1.3.0"
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 130f27322..c6d88aed1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -28,4 +28,5 @@ include(
     ":audio",
     ":audio-low",
     ":utils",
+    ":auto",
 )
diff --git a/themes/src/main/java/dev/lucasnlm/antimine/themes/ThemeActivity.kt b/themes/src/main/java/dev/lucasnlm/antimine/themes/ThemeActivity.kt
index b259b3d49..da73b6271 100644
--- a/themes/src/main/java/dev/lucasnlm/antimine/themes/ThemeActivity.kt
+++ b/themes/src/main/java/dev/lucasnlm/antimine/themes/ThemeActivity.kt
@@ -87,15 +87,15 @@ class ThemeActivity : ThemedActivity() {
         }
 
         lifecycleScope.launch {
-            val size = dimensionRepository.displaySize()
+            val size = dimensionRepository.displayMetrics()
             val themesColumns =
-                if (size.width > size.height) {
+                if (size.widthPixels > size.heightPixels) {
                     5
                 } else {
                     3
                 }
             val skinsColumns =
-                if (size.width > size.height) {
+                if (size.widthPixels > size.heightPixels) {
                     2
                 } else {
                     5
@@ -147,7 +147,7 @@ class ThemeActivity : ThemedActivity() {
                 layoutManager =
                     object : GridLayoutManager(context, skinsColumns) {
                         override fun checkLayoutParams(layoutParams: RecyclerView.LayoutParams?): Boolean {
-                            val lpSize = width / (skinsColumns + 1)
+                            val lpSize = binding.skins.measuredWidth / (skinsColumns + 1)
                             layoutParams?.height = lpSize
                             layoutParams?.width = lpSize
                             return true
diff --git a/themes/src/main/res/layout-land/activity_theme.xml b/themes/src/main/res/layout-land/activity_theme.xml
index 7d8be5685..319031ebf 100644
--- a/themes/src/main/res/layout-land/activity_theme.xml
+++ b/themes/src/main/res/layout-land/activity_theme.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:fitsSystemWindows="true"
     tools:context=".ThemeActivity">
 
@@ -22,35 +22,35 @@
         android:id="@+id/unlockAll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/main_activity_padding"
-        android:layout_marginTop="8dp"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        android:layout_marginTop="16dp"
+        android:layout_marginHorizontal="@dimen/root_horizontal_spacing"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintTop_toBottomOf="@id/toolbar" />
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/skinsCard"
         style="?attr/materialCardViewFilledStyle"
         android:layout_width="164dp"
         android:layout_height="0dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginVertical="@dimen/root_vertical_spacing"
+        android:layout_marginStart="@dimen/root_horizontal_spacing"
         android:layout_marginEnd="8dp"
         app:contentPadding="8dp"
-        app:layout_constraintTop_toBottomOf="@id/unlockAll"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/themesCard"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/unlockAll">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/skins"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:overScrollMode="never"
             android:fadingEdge="vertical"
             android:fadingEdgeLength="30dp"
             android:fillViewport="false"
-            android:requiresFadingEdge="vertical"/>
+            android:overScrollMode="never"
+            android:requiresFadingEdge="vertical" />
 
     </com.google.android.material.card.MaterialCardView>
 
@@ -59,14 +59,14 @@
         style="?attr/materialCardViewFilledStyle"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:contentPadding="8dp"
+        android:layout_marginVertical="@dimen/root_vertical_spacing"
         android:layout_marginStart="8dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintTop_toBottomOf="@id/unlockAll"
-        app:layout_constraintStart_toEndOf="@+id/skinsCard"
+        android:layout_marginEnd="@dimen/root_horizontal_spacing"
+        app:contentPadding="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintStart_toEndOf="@+id/skinsCard"
+        app:layout_constraintTop_toBottomOf="@id/unlockAll">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/themes"
@@ -74,10 +74,10 @@
             android:layout_height="match_parent"
             android:clipToPadding="false"
             android:fadeScrollbars="false"
-            android:overScrollMode="never"
             android:fadingEdge="vertical"
             android:fadingEdgeLength="30dp"
             android:fillViewport="false"
-            android:requiresFadingEdge="vertical"/>
+            android:overScrollMode="never"
+            android:requiresFadingEdge="vertical" />
     </com.google.android.material.card.MaterialCardView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/themes/src/main/res/layout/activity_theme.xml b/themes/src/main/res/layout/activity_theme.xml
index 900b8ef69..bb46f0e1e 100644
--- a/themes/src/main/res/layout/activity_theme.xml
+++ b/themes/src/main/res/layout/activity_theme.xml
@@ -23,7 +23,7 @@
         style="?attr/materialCardViewFilledStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/main_activity_padding"
+        android:layout_marginHorizontal="@dimen/root_horizontal_spacing"
         android:layout_marginBottom="12dp"
         android:layout_marginTop="8dp"
         app:contentPadding="8dp"
@@ -48,7 +48,7 @@
         android:id="@+id/unlockAll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/main_activity_padding"
+        android:paddingHorizontal="@dimen/root_horizontal_spacing"
         android:layout_marginTop="16dp"
         app:layout_constraintEnd_toEndOf="@id/skinsCard"
         app:layout_constraintStart_toStartOf="@id/skinsCard"
diff --git a/themes/src/main/res/values/dimens.xml b/themes/src/main/res/values/dimens.xml
index 11e96b91b..e3759945a 100644
--- a/themes/src/main/res/values/dimens.xml
+++ b/themes/src/main/res/values/dimens.xml
@@ -1,3 +1,3 @@
 <resources>
-    <dimen name="theme_divider">5dp</dimen>
+    <dimen name="theme_divider">8dp</dimen>
 </resources>
diff --git a/tutorial/src/main/res/layout/tutorial_activity.xml b/tutorial/src/main/res/layout/tutorial_activity.xml
index 95f0e6b86..21f05f0e6 100644
--- a/tutorial/src/main/res/layout/tutorial_activity.xml
+++ b/tutorial/src/main/res/layout/tutorial_activity.xml
@@ -21,8 +21,10 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:fadeScrollbars="false"
-        android:paddingHorizontal="@dimen/main_activity_padding"
+        android:paddingHorizontal="@dimen/root_horizontal_spacing"
+        android:paddingVertical="@dimen/root_vertical_spacing"
         android:scrollbarStyle="outsideInset"
+        android:scrollbarSize="@dimen/base_scrollbar_size"
         app:layout_constraintBottom_toTopOf="@+id/playGame"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -34,11 +36,12 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/basic"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:gravity="start|center_vertical"
                 android:paddingBottom="16dp"
                 android:text="@string/tutorial_basic"
-                android:textSize="18sp"
+                android:textSize="@dimen/base_font_size"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -62,11 +65,12 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text1"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:gravity="start|center_vertical"
                 android:paddingVertical="16dp"
                 android:text="@string/tutorial_text_1"
-                android:textSize="18sp"
+                android:textSize="@dimen/base_font_size"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/image" />
@@ -90,11 +94,12 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text2"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:gravity="start|center_vertical"
                 android:paddingVertical="16dp"
                 android:text="@string/tutorial_text_2"
-                android:textSize="18sp"
+                android:textSize="@dimen/base_font_size"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/image2" />
@@ -118,11 +123,12 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text3"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:gravity="start|center_vertical"
                 android:paddingVertical="16dp"
                 android:text="@string/tutorial_text_3"
-                android:textSize="18sp"
+                android:textSize="@dimen/base_font_size"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/image3" />
@@ -147,11 +153,12 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text4"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:gravity="start|center_vertical"
                 android:paddingVertical="16dp"
                 android:text="@string/tutorial_text_4"
-                android:textSize="18sp"
+                android:textSize="@dimen/base_font_size"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/image4" />
@@ -161,8 +168,8 @@
     <com.google.android.material.divider.MaterialDivider
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:dividerInsetEnd="16dp"
-        app:dividerInsetStart="16dp"
+        app:dividerInsetEnd="@dimen/root_horizontal_spacing"
+        app:dividerInsetStart="@dimen/root_horizontal_spacing"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/scrollView" />
@@ -170,9 +177,9 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/playGame"
         style="@style/CustomButton"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
+        android:layout_marginHorizontal="@dimen/root_horizontal_spacing"
         android:gravity="center"
         android:paddingVertical="16dp"
         android:text="@string/start"
diff --git a/ui/src/main/res/values-car/specifiq.xml b/ui/src/main/res/values-car/specifiq.xml
new file mode 100644
index 000000000..976124d3c
--- /dev/null
+++ b/ui/src/main/res/values-car/specifiq.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="base_spacing">16dp</dimen>
+    <dimen name="base_icon_size">28dp</dimen>
+    <dimen name="base_icon_control_size">28dp</dimen>
+    <dimen name="base_font_size">24sp</dimen>
+    <bool name="base_font_bold">false</bool>
+    <dimen name="base_icon_padding">16dp</dimen>
+    <dimen name="base_scrollbar_size">12dp</dimen>
+    <dimen name="base_switch_button_size">72dp</dimen>
+    <dimen name="base_icon_bar_size">64dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/ui/src/main/res/values/specifiq.xml b/ui/src/main/res/values/specifiq.xml
new file mode 100644
index 000000000..75a9840d2
--- /dev/null
+++ b/ui/src/main/res/values/specifiq.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="base_spacing">4dp</dimen>
+    <dimen name="base_icon_size">20dp</dimen>
+    <dimen name="base_icon_control_size">24dp</dimen>
+    <dimen name="base_font_size">14sp</dimen>
+    <bool name="base_font_bold">true</bool>
+    <dimen name="base_icon_padding">8dp</dimen>
+    <dimen name="base_scrollbar_size">4dp</dimen>
+    <dimen name="base_switch_button_size">52dp</dimen>
+    <dimen name="base_icon_bar_size">52dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/ui/src/main/res/values/themes.xml b/ui/src/main/res/values/themes.xml
index 3df5a4fbd..d6f8d5c6e 100644
--- a/ui/src/main/res/values/themes.xml
+++ b/ui/src/main/res/values/themes.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="CustomToolbar" parent="Widget.MaterialComponents.Toolbar">
+        <item name="titleTextAppearance">?attr/textAppearanceHeadline6</item>
+    </style>
+
     <style name="ShapeAppearance.App.SmallComponent" parent="ShapeAppearance.Material3.SmallComponent">
         <item name="cornerFamily">cut</item>
         <item name="cornerSize">0dp</item>
@@ -19,17 +24,20 @@
     </style>
 
     <style name="SectionTitle" parent="@style/TextAppearance.Material3.TitleMedium">
-        <item name="android:textStyle">bold</item>
+        <item name="android:textStyle">@bool/base_font_bold</item>
         <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">@dimen/base_font_size</item>
     </style>
 
     <style name="CustomButtonActive" parent="@style/Widget.Material3.Button.IconButton.Filled">
-        <item name="android:textStyle">bold</item>
+        <item name="android:textStyle">@bool/base_font_bold</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:gravity">start</item>
+        <item name="android:textSize">@dimen/base_font_size</item>
         <item name="elevation">0dp</item>
         <item name="cornerRadius">8dp</item>
-        <item name="iconPadding">8dp</item>
+        <item name="iconPadding">@dimen/base_icon_padding</item>
+        <item name="iconSize">@dimen/base_icon_size</item>
         <item name="startIconContentDescription">null</item>
         <item name="android:soundEffectsEnabled">false</item>
     </style>
@@ -37,23 +45,27 @@
     <style name="CustomButtonOutlined" parent="@style/Widget.Material3.Button.IconButton.Outlined">
         <item name="strokeColor">?colorPrimaryDark</item>
         <item name="strokeWidth">1dp</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:textStyle">@bool/base_font_bold</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:gravity">start</item>
+        <item name="android:textSize">@dimen/base_font_size</item>
         <item name="elevation">0dp</item>
         <item name="cornerRadius">8dp</item>
-        <item name="iconPadding">8dp</item>
+        <item name="iconPadding">@dimen/base_icon_padding</item>
+        <item name="iconSize">@dimen/base_icon_size</item>
         <item name="startIconContentDescription">null</item>
         <item name="android:soundEffectsEnabled">false</item>
     </style>
 
     <style name="CustomButton" parent="@style/Widget.Material3.Button.IconButton">
-        <item name="android:textStyle">bold</item>
+        <item name="android:textStyle">@bool/base_font_bold</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:gravity">start</item>
+        <item name="android:textSize">@dimen/base_font_size</item>
         <item name="elevation">0dp</item>
         <item name="cornerRadius">8dp</item>
-        <item name="iconPadding">8dp</item>
+        <item name="iconPadding">@dimen/base_icon_padding</item>
+        <item name="iconSize">@dimen/base_icon_size</item>
         <item name="startIconContentDescription">null</item>
         <item name="android:soundEffectsEnabled">false</item>
     </style>
@@ -61,6 +73,7 @@
     <style name="CustomButtonFlat" parent="@style/Widget.Material3.Button.TextButton">
         <item name="android:textAllCaps">true</item>
         <item name="android:gravity">start</item>
+        <item name="android:textSize">@dimen/base_font_size</item>
         <item name="elevation">0dp</item>
         <item name="cornerRadius">0dp</item>
         <item name="startIconContentDescription">null</item>
@@ -74,15 +87,19 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowTranslucentNavigation">true</item>
-        <item name="android:windowSplashScreenBackground" tools:targetApi="s">@color/launcher_background_night</item>
+        <item name="android:windowSplashScreenBackground" tools:targetApi="s">
+            @color/launcher_background_night
+        </item>
         <item name="android:windowSplashScreenAnimationDuration" tools:targetApi="s">1000</item>
-        <item name="android:windowSplashScreenBehavior" tools:targetApi="tiramisu">icon_preferred</item>
+        <item name="android:windowSplashScreenBehavior" tools:targetApi="tiramisu">icon_preferred
+        </item>
     </style>
 
     <style name="AntimineLight" parent="Theme.Material3.DynamicColors.Light">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
+
     <style name="AntimineDark" parent="Theme.Material3.DynamicColors.Dark">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -197,7 +214,8 @@
         <item name="colorSecondary">@color/colors_garden_light_secondary</item>
         <item name="colorOnSecondary">@color/colors_garden_light_onSecondary</item>
         <item name="colorSecondaryContainer">@color/colors_garden_light_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/colors_garden_light_onSecondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/colors_garden_light_onSecondaryContainer
+        </item>
         <item name="colorTertiary">@color/colors_garden_light_tertiary</item>
         <item name="colorOnTertiary">@color/colors_garden_light_onTertiary</item>
         <item name="colorTertiaryContainer">@color/colors_garden_light_tertiaryContainer</item>
@@ -477,7 +495,8 @@
         <item name="colorSecondary">@color/colors_light_purple_secondary</item>
         <item name="colorOnSecondary">@color/colors_light_purple_onSecondary</item>
         <item name="colorSecondaryContainer">@color/colors_light_purple_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/colors_light_purple_onSecondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/colors_light_purple_onSecondaryContainer
+        </item>
         <item name="colorTertiary">@color/colors_light_purple_tertiary</item>
         <item name="colorOnTertiary">@color/colors_light_purple_onTertiary</item>
         <item name="colorTertiaryContainer">@color/colors_light_purple_tertiaryContainer</item>
@@ -617,7 +636,8 @@
         <item name="colorSecondary">@color/colors_light_banana_secondary</item>
         <item name="colorOnSecondary">@color/colors_light_banana_onSecondary</item>
         <item name="colorSecondaryContainer">@color/colors_light_banana_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/colors_light_banana_onSecondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/colors_light_banana_onSecondaryContainer
+        </item>
         <item name="colorTertiary">@color/colors_light_banana_tertiary</item>
         <item name="colorOnTertiary">@color/colors_light_banana_onTertiary</item>
         <item name="colorTertiaryContainer">@color/colors_light_banana_tertiaryContainer</item>
diff --git a/wear/src/main/res/layout/activity_tutorial.xml b/wear/src/main/res/layout/activity_tutorial.xml
index 8d23991ff..4840afac0 100644
--- a/wear/src/main/res/layout/activity_tutorial.xml
+++ b/wear/src/main/res/layout/activity_tutorial.xml
@@ -13,7 +13,7 @@
         android:layout_height="match_parent"
         android:clipChildren="false"
         android:fadeScrollbars="false"
-        android:paddingHorizontal="@dimen/main_activity_padding"
+        android:paddingHorizontal="@dimen/root_horizontal_spacing"
         android:paddingTop="24dp"
         android:clipToPadding="false"
         android:scrollbarStyle="outsideInset">