diff --git a/app/src/main/res/layout/fragment_apps.xml b/app/src/main/res/layout/fragment_apps.xml
index 5f9881e47..4d84369e6 100644
--- a/app/src/main/res/layout/fragment_apps.xml
+++ b/app/src/main/res/layout/fragment_apps.xml
@@ -29,7 +29,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
-        app:itemSpacing="@dimen/margin_normal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:stackFromEnd="false"
         tools:listitem="@layout/view_app_list" />
diff --git a/app/src/main/res/layout/fragment_favourite.xml b/app/src/main/res/layout/fragment_favourite.xml
index ec04fbb7e..2084bc9d3 100644
--- a/app/src/main/res/layout/fragment_favourite.xml
+++ b/app/src/main/res/layout/fragment_favourite.xml
@@ -40,7 +40,6 @@
         android:layout_below="@+id/toolbar"
         android:clipToPadding="true"
         android:paddingBottom="@dimen/height_bottom_adj"
-        app:itemSpacing="@dimen/margin_normal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:stackFromEnd="false" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_for_you.xml b/app/src/main/res/layout/fragment_for_you.xml
index 25ea52ad8..575e4a6eb 100644
--- a/app/src/main/res/layout/fragment_for_you.xml
+++ b/app/src/main/res/layout/fragment_for_you.xml
@@ -28,7 +28,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingBottom="@dimen/height_bottom_adj"
-        app:itemSpacing="@dimen/margin_normal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:stackFromEnd="false" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_generic_recycler.xml b/app/src/main/res/layout/fragment_generic_recycler.xml
index 995b0324c..23d8c210b 100644
--- a/app/src/main/res/layout/fragment_generic_recycler.xml
+++ b/app/src/main/res/layout/fragment_generic_recycler.xml
@@ -28,7 +28,6 @@
         android:layout_height="match_parent"
         android:clipToPadding="false"
         android:paddingBottom="@dimen/height_bottom_adj"
-        app:itemSpacing="@dimen/padding_small"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:stackFromEnd="false" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_generic_with_pager.xml b/app/src/main/res/layout/fragment_generic_with_pager.xml
index 6dc741feb..c0a617354 100644
--- a/app/src/main/res/layout/fragment_generic_with_pager.xml
+++ b/app/src/main/res/layout/fragment_generic_with_pager.xml
@@ -32,15 +32,14 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/layout_action_toolbar"
         android:background="@android:color/transparent"
-        android:paddingStart="@dimen/margin_large"
-        android:paddingEnd="@dimen/margin_large"
-        android:paddingBottom="@dimen/padding_small"
+        android:paddingStart="@dimen/margin_normal"
+        android:paddingEnd="@dimen/margin_normal"
         app:tabGravity="fill"
         app:tabIndicator="@drawable/tab_indicator"
         app:tabIndicatorHeight="2dp"
         app:tabMode="scrollable"
-        app:tabPaddingEnd="@dimen/padding_normal"
-        app:tabPaddingStart="@dimen/padding_normal"
+        app:tabPaddingEnd="@dimen/padding_small"
+        app:tabPaddingStart="@dimen/padding_small"
         app:tabTextAppearance="@style/TextAppearance.Aurora.Tab.Title" />
 
     <androidx.viewpager2.widget.ViewPager2
diff --git a/app/src/main/res/layout/fragment_generic_with_toolbar.xml b/app/src/main/res/layout/fragment_generic_with_toolbar.xml
index 50b15d762..154f2d152 100644
--- a/app/src/main/res/layout/fragment_generic_with_toolbar.xml
+++ b/app/src/main/res/layout/fragment_generic_with_toolbar.xml
@@ -34,7 +34,6 @@
         android:layout_below="@+id/layout_toolbar_action"
         android:clipToPadding="true"
         android:paddingBottom="@dimen/height_bottom_adj"
-        app:itemSpacing="@dimen/margin_normal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:stackFromEnd="false" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search_result.xml b/app/src/main/res/layout/fragment_search_result.xml
index 5ae5ca5a8..accaa3bdf 100644
--- a/app/src/main/res/layout/fragment_search_result.xml
+++ b/app/src/main/res/layout/fragment_search_result.xml
@@ -46,7 +46,6 @@
             android:layout_height="match_parent"
             android:layout_below="@+id/divider"
             android:paddingTop="@dimen/padding_normal"
-            app:itemSpacing="@dimen/margin_normal"
             tools:listitem="@layout/view_app_list" />
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_top_container.xml b/app/src/main/res/layout/fragment_top_container.xml
index 2a10291cb..5c59668dc 100644
--- a/app/src/main/res/layout/fragment_top_container.xml
+++ b/app/src/main/res/layout/fragment_top_container.xml
@@ -29,7 +29,6 @@
         android:layout_height="match_parent"
         android:clipToPadding="true"
         android:paddingBottom="@dimen/height_bottom_adj"
-        app:itemSpacing="@dimen/margin_normal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:stackFromEnd="false" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_updates.xml b/app/src/main/res/layout/fragment_updates.xml
index 7a03b2dac..51cf2d668 100644
--- a/app/src/main/res/layout/fragment_updates.xml
+++ b/app/src/main/res/layout/fragment_updates.xml
@@ -45,7 +45,6 @@
             android:layout_height="match_parent"
             android:clipToPadding="false"
             android:paddingBottom="@dimen/height_bottom_adj"
-            app:itemSpacing="@dimen/margin_normal"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:stackFromEnd="false"
             tools:listitem="@layout/view_app_list" />
diff --git a/app/src/main/res/layout/layout_details_review.xml b/app/src/main/res/layout/layout_details_review.xml
index 72582ee2c..26021c778 100644
--- a/app/src/main/res/layout/layout_details_review.xml
+++ b/app/src/main/res/layout/layout_details_review.xml
@@ -153,7 +153,6 @@
         android:orientation="vertical"
         android:overScrollMode="never"
         android:scrollbars="none"
-        app:itemSpacing="@dimen/margin_normal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:itemCount="4"
         tools:listitem="@layout/view_review" />
diff --git a/app/src/main/res/layout/view_app.xml b/app/src/main/res/layout/view_app.xml
index b0024a6cd..7147f6bfe 100644
--- a/app/src/main/res/layout/view_app.xml
+++ b/app/src/main/res/layout/view_app.xml
@@ -19,6 +19,7 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:padding="@dimen/padding_xsmall"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
@@ -26,9 +27,7 @@
         android:id="@+id/img_icon"
         android:layout_width="@dimen/icon_size_cluster"
         android:layout_height="@dimen/icon_size_cluster"
-        android:layout_centerHorizontal="true"
-        android:layout_marginStart="@dimen/padding_xsmall"
-        android:layout_marginEnd="@dimen/padding_xsmall" />
+        android:layout_centerHorizontal="true"/>
 
     <TextView
         android:id="@+id/txt_name"
diff --git a/app/src/main/res/layout/view_app_list.xml b/app/src/main/res/layout/view_app_list.xml
index efa16fc22..59f3df636 100644
--- a/app/src/main/res/layout/view_app_list.xml
+++ b/app/src/main/res/layout/view_app_list.xml
@@ -22,8 +22,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    android:paddingStart="@dimen/padding_small"
-    android:paddingEnd="@dimen/padding_xsmall">
+    android:paddingStart="@dimen/padding_medium"
+    android:paddingTop="@dimen/padding_xsmall"
+    android:paddingEnd="@dimen/padding_small"
+    android:paddingBottom="@dimen/padding_xsmall">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/img_icon"
diff --git a/app/src/main/res/layout/view_app_shimmer.xml b/app/src/main/res/layout/view_app_shimmer.xml
index dcafeacbe..384ef0937 100644
--- a/app/src/main/res/layout/view_app_shimmer.xml
+++ b/app/src/main/res/layout/view_app_shimmer.xml
@@ -28,15 +28,14 @@
         android:id="@+id/card"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="@dimen/padding_xsmall">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/img_icon"
             android:layout_width="@dimen/icon_size_cluster"
             android:layout_height="@dimen/icon_size_cluster"
             android:layout_centerHorizontal="true"
-            android:layout_marginStart="@dimen/padding_xsmall"
-            android:layout_marginEnd="@dimen/padding_xsmall"
             android:background="@drawable/bg_rounded" />
 
         <TextView
diff --git a/app/src/main/res/layout/view_app_update.xml b/app/src/main/res/layout/view_app_update.xml
index 57f3ed6ec..10379aecf 100644
--- a/app/src/main/res/layout/view_app_update.xml
+++ b/app/src/main/res/layout/view_app_update.xml
@@ -22,122 +22,105 @@
 <RelativeLayout 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:id="@+id/layout_content"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
     android:orientation="vertical"
-    android:paddingStart="@dimen/padding_normal"
-    android:paddingEnd="@dimen/padding_small">
+    android:paddingStart="@dimen/padding_medium"
+    android:paddingTop="@dimen/padding_small"
+    android:paddingEnd="@dimen/padding_small"
+    android:paddingBottom="@dimen/padding_small">
 
-    <FrameLayout
-        android:id="@+id/expansion_header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    <RelativeLayout
+        android:id="@+id/head_flipper"
+        android:layout_width="@dimen/icon_size_medium"
+        android:layout_height="@dimen/icon_size_medium">
 
-        <RelativeLayout
-            android:id="@+id/layout_content"
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/img_icon"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true" />
 
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/progress_download"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:visibility="gone"
+            app:indicatorSize="@dimen/icon_size_medium"
+            app:trackThickness="3dp"
+            tools:progress="40" />
+    </RelativeLayout>
 
-            <RelativeLayout
-                android:id="@+id/head_flipper"
-                android:layout_width="@dimen/icon_size_medium"
-                android:layout_height="@dimen/icon_size_medium">
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/txt_line1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_normal"
+        android:layout_toStartOf="@+id/headerIndicator"
+        android:layout_toEndOf="@id/head_flipper"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAppearance="@style/TextAppearance.Aurora.Line1" />
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/img_icon"
-                    android:layout_width="@dimen/icon_size_medium"
-                    android:layout_height="@dimen/icon_size_medium" />
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/txt_line2"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/txt_line1"
+        android:layout_alignStart="@+id/txt_line1"
+        android:layout_alignEnd="@id/txt_line1"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAppearance="@style/TextAppearance.Aurora.Line3" />
 
-                <com.google.android.material.progressindicator.CircularProgressIndicator
-                    android:id="@+id/progress_download"
-                    android:layout_width="@dimen/icon_size_medium"
-                    android:layout_height="@dimen/icon_size_medium"
-                    android:layout_centerInParent="true"
-                    android:visibility="gone"
-                    app:indicatorSize="@dimen/icon_size_medium"
-                    app:trackThickness="3dp"
-                    tools:progress="40" />
-            </RelativeLayout>
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/txt_line3"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/txt_line2"
+        android:layout_alignStart="@+id/txt_line1"
+        android:layout_alignEnd="@id/txt_line1"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAppearance="@style/TextAppearance.Aurora.Line3" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/txt_line1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/margin_normal"
-                android:layout_toStartOf="@+id/headerIndicator"
-                android:layout_toEndOf="@id/head_flipper"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.Aurora.Line1" />
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/txt_line4"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/txt_line3"
+        android:layout_alignStart="@+id/txt_line1"
+        android:layout_alignEnd="@id/txt_line1"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAppearance="@style/TextAppearance.Aurora.Line3" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/txt_line2"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/txt_line1"
-                android:layout_alignStart="@+id/txt_line1"
-                android:layout_alignEnd="@id/txt_line1"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.Aurora.Line3" />
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/headerIndicator"
+        style="@style/Widget.Material3.Button.IconButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/txt_line1"
+        android:layout_toStartOf="@id/btn_action"
+        android:contentDescription="@string/details_changelog"
+        app:icon="@drawable/ic_arrow_down" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/txt_line3"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/txt_line2"
-                android:layout_alignStart="@+id/txt_line1"
-                android:layout_alignEnd="@id/txt_line1"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.Aurora.Line3" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/txt_line4"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/txt_line3"
-                android:layout_alignStart="@+id/txt_line1"
-                android:layout_alignEnd="@id/txt_line1"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.Aurora.Line3" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/headerIndicator"
-                style="@style/Widget.Material3.Button.IconButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBottom="@id/layout_action"
-                android:layout_toStartOf="@id/layout_action"
-                android:contentDescription="@string/details_changelog"
-                app:icon="@drawable/ic_arrow_down" />
-
-            <LinearLayout
-                android:id="@+id/layout_action"
-                android:layout_width="115dp"
-                android:layout_height="@dimen/height_button"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <com.aurora.store.view.custom.layouts.button.UpdateButton
-                    android:id="@+id/btn_action"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-        </RelativeLayout>
-    </FrameLayout>
+    <com.aurora.store.view.custom.layouts.button.UpdateButton
+        android:id="@+id/btn_action"
+        android:layout_width="120dp"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/txt_line1"
+        android:layout_alignParentEnd="true"
+        android:gravity="center" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/txt_changelog"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/expansion_header"
-        android:layout_marginTop="@dimen/margin_small"
+        android:layout_below="@id/txt_line4"
         android:background="@drawable/bg_changelog"
         android:ellipsize="end"
         android:minHeight="?actionBarSize"
diff --git a/app/src/main/res/layout/view_category.xml b/app/src/main/res/layout/view_category.xml
index 9a6295f27..815fe7cf2 100644
--- a/app/src/main/res/layout/view_category.xml
+++ b/app/src/main/res/layout/view_category.xml
@@ -21,8 +21,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="@dimen/padding_small"
-    android:paddingEnd="@dimen/padding_small">
+    android:padding="@dimen/padding_small"
+    >
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/img_background"
@@ -40,8 +40,6 @@
         android:layout_toEndOf="@id/img_background"
         android:ellipsize="end"
         android:maxLines="2"
-        android:paddingStart="@dimen/padding_small"
-        android:paddingEnd="@dimen/padding_small"
         android:textSize="16sp"
         tools:text="Category" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_device.xml b/app/src/main/res/layout/view_device.xml
index d709498ce..66005edb0 100644
--- a/app/src/main/res/layout/view_device.xml
+++ b/app/src/main/res/layout/view_device.xml
@@ -21,8 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingStart="@dimen/padding_normal"
-    android:paddingEnd="@dimen/padding_small">
+    android:padding="@dimen/padding_small">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/line1"
@@ -38,8 +37,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/line1"
         android:layout_alignStart="@id/line1"
-        android:layout_alignEnd="@id/line1"
-        android:layout_marginTop="@dimen/margin_xxsmall" />
+        android:layout_alignEnd="@id/line1" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/line3"
@@ -48,14 +46,13 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/line2"
         android:layout_alignStart="@id/line1"
-        android:layout_alignEnd="@id/line1"
-        android:layout_marginTop="@dimen/margin_xxsmall" />
+        android:layout_alignEnd="@id/line1" />
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkbox"
         android:layout_width="@dimen/icon_size_category"
         android:layout_height="@dimen/icon_size_category"
         android:layout_alignParentEnd="true"
-        android:layout_centerInParent="true"
+        android:layout_centerVertical="true"
         android:minWidth="0dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_header.xml b/app/src/main/res/layout/view_header.xml
index 4ab481c3b..7fdb14ccd 100644
--- a/app/src/main/res/layout/view_header.xml
+++ b/app/src/main/res/layout/view_header.xml
@@ -22,33 +22,22 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/layout"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/padding_medium"
+    android:paddingTop="@dimen/padding_xsmall"
+    android:paddingEnd="@dimen/padding_small"
+    android:paddingBottom="@dimen/padding_xsmall">
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/txt_title"
+        style="@style/AuroraTextStyle.Subtitle.Alt"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginTop="@dimen/margin_small"
         android:layout_toStartOf="@id/img_action"
-        android:orientation="horizontal">
-
-        <View
-            android:layout_width="4dp"
-            android:layout_height="match_parent"
-            android:layout_marginStart="@dimen/padding_normal"
-            android:background="?colorAccent" />
-
-        <TextView
-            android:id="@+id/txt_title"
-            style="@style/AuroraTextStyle.Subtitle.Alt"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/padding_normal"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:maxLines="1"
-            tools:text="Header" />
-    </LinearLayout>
+        android:ellipsize="end"
+        android:maxLines="1"
+        tools:text="Header" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/img_action"
@@ -58,8 +47,8 @@
         android:layout_centerVertical="true"
         android:layout_marginStart="@dimen/margin_small"
         android:background="?selectableItemBackgroundBorderless"
-        android:padding="@dimen/padding_xsmall"
         android:contentDescription="@string/expand"
+        android:padding="@dimen/padding_xsmall"
         app:srcCompat="@drawable/ic_arrow_right"
         app:tint="?android:textColorPrimary" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/view_header_shimmer.xml b/app/src/main/res/layout/view_header_shimmer.xml
index 215e41e65..c764f5bec 100644
--- a/app/src/main/res/layout/view_header_shimmer.xml
+++ b/app/src/main/res/layout/view_header_shimmer.xml
@@ -27,33 +27,22 @@
     <RelativeLayout
         android:id="@+id/layout"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/padding_medium"
+        android:paddingTop="@dimen/padding_xsmall"
+        android:paddingEnd="@dimen/padding_small"
+        android:paddingBottom="@dimen/padding_xsmall">
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/txt_title"
+            style="@style/AuroraTextStyle.Subtitle.Alt"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginTop="@dimen/margin_small"
             android:layout_toStartOf="@id/img_action"
-            android:orientation="horizontal">
-
-            <View
-                android:layout_width="4dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="@dimen/padding_normal"
-                android:background="?colorShimmer" />
-
-            <TextView
-                android:id="@+id/txt_title"
-                style="@style/AuroraTextStyle.Subtitle.Alt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/padding_normal"
-                android:background="?colorShimmer"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:maxLines="1" />
-        </LinearLayout>
+            android:background="?colorShimmer"
+            android:ellipsize="end"
+            android:maxLines="1" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/img_action"
@@ -61,10 +50,10 @@
             android:layout_height="@dimen/icon_size_category"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:layout_margin="@dimen/margin_small"
+            android:layout_marginStart="@dimen/margin_small"
             android:background="?selectableItemBackgroundBorderless"
-            android:padding="@dimen/padding_xsmall"
             android:contentDescription="@string/expand"
+            android:padding="@dimen/padding_xsmall"
             app:srcCompat="@drawable/ic_arrow_right"
             app:tint="?colorShimmer" />
     </RelativeLayout>
diff --git a/app/src/main/res/layout/view_header_update.xml b/app/src/main/res/layout/view_header_update.xml
index 4fcd92616..a6b9d04be 100644
--- a/app/src/main/res/layout/view_header_update.xml
+++ b/app/src/main/res/layout/view_header_update.xml
@@ -20,42 +20,30 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/layout"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/padding_medium"
+    android:paddingTop="@dimen/padding_xsmall"
+    android:paddingEnd="@dimen/padding_small"
+    android:paddingBottom="@dimen/padding_xsmall">
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/txt_title"
+        style="@style/AuroraTextStyle.Subtitle.Alt"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginTop="@dimen/margin_small"
         android:layout_toStartOf="@id/btn_action"
-        android:orientation="horizontal">
-
-        <View
-            android:layout_width="4dp"
-            android:layout_height="match_parent"
-            android:layout_marginStart="@dimen/padding_normal"
-            android:background="?colorAccent" />
-
-        <TextView
-            android:id="@+id/txt_title"
-            style="@style/AuroraTextStyle.Subtitle.Alt"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/padding_normal"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:maxLines="1"
-            tools:text="Header" />
-    </LinearLayout>
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        tools:text="Header" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_action"
-        android:layout_width="wrap_content"
+        android:layout_width="120dp"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
         android:layout_alignParentEnd="true"
-        android:layout_marginHorizontal="@dimen/margin_small"
-        android:layout_marginVertical="@dimen/margin_xsmall"
+        android:layout_centerVertical="true"
         android:text="@string/action_update_all" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/view_locale.xml b/app/src/main/res/layout/view_locale.xml
index 56ae4a234..21c94eb01 100644
--- a/app/src/main/res/layout/view_locale.xml
+++ b/app/src/main/res/layout/view_locale.xml
@@ -21,8 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingStart="@dimen/padding_normal"
-    android:paddingEnd="@dimen/padding_small">
+    android:padding="@dimen/padding_small">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/line1"
@@ -39,7 +38,6 @@
         android:layout_below="@+id/line1"
         android:layout_alignStart="@id/line1"
         android:layout_alignEnd="@id/line1"
-        android:layout_marginTop="@dimen/margin_xxsmall"
         android:textAlignment="viewStart"
         android:textDirection="locale" />
 
@@ -48,6 +46,6 @@
         android:layout_width="@dimen/icon_size_category"
         android:layout_height="@dimen/icon_size_category"
         android:layout_alignParentEnd="true"
-        android:layout_centerInParent="true"
+        android:layout_centerVertical="true"
         android:minWidth="0dp" />
 </RelativeLayout>