diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
index eb6280d7..0c0954d5 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
@@ -255,7 +255,10 @@ public class CreateIssueActivity extends BaseActivity
 
 			RequestBody requestFile =
 					RequestBody.create(
-							file, MediaType.parse(getContentResolver().getType(contentUri.get(i))));
+							file,
+							MediaType.parse(
+									Objects.requireNonNull(
+											getContentResolver().getType(contentUri.get(i)))));
 
 			uploadAttachments(requestFile, issueIndex, file.getName());
 		}
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsCodeEditorActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsCodeEditorActivity.java
index 3a045bc2..62d973b7 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsCodeEditorActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsCodeEditorActivity.java
@@ -15,7 +15,6 @@ public class SettingsCodeEditorActivity extends BaseActivity {
 
 	private static String[] colorList;
 	private static int colorSelectedChoice = 0;
-	private View.OnClickListener onClickListener;
 	private static String[] indentationList;
 	private static int indentationSelectedChoice = 0;
 	private static String[] indentationTabsList;
@@ -30,8 +29,7 @@ public class SettingsCodeEditorActivity extends BaseActivity {
 				ActivitySettingsCodeEditorBinding.inflate(getLayoutInflater());
 		setContentView(activitySettingsCodeEditorBinding.getRoot());
 
-		initCloseListener();
-		activitySettingsCodeEditorBinding.close.setOnClickListener(onClickListener);
+		activitySettingsCodeEditorBinding.topAppBar.setNavigationOnClickListener(v -> finish());
 
 		// color selector dialog
 		colorList = getResources().getStringArray(R.array.ceColors);
@@ -141,8 +139,4 @@ public class SettingsCodeEditorActivity extends BaseActivity {
 					materialAlertDialogBuilder.create().show();
 				});
 	}
-
-	private void initCloseListener() {
-		onClickListener = view -> finish();
-	}
 }
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
index 0dfcc60a..14581086 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
@@ -7,10 +7,6 @@ import android.app.KeyguardManager;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 import androidx.biometric.BiometricManager;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import java.io.File;
@@ -31,7 +27,6 @@ public class SettingsSecurityActivity extends BaseActivity {
 	private static int cacheSizeDataSelectedChoice = 0;
 	private static String[] cacheSizeImagesList;
 	private static int cacheSizeImagesSelectedChoice = 0;
-	private View.OnClickListener onClickListener;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -42,33 +37,15 @@ public class SettingsSecurityActivity extends BaseActivity {
 				ActivitySettingsSecurityBinding.inflate(getLayoutInflater());
 		setContentView(activitySettingsSecurityBinding.getRoot());
 
-		ImageView closeActivity = activitySettingsSecurityBinding.close;
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		TextView cacheSizeDataSelected =
-				activitySettingsSecurityBinding.cacheSizeDataSelected; // setter for data cache size
-		TextView cacheSizeImagesSelected =
-				activitySettingsSecurityBinding
-						.cacheSizeImagesSelected; // setter for images cache size
-		TextView clearCacheSelected =
-				activitySettingsSecurityBinding.clearCacheSelected; // setter for clear cache
-
-		LinearLayout certsFrame = activitySettingsSecurityBinding.certsFrame;
-		LinearLayout cacheSizeDataFrame =
-				activitySettingsSecurityBinding.cacheSizeDataSelectionFrame;
-		LinearLayout cacheSizeImagesFrame =
-				activitySettingsSecurityBinding.cacheSizeImagesSelectionFrame;
-		LinearLayout clearCacheFrame = activitySettingsSecurityBinding.clearCacheSelectionFrame;
+		activitySettingsSecurityBinding.topAppBar.setNavigationOnClickListener(v -> finish());
 
 		cacheSizeDataList = getResources().getStringArray(R.array.cacheSizeList);
 		cacheSizeImagesList = getResources().getStringArray(R.array.cacheSizeList);
 
-		cacheSizeDataSelected.setText(
+		activitySettingsSecurityBinding.cacheSizeDataSelected.setText(
 				tinyDB.getString(
 						"cacheSizeStr", getString(R.string.cacheSizeDataSelectionSelectedText)));
-		cacheSizeImagesSelected.setText(
+		activitySettingsSecurityBinding.cacheSizeImagesSelected.setText(
 				tinyDB.getString(
 						"cacheSizeImagesStr",
 						getString(R.string.cacheSizeImagesSelectionSelectedText)));
@@ -154,11 +131,11 @@ public class SettingsSecurityActivity extends BaseActivity {
 
 		// clear cache setter
 		File cacheDir = appCtx.getCacheDir();
-		clearCacheSelected.setText(
+		activitySettingsSecurityBinding.clearCacheSelected.setText(
 				FileUtils.byteCountToDisplaySize((int) FileUtils.sizeOfDirectory(cacheDir)));
 
 		// clear cache
-		clearCacheFrame.setOnClickListener(
+		activitySettingsSecurityBinding.clearCacheSelectionFrame.setOnClickListener(
 				v1 -> {
 					MaterialAlertDialogBuilder materialAlertDialogBuilder =
 							new MaterialAlertDialogBuilder(ctx)
@@ -188,7 +165,7 @@ public class SettingsSecurityActivity extends BaseActivity {
 				});
 
 		// cache size images selection dialog
-		cacheSizeImagesFrame.setOnClickListener(
+		activitySettingsSecurityBinding.cacheSizeImagesSelectionFrame.setOnClickListener(
 				view -> {
 					MaterialAlertDialogBuilder materialAlertDialogBuilder =
 							new MaterialAlertDialogBuilder(ctx)
@@ -199,7 +176,8 @@ public class SettingsSecurityActivity extends BaseActivity {
 											cacheSizeImagesSelectedChoice,
 											(dialogInterfaceTheme, i) -> {
 												cacheSizeImagesSelectedChoice = i;
-												cacheSizeImagesSelected.setText(
+												activitySettingsSecurityBinding
+														.cacheSizeImagesSelected.setText(
 														cacheSizeImagesList[i]);
 												tinyDB.putString(
 														"cacheSizeImagesStr",
@@ -217,7 +195,7 @@ public class SettingsSecurityActivity extends BaseActivity {
 				});
 
 		// cache size data selection dialog
-		cacheSizeDataFrame.setOnClickListener(
+		activitySettingsSecurityBinding.cacheSizeDataSelectionFrame.setOnClickListener(
 				view -> {
 					MaterialAlertDialogBuilder materialAlertDialogBuilder =
 							new MaterialAlertDialogBuilder(ctx)
@@ -228,7 +206,9 @@ public class SettingsSecurityActivity extends BaseActivity {
 											cacheSizeDataSelectedChoice,
 											(dialogInterfaceTheme, i) -> {
 												cacheSizeDataSelectedChoice = i;
-												cacheSizeDataSelected.setText(cacheSizeDataList[i]);
+												activitySettingsSecurityBinding
+														.cacheSizeDataSelected.setText(
+														cacheSizeDataList[i]);
 												tinyDB.putString(
 														"cacheSizeStr", cacheSizeDataList[i]);
 												tinyDB.putInt("cacheSizeId", i);
@@ -244,7 +224,7 @@ public class SettingsSecurityActivity extends BaseActivity {
 				});
 
 		// certs deletion
-		certsFrame.setOnClickListener(
+		activitySettingsSecurityBinding.certsFrame.setOnClickListener(
 				v1 -> {
 					MaterialAlertDialogBuilder materialAlertDialogBuilder =
 							new MaterialAlertDialogBuilder(ctx)
@@ -271,9 +251,4 @@ public class SettingsSecurityActivity extends BaseActivity {
 					materialAlertDialogBuilder.create().show();
 				});
 	}
-
-	private void initCloseListener() {
-
-		onClickListener = view -> finish();
-	}
 }
diff --git a/app/src/main/res/layout/activity_add_new_account.xml b/app/src/main/res/layout/activity_add_new_account.xml
index 239927de..660dc7ef 100644
--- a/app/src/main/res/layout/activity_add_new_account.xml
+++ b/app/src/main/res/layout/activity_add_new_account.xml
@@ -17,6 +17,7 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            android:background="?attr/primaryBackgroundColor"
             app:contentScrim="?attr/primaryBackgroundColor"
             android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
 
diff --git a/app/src/main/res/layout/activity_create_issue.xml b/app/src/main/res/layout/activity_create_issue.xml
index c20ffcd8..50e8b7b9 100644
--- a/app/src/main/res/layout/activity_create_issue.xml
+++ b/app/src/main/res/layout/activity_create_issue.xml
@@ -17,6 +17,7 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            android:background="?attr/primaryBackgroundColor"
             app:contentScrim="?attr/primaryBackgroundColor"
             android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
 
diff --git a/app/src/main/res/layout/activity_create_label.xml b/app/src/main/res/layout/activity_create_label.xml
index d223cda7..e30ccf5f 100644
--- a/app/src/main/res/layout/activity_create_label.xml
+++ b/app/src/main/res/layout/activity_create_label.xml
@@ -17,6 +17,7 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            android:background="?attr/primaryBackgroundColor"
             app:contentScrim="?attr/primaryBackgroundColor"
             android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
 
@@ -72,7 +73,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dimen32dp"
-                android:layout_marginTop="@dimen/dimen16dp"
+                android:layout_marginTop="@dimen/dimen32dp"
                 android:orientation="horizontal">
 
                 <TextView
@@ -88,7 +89,7 @@
 
                 <com.google.android.material.card.MaterialCardView
                     style="?attr/materialCardViewElevatedStyle"
-                    android:layout_width="@dimen/dimen60dp"
+                    android:layout_width="@dimen/dimen48dp"
                     android:layout_height="@dimen/dimen28dp"
                     app:cardCornerRadius="@dimen/dimen16dp"
                     app:cardElevation="@dimen/dimen0dp">
diff --git a/app/src/main/res/layout/activity_create_milestone.xml b/app/src/main/res/layout/activity_create_milestone.xml
index 543afe8f..a5aab4c1 100644
--- a/app/src/main/res/layout/activity_create_milestone.xml
+++ b/app/src/main/res/layout/activity_create_milestone.xml
@@ -17,6 +17,7 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            android:background="?attr/primaryBackgroundColor"
             app:contentScrim="?attr/primaryBackgroundColor"
             android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
 
diff --git a/app/src/main/res/layout/activity_create_pr.xml b/app/src/main/res/layout/activity_create_pr.xml
index 54f6ff69..7980eea0 100644
--- a/app/src/main/res/layout/activity_create_pr.xml
+++ b/app/src/main/res/layout/activity_create_pr.xml
@@ -17,6 +17,7 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            android:background="?attr/primaryBackgroundColor"
             app:contentScrim="?attr/primaryBackgroundColor"
             android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
 
diff --git a/app/src/main/res/layout/activity_create_repo.xml b/app/src/main/res/layout/activity_create_repo.xml
index 471e0a3b..b769f6d4 100644
--- a/app/src/main/res/layout/activity_create_repo.xml
+++ b/app/src/main/res/layout/activity_create_repo.xml
@@ -17,6 +17,7 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            android:background="?attr/primaryBackgroundColor"
             app:contentScrim="?attr/primaryBackgroundColor"
             android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
 
diff --git a/app/src/main/res/layout/activity_settings_code_editor.xml b/app/src/main/res/layout/activity_settings_code_editor.xml
index 7082342f..3bedac6b 100644
--- a/app/src/main/res/layout/activity_settings_code_editor.xml
+++ b/app/src/main/res/layout/activity_settings_code_editor.xml
@@ -1,150 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/primaryBackgroundColor"
-    android:orientation="vertical">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dimen10dp"
-        android:theme="@style/Widget.AppCompat.SearchView"
-        app:elevation="@dimen/dimen0dp">
+        android:background="?attr/primaryBackgroundColor"
+        android:fitsSystemWindows="true">
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             android:background="?attr/primaryBackgroundColor"
-            android:theme="@style/AppTheme.AppBarOverlay">
+            app:contentScrim="?attr/primaryBackgroundColor"
+            android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
 
-            <ImageView
-                android:id="@+id/close"
-                android:layout_width="@dimen/dimen26dp"
-                android:layout_height="@dimen/dimen26dp"
-                android:layout_marginStart="@dimen/dimen16dp"
-                android:layout_marginEnd="@dimen/dimen16dp"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:contentDescription="@string/close"
-                android:focusable="true"
-                android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+             <com.google.android.material.appbar.MaterialToolbar
+                 android:id="@+id/topAppBar"
+                 android:layout_width="match_parent"
+                 android:elevation="0dp"
+                 android:layout_height="?attr/actionBarSize"
+                 app:title="@string/codeEditor"
+                 app:layout_collapseMode="pin"
+                 app:navigationIcon="@drawable/ic_close" />
 
-            <TextView
-                android:id="@+id/toolbar_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:maxLines="1"
-                android:text="@string/codeEditor"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
-
-        </com.google.android.material.appbar.MaterialToolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <LinearLayout
-        android:id="@+id/ceColorSelectionFrame"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dimen6dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:orientation="vertical"
-        android:padding="@dimen/dimen16dp">
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <TextView
-            android:id="@+id/ceColorHeaderSelector"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen24dp"
-            android:text="@string/ceSyntaxHighlightColor"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:orientation="vertical"
+            android:padding="@dimen/dimen16dp">
 
-        <TextView
-            android:id="@+id/ceColorSelected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen24dp"
-            android:text="@string/themeSelectionSelectedText"
-            android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            <LinearLayout
+                android:id="@+id/ceColorSelectionFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:focusable="true"
+                android:layout_marginTop="@dimen/dimen8dp"
+                android:orientation="vertical">
 
-    </LinearLayout>
+                <TextView
+                    android:id="@+id/ceColorHeaderSelector"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/ceSyntaxHighlightColor"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen18sp"/>
 
-    <LinearLayout
-        android:id="@+id/indentationSelectionFrame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dimen6dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:orientation="vertical"
-        android:padding="@dimen/dimen16dp">
+                <TextView
+                    android:id="@+id/ceColorSelected"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/themeSelectionSelectedText"
+                    android:textColor="?attr/selectedTextColor"
+                    android:textSize="@dimen/dimen16sp" />
 
-        <TextView
-            android:id="@+id/indentationHeaderSelector"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen24dp"
-            android:text="@string/ceIndentation"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            </LinearLayout>
 
-        <TextView
-            android:id="@+id/indentationSelected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen24dp"
-            android:text="@string/settingsThemeTimeSelectedHint"
-            android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            <LinearLayout
+                android:id="@+id/indentationSelectionFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dimen32dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:orientation="vertical">
 
-    </LinearLayout>
+                <TextView
+                    android:id="@+id/indentationHeaderSelector"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/ceIndentation"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen18sp" />
 
-    <LinearLayout
-        android:id="@+id/indentationTabsSelectionFrame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dimen6dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:orientation="vertical"
-        android:padding="@dimen/dimen16dp">
+                <TextView
+                    android:id="@+id/indentationSelected"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/settingsThemeTimeSelectedHint"
+                    android:textColor="?attr/selectedTextColor"
+                    android:textSize="@dimen/dimen16sp" />
 
-        <TextView
-            android:id="@+id/indentationTabsHeaderSelector"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen24dp"
-            android:text="@string/ceIndentationTabsWidth"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            </LinearLayout>
 
-        <TextView
-            android:id="@+id/indentationTabsSelected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen24dp"
-            android:text="@string/settingsThemeTimeSelectedHint"
-            android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            <LinearLayout
+                android:id="@+id/indentationTabsSelectionFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dimen32dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:orientation="vertical">
 
-    </LinearLayout>
+                <TextView
+                    android:id="@+id/indentationTabsHeaderSelector"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/ceIndentationTabsWidth"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen18sp" />
 
-</LinearLayout>
+                <TextView
+                    android:id="@+id/indentationTabsSelected"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/settingsThemeTimeSelectedHint"
+                    android:textColor="?attr/selectedTextColor"
+                    android:textSize="@dimen/dimen16sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_settings_notifications.xml b/app/src/main/res/layout/activity_settings_notifications.xml
index 8a56267a..cca7430e 100644
--- a/app/src/main/res/layout/activity_settings_notifications.xml
+++ b/app/src/main/res/layout/activity_settings_notifications.xml
@@ -17,6 +17,7 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            android:background="?attr/primaryBackgroundColor"
             app:contentScrim="?attr/primaryBackgroundColor"
             android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
 
diff --git a/app/src/main/res/layout/activity_settings_security.xml b/app/src/main/res/layout/activity_settings_security.xml
index 35967f02..4fcc211f 100644
--- a/app/src/main/res/layout/activity_settings_security.xml
+++ b/app/src/main/res/layout/activity_settings_security.xml
@@ -1,196 +1,169 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/primaryBackgroundColor"
-    android:orientation="vertical">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dimen10dp"
-        android:theme="@style/Widget.AppCompat.SearchView"
-        app:elevation="@dimen/dimen0dp">
+        android:background="?attr/primaryBackgroundColor"
+        android:fitsSystemWindows="true">
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/primaryBackgroundColor">
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            android:background="?attr/primaryBackgroundColor"
+            app:contentScrim="?attr/primaryBackgroundColor"
+            android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
 
-            <ImageView
-                android:id="@+id/close"
-                android:layout_width="@dimen/dimen26dp"
-                android:layout_height="@dimen/dimen26dp"
-                android:layout_marginStart="@dimen/dimen16dp"
-                android:layout_marginEnd="@dimen/dimen16dp"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:contentDescription="@string/close"
-                android:focusable="true"
-                android:gravity="center_vertical"
-                android:src="@drawable/ic_close"/>
+             <com.google.android.material.appbar.MaterialToolbar
+                 android:id="@+id/topAppBar"
+                 android:layout_width="match_parent"
+                 android:elevation="0dp"
+                 android:layout_height="?attr/actionBarSize"
+                 app:title="@string/settingsSecurityHeader"
+                 app:layout_collapseMode="pin"
+                 app:navigationIcon="@drawable/ic_close" />
 
-            <TextView
-                android:id="@+id/toolbar_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:maxLines="1"
-                android:text="@string/settingsSecurityHeader"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="@dimen/dimen20sp"/>
-
-        </com.google.android.material.appbar.MaterialToolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <RelativeLayout
-        android:id="@+id/biometricFrame"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dimen6dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:orientation="horizontal"
-        android:padding="@dimen/dimen16dp">
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <TextView
-            android:id="@+id/biometricHeader"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen72dp"
-            android:text="@string/settingsBiometricHeader"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:orientation="vertical"
+            android:padding="@dimen/dimen16dp">
 
-        <com.google.android.material.materialswitch.MaterialSwitch
-            android:id="@+id/switchBiometric"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dimen24dp"
-            android:layout_alignParentEnd="true"
-            android:layout_gravity="end"
-            android:layout_toEndOf="@+id/biometricHeader"
-            android:gravity="end"
-            android:paddingStart="@dimen/dimen0dp"
-            android:paddingEnd="@dimen/dimen24dp" />
+            <LinearLayout
+                android:id="@+id/biometricFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
-    </RelativeLayout>
+                <TextView
+                    android:id="@+id/biometricHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight=".90"
+                    android:text="@string/settingsBiometricHeader"
+                    android:layout_marginTop="@dimen/dimen4dp"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen18sp" />
 
-    <LinearLayout
-        android:id="@+id/certsFrame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dimen6dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:orientation="vertical"
-        android:padding="@dimen/dimen16dp">
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    android:id="@+id/switchBiometric"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/settingsBiometricHeader"
+                    android:layout_weight=".10" />
 
-        <TextView
-            android:id="@+id/tvCertHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen24dp"
-            android:text="@string/settingsCertsSelectorHeader"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="18sp"/>
+            </LinearLayout>
 
-    </LinearLayout>
+            <LinearLayout
+                android:id="@+id/certsFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dimen32dp"
+                android:orientation="vertical">
 
-    <LinearLayout
-        android:id="@+id/cacheSizeDataSelectionFrame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dimen6dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:orientation="vertical"
-        android:padding="@dimen/dimen16dp">
+                <TextView
+                    android:id="@+id/tvCertHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/settingsCertsSelectorHeader"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="18sp" />
 
-        <TextView
-            android:id="@+id/cacheSizeDataHeaderSelector"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen24dp"
-            android:text="@string/cacheSizeDataSelectionHeaderText"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            </LinearLayout>
 
-        <TextView
-            android:id="@+id/cacheSizeDataSelected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen24dp"
-            android:text="@string/cacheSizeDataSelectionSelectedText"
-            android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            <LinearLayout
+                android:id="@+id/cacheSizeDataSelectionFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dimen32dp"
+                android:orientation="vertical">
 
-    </LinearLayout>
+                <TextView
+                    android:id="@+id/cacheSizeDataHeaderSelector"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cacheSizeDataSelectionHeaderText"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen18sp" />
 
-    <LinearLayout
-        android:id="@+id/cacheSizeImagesSelectionFrame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dimen6dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:orientation="vertical"
-        android:padding="@dimen/dimen16dp">
+                <TextView
+                    android:id="@+id/cacheSizeDataSelected"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cacheSizeDataSelectionSelectedText"
+                    android:textColor="?attr/selectedTextColor"
+                    android:textSize="@dimen/dimen16sp" />
 
-        <TextView
-            android:id="@+id/cacheSizeImagesHeaderSelector"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen24dp"
-            android:text="@string/cacheSizeImagesSelectionHeaderText"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            </LinearLayout>
 
-        <TextView
-            android:id="@+id/cacheSizeImagesSelected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen24dp"
-            android:text="@string/cacheSizeImagesSelectionSelectedText"
-            android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            <LinearLayout
+                android:id="@+id/cacheSizeImagesSelectionFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dimen32dp"
+                android:orientation="vertical">
 
-    </LinearLayout>
+                <TextView
+                    android:id="@+id/cacheSizeImagesHeaderSelector"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cacheSizeImagesSelectionHeaderText"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen18sp" />
 
-    <LinearLayout
-        android:id="@+id/clearCacheSelectionFrame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dimen6dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:orientation="vertical"
-        android:padding="@dimen/dimen16dp">
+                <TextView
+                    android:id="@+id/cacheSizeImagesSelected"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cacheSizeImagesSelectionSelectedText"
+                    android:textColor="?attr/selectedTextColor"
+                    android:textSize="@dimen/dimen16sp" />
 
-        <TextView
-            android:id="@+id/clearCacheHeaderSelector"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen24dp"
-            android:text="@string/clearCacheSelectionHeaderText"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            </LinearLayout>
 
-        <TextView
-            android:id="@+id/clearCacheSelected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen24dp"
-            android:text="@string/clearCacheSelectionSelectedText"
-            android:textColor="?attr/selectedTextColor"
-            android:textSize="@dimen/dimen16sp"/>
+            <LinearLayout
+                android:id="@+id/clearCacheSelectionFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dimen32dp"
+                android:orientation="vertical">
 
-    </LinearLayout>
+                <TextView
+                    android:id="@+id/clearCacheHeaderSelector"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/clearCacheSelectionHeaderText"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen18sp" />
 
-</LinearLayout>
+                <TextView
+                    android:id="@+id/clearCacheSelected"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/clearCacheSelectionSelectedText"
+                    android:textColor="?attr/selectedTextColor"
+                    android:textSize="@dimen/dimen16sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>