diff --git a/app/src/main/res/layout/activity_settings_about.xml b/app/src/main/res/layout/activity_settings_about.xml
index ee28a7e1..c2811c0c 100644
--- a/app/src/main/res/layout/activity_settings_about.xml
+++ b/app/src/main/res/layout/activity_settings_about.xml
@@ -1,194 +1,202 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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:id="@+id/settingsAboutLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="31dp"
-    android:paddingEnd="31dp">
-    <TextView
-        android:id="@+id/settingsAboutTitle"
-        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" />
-
-    <Button
-        android:id="@+id/settingsFAQ"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_marginStart="-31dp"
-        android:layout_marginEnd="-21dp"
-        android:background="@drawable/ui_bg"
-        android:backgroundTint="?attr/colorOnBackground"
-        android:backgroundTintMode="src_atop"
-        android:fontFamily="@font/poppins_bold"
-        android:insetTop="0dp"
-        android:insetBottom="0dp"
-        android:paddingStart="31dp"
-        android:paddingEnd="31dp"
-        android:text="@string/faq"
-        android:textAlignment="viewStart"
-        android:textAllCaps="false"
-        android:textColor="?attr/colorOnBackground"
-        app:cornerRadius="0dp"
-        app:icon="@drawable/ic_round_help_24"
-        app:iconPadding="16dp"
-        app:iconSize="24dp"
-        app:iconTint="?attr/colorPrimary" />
-
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/settingsCheckUpdate"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:checked="true"
-        android:drawableStart="@drawable/ic_round_new_releases_24"
-        android:drawablePadding="16dp"
-        android:elegantTextHeight="true"
-        android:fontFamily="@font/poppins_bold"
-        android:minHeight="64dp"
-        android:text="@string/check_app_updates"
-        android:textAlignment="viewStart"
-        android:textColor="?attr/colorOnBackground"
-        app:cornerRadius="0dp"
-        app:drawableTint="?attr/colorPrimary"
-        app:showText="false"
-        app:thumbTint="@color/button_switch_track" />
-
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/settingsShareUsername"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:checked="false"
-        android:drawableStart="@drawable/ic_round_search_24"
-        android:drawablePadding="16dp"
-        android:elegantTextHeight="true"
-        android:fontFamily="@font/poppins_bold"
-        android:minHeight="64dp"
-        android:text="@string/share_username_in_crash_reports"
-        android:textAlignment="viewStart"
-        android:textColor="?attr/colorOnBackground"
-        app:cornerRadius="0dp"
-        app:drawableTint="?attr/colorPrimary"
-        app:showText="false"
-        app:thumbTint="@color/button_switch_track" />
-
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/settingsLogToFile"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:checked="false"
-        android:drawableStart="@drawable/ic_round_edit_note_24"
-        android:drawablePadding="16dp"
-        android:elegantTextHeight="true"
-        android:fontFamily="@font/poppins_bold"
-        android:minHeight="64dp"
-        android:text="@string/log_to_file"
-        android:textAlignment="viewStart"
-        android:textColor="?attr/colorOnBackground"
-        app:cornerRadius="0dp"
-        app:drawableTint="?attr/colorPrimary"
-        app:showText="false"
-        app:thumbTint="@color/button_switch_track" />
+    tools:context=".settings.SettingsAboutActivity">
 
     <LinearLayout
+        android:id="@+id/settingsAboutLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal">
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingStart="31dp"
+        android:paddingEnd="31dp">
 
         <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:alpha="0.58"
-            android:fontFamily="@font/poppins_bold"
-            android:text="@string/logging_warning" />
+            android:id="@+id/settingsAboutTitle"
+            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" />
 
-        <ImageButton
-            android:id="@+id/settingsShareLog"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="?android:attr/selectableItemBackground"
-            android:padding="16dp"
-            android:src="@drawable/ic_round_share_24" />
+        <Button
+            android:id="@+id/settingsFAQ"
+            android:layout_width="match_parent"
+            android:layout_height="64dp"
+            android:layout_marginStart="-31dp"
+            android:layout_marginEnd="-21dp"
+            android:background="@drawable/ui_bg"
+            android:backgroundTint="?attr/colorOnBackground"
+            android:backgroundTintMode="src_atop"
+            android:fontFamily="@font/poppins_bold"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingStart="31dp"
+            android:paddingEnd="31dp"
+            android:text="@string/faq"
+            android:textAlignment="viewStart"
+            android:textAllCaps="false"
+            android:textColor="?attr/colorOnBackground"
+            app:cornerRadius="0dp"
+            app:icon="@drawable/ic_round_help_24"
+            app:iconPadding="16dp"
+            app:iconSize="24dp"
+            app:iconTint="?attr/colorPrimary" />
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            android:id="@+id/settingsCheckUpdate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:drawableStart="@drawable/ic_round_new_releases_24"
+            android:drawablePadding="16dp"
+            android:elegantTextHeight="true"
+            android:fontFamily="@font/poppins_bold"
+            android:minHeight="64dp"
+            android:text="@string/check_app_updates"
+            android:textAlignment="viewStart"
+            android:textColor="?attr/colorOnBackground"
+            app:cornerRadius="0dp"
+            app:drawableTint="?attr/colorPrimary"
+            app:showText="false"
+            app:thumbTint="@color/button_switch_track" />
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            android:id="@+id/settingsShareUsername"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableStart="@drawable/ic_round_search_24"
+            android:drawablePadding="16dp"
+            android:elegantTextHeight="true"
+            android:fontFamily="@font/poppins_bold"
+            android:minHeight="64dp"
+            android:text="@string/share_username_in_crash_reports"
+            android:textAlignment="viewStart"
+            android:textColor="?attr/colorOnBackground"
+            app:cornerRadius="0dp"
+            app:drawableTint="?attr/colorPrimary"
+            app:showText="false"
+            app:thumbTint="@color/button_switch_track" />
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            android:id="@+id/settingsLogToFile"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableStart="@drawable/ic_round_edit_note_24"
+            android:drawablePadding="16dp"
+            android:elegantTextHeight="true"
+            android:fontFamily="@font/poppins_bold"
+            android:minHeight="64dp"
+            android:text="@string/log_to_file"
+            android:textAlignment="viewStart"
+            android:textColor="?attr/colorOnBackground"
+            app:cornerRadius="0dp"
+            app:drawableTint="?attr/colorPrimary"
+            app:showText="false"
+            app:thumbTint="@color/button_switch_track" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:alpha="0.58"
+                android:fontFamily="@font/poppins_bold"
+                android:text="@string/logging_warning" />
+
+            <ImageButton
+                android:id="@+id/settingsShareLog"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:background="?android:attr/selectableItemBackground"
+                android:padding="16dp"
+                android:src="@drawable/ic_round_share_24"
+                tools:ignore="ContentDescription" />
+
+
+        </LinearLayout>
+
+
+        <Button
+            android:id="@+id/settingsDev"
+            style="@style/Widget.Material3.Button.TextButton"
+            android:layout_width="match_parent"
+            android:layout_height="64dp"
+            android:layout_marginStart="-31dp"
+            android:layout_marginEnd="-31dp"
+            android:fontFamily="@font/poppins_bold"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingStart="31dp"
+            android:paddingEnd="31dp"
+            android:text="@string/devs"
+            android:textAlignment="viewStart"
+            android:textAllCaps="false"
+            android:textColor="?attr/colorOnBackground"
+            app:cornerRadius="0dp"
+            app:icon="@drawable/ic_round_accessible_forward_24"
+            app:iconPadding="16dp"
+            app:iconSize="24dp" />
+
+        <Button
+            android:id="@+id/settingsForks"
+            style="@style/Widget.Material3.Button.TextButton"
+            android:layout_width="match_parent"
+            android:layout_height="64dp"
+            android:layout_marginStart="-31dp"
+            android:layout_marginEnd="-31dp"
+            android:fontFamily="@font/poppins_bold"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingStart="31dp"
+            android:paddingEnd="31dp"
+            android:text="@string/forks"
+            android:textAlignment="viewStart"
+            android:textAllCaps="false"
+            android:textColor="?attr/colorOnBackground"
+            app:cornerRadius="0dp"
+            app:icon="@drawable/ic_round_restaurant_24"
+            app:iconPadding="16dp"
+            app:iconSize="24dp" />
+
+        <Button
+            android:id="@+id/settingsDisclaimer"
+            style="@style/Widget.Material3.Button.TextButton"
+            android:layout_width="match_parent"
+            android:layout_height="64dp"
+            android:layout_marginStart="-31dp"
+            android:layout_marginEnd="-31dp"
+            android:fontFamily="@font/poppins_bold"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingStart="31dp"
+            android:paddingEnd="31dp"
+            android:text="@string/disclaimer"
+            android:textAlignment="viewStart"
+            android:textAllCaps="false"
+            android:textColor="?attr/colorOnBackground"
+            app:cornerRadius="0dp"
+            app:icon="@drawable/ic_round_info_24"
+            app:iconPadding="16dp"
+            app:iconSize="24dp" />
 
 
     </LinearLayout>
-
-
-    <Button
-        android:id="@+id/settingsDev"
-        style="@style/Widget.Material3.Button.TextButton"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_marginStart="-31dp"
-        android:layout_marginEnd="-31dp"
-        android:fontFamily="@font/poppins_bold"
-        android:insetTop="0dp"
-        android:insetBottom="0dp"
-        android:paddingStart="31dp"
-        android:paddingEnd="31dp"
-        android:text="@string/devs"
-        android:textAlignment="viewStart"
-        android:textAllCaps="false"
-        android:textColor="?attr/colorOnBackground"
-        app:cornerRadius="0dp"
-        app:icon="@drawable/ic_round_accessible_forward_24"
-        app:iconPadding="16dp"
-        app:iconSize="24dp" />
-
-    <Button
-        android:id="@+id/settingsForks"
-        style="@style/Widget.Material3.Button.TextButton"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_marginStart="-31dp"
-        android:layout_marginEnd="-31dp"
-        android:fontFamily="@font/poppins_bold"
-        android:insetTop="0dp"
-        android:insetBottom="0dp"
-        android:paddingStart="31dp"
-        android:paddingEnd="31dp"
-        android:text="@string/forks"
-        android:textAlignment="viewStart"
-        android:textAllCaps="false"
-        android:textColor="?attr/colorOnBackground"
-        app:cornerRadius="0dp"
-        app:icon="@drawable/ic_round_restaurant_24"
-        app:iconPadding="16dp"
-        app:iconSize="24dp" />
-
-    <Button
-        android:id="@+id/settingsDisclaimer"
-        style="@style/Widget.Material3.Button.TextButton"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_marginStart="-31dp"
-        android:layout_marginEnd="-31dp"
-        android:fontFamily="@font/poppins_bold"
-        android:insetTop="0dp"
-        android:insetBottom="0dp"
-        android:paddingStart="31dp"
-        android:paddingEnd="31dp"
-        android:text="@string/disclaimer"
-        android:textAlignment="viewStart"
-        android:textAllCaps="false"
-        android:textColor="?attr/colorOnBackground"
-        app:cornerRadius="0dp"
-        app:icon="@drawable/ic_round_info_24"
-        app:iconPadding="16dp"
-        app:iconSize="24dp" />
-
-
-</LinearLayout>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings_accounts.xml b/app/src/main/res/layout/activity_settings_accounts.xml
index 31aa1a63..f0f29782 100644
--- a/app/src/main/res/layout/activity_settings_accounts.xml
+++ b/app/src/main/res/layout/activity_settings_accounts.xml
@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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:id="@+id/settingsAccountsLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="31dp"
-    android:paddingEnd="31dp">
-    <TextView
-        android:id="@+id/settingsaccountTitle"
+    tools:context=".settings.SettingsAccountActivity">
+
+    <LinearLayout
+        android:id="@+id/settingsAccountsLayout"
         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="vertical"
+        android:paddingStart="31dp"
+        android:paddingEnd="31dp">
+
+        <TextView
+            android:id="@+id/settingsaccountTitle"
+            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" />
 
         <LinearLayout
             android:id="@+id/settingsAnilistLoginContainer"
@@ -222,8 +228,8 @@
                 android:id="@+id/settingsImageSwitcher"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/discord_status_idle"
-                android:padding="16dp" />
+                android:padding="16dp"
+                android:src="@drawable/discord_status_idle" />
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/settingsDiscordAvatarContainer"
@@ -266,4 +272,5 @@
             app:drawableStartCompat="@drawable/ic_round_help_24"
             app:drawableTint="?attr/colorPrimary" />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings_anime.xml b/app/src/main/res/layout/activity_settings_anime.xml
index 7b1c59e4..667e8bc6 100644
--- a/app/src/main/res/layout/activity_settings_anime.xml
+++ b/app/src/main/res/layout/activity_settings_anime.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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"
+    tools:context=".settings.SettingsAnimeActivity">
+
+<LinearLayout
     android:id="@+id/settingsAnimeLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -196,4 +201,5 @@
             app:showText="false"
             app:thumbTint="@color/button_switch_track" />
 
-</LinearLayout>
\ No newline at end of file
+</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 f03e52bd..c9be5ba2 100644
--- a/app/src/main/res/layout/activity_settings_common.xml
+++ b/app/src/main/res/layout/activity_settings_common.xml
@@ -1,28 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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:id="@+id/settingsCommonLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="31dp"
-    android:paddingEnd="31dp">
+    tools:context=".settings.SettingsCommonActivity">
 
-    <TextView
-        android:id="@+id/settingsCommonTitle"
+    <LinearLayout
+        android:id="@+id/settingsCommonLayout"
         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="vertical"
+        android:paddingStart="31dp"
+        android:paddingEnd="31dp">
+
+        <TextView
+            android:id="@+id/settingsCommonTitle"
+            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" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -304,4 +309,5 @@
             app:iconSize="24dp"
             app:iconTint="?attr/colorPrimary" />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings_extensions.xml b/app/src/main/res/layout/activity_settings_extensions.xml
index 465f5d24..6cbb8d80 100644
--- a/app/src/main/res/layout/activity_settings_extensions.xml
+++ b/app/src/main/res/layout/activity_settings_extensions.xml
@@ -1,28 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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:id="@+id/settingsExtensionsLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="31dp"
-    android:paddingEnd="31dp">
+    tools:context=".settings.SettingsExtensionsActivity">
 
-    <TextView
-        android:id="@+id/settingsExtensionsTitle"
+    <LinearLayout
+        android:id="@+id/settingsExtensionsLayout"
         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="vertical"
+        android:paddingStart="31dp"
+        android:paddingEnd="31dp">
+
+        <TextView
+            android:id="@+id/settingsExtensionsTitle"
+            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" />
 
 
         <Button
@@ -190,4 +195,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_manga.xml b/app/src/main/res/layout/activity_settings_manga.xml
index 353850fd..61b9d0c5 100644
--- a/app/src/main/res/layout/activity_settings_manga.xml
+++ b/app/src/main/res/layout/activity_settings_manga.xml
@@ -1,28 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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:id="@+id/settingsMangaLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="31dp"
-    android:paddingEnd="31dp">
+    tools:context=".settings.SettingsMangaActivity">
 
-    <TextView
-        android:id="@+id/settingsMangaTitle"
+    <LinearLayout
+        android:id="@+id/settingsMangaLayout"
         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="vertical"
+        android:paddingStart="31dp"
+        android:paddingEnd="31dp">
+
+        <TextView
+            android:id="@+id/settingsMangaTitle"
+            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" />
 
 
         <LinearLayout
@@ -143,6 +148,7 @@
             app:iconPadding="16dp"
             app:iconSize="24dp"
             app:iconTint="?attr/colorPrimary" />
+
         <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/settingsIncludeMangaList"
             android:layout_width="match_parent"
@@ -161,4 +167,5 @@
             app:showText="false"
             app:thumbTint="@color/button_switch_track" />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings_notifications.xml b/app/src/main/res/layout/activity_settings_notifications.xml
index 4e682013..86d75683 100644
--- a/app/src/main/res/layout/activity_settings_notifications.xml
+++ b/app/src/main/res/layout/activity_settings_notifications.xml
@@ -1,28 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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:id="@+id/settingsNotificationsLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="31dp"
-    android:paddingEnd="31dp">
+    tools:context=".settings.SettingsNotificationActivity">
 
-    <TextView
-        android:id="@+id/settingsNotificationsTitle"
+    <LinearLayout
+        android:id="@+id/settingsNotificationsLayout"
         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="vertical"
+        android:paddingStart="31dp"
+        android:paddingEnd="31dp">
+
+        <TextView
+            android:id="@+id/settingsNotificationsTitle"
+            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" />
+
         <Button
             android:id="@+id/settingsSubscriptionsTime"
             style="@style/Widget.Material3.Button.TextButton"
@@ -162,4 +168,5 @@
             app:showText="false"
             app:thumbTint="@color/button_switch_track" />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings_theme.xml b/app/src/main/res/layout/activity_settings_theme.xml
index e9d4ab20..4cb2dea0 100644
--- a/app/src/main/res/layout/activity_settings_theme.xml
+++ b/app/src/main/res/layout/activity_settings_theme.xml
@@ -1,250 +1,256 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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:id="@+id/settingsThemeLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="31dp"
-    android:paddingEnd="31dp">
-
-    <TextView
-        android:id="@+id/settingsThemeTitle"
-        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" />
-
+    tools:context=".settings.SettingsThemeActivity">
 
     <LinearLayout
+        android:id="@+id/settingsThemeLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:gravity="center"
-        android:orientation="horizontal">
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingStart="31dp"
+        android:paddingEnd="31dp">
 
         <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:alpha="0.58"
-            android:fontFamily="@font/poppins_bold"
-            android:text="@string/theme" />
+            android:id="@+id/settingsThemeTitle"
+            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" />
 
-        <androidx.cardview.widget.CardView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:cardBackgroundColor="@color/nav_bg_inv"
-            app:cardCornerRadius="16dp"
-            app:cardElevation="0dp">
 
-            <ImageButton
-                android:id="@+id/settingsUiLight"
-                android:layout_width="48dp"
-                android:layout_height="64dp"
-                android:alpha="0.33"
-                android:background="?android:attr/selectableItemBackground"
-                android:src="@drawable/ic_round_brightness_high_24"
-                app:tint="?attr/colorOnBackground"
-                tools:ignore="ContentDescription,SpeakableTextPresentCheck,ImageContrastCheck,DuplicateSpeakableTextCheck" />
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:cardBackgroundColor="@color/nav_bg_inv"
-            app:cardCornerRadius="16dp"
-            app:cardElevation="0dp">
-
-            <ImageButton
-                android:id="@+id/settingsUiDark"
-                android:layout_width="48dp"
-                android:layout_height="64dp"
-                android:alpha="0.33"
-                android:background="?android:attr/selectableItemBackground"
-                android:scaleX="-1"
-                android:src="@drawable/ic_round_brightness_4_24"
-                app:tint="?attr/colorOnBackground"
-                tools:ignore="ContentDescription,SpeakableTextPresentCheck,ImageContrastCheck" />
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:cardBackgroundColor="@color/nav_bg_inv"
-            app:cardCornerRadius="16dp"
-            app:cardElevation="0dp">
-
-            <ImageButton
-                android:id="@+id/settingsUiAuto"
-                android:layout_width="48dp"
-                android:layout_height="64dp"
-                android:alpha="0.33"
-                android:background="?android:attr/selectableItemBackground"
-                android:src="@drawable/ic_round_brightness_auto_24"
-                app:tint="?attr/colorOnBackground"
-                tools:ignore="ContentDescription,SpeakableTextPresentCheck,ImageContrastCheck" />
-        </androidx.cardview.widget.CardView>
-
-    </LinearLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        app:boxCornerRadiusBottomEnd="8dp"
-        app:boxCornerRadiusBottomStart="8dp"
-        app:boxCornerRadiusTopEnd="8dp"
-        app:boxCornerRadiusTopStart="8dp"
-        app:hintAnimationEnabled="true"
-        app:startIconDrawable="@drawable/ic_round_source_24">
-
-        <AutoCompleteTextView
-            android:id="@+id/themeSwitcher"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:alpha="0.58"
+                android:fontFamily="@font/poppins_bold"
+                android:text="@string/theme" />
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/nav_bg_inv"
+                app:cardCornerRadius="16dp"
+                app:cardElevation="0dp">
+
+                <ImageButton
+                    android:id="@+id/settingsUiLight"
+                    android:layout_width="48dp"
+                    android:layout_height="64dp"
+                    android:alpha="0.33"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:src="@drawable/ic_round_brightness_high_24"
+                    app:tint="?attr/colorOnBackground"
+                    tools:ignore="ContentDescription,SpeakableTextPresentCheck,ImageContrastCheck,DuplicateSpeakableTextCheck" />
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/nav_bg_inv"
+                app:cardCornerRadius="16dp"
+                app:cardElevation="0dp">
+
+                <ImageButton
+                    android:id="@+id/settingsUiDark"
+                    android:layout_width="48dp"
+                    android:layout_height="64dp"
+                    android:alpha="0.33"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:scaleX="-1"
+                    android:src="@drawable/ic_round_brightness_4_24"
+                    app:tint="?attr/colorOnBackground"
+                    tools:ignore="ContentDescription,SpeakableTextPresentCheck,ImageContrastCheck" />
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/nav_bg_inv"
+                app:cardCornerRadius="16dp"
+                app:cardElevation="0dp">
+
+                <ImageButton
+                    android:id="@+id/settingsUiAuto"
+                    android:layout_width="48dp"
+                    android:layout_height="64dp"
+                    android:alpha="0.33"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:src="@drawable/ic_round_brightness_auto_24"
+                    app:tint="?attr/colorOnBackground"
+                    tools:ignore="ContentDescription,SpeakableTextPresentCheck,ImageContrastCheck" />
+            </androidx.cardview.widget.CardView>
+
+        </LinearLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            app:boxCornerRadiusBottomEnd="8dp"
+            app:boxCornerRadiusBottomStart="8dp"
+            app:boxCornerRadiusTopEnd="8dp"
+            app:boxCornerRadiusTopStart="8dp"
+            app:hintAnimationEnabled="true"
+            app:startIconDrawable="@drawable/ic_round_source_24">
+
+            <AutoCompleteTextView
+                android:id="@+id/themeSwitcher"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:fontFamily="@font/poppins_bold"
+                android:freezesText="false"
+                android:inputType="none"
+                android:padding="8dp"
+                android:text="@string/watch"
+                android:textAllCaps="true"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="14sp"
+                tools:ignore="LabelFor,TextContrastCheck,DuplicateSpeakableTextCheck" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            android:id="@+id/settingsUseOLED"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableStart="@drawable/ic_round_brightness_4_24"
+            android:drawablePadding="16dp"
+            android:elegantTextHeight="true"
             android:fontFamily="@font/poppins_bold"
-            android:freezesText="false"
-            android:inputType="none"
-            android:padding="8dp"
-            android:text="@string/watch"
-            android:textAllCaps="true"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="14sp"
-            tools:ignore="LabelFor,TextContrastCheck,DuplicateSpeakableTextCheck" />
-    </com.google.android.material.textfield.TextInputLayout>
+            android:minHeight="64dp"
+            android:text="@string/oled_theme_variant"
+            android:textAlignment="viewStart"
+            android:textColor="?attr/colorOnBackground"
+            app:cornerRadius="0dp"
+            app:drawableTint="?attr/colorPrimary"
+            app:showText="false"
+            app:thumbTint="@color/button_switch_track" />
 
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/settingsUseOLED"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:checked="false"
-        android:drawableStart="@drawable/ic_round_brightness_4_24"
-        android:drawablePadding="16dp"
-        android:elegantTextHeight="true"
-        android:fontFamily="@font/poppins_bold"
-        android:minHeight="64dp"
-        android:text="@string/oled_theme_variant"
-        android:textAlignment="viewStart"
-        android:textColor="?attr/colorOnBackground"
-        app:cornerRadius="0dp"
-        app:drawableTint="?attr/colorPrimary"
-        app:showText="false"
-        app:thumbTint="@color/button_switch_track" />
+        <View
+            android:id="@+id/themeDivider1"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginStart="-16dp"
+            android:layout_marginEnd="-16dp"
+            android:background="?android:attr/listDivider" />
 
-    <View
-        android:id="@+id/themeDivider1"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginStart="-16dp"
-        android:layout_marginEnd="-16dp"
-        android:background="?android:attr/listDivider" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/poppins_bold"
+            android:gravity="center"
+            android:padding="16dp"
+            android:text="@string/requires_android_12"
+            android:textColor="?attr/colorSecondary" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fontFamily="@font/poppins_bold"
-        android:gravity="center"
-        android:padding="16dp"
-        android:text="@string/requires_android_12"
-        android:textColor="?attr/colorSecondary" />
+        <com.google.android.material.materialswitch.MaterialSwitch
+            android:id="@+id/settingsUseMaterialYou"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableStart="@drawable/ic_round_new_releases_24"
+            android:drawablePadding="16dp"
+            android:elegantTextHeight="true"
+            android:fontFamily="@font/poppins_bold"
+            android:minHeight="64dp"
+            android:text="@string/use_material_you"
+            android:textAlignment="viewStart"
+            android:textColor="?attr/colorOnBackground"
+            app:cornerRadius="0dp"
+            app:drawableTint="?attr/colorPrimary"
+            app:showText="false"
+            app:thumbTint="@color/button_switch_track" />
 
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/settingsUseMaterialYou"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:checked="false"
-        android:drawableStart="@drawable/ic_round_new_releases_24"
-        android:drawablePadding="16dp"
-        android:elegantTextHeight="true"
-        android:fontFamily="@font/poppins_bold"
-        android:minHeight="64dp"
-        android:text="@string/use_material_you"
-        android:textAlignment="viewStart"
-        android:textColor="?attr/colorOnBackground"
-        app:cornerRadius="0dp"
-        app:drawableTint="?attr/colorPrimary"
-        app:showText="false"
-        app:thumbTint="@color/button_switch_track" />
+        <com.google.android.material.materialswitch.MaterialSwitch
+            android:id="@+id/settingsUseSourceTheme"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:checked="false"
+            android:drawableStart="@drawable/ic_palette"
+            android:drawablePadding="16dp"
+            android:elegantTextHeight="true"
+            android:fontFamily="@font/poppins_bold"
+            android:minHeight="64dp"
+            android:text="@string/use_unique_theme_for_each_item"
+            android:textAlignment="viewStart"
+            android:textColor="?attr/colorOnBackground"
+            app:cornerRadius="0dp"
+            app:drawableTint="?attr/colorPrimary"
+            app:showText="false"
+            app:thumbTint="@color/button_switch_track" />
 
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/settingsUseSourceTheme"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:checked="false"
-        android:drawableStart="@drawable/ic_palette"
-        android:drawablePadding="16dp"
-        android:elegantTextHeight="true"
-        android:fontFamily="@font/poppins_bold"
-        android:minHeight="64dp"
-        android:text="@string/use_unique_theme_for_each_item"
-        android:textAlignment="viewStart"
-        android:textColor="?attr/colorOnBackground"
-        app:cornerRadius="0dp"
-        app:drawableTint="?attr/colorPrimary"
-        app:showText="false"
-        app:thumbTint="@color/button_switch_track" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-11dp"
+            android:alpha="0.58"
+            android:fontFamily="@font/poppins_bold"
+            android:text="@string/custom_theme" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="-11dp"
-        android:alpha="0.58"
-        android:fontFamily="@font/poppins_bold"
-        android:text="@string/custom_theme" />
+        <com.google.android.material.materialswitch.MaterialSwitch
+            android:id="@+id/settingsUseCustomTheme"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableStart="@drawable/ic_palette"
+            android:drawablePadding="16dp"
+            android:elegantTextHeight="true"
+            android:fontFamily="@font/poppins_bold"
+            android:minHeight="64dp"
+            android:text="@string/use_custom_theme"
+            android:textAlignment="viewStart"
+            android:textColor="?attr/colorOnBackground"
+            app:cornerRadius="0dp"
+            app:drawableTint="?attr/colorPrimary"
+            app:showText="false"
+            app:thumbTint="@color/button_switch_track" />
 
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/settingsUseCustomTheme"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:checked="false"
-        android:drawableStart="@drawable/ic_palette"
-        android:drawablePadding="16dp"
-        android:elegantTextHeight="true"
-        android:fontFamily="@font/poppins_bold"
-        android:minHeight="64dp"
-        android:text="@string/use_custom_theme"
-        android:textAlignment="viewStart"
-        android:textColor="?attr/colorOnBackground"
-        app:cornerRadius="0dp"
-        app:drawableTint="?attr/colorPrimary"
-        app:showText="false"
-        app:thumbTint="@color/button_switch_track" />
+        <Button
+            android:id="@+id/customTheme"
+            android:layout_width="match_parent"
+            android:layout_height="64dp"
+            android:layout_marginStart="-31dp"
+            android:layout_marginEnd="-31dp"
+            android:background="@drawable/ui_bg"
+            android:backgroundTint="?attr/colorSecondary"
+            android:backgroundTintMode="src_atop"
+            android:fontFamily="@font/poppins_bold"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingStart="31dp"
+            android:paddingEnd="31dp"
+            android:text="@string/color_picker"
+            android:textAlignment="viewStart"
+            android:textAllCaps="false"
+            android:textColor="?attr/colorOnBackground"
+            app:cornerRadius="0dp"
+            app:icon="@drawable/ic_round_color_picker_24"
+            app:iconPadding="16dp"
+            app:iconSize="24dp"
+            app:iconTint="?attr/colorPrimary" />
 
-    <Button
-        android:id="@+id/customTheme"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_marginStart="-31dp"
-        android:layout_marginEnd="-31dp"
-        android:background="@drawable/ui_bg"
-        android:backgroundTint="?attr/colorSecondary"
-        android:backgroundTintMode="src_atop"
-        android:fontFamily="@font/poppins_bold"
-        android:insetTop="0dp"
-        android:insetBottom="0dp"
-        android:paddingStart="31dp"
-        android:paddingEnd="31dp"
-        android:text="@string/color_picker"
-        android:textAlignment="viewStart"
-        android:textAllCaps="false"
-        android:textColor="?attr/colorOnBackground"
-        app:cornerRadius="0dp"
-        app:icon="@drawable/ic_round_color_picker_24"
-        app:iconPadding="16dp"
-        app:iconSize="24dp"
-        app:iconTint="?attr/colorPrimary" />
-
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file