diff --git a/app/src/main/java/ani/dantotsu/media/Character.kt b/app/src/main/java/ani/dantotsu/media/Character.kt
index 48746505..27300e46 100644
--- a/app/src/main/java/ani/dantotsu/media/Character.kt
+++ b/app/src/main/java/ani/dantotsu/media/Character.kt
@@ -2,7 +2,6 @@ package ani.dantotsu.media
 
 import ani.dantotsu.connections.anilist.api.FuzzyDate
 import ani.dantotsu.connections.anilist.api.Query
-import org.checkerframework.checker.units.qual.A
 import java.io.Serializable
 
 data class Character(
diff --git a/app/src/main/java/ani/dantotsu/media/OtherDetailsViewModel.kt b/app/src/main/java/ani/dantotsu/media/OtherDetailsViewModel.kt
index 88ccc93f..0be0fc22 100644
--- a/app/src/main/java/ani/dantotsu/media/OtherDetailsViewModel.kt
+++ b/app/src/main/java/ani/dantotsu/media/OtherDetailsViewModel.kt
@@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import ani.dantotsu.connections.anilist.Anilist
-import org.checkerframework.checker.units.qual.A
 import java.text.DateFormat
 import java.util.Date
 
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsAboutActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsAboutActivity.kt
index 25f73f1c..d12da07f 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsAboutActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsAboutActivity.kt
@@ -41,7 +41,7 @@ class SettingsAboutActivity : AppCompatActivity() {
                 topMargin = statusBarHeight
                 bottomMargin = navBarHeight
             }
-            settingsAboutTitle.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
+            aboutSettingsBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
 
             settingsDev.setOnClickListener {
                 DevelopersDialogFragment().show(supportFragmentManager, "dialog")
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsAccountActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsAccountActivity.kt
index 8344c1a5..fd3300a4 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsAccountActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsAccountActivity.kt
@@ -47,7 +47,7 @@ class SettingsAccountActivity : AppCompatActivity() {
                 topMargin = statusBarHeight
                 bottomMargin = navBarHeight
             }
-            settingsaccountTitle.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
+            accountSettingsBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
 
             settingsAccountHelp.setOnClickListener {
                 CustomBottomDialog.newInstance().apply {
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsAnimeActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsAnimeActivity.kt
index 5c517843..9ea39044 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsAnimeActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsAnimeActivity.kt
@@ -40,7 +40,7 @@ class SettingsAnimeActivity: AppCompatActivity(){
             settingsPlayer.setOnClickListener {
                 startActivity(Intent(context, PlayerSettingsActivity::class.java))
             }
-            settingsAnimeTitle.setOnClickListener {
+            animeSettingsBack.setOnClickListener {
                 onBackPressedDispatcher.onBackPressed()
             }
             purgeAnimeDownloads.setOnClickListener {
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsCommonActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsCommonActivity.kt
index d75ed217..ea24924a 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsCommonActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsCommonActivity.kt
@@ -98,7 +98,7 @@ class SettingsCommonActivity: AppCompatActivity(){
                 topMargin = statusBarHeight
                 bottomMargin = navBarHeight
             }
-            settingsCommonTitle.setOnClickListener {
+            commonSettingsBack.setOnClickListener {
                 onBackPressedDispatcher.onBackPressed()
             }
             settingsDownloadManager.setOnClickListener {
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsExtensionsActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsExtensionsActivity.kt
index 501d2fd9..b354fe98 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsExtensionsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsExtensionsActivity.kt
@@ -149,7 +149,7 @@ class SettingsExtensionsActivity: AppCompatActivity() {
                 topMargin = statusBarHeight
                 bottomMargin = navBarHeight
             }
-            settingsExtensionsTitle.setOnClickListener{
+            extensionSettingsBack.setOnClickListener{
                 onBackPressedDispatcher.onBackPressed()
             }
             setExtensionOutput(animeRepoInventory, MediaType.ANIME)
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsMangaActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsMangaActivity.kt
index c4b08d40..e42034a0 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsMangaActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsMangaActivity.kt
@@ -36,7 +36,7 @@ class SettingsMangaActivity: AppCompatActivity(){
                 topMargin = statusBarHeight
                 bottomMargin = navBarHeight
             }
-            settingsMangaTitle.setOnClickListener {
+            mangaSettingsBack.setOnClickListener {
                 onBackPressedDispatcher.onBackPressed()
             }
             purgeMangaDownloads.setOnClickListener {
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsNotificationActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsNotificationActivity.kt
index f9ca378f..eaf6909e 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsNotificationActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsNotificationActivity.kt
@@ -46,7 +46,7 @@ class SettingsNotificationActivity: AppCompatActivity(){
                 topMargin = statusBarHeight
                 bottomMargin = navBarHeight
             }
-            settingsNotificationsTitle.setOnClickListener {
+            notificationSettingsBack.setOnClickListener {
                 onBackPressedDispatcher.onBackPressed()
             }
             settingsSubscriptionsTime.text =
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsThemeActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsThemeActivity.kt
index c4d629b8..3f23989a 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsThemeActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsThemeActivity.kt
@@ -33,7 +33,7 @@ class SettingsThemeActivity : AppCompatActivity() {
                 topMargin = statusBarHeight
                 bottomMargin = navBarHeight
             }
-            settingsThemeTitle.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
+            themeSettingsBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
 
             settingsUseMaterialYou.apply {
                 isChecked = PrefManager.getVal(PrefName.UseMaterialYou)
diff --git a/app/src/main/res/drawable/ic_lightbulb_24.xml b/app/src/main/res/drawable/ic_lightbulb_24.xml
new file mode 100644
index 00000000..487b9ff8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lightbulb_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880ZM320,760L320,680L640,680L640,760L320,760ZM330,640Q261,599 220.5,530Q180,461 180,380Q180,255 267.5,167.5Q355,80 480,80Q605,80 692.5,167.5Q780,255 780,380Q780,461 739.5,530Q699,599 630,640L330,640ZM354,560L606,560Q651,528 675.5,481Q700,434 700,380Q700,288 636,224Q572,160 480,160Q388,160 324,224Q260,288 260,380Q260,434 284.5,481Q309,528 354,560ZM480,560Q480,560 480,560Q480,560 480,560Q480,560 480,560Q480,560 480,560Q480,560 480,560Q480,560 480,560Q480,560 480,560Q480,560 480,560L480,560Z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_settings_about.xml b/app/src/main/res/layout/activity_settings_about.xml
index c2811c0c..348945b4 100644
--- a/app/src/main/res/layout/activity_settings_about.xml
+++ b/app/src/main/res/layout/activity_settings_about.xml
@@ -11,23 +11,54 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingStart="31dp"
-        android:paddingEnd="31dp">
+        android:paddingStart="32dp"
+        android:paddingEnd="32dp">
 
-        <TextView
-            android:id="@+id/settingsAboutTitle"
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="-16dp"
+            android:layout_marginTop="32dp"
+            app:cardBackgroundColor="@color/nav_bg_inv"
+            app:cardCornerRadius="16dp"
+            app:cardElevation="0dp">
+
+            <ImageButton
+                android:id="@+id/aboutSettingsBack"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:background="@color/nav_bg_inv"
+                android:paddingVertical="16dp"
+                app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
+        </androidx.cardview.widget.CardView>
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="64dp"
-            android:layout_marginTop="16dp"
-            android:fontFamily="@font/poppins"
-            android:gravity="center"
-            android:paddingEnd="28dp"
-            android:text="@string/about"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
-            app:drawableTint="?attr/colorOnBackground"
-            tools:ignore="RtlSymmetry" />
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            tools:ignore="UseCompoundDrawables">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="32dp"
+                android:layout_weight="1"
+                android:text="@string/about"
+                android:textSize="28sp" />
+
+            <ImageView
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:layout_gravity="center"
+                android:padding="24dp"
+                app:srcCompat="@drawable/ic_round_info_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription" />
+
+        </LinearLayout>
 
         <Button
             android:id="@+id/settingsFAQ"
diff --git a/app/src/main/res/layout/activity_settings_accounts.xml b/app/src/main/res/layout/activity_settings_accounts.xml
index f0f29782..e1f7eccf 100644
--- a/app/src/main/res/layout/activity_settings_accounts.xml
+++ b/app/src/main/res/layout/activity_settings_accounts.xml
@@ -11,23 +11,53 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingStart="31dp"
-        android:paddingEnd="31dp">
+        android:paddingStart="32dp"
+        android:paddingEnd="32dp">
 
-        <TextView
-            android:id="@+id/settingsaccountTitle"
+        <androidx.cardview.widget.CardView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="-16dp"
+            android:layout_marginTop="32dp"
+            app:cardBackgroundColor="@color/nav_bg_inv"
+            app:cardCornerRadius="16dp"
+            app:cardElevation="0dp">
+
+            <ImageButton
+                android:id="@+id/accountSettingsBack"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:background="@color/nav_bg_inv"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
+        </androidx.cardview.widget.CardView>
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="64dp"
-            android:layout_marginTop="16dp"
-            android:fontFamily="@font/poppins"
-            android:gravity="center"
-            android:paddingEnd="28dp"
-            android:text="@string/accounts"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
-            app:drawableTint="?attr/colorOnBackground"
-            tools:ignore="RtlSymmetry" />
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            tools:ignore="UseCompoundDrawables">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="32dp"
+                android:layout_weight="1"
+                android:text="@string/accounts"
+                android:textSize="28sp" />
+
+            <ImageView
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:layout_gravity="center"
+                android:padding="24dp"
+                app:srcCompat="@drawable/ic_round_person_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription" />
+
+        </LinearLayout>
 
         <LinearLayout
             android:id="@+id/settingsAnilistLoginContainer"
diff --git a/app/src/main/res/layout/activity_settings_anime.xml b/app/src/main/res/layout/activity_settings_anime.xml
index 667e8bc6..6a7c2c68 100644
--- a/app/src/main/res/layout/activity_settings_anime.xml
+++ b/app/src/main/res/layout/activity_settings_anime.xml
@@ -6,28 +6,60 @@
     android:layout_height="match_parent"
     tools:context=".settings.SettingsAnimeActivity">
 
-<LinearLayout
-    android:id="@+id/settingsAnimeLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="31dp"
-    android:paddingEnd="31dp">
-
-    <TextView
-        android:id="@+id/settingsAnimeTitle"
+    <LinearLayout
+        android:id="@+id/settingsAnimeLayout"
         android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_marginTop="16dp"
-        android:fontFamily="@font/poppins"
-        android:gravity="center"
-        android:paddingEnd="28dp"
-        android:text="@string/anime"
-        android:textSize="20sp"
-        android:textStyle="bold"
-        app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
-        app:drawableTint="?attr/colorOnBackground"
-        tools:ignore="RtlSymmetry" />
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingStart="32dp"
+        android:paddingEnd="32dp">
+
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="-16dp"
+            android:layout_marginTop="32dp"
+            app:cardBackgroundColor="@color/nav_bg_inv"
+            app:cardCornerRadius="16dp"
+            app:cardElevation="0dp">
+
+            <ImageButton
+                android:id="@+id/animeSettingsBack"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:background="@color/nav_bg_inv"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
+        </androidx.cardview.widget.CardView>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            tools:ignore="UseCompoundDrawables">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="32dp"
+                android:layout_weight="1"
+                android:text="@string/anime"
+                android:textSize="28sp" />
+
+            <ImageView
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:layout_gravity="center"
+
+                android:padding="24dp"
+                app:srcCompat="@drawable/ic_round_movie_filter_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription" />
+
+        </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -201,5 +233,5 @@
             app:showText="false"
             app:thumbTint="@color/button_switch_track" />
 
-</LinearLayout>
+    </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings_common.xml b/app/src/main/res/layout/activity_settings_common.xml
index c9be5ba2..07f4e777 100644
--- a/app/src/main/res/layout/activity_settings_common.xml
+++ b/app/src/main/res/layout/activity_settings_common.xml
@@ -11,23 +11,55 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingStart="31dp"
-        android:paddingEnd="31dp">
+        android:paddingStart="32dp"
+        android:paddingEnd="32dp">
 
-        <TextView
-            android:id="@+id/settingsCommonTitle"
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="-16dp"
+            android:layout_marginTop="32dp"
+            app:cardBackgroundColor="@color/nav_bg_inv"
+            app:cardCornerRadius="16dp"
+            app:cardElevation="0dp">
+
+            <ImageButton
+                android:id="@+id/commonSettingsBack"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:background="@color/nav_bg_inv"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
+        </androidx.cardview.widget.CardView>
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="64dp"
-            android:layout_marginTop="16dp"
-            android:fontFamily="@font/poppins"
-            android:gravity="center"
-            android:paddingEnd="28dp"
-            android:text="@string/common"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
-            app:drawableTint="?attr/colorOnBackground"
-            tools:ignore="RtlSymmetry" />
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            tools:ignore="UseCompoundDrawables">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="32dp"
+                android:layout_weight="1"
+                android:text="@string/common"
+                android:textSize="28sp" />
+
+            <ImageView
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:layout_gravity="center"
+                android:padding="24dp"
+                app:srcCompat="@drawable/ic_lightbulb_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription" />
+
+        </LinearLayout>
+
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_settings_extensions.xml b/app/src/main/res/layout/activity_settings_extensions.xml
index 6cbb8d80..29fa4ffd 100644
--- a/app/src/main/res/layout/activity_settings_extensions.xml
+++ b/app/src/main/res/layout/activity_settings_extensions.xml
@@ -11,23 +11,54 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingStart="31dp"
-        android:paddingEnd="31dp">
+        android:paddingStart="32dp"
+        android:paddingEnd="32dp">
 
-        <TextView
-            android:id="@+id/settingsExtensionsTitle"
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="-16dp"
+            android:layout_marginTop="32dp"
+            app:cardBackgroundColor="@color/nav_bg_inv"
+            app:cardCornerRadius="16dp"
+            app:cardElevation="0dp">
+
+            <ImageButton
+                android:id="@+id/extensionSettingsBack"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:background="@color/nav_bg_inv"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
+        </androidx.cardview.widget.CardView>
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="64dp"
-            android:layout_marginTop="16dp"
-            android:fontFamily="@font/poppins"
-            android:gravity="center"
-            android:paddingEnd="28dp"
-            android:text="@string/extensions"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
-            app:drawableTint="?attr/colorOnBackground"
-            tools:ignore="RtlSymmetry" />
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            tools:ignore="UseCompoundDrawables">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="32dp"
+                android:layout_weight="1"
+                android:text="@string/extensions"
+                android:textSize="28sp" />
+
+            <ImageView
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:layout_gravity="center"
+                android:padding="24dp"
+                app:srcCompat="@drawable/ic_extension"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription" />
+
+        </LinearLayout>
 
 
         <Button
diff --git a/app/src/main/res/layout/activity_settings_manga.xml b/app/src/main/res/layout/activity_settings_manga.xml
index 61b9d0c5..d49b75cf 100644
--- a/app/src/main/res/layout/activity_settings_manga.xml
+++ b/app/src/main/res/layout/activity_settings_manga.xml
@@ -11,23 +11,53 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingStart="31dp"
-        android:paddingEnd="31dp">
+        android:paddingStart="32dp"
+        android:paddingEnd="32dp">
 
-        <TextView
-            android:id="@+id/settingsMangaTitle"
+        <androidx.cardview.widget.CardView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="-16dp"
+            android:layout_marginTop="32dp"
+            app:cardBackgroundColor="@color/nav_bg_inv"
+            app:cardCornerRadius="16dp"
+            app:cardElevation="0dp">
+
+            <ImageButton
+                android:id="@+id/mangaSettingsBack"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:background="@color/nav_bg_inv"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
+        </androidx.cardview.widget.CardView>
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="64dp"
-            android:layout_marginTop="16dp"
-            android:fontFamily="@font/poppins"
-            android:gravity="center"
-            android:paddingEnd="28dp"
-            android:text="@string/manga"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
-            app:drawableTint="?attr/colorOnBackground"
-            tools:ignore="RtlSymmetry" />
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            tools:ignore="UseCompoundDrawables">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="32dp"
+                android:layout_weight="1"
+                android:text="@string/manga"
+                android:textSize="28sp" />
+
+            <ImageView
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:layout_gravity="center"
+                android:padding="24dp"
+                app:srcCompat="@drawable/ic_round_import_contacts_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription" />
+
+        </LinearLayout>
 
 
         <LinearLayout
diff --git a/app/src/main/res/layout/activity_settings_notifications.xml b/app/src/main/res/layout/activity_settings_notifications.xml
index 86d75683..649b93db 100644
--- a/app/src/main/res/layout/activity_settings_notifications.xml
+++ b/app/src/main/res/layout/activity_settings_notifications.xml
@@ -11,23 +11,55 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingStart="31dp"
-        android:paddingEnd="31dp">
+        android:paddingStart="32dp"
+        android:paddingEnd="32dp">
 
-        <TextView
-            android:id="@+id/settingsNotificationsTitle"
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="-16dp"
+            android:layout_marginTop="32dp"
+            app:cardBackgroundColor="@color/nav_bg_inv"
+            app:cardCornerRadius="16dp"
+            app:cardElevation="0dp">
+
+            <ImageButton
+                android:id="@+id/notificationSettingsBack"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:background="@color/nav_bg_inv"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
+        </androidx.cardview.widget.CardView>
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="64dp"
-            android:layout_marginTop="16dp"
-            android:fontFamily="@font/poppins"
-            android:gravity="center"
-            android:paddingEnd="28dp"
-            android:text="@string/notifications"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
-            app:drawableTint="?attr/colorOnBackground"
-            tools:ignore="RtlSymmetry" />
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            tools:ignore="UseCompoundDrawables">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="32dp"
+                android:layout_weight="1"
+                android:text="@string/notifications"
+                android:textSize="28sp" />
+
+            <ImageView
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:layout_gravity="center"
+                android:padding="24dp"
+                app:srcCompat="@drawable/ic_round_notifications_none_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription" />
+
+        </LinearLayout>
+
 
         <Button
             android:id="@+id/settingsSubscriptionsTime"
diff --git a/app/src/main/res/layout/activity_settings_theme.xml b/app/src/main/res/layout/activity_settings_theme.xml
index 4cb2dea0..dfa74257 100644
--- a/app/src/main/res/layout/activity_settings_theme.xml
+++ b/app/src/main/res/layout/activity_settings_theme.xml
@@ -11,23 +11,54 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingStart="31dp"
-        android:paddingEnd="31dp">
+        android:paddingStart="32dp"
+        android:paddingEnd="32dp">
 
-        <TextView
-            android:id="@+id/settingsThemeTitle"
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="-16dp"
+            android:layout_marginTop="32dp"
+            app:cardBackgroundColor="@color/nav_bg_inv"
+            app:cardCornerRadius="16dp"
+            app:cardElevation="0dp">
+
+            <ImageButton
+                android:id="@+id/themeSettingsBack"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:background="@color/nav_bg_inv"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
+        </androidx.cardview.widget.CardView>
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="64dp"
-            android:layout_marginTop="16dp"
-            android:fontFamily="@font/poppins"
-            android:gravity="center"
-            android:paddingEnd="28dp"
-            android:text="@string/theme"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            app:drawableStartCompat="@drawable/ic_round_arrow_back_ios_new_24"
-            app:drawableTint="?attr/colorOnBackground"
-            tools:ignore="RtlSymmetry" />
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            tools:ignore="UseCompoundDrawables">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="32dp"
+                android:layout_weight="1"
+                android:text="@string/theme"
+                android:textSize="28sp" />
+
+            <ImageView
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:layout_gravity="center"
+                android:padding="24dp"
+                app:srcCompat="@drawable/ic_palette"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription" />
+
+        </LinearLayout>
 
 
         <LinearLayout