diff --git a/app/src/main/java/mod/hey/studios/project/ProjectSettingsDialog.java b/app/src/main/java/mod/hey/studios/project/ProjectSettingsDialog.java
index 7177592fb5..37018d4484 100644
--- a/app/src/main/java/mod/hey/studios/project/ProjectSettingsDialog.java
+++ b/app/src/main/java/mod/hey/studios/project/ProjectSettingsDialog.java
@@ -37,18 +37,22 @@ public void show() {
                 behavior.setSkipCollapsed(true);
             }
         });
-        
+
         binding.etMinimumSdkVersion.setText(settings.getValue(ProjectSettings.SETTING_MINIMUM_SDK_VERSION, String.valueOf(VAR_DEFAULT_MIN_SDK_VERSION)));
         binding.etTargetSdkVersion.setText(settings.getValue(ProjectSettings.SETTING_TARGET_SDK_VERSION, String.valueOf(VAR_DEFAULT_TARGET_SDK_VERSION)));
         binding.etApplicationClassName.setText(settings.getValue(ProjectSettings.SETTING_APPLICATION_CLASS, ".SketchApplication"));
 
-        binding.enableViewbinding.setChecked(
+        binding.cbEnableViewbinding.setChecked(
                 settings.getValue(ProjectSettings.SETTING_ENABLE_VIEWBINDING, "false").equals("true"));
         binding.cbRemoveOldMethods.setChecked(
                 settings.getValue(ProjectSettings.SETTING_DISABLE_OLD_METHODS, "false").equals("true"));
         binding.cbUseNewMaterialComponentsAppTheme.setChecked(
                 settings.getValue(ProjectSettings.SETTING_ENABLE_BRIDGELESS_THEMES, "false").equals("true"));
 
+        binding.enableViewbinding.setOnClickListener(v -> binding.cbEnableViewbinding.performClick());
+        binding.removeOldMethods.setOnClickListener(v -> binding.cbRemoveOldMethods.performClick());
+        binding.useNewMaterialComponentsAppTheme.setOnClickListener(v -> binding.cbUseNewMaterialComponentsAppTheme.performClick());
+
         binding.enableViewbinding.setTag(ProjectSettings.SETTING_ENABLE_VIEWBINDING);
         binding.etMinimumSdkVersion.setTag(ProjectSettings.SETTING_MINIMUM_SDK_VERSION);
         binding.etTargetSdkVersion.setTag(ProjectSettings.SETTING_TARGET_SDK_VERSION);
@@ -62,7 +66,7 @@ public void show() {
                 binding.etMinimumSdkVersion,
                 binding.etTargetSdkVersion,
                 binding.etApplicationClassName,
-                binding.enableViewbinding,
+                binding.cbEnableViewbinding,
                 binding.cbRemoveOldMethods,
                 binding.cbUseNewMaterialComponentsAppTheme
         };
diff --git a/app/src/main/res/layout/activity_logcatreader.xml b/app/src/main/res/layout/activity_logcatreader.xml
index 11cb5401d4..14cb03c22b 100644
--- a/app/src/main/res/layout/activity_logcatreader.xml
+++ b/app/src/main/res/layout/activity_logcatreader.xml
@@ -70,7 +70,7 @@
         android:background="?attr/colorSurface"
         android:gravity="center"
         android:orientation="vertical"
-        android:paddingHorizontal="16dp"
+        android:paddingHorizontal="24dp"
         android:paddingBottom="100dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:visibility="gone">
@@ -78,6 +78,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="center"
             android:text="Logcat hasn't captured anything yet"
             android:textColor="?attr/colorOnSurface"
             android:textSize="20sp" />
@@ -86,6 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
+            android:gravity="center"
             android:text="Keep this screen open then run your app"
             android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="14sp" />
diff --git a/app/src/main/res/layout/bottom_sheet_project_options.xml b/app/src/main/res/layout/bottom_sheet_project_options.xml
index f9dd1ac0f8..42da01742b 100644
--- a/app/src/main/res/layout/bottom_sheet_project_options.xml
+++ b/app/src/main/res/layout/bottom_sheet_project_options.xml
@@ -16,7 +16,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginBottom="10dp"
         android:text="Project Settings"
-        android:textAppearance="?attr/textAppearanceHeadlineSmallEmphasized" />
+        android:textAppearance="?attr/textAppearanceTitleLarge" />
 
     <LinearLayout
         android:id="@+id/project_settings"
diff --git a/app/src/main/res/layout/compile_log.xml b/app/src/main/res/layout/compile_log.xml
index 3160f113f6..33e0a6b4c4 100644
--- a/app/src/main/res/layout/compile_log.xml
+++ b/app/src/main/res/layout/compile_log.xml
@@ -60,34 +60,31 @@
         android:id="@+id/noContentLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?android:colorBackground"
+        android:background="?attr/colorSurface"
         android:gravity="center"
         android:orientation="vertical"
-        android:paddingHorizontal="16dp"
+        android:paddingHorizontal="24dp"
         android:paddingBottom="100dp"
         android:visibility="gone"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="150dp"
-            android:src="@drawable/img_nocontent" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="30dp"
             android:gravity="center"
             android:text="Awesome, no bugs to fix!"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="20sp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="4dp"
             android:gravity="center"
             android:text="Let's continue working on the project"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="14sp" />
+
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/dialog_project_settings.xml b/app/src/main/res/layout/dialog_project_settings.xml
index 4743662828..fec527b4c9 100644
--- a/app/src/main/res/layout/dialog_project_settings.xml
+++ b/app/src/main/res/layout/dialog_project_settings.xml
@@ -3,10 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="16dp"
-    android:paddingEnd="16dp"
-    android:paddingStart="16dp">
+    android:orientation="vertical">
 
     <com.google.android.material.bottomsheet.BottomSheetDragHandleView
         android:id="@+id/drag_handle"
@@ -17,27 +14,27 @@
         android:id="@+id/preference_scroller"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginTop="8dp">
+        android:layout_weight="1">
 
         <LinearLayout
             android:id="@+id/preference_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingHorizontal="8dp">
+            android:orientation="vertical">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/til_minimum_sdk_version"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp">
+                android:layout_marginEnd="24dp"
+                android:layout_marginStart="24dp"
+                android:layout_marginTop="12dp"
+                android:hint="Minimum SDK version">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/et_minimum_sdk_version"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="Minimum SDK version"
                     android:inputType="number" />
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -45,13 +42,15 @@
                 android:id="@+id/til_target_sdk_version"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp">
+                android:layout_marginEnd="24dp"
+                android:layout_marginStart="24dp"
+                android:layout_marginTop="12dp"
+                android:hint="Target SDK version">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/et_target_sdk_version"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="Target SDK version"
                     android:inputType="number" />
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -59,118 +58,153 @@
                 android:id="@+id/til_application_class_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp">
+                android:layout_marginEnd="24dp"
+                android:layout_marginStart="24dp"
+                android:layout_marginTop="12dp"
+                android:hint="Application class name">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/et_application_class_name"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="Application class name"
                     android:inputType="text" />
             </com.google.android.material.textfield.TextInputLayout>
 
-            <com.google.android.material.card.MaterialCardView
-                style="?attr/materialCardViewFilledStyle"
+            <LinearLayout
+                android:id="@+id/enable_viewbinding"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                app:cardBackgroundColor="?attr/colorSurfaceContainer"
-                app:strokeWidth="0.5dp">
+                android:layout_marginTop="8dp"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:paddingHorizontal="24dp"
+                android:paddingVertical="16dp">
 
                 <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:background="?selectableItemBackground"
-                    android:orientation="vertical"
-                    android:padding="12dp">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <com.google.android.material.materialswitch.MaterialSwitch
-                        android:id="@+id/enable_viewbinding"
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:minHeight="0dp"
                         android:text="Enable ViewBinding"
-                        android:textStyle="bold" />
+                        android:textAppearance="?attr/textAppearanceBodyLarge"
+                        android:textColor="?attr/colorOnSurface" />
 
                     <TextView
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
-                        android:layout_marginEnd="26dp"
+                        android:layout_marginTop="2dp"
                         android:text="This will enable ViewBinding in your project. Note: It will require changes on older projects"
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textAppearance="?attr/textAppearanceBodyMedium"
+                        android:textColor="?attr/colorOnSurfaceVariant" />
 
                 </LinearLayout>
-            </com.google.android.material.card.MaterialCardView>
 
+                <CheckBox
+                    android:id="@+id/cb_enable_viewbinding"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:minWidth="0dp"
+                    android:minHeight="0dp" />
+
+            </LinearLayout>
 
-            <com.google.android.material.card.MaterialCardView
-                style="?attr/materialCardViewFilledStyle"
+            <LinearLayout
+                android:id="@+id/remove_old_methods"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                app:cardBackgroundColor="?attr/colorSurfaceContainer"
-                app:strokeWidth="0.5dp">
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:paddingHorizontal="24dp"
+                android:paddingVertical="16dp">
 
                 <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:background="?selectableItemBackground"
-                    android:orientation="vertical"
-                    android:padding="12dp">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <com.google.android.material.materialswitch.MaterialSwitch
-                        android:id="@+id/cb_remove_old_methods"
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:minHeight="0dp"
                         android:text="Remove old deprecated methods"
-                        android:textStyle="bold" />
+                        android:textAppearance="?attr/textAppearanceBodyLarge"
+                        android:textColor="?attr/colorOnSurface" />
 
                     <TextView
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
-                        android:layout_marginEnd="26dp"
+                        android:layout_marginTop="2dp"
                         android:text="This will remove methods in files, like showMessage, getDip, etc."
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textAppearance="?attr/textAppearanceBodyMedium"
+                        android:textColor="?attr/colorOnSurfaceVariant" />
 
                 </LinearLayout>
-            </com.google.android.material.card.MaterialCardView>
 
-            <com.google.android.material.card.MaterialCardView
-                style="?attr/materialCardViewFilledStyle"
+                <CheckBox
+                    android:id="@+id/cb_remove_old_methods"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:minWidth="0dp"
+                    android:minHeight="0dp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/use_new_material_components_app_theme"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                app:cardBackgroundColor="?attr/colorSurfaceContainer"
-                app:strokeWidth="0.5dp">
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:paddingHorizontal="24dp"
+                android:paddingVertical="16dp">
 
                 <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:background="?selectableItemBackground"
-                    android:orientation="vertical"
-                    android:padding="12dp">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <com.google.android.material.materialswitch.MaterialSwitch
-                        android:id="@+id/cb_use_new_material_components_app_theme"
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:minHeight="0dp"
                         android:text="Use MaterialComponents"
-                        android:textStyle="bold" />
+                        android:textAppearance="?attr/textAppearanceBodyLarge"
+                        android:textColor="?attr/colorOnSurface" />
 
                     <TextView
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
-                        android:layout_marginEnd="26dp"
+                        android:layout_marginTop="2dp"
                         android:text="This will replace e.g. Button with MaterialButton, be careful!"
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textAppearance="?attr/textAppearanceBodyMedium"
+                        android:textColor="?attr/colorOnSurfaceVariant" />
 
                 </LinearLayout>
-            </com.google.android.material.card.MaterialCardView>
+
+                <CheckBox
+                    android:id="@+id/cb_use_new_material_components_app_theme"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:minWidth="0dp"
+                    android:minHeight="0dp" />
+
+            </LinearLayout>
 
         </LinearLayout>
     </ScrollView>
@@ -179,21 +213,25 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:gravity="end"
-        android:layout_marginTop="16dp">
+        android:layout_marginEnd="24dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginVertical="8dp">
 
         <Button
             android:id="@+id/cancel"
             style="?attr/materialButtonOutlinedStyle"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_weight="1"
             android:text="@string/common_word_cancel" />
 
         <Button
             android:id="@+id/save"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:text="@string/common_word_save" />
+
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_events_manager_details.xml b/app/src/main/res/layout/fragment_events_manager_details.xml
index 8392e26722..c62568afd2 100644
--- a/app/src/main/res/layout/fragment_events_manager_details.xml
+++ b/app/src/main/res/layout/fragment_events_manager_details.xml
@@ -58,34 +58,31 @@
         android:id="@+id/no_events_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?android:colorBackground"
+        android:background="?attr/colorSurface"
         android:gravity="center"
         android:orientation="vertical"
-        android:paddingHorizontal="16dp"
+        android:paddingHorizontal="24dp"
         android:paddingBottom="100dp"
         android:visibility="gone"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="150dp"
-            android:src="@drawable/img_nocontent" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="40dp"
             android:gravity="center"
             android:text="No events"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="20sp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="4dp"
             android:gravity="center"
             android:text="Start by creating a new one"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="14sp" />
+
     </LinearLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/app/src/main/res/layout/logic_popup_add_component_temp.xml b/app/src/main/res/layout/logic_popup_add_component_temp.xml
index 781551032d..79558318bd 100644
--- a/app/src/main/res/layout/logic_popup_add_component_temp.xml
+++ b/app/src/main/res/layout/logic_popup_add_component_temp.xml
@@ -203,7 +203,8 @@
                     android:layout_marginTop="16dp"
                     android:layout_marginRight="24dp"
                     android:importantForAutofill="noExcludeDescendants"
-                    app:endIconDrawable="@drawable/ic_expand_more_grey600_24dp">
+                    app:endIconDrawable="@drawable/ic_expand_more_grey600_24dp"
+                    app:endIconMode="custom">
 
                     <EditText
                         android:id="@+id/ed_input_file_picker"
diff --git a/app/src/main/res/layout/manage_app_compat.xml b/app/src/main/res/layout/manage_app_compat.xml
index fa99d4c3e4..1ce5c38a58 100644
--- a/app/src/main/res/layout/manage_app_compat.xml
+++ b/app/src/main/res/layout/manage_app_compat.xml
@@ -54,7 +54,7 @@
         android:background="?attr/colorSurface"
         android:gravity="center"
         android:orientation="vertical"
-        android:paddingHorizontal="16dp"
+        android:paddingHorizontal="24dp"
         android:visibility="gone"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:visibility="gone">
@@ -63,6 +63,7 @@
             android:id="@+id/note_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="center"
             android:textColor="?attr/colorOnSurface"
             android:textSize="20sp" />
 
@@ -71,6 +72,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
+            android:gravity="center"
             android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="14sp" />
 
diff --git a/app/src/main/res/layout/manage_file.xml b/app/src/main/res/layout/manage_file.xml
index e93eee1b42..9dc20f04a1 100644
--- a/app/src/main/res/layout/manage_file.xml
+++ b/app/src/main/res/layout/manage_file.xml
@@ -52,34 +52,31 @@
         android:id="@+id/noContentLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?android:colorBackground"
+        android:background="?attr/colorSurface"
         android:gravity="center"
         android:orientation="vertical"
-        android:paddingHorizontal="16dp"
+        android:paddingHorizontal="24dp"
         android:paddingBottom="100dp"
         android:visibility="gone"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="150dp"
-            android:src="@drawable/img_nocontent" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="30dp"
             android:gravity="center"
             android:text="@string/assets_manager_nofiles_title"
+            android:textColor="?attr/colorOnSurface"
             android:textSize="20sp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="4dp"
             android:gravity="center"
             android:text="@string/assets_manager_nofiles_body"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="14sp" />
+
     </LinearLayout>
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton