diff --git a/app/src/main/res/layout/activity_pin_shortcut.xml b/app/src/main/res/layout/activity_pin_shortcut.xml
index da724e7..10fd0c0 100644
--- a/app/src/main/res/layout/activity_pin_shortcut.xml
+++ b/app/src/main/res/layout/activity_pin_shortcut.xml
@@ -63,61 +63,63 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@id/pin_shortcut_appbar">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
             android:layout_margin="20dp"
-            android:orientation="vertical">
+            android:padding="16dp">
 
             <TextView
                 android:id="@+id/pin_shortcut_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_margin="50dp"
+                android:layout_marginBottom="50dp"
                 android:drawablePadding="10dp"
                 android:gravity="center_vertical"
                 android:minHeight="40dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
                 tools:drawableLeft="@drawable/baseline_settings_24"
                 tools:text="Shortcut name" />
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="10dp" />
 
             <CheckBox
                 android:id="@+id/pin_shortcut_switch_visible"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:minHeight="48dp"
+                android:text="@string/pin_shortcut_switch_visible"
                 android:textColor="?android:textColor"
-                android:checked="true"
-                android:text="@string/pin_shortcut_switch_visible" />
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="10dp" />
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/pin_shortcut_label"
+                app:layout_constraintWidth_max="@dimen/max_button_width" />
 
             <Button
                 android:id="@+id/pin_shortcut_button_bind"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="@string/pin_shortcut_button_bind" />
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="10dp" />
-
-        </LinearLayout>
+                android:layout_margin="10dp"
+                android:text="@string/pin_shortcut_button_bind"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/pin_shortcut_switch_visible"
+                app:layout_constraintWidth_max="@dimen/max_button_width" />
 
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </ScrollView>
 
     <Button
         android:id="@+id/pin_shortcut_button_ok"
-        android:layout_margin="10dp"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_margin="16dp"
         android:text="@android:string/ok"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintWidth_max="@dimen/max_button_width" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_report_crash.xml b/app/src/main/res/layout/activity_report_crash.xml
index c7f2110..29078a2 100644
--- a/app/src/main/res/layout/activity_report_crash.xml
+++ b/app/src/main/res/layout/activity_report_crash.xml
@@ -23,37 +23,67 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" >
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
             android:padding="10dp">
 
             <de.jrpie.android.launcher.ui.util.HtmlTextView
+                android:id="@+id/crash_info_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/crash_info" />
+                android:text="@string/crash_info"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
 
-            <Button
-                android:id="@+id/report_crash_button_copy"
-                android:text="@string/report_crash_button_copy"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="20dp" />
-            <Button
-                android:id="@+id/report_crash_button_mail"
-                android:text="@string/report_crash_button_mail"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <Button
-                android:id="@+id/report_crash_button_report"
-                android:text="@string/report_crash_button_report"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/button_container"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:maxWidth="@dimen/max_button_width"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/crash_info_text">
+
+                <Button
+                    android:id="@+id/report_crash_button_copy"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="48dp"
+                    android:text="@string/report_crash_button_copy"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <Button
+                    android:id="@+id/report_crash_button_mail"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="48dp"
+                    android:text="@string/report_crash_button_mail"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/report_crash_button_copy" />
+
+                <Button
+                    android:id="@+id/report_crash_button_report"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="48dp"
+                    android:text="@string/report_crash_button_report"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/report_crash_button_mail" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_choose_color.xml b/app/src/main/res/layout/dialog_choose_color.xml
index dc7ddca..5e6d20b 100644
--- a/app/src/main/res/layout/dialog_choose_color.xml
+++ b/app/src/main/res/layout/dialog_choose_color.xml
@@ -1,83 +1,105 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/AlertDialogCustom"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
+    android:layout_height="wrap_content"
     android:padding="20dp">
 
     <EditText
+        android:id="@+id/dialog_select_color_preview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:inputType="textNoSuggestions"
         android:singleLine="true"
         android:hint="@string/dialog_select_color_color_hex"
         android:autofillHints="color"
-        android:id="@+id/dialog_select_color_preview"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center|center_horizontal"
+        android:gravity="center"
+        android:minHeight="48dp"
         android:padding="5dp"
         android:textSize="20sp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         tools:text="#ffbb00" />
 
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="10dp" />
-
     <TextView
+        android:id="@+id/label_alpha"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/dialog_select_color_alpha" />
+        android:text="@string/dialog_select_color_alpha"
+        app:layout_constraintTop_toBottomOf="@id/dialog_select_color_preview"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <SeekBar
         android:id="@+id/dialog_select_color_seekbar_alpha"
+        android:layout_height="48dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:max="255" />
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="10dp" />
+        android:max="255"
+        android:minHeight="48dp"
+        app:layout_constraintTop_toBottomOf="@id/label_alpha"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <TextView
+        android:id="@+id/label_red"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/dialog_select_color_red" />
+        android:text="@string/dialog_select_color_red"
+        app:layout_constraintTop_toBottomOf="@id/dialog_select_color_seekbar_alpha"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <SeekBar
         android:id="@+id/dialog_select_color_seekbar_red"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:max="255" />
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="10dp" />
+        android:layout_height="48dp"
+        android:max="255"
+        android:minHeight="48dp"
+        app:layout_constraintTop_toBottomOf="@id/label_red"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <TextView
+        android:id="@+id/label_green"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/dialog_select_color_green" />
+        android:text="@string/dialog_select_color_green"
+        app:layout_constraintTop_toBottomOf="@id/dialog_select_color_seekbar_red"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <SeekBar
         android:id="@+id/dialog_select_color_seekbar_green"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:max="255" />
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="10dp" />
+        android:layout_height="48dp"
+        android:max="255"
+        android:minHeight="48dp"
+        app:layout_constraintTop_toBottomOf="@id/label_green"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <TextView
+        android:id="@+id/label_blue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/dialog_select_color_blue" />
+        android:text="@string/dialog_select_color_blue"
+        app:layout_constraintTop_toBottomOf="@id/dialog_select_color_seekbar_green"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <SeekBar
         android:id="@+id/dialog_select_color_seekbar_blue"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:max="255" />
+        android:layout_height="48dp"
+        android:max="255"
+        android:minHeight="48dp"
+        app:layout_constraintTop_toBottomOf="@id/label_blue"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_report_bug.xml b/app/src/main/res/layout/dialog_report_bug.xml
index 7ef37d2..41b5e6e 100644
--- a/app/src/main/res/layout/dialog_report_bug.xml
+++ b/app/src/main/res/layout/dialog_report_bug.xml
@@ -1,53 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/AlertDialogDanger"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        android:layout_margin="20dp"
+        android:padding="16dp">
 
         <TextView
             android:id="@+id/dialog_report_bug_info"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/dialog_report_bug_info" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20dp" />
+            android:text="@string/dialog_report_bug_info"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <TextView
             android:id="@+id/dialog_report_bug_device_info"
-            android:padding="10dp"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            tools:text="Version: ?\nAndroid Version: ?" />
+            android:padding="10dp"
+            tools:text="Version: ?&#10;Android Version: ?"
+            app:layout_constraintTop_toBottomOf="@id/dialog_report_bug_info"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <Button
             android:id="@+id/dialog_report_bug_button_clipboard"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/dialog_report_bug_button_clipboard" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20dp" />
+            android:minHeight="48dp"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
+            android:text="@string/dialog_report_bug_button_clipboard"
+            app:layout_constraintTop_toBottomOf="@id/dialog_report_bug_device_info"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <TextView
-            android:layout_width="match_parent"
+            android:id="@+id/dialog_report_bug_security_info"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/dialog_report_bug_security_info"/>
+            android:layout_marginTop="20dp"
+            android:text="@string/dialog_report_bug_security_info"
+            app:layout_constraintTop_toBottomOf="@id/dialog_report_bug_button_clipboard"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
         <Button
             android:id="@+id/dialog_report_bug_button_security"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/dialog_report_bug_button_security" />
+            android:layout_marginTop="20dp"
+            android:minHeight="48dp"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
+            android:text="@string/dialog_report_bug_button_security"
+            app:layout_constraintTop_toBottomOf="@id/dialog_report_bug_security_info"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_select_lock_method.xml b/app/src/main/res/layout/dialog_select_lock_method.xml
index 7d25e02..9669611 100644
--- a/app/src/main/res/layout/dialog_select_lock_method.xml
+++ b/app/src/main/res/layout/dialog_select_lock_method.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="10dp">
@@ -7,27 +8,33 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <de.jrpie.android.launcher.ui.util.HtmlTextView
-        android:id="@+id/dialog_select_lock_method_text"
-        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/screen_lock_method_dialog_text"
-        android:textColor="@android:color/black" />
+        android:padding="16dp"
+        android:gravity="center_horizontal">
+
+        <de.jrpie.android.launcher.ui.util.HtmlTextView
+            android:id="@+id/dialog_select_lock_method_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/screen_lock_method_dialog_text"
+            android:textColor="@android:color/black"
+            android:layout_marginBottom="20dp"
+            tools:ignore="VisualLintLongText" />
 
         <Button
             android:id="@+id/dialog_select_lock_method_button_device_admin"
             android:text="@string/screen_lock_method_use_device_admin"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            />
+            android:layout_height="48dp"
+            android:minHeight="48dp"
+            android:layout_marginBottom="12dp" />
 
         <Button
             android:id="@+id/dialog_select_lock_method_button_accessibility"
             android:text="@string/screen_lock_method_use_accessibility"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
+            android:layout_height="48dp"
+            android:minHeight="48dp" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_apps.xml b/app/src/main/res/layout/list_apps.xml
index 58b76e9..e5f583d 100644
--- a/app/src/main/res/layout/list_apps.xml
+++ b/app/src/main/res/layout/list_apps.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/list_apps_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list_apps_rview"
         android:layout_width="match_parent"
@@ -21,44 +21,54 @@
         app:fastScrollHorizontalThumbDrawable="@drawable/fast_scroll_thumb_drawable"
         app:fastScrollHorizontalTrackDrawable="@drawable/fast_scroll_track_drawable"
         app:fastScrollVerticalThumbDrawable="@drawable/fast_scroll_thumb_drawable"
-        app:fastScrollVerticalTrackDrawable="@drawable/fast_scroll_track_drawable" >
+        app:fastScrollVerticalTrackDrawable="@drawable/fast_scroll_track_drawable" />
 
-
-        <!--
-        android:scrollbars="vertical"
-        -->
-
-        <!--:fastScrollAlwaysVisible="true"-->
-
-    </androidx.recyclerview.widget.RecyclerView>
-
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/bottom_controls_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:layout_margin="8dp"
-        >
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
 
-        <androidx.appcompat.widget.SearchView
-            android:id="@+id/list_apps_searchview"
-            android:layout_width="fill_parent"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/bottomBar"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:iconifiedByDefault="false"
-            app:iconifiedByDefault="false"
-            app:queryHint="@string/list_apps_search_hint"
-            app:searchHintIcon="@drawable/baseline_search_24"
-            app:searchIcon="@drawable/baseline_search_24" />
+            android:maxWidth="@dimen/max_search_bar_width"
+            app:layout_constraintWidth_max="@dimen/max_search_bar_width"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
-        <CheckBox
-            android:id="@+id/list_apps_check_box_favorites"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="0"
-            android:layout_marginEnd="16dp"
-            android:button="@drawable/checkbox_favorite" />
+            <androidx.appcompat.widget.SearchView
+                android:id="@+id/list_apps_searchview"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:iconifiedByDefault="false"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/list_apps_check_box_favorites"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:queryHint="@string/list_apps_search_hint"
+                app:searchHintIcon="@drawable/baseline_search_24"
+                app:searchIcon="@drawable/baseline_search_24" />
 
-    </LinearLayout>
+            <CheckBox
+                android:id="@+id/list_apps_check_box_favorites"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:button="@drawable/checkbox_favorite"
+                android:contentDescription="@string/list_title_favorite"
+                app:layout_constraintTop_toTopOf="@+id/list_apps_searchview"
+                app:layout_constraintBottom_toBottomOf="@+id/list_apps_searchview"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/list_apps_searchview" />
 
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-</LinearLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/settings_actions.xml b/app/src/main/res/layout/settings_actions.xml
index 02afc9b..9696186 100644
--- a/app/src/main/res/layout/settings_actions.xml
+++ b/app/src/main/res/layout/settings_actions.xml
@@ -16,28 +16,37 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginBottom="16dp"
-        app:layout_constraintBottom_toTopOf="@+id/settings_actions_buttons"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/settings_actions_buttons_wrapper"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent" />
 
-    <LinearLayout
-        android:id="@+id/settings_actions_buttons"
-        android:layout_width="match_parent"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/settings_actions_buttons_wrapper"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="32dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintWidth_max="@dimen/max_button_width">
 
-        <Button
-            android:id="@+id/settings_actions_button_install_apps"
+        <LinearLayout
+            android:id="@+id/settings_actions_buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/settings_apps_install"
-            android:textAllCaps="false" />
+            android:layout_marginBottom="32dp"
+            android:orientation="vertical"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
-    </LinearLayout>
+            <Button
+                android:id="@+id/settings_actions_button_install_apps"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_apps_install"
+                android:textAllCaps="false" />
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/settings_meta.xml b/app/src/main/res/layout/settings_meta.xml
index 1adee37..36ad2fd 100644
--- a/app/src/main/res/layout/settings_meta.xml
+++ b/app/src/main/res/layout/settings_meta.xml
@@ -9,112 +9,105 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center|top"
+        android:gravity="center_horizontal"
         android:orientation="vertical"
         android:paddingLeft="32sp"
         android:paddingTop="16sp"
         android:paddingRight="32sp">
 
-
-        <Button
-            android:id="@+id/settings_meta_button_view_tutorial"
-            android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/settings_meta_show_tutorial"
-            android:textAllCaps="false" />
+            android:minWidth="@dimen/max_button_width"
+            android:orientation="vertical">
 
-        <Button
-            android:id="@+id/settings_meta_button_reset_settings"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_meta_reset"
-            android:textAllCaps="false" />
+            <Button
+                android:id="@+id/settings_meta_button_view_tutorial"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_meta_show_tutorial"
+                android:textAllCaps="false" />
 
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="64sp" />
+            <Button
+                android:id="@+id/settings_meta_button_reset_settings"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_meta_reset"
+                android:textAllCaps="false"
+                android:layout_marginBottom="64sp"/>
 
-        <Button
-            android:id="@+id/settings_meta_button_view_code"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_meta_view_code"
-            android:textAllCaps="false" />
+            <Button
+                android:id="@+id/settings_meta_button_view_code"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_meta_view_code"
+                android:textAllCaps="false" />
 
-        <Button
-            android:id="@+id/settings_meta_button_view_docs"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_meta_view_docs"
-            android:textAllCaps="false" />
+            <Button
+                android:id="@+id/settings_meta_button_view_docs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_meta_view_docs"
+                android:textAllCaps="false" />
 
-        <Button
-            android:id="@+id/settings_meta_button_report_bug"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_meta_report_bug"
-            android:textAllCaps="false" />
+            <Button
+                android:id="@+id/settings_meta_button_report_bug"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="64dp"
+                android:layout_width="match_parent"
+                android:text="@string/settings_meta_report_bug"
+                android:textAllCaps="false" />
 
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="64sp" />
+            <Button
+                android:id="@+id/settings_meta_button_join_chat"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_meta_join_chat"
+                android:textAllCaps="false" />
 
-        <Button
-            android:id="@+id/settings_meta_button_join_chat"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_meta_join_chat"
-            android:textAllCaps="false" />
+            <!--<Button
+                android:id="@+id/settings_meta_button_contact"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_meta_contact"
+                android:textAllCaps="false" />-->
 
-        <!--<Button
-            android:id="@+id/settings_meta_button_contact"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_meta_contact"
-            android:textAllCaps="false" />-->
+            <Button
+                android:id="@+id/settings_meta_button_fork_contact"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_meta_fork_contact"
+                android:textAllCaps="false" />
 
-        <Button
-            android:id="@+id/settings_meta_button_fork_contact"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_meta_fork_contact"
-            android:textAllCaps="false" />
+            <Button
+                android:id="@+id/settings_meta_button_donate"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="64dp"
+                android:layout_width="match_parent"
+                android:text="@string/settings_meta_donate"
+                android:textAllCaps="false" />
 
-        <Button
-            android:id="@+id/settings_meta_button_donate"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_meta_donate"
-            android:textAllCaps="false" />
+            <Button
+                android:id="@+id/settings_meta_button_privacy"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_meta_privacy"
+                android:textAllCaps="false" />
 
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="64sp" />
-
-        <Button
-            android:id="@+id/settings_meta_button_privacy"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_meta_privacy"
-            android:textAllCaps="false" />
-
-        <Button
-            android:id="@+id/settings_meta_button_licenses"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_meta_licenses"
-            android:textAllCaps="false" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="32sp" />
-
-        <TextView
-            android:id="@+id/settings_meta_text_version"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAlignment="textEnd"
-            tools:text="v1.2.3" />
+            <Button
+                android:id="@+id/settings_meta_button_licenses"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="32dp"
+                android:layout_width="match_parent"
+                android:text="@string/settings_meta_licenses"
+                android:textAllCaps="false" />
 
+            <TextView
+                android:id="@+id/settings_meta_text_version"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textEnd"
+                tools:text="v1.2.3" />
+        </LinearLayout>
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 0d109bc..06d5934 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -2,4 +2,6 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="appbar_padding">16dp</dimen>
     <dimen name="app_icon_side">40dip</dimen>
+    <dimen name="max_button_width">400dp</dimen>
+    <dimen name="max_search_bar_width">600dp</dimen>
 </resources>