diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml
index 556b7add..3a80883f 100644
--- a/app/src/main/res/layout-sw600dp/activity_main.xml
+++ b/app/src/main/res/layout-sw600dp/activity_main.xml
@@ -39,4 +39,4 @@
         app:layout_constraintStart_toEndOf="@id/nav_view"
         app:layout_constraintTop_toBottomOf="@id/app_bar_layout"
         app:navGraph="@navigation/mobile_navigation" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_alert_dialog.xml b/app/src/main/res/layout/activity_alert_dialog.xml
index 04dd089e..d5afa346 100644
--- a/app/src/main/res/layout/activity_alert_dialog.xml
+++ b/app/src/main/res/layout/activity_alert_dialog.xml
@@ -24,7 +24,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:tooltipText="@string/tooltip_show_java_code_snippet"
diff --git a/app/src/main/res/layout/activity_android_history.xml b/app/src/main/res/layout/activity_android_history.xml
index eabe01d6..d2c72065 100644
--- a/app/src/main/res/layout/activity_android_history.xml
+++ b/app/src/main/res/layout/activity_android_history.xml
@@ -11,8 +11,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingHorizontal="24dp"
-        android:paddingTop="24dp"
-        android:paddingBottom="24dp">
+        android:paddingVertical="24dp">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/text_view_history"
diff --git a/app/src/main/res/layout/activity_android_start_project.xml b/app/src/main/res/layout/activity_android_start_project.xml
index d8b6e095..66bbc9ec 100644
--- a/app/src/main/res/layout/activity_android_start_project.xml
+++ b/app/src/main/res/layout/activity_android_start_project.xml
@@ -31,8 +31,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:paddingHorizontal="24dp"
-            android:paddingTop="24dp"
-            android:paddingBottom="24dp">
+            android:paddingVertical="24dp">
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text_view_first_step"
diff --git a/app/src/main/res/layout/activity_bottom_navigation.xml b/app/src/main/res/layout/activity_bottom_navigation.xml
index 371821ec..ecc93e0d 100644
--- a/app/src/main/res/layout/activity_bottom_navigation.xml
+++ b/app/src/main/res/layout/activity_bottom_navigation.xml
@@ -29,7 +29,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:tooltipText="@string/tooltip_show_java_code_snippet"
diff --git a/app/src/main/res/layout/activity_buttons.xml b/app/src/main/res/layout/activity_buttons.xml
index 1e7ee84d..6560e2a8 100644
--- a/app/src/main/res/layout/activity_buttons.xml
+++ b/app/src/main/res/layout/activity_buttons.xml
@@ -15,26 +15,26 @@
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingHorizontal="24dp">
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/description" />
 
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
-                app:cardCornerRadius="24dp">
+                android:layout_marginVertical="24dp"
+                app:cardCornerRadius="24dp"
+                app:contentPadding="24dp">
 
                 <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="24dp"
                     android:text="@string/summary_buttons" />
             </com.google.android.material.card.MaterialCardView>
 
@@ -42,7 +42,6 @@
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:text="@string/layout_preview" />
 
             <com.google.android.material.textview.MaterialTextView
@@ -50,7 +49,6 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/button_normal" />
 
@@ -60,7 +58,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button"
                 tools:ignore="DuplicateSpeakableTextCheck" />
 
@@ -69,7 +67,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button_outlined" />
 
             <com.google.android.material.button.MaterialButton
@@ -78,7 +76,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button"
                 tools:ignore="DuplicateSpeakableTextCheck,TextContrastCheck" />
 
@@ -87,7 +85,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button_elevated" />
 
             <com.google.android.material.button.MaterialButton
@@ -96,7 +94,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button" />
 
             <com.google.android.material.textview.MaterialTextView
@@ -104,7 +102,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button_normal_icon" />
 
             <com.google.android.material.button.MaterialButton
@@ -113,7 +111,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button"
                 app:icon="@drawable/ic_check_circle" />
 
@@ -122,7 +120,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button_outlined_icon" />
 
             <com.google.android.material.button.MaterialButton
@@ -131,7 +129,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button"
                 app:icon="@drawable/ic_check_circle" />
 
@@ -140,7 +138,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button_elevated_icon" />
 
             <com.google.android.material.button.MaterialButton
@@ -149,7 +147,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button"
                 app:icon="@drawable/ic_check_circle"
                 tools:ignore="TextContrastCheck" />
@@ -159,7 +157,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/extended_floating_button_primary" />
 
             <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
@@ -168,7 +166,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button"
                 tools:ignore="ContentDescription" />
 
@@ -177,7 +175,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/extended_floating_button_secondary" />
 
             <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
@@ -186,7 +184,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button"
                 tools:ignore="ContentDescription" />
 
@@ -195,7 +193,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/extended_floating_button_surface" />
 
             <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
@@ -204,7 +202,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button"
                 tools:ignore="ContentDescription" />
 
@@ -213,7 +211,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/extended_floating_button_tertiary" />
 
             <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
@@ -222,7 +220,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button"
                 tools:ignore="ContentDescription" />
 
@@ -231,7 +229,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/extended_floating_button_primary_icon" />
 
             <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
@@ -240,7 +238,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button"
                 app:icon="@drawable/ic_check_circle"
                 tools:ignore="ContentDescription" />
@@ -250,7 +248,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/extended_floating_button_secondary_icon" />
 
             <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
@@ -259,7 +257,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button"
                 app:icon="@drawable/ic_check_circle"
                 tools:ignore="ContentDescription" />
@@ -269,7 +267,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/extended_floating_button_surface_icon" />
 
             <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
@@ -278,7 +276,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button"
                 app:icon="@drawable/ic_check_circle"
                 tools:ignore="ContentDescription" />
@@ -288,7 +286,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/extended_floating_button_tertiary_icon" />
 
             <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
@@ -297,7 +295,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/button"
                 app:icon="@drawable/ic_check_circle"
                 tools:ignore="ContentDescription" />
@@ -307,7 +305,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/floating_button_primary_icon" />
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -316,7 +314,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:src="@drawable/ic_check_circle"
                 tools:ignore="ContentDescription" />
 
@@ -325,7 +323,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/floating_button_secondary_icon" />
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -334,7 +332,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:src="@drawable/ic_check_circle"
                 tools:ignore="ContentDescription" />
 
@@ -343,7 +341,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/floating_button_surface_icon" />
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -352,7 +350,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:src="@drawable/ic_check_circle"
                 tools:ignore="ContentDescription" />
 
@@ -361,7 +359,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/floating_button_tertiary_icon" />
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -370,7 +368,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:src="@drawable/ic_check_circle"
                 tools:ignore="ContentDescription" />
         </androidx.appcompat.widget.LinearLayoutCompat>
@@ -381,7 +379,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -390,4 +389,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_chronometer.xml b/app/src/main/res/layout/activity_chronometer.xml
index 1c20b9a5..334bfd31 100644
--- a/app/src/main/res/layout/activity_chronometer.xml
+++ b/app/src/main/res/layout/activity_chronometer.xml
@@ -15,27 +15,27 @@
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="24dp">
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/description" />
 
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
-                app:cardCornerRadius="24dp">
+                android:layout_marginVertical="24dp"
+                app:cardCornerRadius="24dp"
+                app:contentPadding="24dp">
 
                 <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="24dp"
                     android:text="@string/summary_chronometer" />
             </com.google.android.material.card.MaterialCardView>
 
@@ -43,7 +43,6 @@
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:text="@string/layout_preview" />
 
             <Chronometer
@@ -52,7 +51,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="00:00"
                 tools:ignore="HardcodedText" />
 
@@ -61,9 +60,7 @@
                 style="@style/Widget.Material3.Button.ElevatedButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
-                android:layout_marginEnd="24dp"
                 android:text="@string/start" />
 
             <com.google.android.material.button.MaterialButton
@@ -71,9 +68,7 @@
                 style="@style/Widget.Material3.Button.ElevatedButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
-                android:layout_marginEnd="24dp"
                 android:text="@string/stop" />
 
             <com.google.android.material.button.MaterialButton
@@ -81,7 +76,7 @@
                 style="@style/Widget.Material3.Button.ElevatedButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/reset" />
         </androidx.appcompat.widget.LinearLayoutCompat>
     </me.zhanghai.android.fastscroll.FastScrollScrollView>
@@ -91,7 +86,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
diff --git a/app/src/main/res/layout/activity_clock.xml b/app/src/main/res/layout/activity_clock.xml
index b84b3b8f..4ab9365a 100644
--- a/app/src/main/res/layout/activity_clock.xml
+++ b/app/src/main/res/layout/activity_clock.xml
@@ -16,26 +16,26 @@
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingHorizontal="24dp">
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/description" />
 
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
-                app:cardCornerRadius="24dp">
+                android:layout_marginVertical="24dp"
+                app:cardCornerRadius="24dp"
+                app:contentPadding="24dp">
 
                 <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="24dp"
                     android:text="@string/summary_clocks" />
             </com.google.android.material.card.MaterialCardView>
 
@@ -43,7 +43,6 @@
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:text="@string/layout_preview" />
 
             <com.google.android.material.textview.MaterialTextView
@@ -51,7 +50,7 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/clock_analog" />
 
             <AnalogClock
@@ -59,13 +58,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="108dp"
                 android:layout_gravity="center"
-                android:layout_margin="24dp" />
+                android:layout_marginVertical="24dp" />
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/clock_digital" />
 
             <DigitalClock
@@ -73,14 +72,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp" />
+                android:layout_marginVertical="24dp" />
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/simpleTextClockText"
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:text="@string/clock_text" />
 
             <TextClock
@@ -88,7 +87,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp" />
+                android:layout_marginVertical="24dp" />
         </androidx.appcompat.widget.LinearLayoutCompat>
     </me.zhanghai.android.fastscroll.FastScrollScrollView>
 
@@ -97,7 +96,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
diff --git a/app/src/main/res/layout/activity_date_picker.xml b/app/src/main/res/layout/activity_date_picker.xml
index 91090d56..22e3c7b9 100644
--- a/app/src/main/res/layout/activity_date_picker.xml
+++ b/app/src/main/res/layout/activity_date_picker.xml
@@ -4,13 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:paddingHorizontal="24dp"
+    android:paddingTop="24dp">
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/currentDateTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:drawableStart="@drawable/ic_date_range"
         android:text="@string/current_date"
         android:textColor="?attr/colorAccent"
@@ -24,7 +26,7 @@
         style="@style/Widget.Material3.Button.ElevatedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginTop="24dp"
         android:text="@string/change_date"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -35,7 +37,7 @@
         android:id="@+id/dateTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:textSize="24sp"
         app:layout_constraintBottom_toTopOf="@id/changeDateButton"
         app:layout_constraintEnd_toEndOf="parent"
@@ -46,7 +48,7 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -55,4 +57,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_grid_view.xml b/app/src/main/res/layout/activity_grid_view.xml
index 5b5f267c..387a007c 100644
--- a/app/src/main/res/layout/activity_grid_view.xml
+++ b/app/src/main/res/layout/activity_grid_view.xml
@@ -10,9 +10,8 @@
         android:id="@+id/grid_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginStart="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginTop="24dp"
-        android:layout_marginEnd="24dp"
         android:layout_marginBottom="80dp"
         android:columnWidth="48dp"
         android:numColumns="auto_fit" />
@@ -22,7 +21,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -31,4 +31,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
index 2e045d82..a270204b 100644
--- a/app/src/main/res/layout/activity_help.xml
+++ b/app/src/main/res/layout/activity_help.xml
@@ -3,13 +3,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:paddingHorizontal="24dp"
+    android:paddingVertical="24dp">
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text_view_faq"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:text="@string/faq"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -19,7 +21,7 @@
         style="@style/Widget.Material3.CardView.Filled"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toTopOf="@id/frame_layout_feedback"
         app:layout_constraintTop_toBottomOf="@id/text_view_faq">
 
@@ -33,6 +35,5 @@
         android:id="@+id/frame_layout_feedback"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
         app:layout_constraintBottom_toBottomOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_image_buttons.xml b/app/src/main/res/layout/activity_image_buttons.xml
index 08e8dfbc..e8167bd5 100644
--- a/app/src/main/res/layout/activity_image_buttons.xml
+++ b/app/src/main/res/layout/activity_image_buttons.xml
@@ -14,27 +14,27 @@
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="24dp">
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/description" />
 
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
-                app:cardCornerRadius="24dp">
+                android:layout_marginVertical="24dp"
+                app:cardCornerRadius="24dp"
+                app:contentPadding="24dp">
 
                 <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="24dp"
                     android:text="@string/summary_image_buttons" />
             </com.google.android.material.card.MaterialCardView>
 
@@ -42,7 +42,6 @@
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:text="@string/layout_preview" />
 
             <androidx.appcompat.widget.AppCompatImageButton
@@ -50,7 +49,7 @@
                 android:layout_width="108dp"
                 android:layout_height="108dp"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:scaleType="fitCenter"
                 android:src="@mipmap/ic_launcher"
                 tools:ignore="SpeakableTextPresentCheck,ImageContrastCheck" />
@@ -62,7 +61,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -71,4 +71,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_images.xml b/app/src/main/res/layout/activity_images.xml
index 497934dd..7edc4c66 100644
--- a/app/src/main/res/layout/activity_images.xml
+++ b/app/src/main/res/layout/activity_images.xml
@@ -15,13 +15,13 @@
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingHorizontal="24dp">
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/description"
                 app:fontFamily="@font/font_poppins" />
@@ -29,13 +29,13 @@
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
-                app:cardCornerRadius="24dp">
+                android:layout_marginVertical="24dp"
+                app:cardCornerRadius="24dp"
+                app:contentPadding="24dp">
 
                 <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="24dp"
                     android:text="@string/summary_image_view" />
             </com.google.android.material.card.MaterialCardView>
 
@@ -43,7 +43,6 @@
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:text="@string/layout_preview"
                 app:fontFamily="@font/font_poppins" />
 
@@ -52,7 +51,7 @@
                 style="@style/Widget.Material3.CardView.Elevated"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 app:cardCornerRadius="24dp">
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -71,7 +70,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -80,4 +80,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_linear_layout.xml b/app/src/main/res/layout/activity_linear_layout.xml
index 8b130070..0e412443 100644
--- a/app/src/main/res/layout/activity_linear_layout.xml
+++ b/app/src/main/res/layout/activity_linear_layout.xml
@@ -15,26 +15,26 @@
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingHorizontal="24dp">
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/description" />
 
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
-                app:cardCornerRadius="24dp">
+                android:layout_marginVertical="24dp"
+                app:cardCornerRadius="24dp"
+                app:contentPadding="24dp">
 
                 <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="24dp"
                     android:text="@string/summary_linear_layout_compat" />
             </com.google.android.material.card.MaterialCardView>
 
@@ -42,14 +42,12 @@
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:text="@string/layout_preview" />
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/vertical" />
 
@@ -57,7 +55,7 @@
                 android:id="@+id/linear_layout_vertical"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:gravity="center"
                 android:orientation="vertical">
 
@@ -86,7 +84,6 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/horizontal" />
 
@@ -95,7 +92,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:orientation="horizontal">
 
                 <com.google.android.material.button.MaterialButton
@@ -125,7 +122,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -134,4 +132,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_navigation_drawer.xml b/app/src/main/res/layout/activity_navigation_drawer.xml
index 327e6d80..def84bbb 100644
--- a/app/src/main/res/layout/activity_navigation_drawer.xml
+++ b/app/src/main/res/layout/activity_navigation_drawer.xml
@@ -27,7 +27,8 @@
             style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="24dp"
+            android:layout_marginEnd="24dp"
+            android:layout_marginBottom="24dp"
             android:contentDescription="@string/tooltip_show_java_code_snippet"
             android:text="@string/show_code"
             android:tooltipText="@string/tooltip_show_java_code_snippet"
diff --git a/app/src/main/res/layout/activity_notification.xml b/app/src/main/res/layout/activity_notification.xml
index 70494111..a0cb15be 100644
--- a/app/src/main/res/layout/activity_notification.xml
+++ b/app/src/main/res/layout/activity_notification.xml
@@ -21,7 +21,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -30,4 +31,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_password_box.xml b/app/src/main/res/layout/activity_password_box.xml
index e837105b..b221e43a 100644
--- a/app/src/main/res/layout/activity_password_box.xml
+++ b/app/src/main/res/layout/activity_password_box.xml
@@ -3,13 +3,15 @@
     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">
+    android:layout_height="match_parent"
+    android:paddingHorizontal="24dp"
+    android:paddingTop="24dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/editTextLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:padding="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -55,7 +57,7 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -64,4 +66,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_permissions_tutorial.xml b/app/src/main/res/layout/activity_permissions_tutorial.xml
index 5067e50d..b7fd4043 100644
--- a/app/src/main/res/layout/activity_permissions_tutorial.xml
+++ b/app/src/main/res/layout/activity_permissions_tutorial.xml
@@ -8,13 +8,15 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="24dp"
+        android:paddingVertical="24dp">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/text_view_permissions_beginning"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="24dp"
+            android:layout_marginBottom="24dp"
             android:text="@string/summary_permissions"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -22,7 +24,7 @@
             android:id="@+id/ad_view_large"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="24dp"
+            android:layout_marginVertical="24dp"
             app:layout_constraintTop_toBottomOf="@id/text_view_permissions_beginning" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -30,7 +32,7 @@
             style="@style/TextAppearance.Material3.TitleLarge"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="24dp"
+            android:layout_marginTop="24dp"
             android:text="@string/permission_dialog_example"
             app:layout_constraintTop_toBottomOf="@id/ad_view_large" />
 
@@ -39,7 +41,7 @@
             style="@style/Widget.Material3.CardView.Elevated"
             android:layout_width="290dp"
             android:layout_height="414dp"
-            android:layout_margin="24dp"
+            android:layout_marginTop="24dp"
             app:cardCornerRadius="24dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -65,7 +67,7 @@
             style="@style/Widget.Material3.Button.ElevatedButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="24dp"
+            android:layout_marginTop="24dp"
             android:text="@string/more_about_permissions"
             android:tooltipText="@string/more_about_permissions"
             app:layout_constraintStart_toStartOf="parent"
@@ -76,7 +78,7 @@
             android:id="@+id/ad_view_bottom"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="24dp"
+            android:layout_marginTop="24dp"
             app:layout_constraintTop_toBottomOf="@id/button_more" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</me.zhanghai.android.fastscroll.FastScrollScrollView>
\ No newline at end of file
+</me.zhanghai.android.fastscroll.FastScrollScrollView>
diff --git a/app/src/main/res/layout/activity_progress_bar.xml b/app/src/main/res/layout/activity_progress_bar.xml
index ed854889..3f1e3032 100644
--- a/app/src/main/res/layout/activity_progress_bar.xml
+++ b/app/src/main/res/layout/activity_progress_bar.xml
@@ -15,26 +15,26 @@
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingHorizontal="24dp">
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/description" />
 
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
-                app:cardCornerRadius="24dp">
+                android:layout_marginVertical="24dp"
+                app:cardCornerRadius="24dp"
+                app:contentPadding="24dp">
 
                 <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="24dp"
                     android:text="@string/summary_progress_bar" />
             </com.google.android.material.card.MaterialCardView>
 
@@ -42,14 +42,12 @@
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:text="@string/layout_preview" />
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/horizontal" />
 
@@ -58,7 +56,7 @@
                 style="@style/Widget.Material3Expressive.LinearProgressIndicator.Wavy"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:indeterminate="true" />
 
             <com.google.android.material.button.MaterialButton
@@ -72,7 +70,6 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/circular" />
 
@@ -82,7 +79,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 android:indeterminate="true" />
 
             <com.google.android.material.button.MaterialButton
@@ -100,7 +97,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -109,4 +107,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_radio_buttons.xml b/app/src/main/res/layout/activity_radio_buttons.xml
index cabdde91..a09b1c79 100644
--- a/app/src/main/res/layout/activity_radio_buttons.xml
+++ b/app/src/main/res/layout/activity_radio_buttons.xml
@@ -4,13 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:paddingHorizontal="24dp"
+    android:paddingTop="24dp">
 
     <com.google.android.material.textview.MaterialTextView
         style="@style/TextAppearance.Material3.TitleLarge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:text="@string/choose_your_option"
 
         app:layout_constraintBottom_toTopOf="@id/radio_group"
@@ -45,7 +47,7 @@
         style="@style/Widget.Material3.Button.ElevatedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginTop="24dp"
         android:text="@string/display_option"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -56,7 +58,7 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -65,4 +67,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_rating_bar.xml b/app/src/main/res/layout/activity_rating_bar.xml
index a28991b2..1e98549c 100644
--- a/app/src/main/res/layout/activity_rating_bar.xml
+++ b/app/src/main/res/layout/activity_rating_bar.xml
@@ -3,14 +3,16 @@
     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">
+    android:layout_height="match_parent"
+    android:paddingHorizontal="24dp"
+    android:paddingTop="24dp">
 
     <me.zhanghai.android.materialratingbar.MaterialRatingBar
         android:id="@+id/rating_bar"
         style="@style/Widget.MaterialRatingBar.RatingBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -42,7 +44,7 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -51,4 +53,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_relative_layout.xml b/app/src/main/res/layout/activity_relative_layout.xml
index 667d4fb8..0b745231 100644
--- a/app/src/main/res/layout/activity_relative_layout.xml
+++ b/app/src/main/res/layout/activity_relative_layout.xml
@@ -10,9 +10,8 @@
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginStart="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginTop="24dp"
-        android:layout_marginEnd="24dp"
         android:layout_marginBottom="80dp">
 
         <RelativeLayout
@@ -73,7 +72,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -82,4 +82,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_retrofit.xml b/app/src/main/res/layout/activity_retrofit.xml
index b5c4f368..38491c08 100644
--- a/app/src/main/res/layout/activity_retrofit.xml
+++ b/app/src/main/res/layout/activity_retrofit.xml
@@ -42,7 +42,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
diff --git a/app/src/main/res/layout/activity_room.xml b/app/src/main/res/layout/activity_room.xml
index fc27aba9..2be26535 100644
--- a/app/src/main/res/layout/activity_room.xml
+++ b/app/src/main/res/layout/activity_room.xml
@@ -20,9 +20,8 @@
         android:id="@+id/textInputLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginHorizontal="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewSummary">
@@ -61,7 +60,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
diff --git a/app/src/main/res/layout/activity_shortcuts.xml b/app/src/main/res/layout/activity_shortcuts.xml
index 4b057c0e..533ac1ca 100644
--- a/app/src/main/res/layout/activity_shortcuts.xml
+++ b/app/src/main/res/layout/activity_shortcuts.xml
@@ -21,7 +21,9 @@
         style="@style/Widget.Material3.Button.ElevatedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
         android:text="@string/more_about_shortcuts"
         android:tooltipText="@string/more_about_shortcuts"
         app:layout_constraintBottom_toTopOf="@id/ad_view_bottom"
@@ -32,8 +34,10 @@
         android:id="@+id/ad_view_bottom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
         ads:adSize="FULL_BANNER"
         ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts_build.xml b/app/src/main/res/layout/activity_shortcuts_build.xml
index a5e1f6e3..5ffbd4ad 100644
--- a/app/src/main/res/layout/activity_shortcuts_build.xml
+++ b/app/src/main/res/layout/activity_shortcuts_build.xml
@@ -17,7 +17,7 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
 
             <TableLayout
                 android:id="@+id/table_layout"
@@ -119,10 +119,12 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
         ads:adSize="FULL_BANNER"
         ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts_code.xml b/app/src/main/res/layout/activity_shortcuts_code.xml
index 6f23d135..e616b699 100644
--- a/app/src/main/res/layout/activity_shortcuts_code.xml
+++ b/app/src/main/res/layout/activity_shortcuts_code.xml
@@ -17,7 +17,7 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
 
             <TableLayout
                 android:id="@+id/table_layout"
@@ -278,10 +278,12 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
         ads:adSize="FULL_BANNER"
         ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts_debugging.xml b/app/src/main/res/layout/activity_shortcuts_debugging.xml
index 94f0c2f8..244711fc 100644
--- a/app/src/main/res/layout/activity_shortcuts_debugging.xml
+++ b/app/src/main/res/layout/activity_shortcuts_debugging.xml
@@ -17,7 +17,7 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
 
             <TableLayout
                 android:id="@+id/table_layout"
@@ -278,10 +278,12 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
         ads:adSize="FULL_BANNER"
         ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts_general.xml b/app/src/main/res/layout/activity_shortcuts_general.xml
index 8ff8cd9f..cced18b8 100644
--- a/app/src/main/res/layout/activity_shortcuts_general.xml
+++ b/app/src/main/res/layout/activity_shortcuts_general.xml
@@ -17,7 +17,7 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
 
             <TableLayout
                 android:id="@+id/table_layout"
@@ -255,10 +255,12 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
         ads:adSize="FULL_BANNER"
         ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts_navigation_and_searching.xml b/app/src/main/res/layout/activity_shortcuts_navigation_and_searching.xml
index b9ffb6e4..b2fcffcc 100644
--- a/app/src/main/res/layout/activity_shortcuts_navigation_and_searching.xml
+++ b/app/src/main/res/layout/activity_shortcuts_navigation_and_searching.xml
@@ -47,7 +47,9 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
         ads:adSize="FULL_BANNER"
         ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/activity_shortcuts_refractoring.xml b/app/src/main/res/layout/activity_shortcuts_refractoring.xml
index 9a2b7370..8d0323e7 100644
--- a/app/src/main/res/layout/activity_shortcuts_refractoring.xml
+++ b/app/src/main/res/layout/activity_shortcuts_refractoring.xml
@@ -17,7 +17,7 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
 
             <TableLayout
                 android:id="@+id/table_layout"
@@ -278,10 +278,12 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
         ads:adSize="FULL_BANNER"
         ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_shortcuts_version_control.xml b/app/src/main/res/layout/activity_shortcuts_version_control.xml
index f6d64aa6..55d395fa 100644
--- a/app/src/main/res/layout/activity_shortcuts_version_control.xml
+++ b/app/src/main/res/layout/activity_shortcuts_version_control.xml
@@ -17,7 +17,7 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
 
             <TableLayout
                 android:id="@+id/table_layout"
@@ -140,10 +140,12 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
         ads:adSize="FULL_BANNER"
         ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_snack_bar.xml b/app/src/main/res/layout/activity_snack_bar.xml
index ec9d7c22..4c398d8e 100644
--- a/app/src/main/res/layout/activity_snack_bar.xml
+++ b/app/src/main/res/layout/activity_snack_bar.xml
@@ -22,7 +22,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -31,4 +32,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_startup.xml b/app/src/main/res/layout/activity_startup.xml
index 4f717100..9926468e 100644
--- a/app/src/main/res/layout/activity_startup.xml
+++ b/app/src/main/res/layout/activity_startup.xml
@@ -13,14 +13,15 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="24dp"
+            android:paddingBottom="24dp">
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text_view_welcome"
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="58dp"
 
                 android:text="@string/welcome"
@@ -31,7 +32,7 @@
                 android:id="@+id/image_view_welcome"
                 android:layout_width="match_parent"
                 android:layout_height="300dp"
-                android:layout_margin="24dp"
+                android:layout_marginTop="24dp"
                 android:src="@drawable/il_startup"
                 app:layout_constraintTop_toBottomOf="@id/text_view_welcome" />
 
@@ -39,8 +40,7 @@
                 android:id="@+id/image_view_about"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginEnd="24dp"
+                android:layout_marginTop="24dp"
                 android:src="@drawable/ic_about"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/image_view_welcome" />
@@ -49,7 +49,7 @@
                 android:id="@+id/text_view_privacy_policy_and_terms_of_service"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
+                android:layout_marginTop="24dp"
                 android:text="@string/summary_browse_terms_of_service_and_privacy_policy"
                 app:layout_constraintTop_toBottomOf="@id/image_view_about" />
 
@@ -72,9 +72,10 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:text="@string/agree"
         app:icon="@drawable/ic_check_circle"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_support.xml b/app/src/main/res/layout/activity_support.xml
index e82d6a8d..ba340323 100644
--- a/app/src/main/res/layout/activity_support.xml
+++ b/app/src/main/res/layout/activity_support.xml
@@ -15,40 +15,39 @@
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="24dp"
+            android:paddingVertical="24dp">
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="24dp"
                 android:text="@string/paid_support" />
 
             <com.google.android.material.card.MaterialCardView
                 style="@style/Widget.Material3.CardView.Outlined"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
-                app:cardCornerRadius="24dp">
+                android:layout_marginVertical="24dp"
+                app:cardCornerRadius="24dp"
+                app:contentPadding="24dp">
 
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:orientation="vertical">
 
                     <com.google.android.material.textview.MaterialTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="24dp"
+                        android:layout_marginBottom="24dp"
                         android:text="@string/summary_donations" />
 
                     <androidx.gridlayout.widget.GridLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="24dp"
-                        android:layout_marginEnd="24dp"
                         android:layout_marginBottom="24dp"
                         app:columnCount="2"
                         app:rowCount="2">
@@ -104,7 +103,6 @@
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/non_paid_support" />
 
@@ -113,9 +111,7 @@
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginEnd="24dp"
                 android:text="@string/web_ad"
                 app:icon="@drawable/ic_language"
                 app:iconGravity="textStart"
@@ -126,19 +122,14 @@
                 android:id="@+id/support_native_ad"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="16dp"
-                android:layout_marginEnd="24dp"
                 app:nativeAdLayout="@layout/ad_support" />
 
             <com.google.android.gms.ads.AdView
                 android:id="@+id/banner_ad_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="16dp"
-                android:layout_marginEnd="24dp"
-                android:layout_marginBottom="24dp"
                 ads:adSize="FULL_BANNER"
                 ads:adUnitId="@string/ad_banner_unit_id" />
         </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/activity_switch.xml b/app/src/main/res/layout/activity_switch.xml
index d261998a..48f332e9 100644
--- a/app/src/main/res/layout/activity_switch.xml
+++ b/app/src/main/res/layout/activity_switch.xml
@@ -17,26 +17,26 @@
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingHorizontal="24dp">
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/description" />
 
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
-                app:cardCornerRadius="24dp">
+                android:layout_marginVertical="24dp"
+                app:cardCornerRadius="24dp"
+                app:contentPadding="24dp">
 
                 <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="24dp"
                     android:text="@string/summary_toggle" />
             </com.google.android.material.card.MaterialCardView>
 
@@ -44,14 +44,12 @@
                 style="@style/TextAppearance.Material3.HeadlineLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:text="@string/layout_preview" />
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/material_switch_preference" />
 
@@ -60,14 +58,14 @@
                 style="@style/Widget.Material3.CardView.Filled"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="24dp"
-                app:cardCornerRadius="24dp">
+                android:layout_marginVertical="24dp"
+                app:cardCornerRadius="24dp"
+                app:contentPadding="24dp">
 
                 <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/material_switch_preference"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="24dp"
                     android:text="@string/switch_me"
                     android:tooltipText="@string/switch_me"
                     tools:targetApi="26" />
@@ -77,7 +75,6 @@
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/material_switch" />
 
@@ -86,13 +83,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp" />
+                android:layout_marginVertical="24dp" />
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/switch_material" />
 
@@ -101,14 +97,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp"
+                android:layout_marginVertical="24dp"
                 tools:ignore="DuplicateSpeakableTextCheck" />
 
             <com.google.android.material.textview.MaterialTextView
                 style="@style/TextAppearance.Material3.HeadlineSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/toggle_button" />
 
@@ -117,7 +112,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="24dp" />
+                android:layout_marginVertical="24dp" />
         </androidx.appcompat.widget.LinearLayoutCompat>
     </me.zhanghai.android.fastscroll.FastScrollScrollView>
 
@@ -126,7 +121,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -135,4 +131,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_table_layout.xml b/app/src/main/res/layout/activity_table_layout.xml
index 035390b3..4f3e35a9 100644
--- a/app/src/main/res/layout/activity_table_layout.xml
+++ b/app/src/main/res/layout/activity_table_layout.xml
@@ -10,9 +10,8 @@
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginStart="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginTop="24dp"
-        android:layout_marginEnd="24dp"
         android:layout_marginBottom="80dp">
 
         <TableLayout
@@ -239,7 +238,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -248,4 +248,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_text_box.xml b/app/src/main/res/layout/activity_text_box.xml
index c1d513ba..f3a37672 100644
--- a/app/src/main/res/layout/activity_text_box.xml
+++ b/app/src/main/res/layout/activity_text_box.xml
@@ -3,13 +3,15 @@
     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">
+    android:layout_height="match_parent"
+    android:paddingHorizontal="24dp"
+    android:paddingTop="24dp">
 
     <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/editText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:hint="@string/hint_type"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -33,7 +35,7 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -42,4 +44,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_time_picker.xml b/app/src/main/res/layout/activity_time_picker.xml
index 4acae1ab..87e15e6a 100644
--- a/app/src/main/res/layout/activity_time_picker.xml
+++ b/app/src/main/res/layout/activity_time_picker.xml
@@ -4,13 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:paddingHorizontal="24dp"
+    android:paddingTop="24dp">
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/currentTimeTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:drawableStart="@drawable/ic_alarm_range"
         android:text="@string/current_time"
         android:textColor="?attr/colorAccent"
@@ -24,7 +26,7 @@
         style="@style/Widget.Material3.Button.ElevatedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginTop="24dp"
         android:text="@string/change_time"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -35,7 +37,7 @@
         android:id="@+id/timeTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:textSize="24sp"
         app:layout_constraintBottom_toTopOf="@id/changeTimeButton"
         app:layout_constraintEnd_toEndOf="parent"
@@ -46,7 +48,7 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -55,4 +57,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_toast.xml b/app/src/main/res/layout/activity_toast.xml
index 32240726..9cacfc3c 100644
--- a/app/src/main/res/layout/activity_toast.xml
+++ b/app/src/main/res/layout/activity_toast.xml
@@ -22,7 +22,8 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -31,4 +32,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_view_binding_tutorial.xml b/app/src/main/res/layout/activity_view_binding_tutorial.xml
index 341b8f74..8be1d021 100644
--- a/app/src/main/res/layout/activity_view_binding_tutorial.xml
+++ b/app/src/main/res/layout/activity_view_binding_tutorial.xml
@@ -8,7 +8,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:paddingBottom="24dp">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/text_view_binding_summary"
@@ -34,9 +35,8 @@
             android:id="@+id/bindingInstructionText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
             android:paddingBottom="16dp"
+            android:paddingHorizontal="16dp"
             android:text="@string/summary_enable_binding"
             app:layout_constraintTop_toBottomOf="@id/bindingSetupText" />
 
@@ -51,10 +51,9 @@
             style="@style/Widget.Material3.CardView.Elevated"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
+            android:layout_marginHorizontal="24dp"
             android:layout_marginTop="24dp"
-            android:layout_marginEnd="24dp"
-            android:padding="4dp"
+            app:contentPadding="4dp"
             app:cardCornerRadius="24dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -83,9 +82,8 @@
             style="@style/Widget.Material3.CardView.Elevated"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginEnd="24dp"
-            android:padding="4dp"
+            android:layout_marginHorizontal="24dp"
+            app:contentPadding="4dp"
             app:cardCornerRadius="24dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -114,9 +112,8 @@
             style="@style/Widget.Material3.CardView.Elevated"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginEnd="24dp"
-            android:padding="4dp"
+            android:layout_marginHorizontal="24dp"
+            app:contentPadding="4dp"
             app:cardCornerRadius="24dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -135,7 +132,8 @@
             style="@style/Widget.Material3.Button.ElevatedButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="24dp"
+            android:layout_marginHorizontal="24dp"
+            android:layout_marginTop="24dp"
             android:text="@string/more_about_view_binding"
             android:tooltipText="@string/more_about_view_binding"
             app:layout_constraintStart_toStartOf="parent"
@@ -146,6 +144,7 @@
             android:id="@+id/lottie_animation"
             android:layout_width="match_parent"
             android:layout_height="192dp"
+            android:layout_marginTop="24dp"
             app:layout_constraintTop_toBottomOf="@id/moreAboutViewBindingButton"
             app:lottie_autoPlay="true"
             app:lottie_loop="false"
@@ -155,7 +154,8 @@
             android:id="@+id/ad_view_bottom"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="24dp"
+            android:layout_marginHorizontal="24dp"
+            android:layout_marginTop="24dp"
             app:layout_constraintTop_toBottomOf="@id/lottie_animation" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</me.zhanghai.android.fastscroll.FastScrollScrollView>
\ No newline at end of file
+</me.zhanghai.android.fastscroll.FastScrollScrollView>
diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index 460e73c7..c6c4edc5 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -4,13 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:paddingHorizontal="24dp"
+    android:paddingTop="24dp">
 
     <com.google.android.material.card.MaterialCardView
         style="@style/Widget.Material3.CardView.Elevated"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         app:cardCornerRadius="24dp"
         app:layout_constraintBottom_toTopOf="@id/floating_button_show_syntax"
         app:layout_constraintEnd_toEndOf="parent"
@@ -28,7 +30,7 @@
         style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginBottom="24dp"
         android:contentDescription="@string/tooltip_show_java_code_snippet"
         android:text="@string/show_code"
         android:textSize="14sp"
@@ -37,4 +39,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:targetApi="26" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/ad_home_banner_large.xml b/app/src/main/res/layout/ad_home_banner_large.xml
index 8b8136b0..37e979b0 100644
--- a/app/src/main/res/layout/ad_home_banner_large.xml
+++ b/app/src/main/res/layout/ad_home_banner_large.xml
@@ -23,8 +23,7 @@
                 style="@style/Widget.Material3.CardView.Filled"
                 android:layout_width="match_parent"
                 android:layout_height="180dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
+                android:layout_marginVertical="8dp"
                 app:cardCornerRadius="12dp">
 
                 <com.google.android.gms.ads.nativead.MediaView
diff --git a/app/src/main/res/layout/ad_support.xml b/app/src/main/res/layout/ad_support.xml
index 83585852..77b5c067 100644
--- a/app/src/main/res/layout/ad_support.xml
+++ b/app/src/main/res/layout/ad_support.xml
@@ -54,8 +54,7 @@
                 style="@style/Widget.Material3.CardView.Filled"
                 android:layout_width="match_parent"
                 android:layout_height="180dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
+                android:layout_marginVertical="8dp"
                 app:cardCornerRadius="12dp">
 
                 <com.google.android.gms.ads.nativead.MediaView
diff --git a/app/src/main/res/layout/dialog_bottom_sheet_menu.xml b/app/src/main/res/layout/dialog_bottom_sheet_menu.xml
index f08a8927..1b8c1189 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet_menu.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet_menu.xml
@@ -14,8 +14,7 @@
         android:layout_width="36dp"
         android:layout_height="4dp"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginVertical="8dp"
         android:background="@drawable/drag_handle_shape"
         android:importantForAccessibility="no" />
 
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index ccf08c35..8dd459a7 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -8,22 +8,22 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="24dp"
+        android:paddingVertical="24dp">
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/card_view_about"
             style="@style/Widget.Material3.CardView.Elevated"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="24dp"
+            app:contentPadding="16dp"
             app:layout_constraintTop_toTopOf="parent"
             app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="16dp">
+                android:layout_height="wrap_content">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/image_view_app_icon"
@@ -86,9 +86,8 @@
                     style="@style/Widget.Material3.Chip.Assist.Elevated"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginHorizontal="16dp"
                     android:layout_marginTop="8dp"
-                    android:layout_marginEnd="16dp"
                     android:minHeight="0dp"
                     android:text="@string/youtube"
                     android:tooltipText="@string/youtube"
@@ -121,8 +120,7 @@
                     style="@style/Widget.Material3.Chip.Assist.Elevated"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginHorizontal="16dp"
                     android:minHeight="0dp"
                     android:text="@string/twitter"
                     android:tooltipText="@string/twitter"
@@ -155,8 +153,7 @@
                     style="@style/Widget.Material3.Chip.Assist.Elevated"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginHorizontal="16dp"
                     android:minHeight="0dp"
                     android:text="@string/music"
                     android:tooltipText="@string/music"
@@ -181,7 +178,7 @@
             android:id="@+id/animation_about"
             android:layout_width="match_parent"
             android:layout_height="192dp"
-            android:layout_margin="24dp"
+            android:layout_marginTop="24dp"
             app:layout_constraintTop_toBottomOf="@id/ad_view"
             app:lottie_autoPlay="true"
             app:lottie_rawRes="@raw/anim_about"
@@ -191,7 +188,7 @@
             android:id="@+id/illustration_about"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="24dp"
+            android:layout_marginTop="24dp"
             android:src="@drawable/il_about"
             app:layout_constraintTop_toBottomOf="@id/animation_about" />
 
@@ -199,7 +196,7 @@
             android:id="@+id/text_view_made_in"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="24dp"
+            android:layout_marginTop="24dp"
             android:text="@string/made_in"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -214,4 +211,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/text_view_made_in" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</me.zhanghai.android.fastscroll.FastScrollScrollView>
\ No newline at end of file
+</me.zhanghai.android.fastscroll.FastScrollScrollView>
diff --git a/app/src/main/res/layout/fragment_buttons_layout.xml b/app/src/main/res/layout/fragment_buttons_layout.xml
index a634b052..cb9f3aa8 100644
--- a/app/src/main/res/layout/fragment_buttons_layout.xml
+++ b/app/src/main/res/layout/fragment_buttons_layout.xml
@@ -8,8 +8,7 @@
         style="@style/Widget.Material3.CardView.Outlined"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="2dp"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
         app:layout_constraintTop_toTopOf="parent"
@@ -22,7 +21,7 @@
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <com.google.android.material.textview.MaterialTextView
@@ -268,11 +267,10 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:nativeAdLayout="@layout/ad_lesson_code" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_clock_layout.xml b/app/src/main/res/layout/fragment_clock_layout.xml
index 23598a05..9d64d2b3 100644
--- a/app/src/main/res/layout/fragment_clock_layout.xml
+++ b/app/src/main/res/layout/fragment_clock_layout.xml
@@ -8,9 +8,7 @@
         style="@style/Widget.Material3.CardView.Outlined"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginStart="24dp"
-
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="2dp"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
         app:layout_constraintTop_toTopOf="parent"
@@ -23,7 +21,7 @@
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <com.google.android.material.textview.MaterialTextView
@@ -76,11 +74,10 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:nativeAdLayout="@layout/ad_lesson_code" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_code.xml b/app/src/main/res/layout/fragment_code.xml
index fce38802..63106b47 100644
--- a/app/src/main/res/layout/fragment_code.xml
+++ b/app/src/main/res/layout/fragment_code.xml
@@ -8,8 +8,7 @@
         style="@style/Widget.Material3.CardView.Outlined"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="2dp"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
         app:layout_constraintTop_toTopOf="parent"
@@ -32,11 +31,10 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:nativeAdLayout="@layout/ad_lesson_code" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 37aa9818..be9bfbd7 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -156,9 +156,8 @@
                 android:id="@+id/other_apps_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
                 android:layout_marginBottom="16dp"
+                android:layout_marginHorizontal="16dp"
                 android:orientation="vertical">
 
                 <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/fragment_layout.xml b/app/src/main/res/layout/fragment_layout.xml
index fce38802..63106b47 100644
--- a/app/src/main/res/layout/fragment_layout.xml
+++ b/app/src/main/res/layout/fragment_layout.xml
@@ -8,8 +8,7 @@
         style="@style/Widget.Material3.CardView.Outlined"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="2dp"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
         app:layout_constraintTop_toTopOf="parent"
@@ -32,11 +31,10 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:nativeAdLayout="@layout/ad_lesson_code" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_linear_layout_layout.xml b/app/src/main/res/layout/fragment_linear_layout_layout.xml
index 43a9f1be..8b8d0704 100644
--- a/app/src/main/res/layout/fragment_linear_layout_layout.xml
+++ b/app/src/main/res/layout/fragment_linear_layout_layout.xml
@@ -8,8 +8,7 @@
         style="@style/Widget.Material3.CardView.Outlined"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="2dp"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
         app:layout_constraintTop_toTopOf="parent"
@@ -22,7 +21,7 @@
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <com.google.android.material.textview.MaterialTextView
@@ -58,11 +57,10 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:nativeAdLayout="@layout/ad_lesson_code" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_no_code.xml b/app/src/main/res/layout/fragment_no_code.xml
index da518daa..d46d8cab 100644
--- a/app/src/main/res/layout/fragment_no_code.xml
+++ b/app/src/main/res/layout/fragment_no_code.xml
@@ -8,11 +8,11 @@
         style="@style/Widget.Material3.CardView.Outlined"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="2dp"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
         app:layout_constraintTop_toTopOf="parent"
+        app:contentPadding="24dp"
         app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded">
 
         <com.google.android.material.textview.MaterialTextView
@@ -20,7 +20,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_margin="24dp"
             android:text="@string/no_java_code_needed"
             android:textAlignment="center" />
     </com.google.android.material.card.MaterialCardView>
@@ -29,11 +28,10 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:nativeAdLayout="@layout/ad_lesson_code" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_same_code.xml b/app/src/main/res/layout/fragment_same_code.xml
index 38d86fc7..1de39e3a 100644
--- a/app/src/main/res/layout/fragment_same_code.xml
+++ b/app/src/main/res/layout/fragment_same_code.xml
@@ -8,8 +8,7 @@
         style="@style/Widget.Material3.CardView.Outlined"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="2dp"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
         app:layout_constraintTop_toTopOf="parent"
@@ -54,11 +53,10 @@
         android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:nativeAdLayout="@layout/ad_lesson_code" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_onboarding_option.xml b/app/src/main/res/layout/item_onboarding_option.xml
index b86d41dd..e34a452d 100644
--- a/app/src/main/res/layout/item_onboarding_option.xml
+++ b/app/src/main/res/layout/item_onboarding_option.xml
@@ -28,8 +28,7 @@
             android:id="@+id/title_text"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginHorizontal="16dp"
             android:text="@{title}"
             android:textAppearance="?attr/textAppearanceTitleMedium"
             android:breakStrategy="balanced"