diff --git a/app/src/main/res/layout-land/fragment_onboarding_permissions.xml b/app/src/main/res/layout-land/fragment_onboarding_permissions.xml
index c82f33c03..f08b3278f 100644
--- a/app/src/main/res/layout-land/fragment_onboarding_permissions.xml
+++ b/app/src/main/res/layout-land/fragment_onboarding_permissions.xml
@@ -20,12 +20,9 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:divider="@drawable/divider"
-    android:orientation="horizontal"
     android:showDividers="middle">
 
     <LinearLayout
@@ -39,8 +36,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:includeFontPadding="true"
-            android:paddingStart="@dimen/padding_normal"
-            android:paddingEnd="@dimen/padding_normal"
             android:text="@string/onboarding_title_permissions"
             android:textAlignment="textStart"
             android:textColor="?colorAccent"
@@ -50,8 +45,6 @@
             style="@style/AuroraTextStyle.Subtitle.Alt"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/padding_normal"
-            android:paddingEnd="@dimen/padding_normal"
             android:text="@string/onboarding_permission_select"
             android:textAlignment="textStart" />
     </LinearLayout>
@@ -63,9 +56,7 @@
         android:layout_weight="1"
         android:clipToPadding="false"
         android:overScrollMode="never"
-        android:padding="@dimen/padding_normal"
+        android:padding="@dimen/padding_medium"
         android:scrollbars="none"
-        app:itemSpacing="@dimen/margin_small"
-        tools:listitem="@layout/view_installer" />
-
+        tools:listitem="@layout/view_permission" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_onboarding_welcome.xml b/app/src/main/res/layout-land/fragment_onboarding_welcome.xml
index e1d58284a..e3f9a99d0 100644
--- a/app/src/main/res/layout-land/fragment_onboarding_welcome.xml
+++ b/app/src/main/res/layout-land/fragment_onboarding_welcome.xml
@@ -20,13 +20,10 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:divider="@drawable/divider"
-    android:orientation="horizontal"
-    android:showDividers="middle">
+    android:orientation="horizontal">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -39,8 +36,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:includeFontPadding="true"
-            android:paddingStart="@dimen/padding_normal"
-            android:paddingEnd="@dimen/padding_normal"
             android:text="@string/onboarding_title_welcome"
             android:textAlignment="textStart"
             android:textColor="?colorAccent"
@@ -50,8 +45,6 @@
             style="@style/AuroraTextStyle.Subtitle.Alt"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/padding_normal"
-            android:paddingEnd="@dimen/padding_normal"
             android:text="@string/onboarding_welcome_select"
             android:textAlignment="textStart" />
 
@@ -64,8 +57,7 @@
         android:layout_weight="1"
         android:clipToPadding="false"
         android:overScrollMode="never"
-        android:padding="@dimen/padding_normal"
+        android:padding="@dimen/padding_medium"
         android:scrollbars="none"
-        app:itemSpacing="@dimen/margin_small"
-        tools:listitem="@layout/view_theme" />
+        tools:listitem="@layout/view_dash" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_app_links.xml b/app/src/main/res/layout/fragment_app_links.xml
index 27f09a91b..8fff4313d 100644
--- a/app/src/main/res/layout/fragment_app_links.xml
+++ b/app/src/main/res/layout/fragment_app_links.xml
@@ -10,7 +10,6 @@
         android:id="@+id/appCompatTextView2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_small"
         android:includeFontPadding="true"
         android:paddingStart="@dimen/padding_normal"
         android:paddingEnd="@dimen/padding_normal"
@@ -45,18 +44,17 @@
         app:layout_constraintTop_toBottomOf="@+id/appCompatTextView">
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/padding_medium">
 
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/playStoreLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/margin_normal"
-                android:layout_marginVertical="@dimen/margin_small"
-                android:background="@drawable/bg_outlined_padded"
-                android:orientation="horizontal"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_small"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/appCompatTextView">
@@ -66,40 +64,34 @@
                     style="@style/AuroraTextStyle.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_toStartOf="@id/playStoreButton"
                     android:text="@string/app_link_play_store" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/playStoreDesc"
-                    style="@style/AuroraTextStyle.Line1"
+                    style="@style/AuroraTextStyle.Line2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/playStoreTitle"
-                    android:layout_alignStart="@id/playStoreTitle"
-                    android:layout_alignEnd="@id/playStoreTitle"
-                    android:layout_marginTop="@dimen/margin_xxsmall"
                     android:maxLines="5"
                     android:text="@string/google_play_store_desc" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/playStoreButton"
-                    style="@style/Widget.Material3.Button.TextButton.Dialog.Flush"
+                    style="@style/Widget.Material3.Button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginStart="@dimen/margin_small"
-                    android:text="@string/action_enable" />
-            </RelativeLayout>
+                    android:insetTop="@dimen/margin_small"
+                    android:insetBottom="@dimen/margin_xsmall"
+                    android:text="@string/action_enable"
+                    android:textColorHighlight="?colorOnPrimary"
+                    app:cornerRadius="@dimen/margin_small" />
+            </LinearLayout>
 
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/marketLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/margin_normal"
-                android:layout_marginVertical="@dimen/margin_small"
-                android:background="@drawable/bg_outlined_padded"
-                android:orientation="horizontal"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_small"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/playStoreLayout">
@@ -109,31 +101,27 @@
                     style="@style/AuroraTextStyle.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_toStartOf="@id/marketButton"
                     android:text="@string/app_link_android_market" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/marketDesc"
-                    style="@style/AuroraTextStyle.Line1"
+                    style="@style/AuroraTextStyle.Line2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/marketTitle"
-                    android:layout_alignStart="@id/marketTitle"
-                    android:layout_alignEnd="@id/marketTitle"
-                    android:layout_marginTop="@dimen/margin_xxsmall"
                     android:maxLines="5"
                     android:text="@string/android_market_desc" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/marketButton"
-                    style="@style/Widget.Material3.Button.TextButton.Dialog.Flush"
+                    style="@style/Widget.Material3.Button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginStart="@dimen/margin_small"
-                    android:text="@string/action_enable" />
-            </RelativeLayout>
+                    android:insetTop="@dimen/margin_small"
+                    android:insetBottom="@dimen/margin_xsmall"
+                    android:text="@string/action_enable"
+                    android:textColorHighlight="?colorOnPrimary"
+                    app:cornerRadius="@dimen/margin_small" />
+            </LinearLayout>
         </LinearLayout>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_onboarding_permissions.xml b/app/src/main/res/layout/fragment_onboarding_permissions.xml
index 603c3acef..8ca551937 100644
--- a/app/src/main/res/layout/fragment_onboarding_permissions.xml
+++ b/app/src/main/res/layout/fragment_onboarding_permissions.xml
@@ -20,7 +20,6 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -54,9 +53,8 @@
         android:layout_height="match_parent"
         android:clipToPadding="false"
         android:overScrollMode="never"
-        android:padding="@dimen/padding_normal"
+        android:padding="@dimen/padding_medium"
         android:scrollbars="none"
-        app:itemSpacing="@dimen/margin_small"
         tools:listitem="@layout/view_permission" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_onboarding_welcome.xml b/app/src/main/res/layout/fragment_onboarding_welcome.xml
index 2036223ba..fca017904 100644
--- a/app/src/main/res/layout/fragment_onboarding_welcome.xml
+++ b/app/src/main/res/layout/fragment_onboarding_welcome.xml
@@ -54,8 +54,7 @@
         android:layout_height="match_parent"
         android:clipToPadding="false"
         android:overScrollMode="never"
-        android:padding="@dimen/padding_normal"
+        android:padding="@dimen/padding_medium"
         android:scrollbars="none"
-        app:itemSpacing="@dimen/margin_small"
-        tools:listitem="@layout/view_theme" />
+        tools:listitem="@layout/view_dash" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_permission.xml b/app/src/main/res/layout/view_permission.xml
index 207e61d5c..0bc5146b6 100644
--- a/app/src/main/res/layout/view_permission.xml
+++ b/app/src/main/res/layout/view_permission.xml
@@ -17,37 +17,38 @@
   ~
   -->
 
-<RelativeLayout 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"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_outlined_padded"
-    android:orientation="horizontal">
+    android:background="?selectableItemBackground"
+    android:orientation="vertical"
+    android:padding="@dimen/padding_small">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/line1"
         style="@style/AuroraTextStyle.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toStartOf="@id/btn_action" />
+        tools:text="Title" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/line2"
-        style="@style/AuroraTextStyle.Line1"
+        style="@style/AuroraTextStyle.Line2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/line1"
-        android:layout_alignStart="@id/line1"
-        android:layout_alignEnd="@id/line1"
         android:maxLines="5"
-        android:layout_marginTop="@dimen/margin_xxsmall" />
+        tools:text="Description" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_action"
-        style="@style/Widget.Material3.Button.TextButton.Dialog.Flush"
+        style="@style/Widget.Material3.Button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/margin_small"
-        android:text="@string/action_grant" />
-</RelativeLayout>
+        android:insetTop="@dimen/margin_small"
+        android:insetBottom="@dimen/margin_xsmall"
+        android:text="@string/action_grant"
+        android:textColorHighlight="?colorOnPrimary"
+        app:cornerRadius="@dimen/margin_small" />
+</LinearLayout>