diff --git a/app/src/main/res/layout/fragment_search_result.xml b/app/src/main/res/layout/fragment_search_result.xml
index 4027605a2..6e71d636b 100644
--- a/app/src/main/res/layout/fragment_search_result.xml
+++ b/app/src/main/res/layout/fragment_search_result.xml
@@ -45,6 +45,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@+id/divider"
+            android:layout_marginTop="5dp"
             android:paddingTop="@dimen/padding_normal"
             tools:listitem="@layout/view_app_list" />
     </RelativeLayout>
@@ -57,6 +58,5 @@
         android:layout_gravity="center_horizontal|bottom"
         android:layout_marginBottom="@dimen/margin_normal"
         android:text="@string/action_filter"
-        app:iconPadding="@dimen/padding_small"
         app:icon="@drawable/ic_filter" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sheet_app_menu.xml b/app/src/main/res/layout/sheet_app_menu.xml
index 1bef2b53d..3e8a0e434 100644
--- a/app/src/main/res/layout/sheet_app_menu.xml
+++ b/app/src/main/res/layout/sheet_app_menu.xml
@@ -27,9 +27,8 @@
         android:id="@+id/navigation_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/margin_small"
         android:background="@color/colorTransparent"
+        android:padding="@dimen/padding_small"
         app:elevation="0dp"
-        app:itemTextAppearance="@style/TextAppearance.Aurora.Line1"
         app:menu="@menu/menu_app" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sheet_app_peek.xml b/app/src/main/res/layout/sheet_app_peek.xml
index 9542bb5ee..0c32fb335 100644
--- a/app/src/main/res/layout/sheet_app_peek.xml
+++ b/app/src/main/res/layout/sheet_app_peek.xml
@@ -27,15 +27,12 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="@dimen/padding_normal">
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_large"
-            android:layout_marginBottom="@dimen/margin_large"
-            android:paddingStart="@dimen/padding_large"
-            android:paddingEnd="@dimen/padding_large">
+            android:layout_height="wrap_content">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/img_icon"
@@ -87,9 +84,7 @@
             <com.google.android.material.chip.ChipGroup
                 android:id="@+id/top_tab_group"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="@dimen/padding_large"
-                android:paddingEnd="@dimen/padding_large">
+                android:layout_height="wrap_content">
 
                 <com.google.android.material.chip.Chip
                     android:id="@+id/chip_favourite"
@@ -115,10 +110,9 @@
         </HorizontalScrollView>
 
         <com.google.android.material.button.MaterialButton
-            style="@style/Widget.Material3.Button.UnelevatedButton"
+            style="@style/Widget.Material3.Button"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/height_button"
-            android:layout_margin="@dimen/margin_large"
+            android:layout_height="wrap_content"
             android:text="@string/action_install" />
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sheet_download_menu.xml b/app/src/main/res/layout/sheet_download_menu.xml
index e791c4945..6a8c1f307 100644
--- a/app/src/main/res/layout/sheet_download_menu.xml
+++ b/app/src/main/res/layout/sheet_download_menu.xml
@@ -27,9 +27,8 @@
         android:id="@+id/navigation_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/margin_small"
         android:background="@color/colorTransparent"
+        android:padding="@dimen/padding_small"
         app:elevation="0dp"
-        app:itemTextAppearance="@style/TextAppearance.Aurora.Line1"
         app:menu="@menu/menu_download_single" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sheet_filter.xml b/app/src/main/res/layout/sheet_filter.xml
index 64f796d69..da4eee12d 100644
--- a/app/src/main/res/layout/sheet_filter.xml
+++ b/app/src/main/res/layout/sheet_filter.xml
@@ -22,97 +22,92 @@
     android:layout_height="wrap_content"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
-    <androidx.core.widget.NestedScrollView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_medium"
-        android:scrollbars="none">
+        android:orientation="vertical">
 
-        <LinearLayout
+        <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+            android:id="@+id/drag_handle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:scrollbars="none">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
-                android:text="@string/action_filter_rating"
-                android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
-
-            <com.google.android.material.chip.ChipGroup
-                android:id="@+id/rating_chips"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                app:chipSpacingHorizontal="@dimen/margin_small"
-                app:chipSpacingVertical="@dimen/margin_xsmall"
-                app:selectionRequired="true"
-                app:singleSelection="true" />
+                android:divider="@drawable/divider"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_normal"
+                android:showDividers="middle">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
-                android:text="@string/action_filter_downloads"
-                android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
-
-            <com.google.android.material.chip.ChipGroup
-                android:id="@+id/download_chips"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                app:chipSpacingHorizontal="@dimen/margin_small"
-                app:chipSpacingVertical="@dimen/margin_xsmall"
-                app:selectionRequired="true"
-                app:singleSelection="true" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
-                android:text="@string/action_filter_misc"
-                android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
-
-            <com.google.android.material.chip.ChipGroup
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp">
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/filter_gfs"
-                    style="@style/AppTheme.FilterChip"
+                <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/action_filter_gsf_dependent_apps" />
+                    android:text="@string/action_filter_rating"
+                    android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/filter_paid"
-                    style="@style/AppTheme.FilterChip"
+                <com.google.android.material.chip.ChipGroup
+                    android:id="@+id/rating_chips"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:chipSpacingHorizontal="@dimen/margin_small"
+                    app:chipSpacingVertical="@dimen/margin_xsmall"
+                    app:selectionRequired="true"
+                    app:singleSelection="true" />
+
+                <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/action_filter_paid_apps" />
+                    android:text="@string/action_filter_downloads"
+                    android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/filter_ads"
-                    style="@style/AppTheme.FilterChip"
+                <com.google.android.material.chip.ChipGroup
+                    android:id="@+id/download_chips"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:chipSpacingHorizontal="@dimen/margin_small"
+                    app:chipSpacingVertical="@dimen/margin_xsmall"
+                    app:selectionRequired="true"
+                    app:singleSelection="true" />
+
+                <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/action_filter_apps_with_ads" />
+                    android:text="@string/action_filter_misc"
+                    android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
 
-            </com.google.android.material.chip.ChipGroup>
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+                <com.google.android.material.chip.ChipGroup
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/filter_gfs"
+                        style="@style/AppTheme.FilterChip"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/action_filter_gsf_dependent_apps" />
+
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/filter_paid"
+                        style="@style/AppTheme.FilterChip"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/action_filter_paid_apps" />
+
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/filter_ads"
+                        style="@style/AppTheme.FilterChip"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/action_filter_apps_with_ads" />
+
+                </com.google.android.material.chip.ChipGroup>
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sheet_install_error.xml b/app/src/main/res/layout/sheet_install_error.xml
index 4a5a3d1f5..6216bd365 100644
--- a/app/src/main/res/layout/sheet_install_error.xml
+++ b/app/src/main/res/layout/sheet_install_error.xml
@@ -29,38 +29,39 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/padding_normal">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/img_icon"
+                android:layout_width="@dimen/icon_size_category"
+                android:layout_height="@dimen/icon_size_category"
+                android:layout_centerVertical="true"
+                tools:src="@drawable/bg_placeholder" />
+
+            <TextView
+                android:id="@+id/txt_header"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="@dimen/margin_normal"
+                android:layout_marginBottom="@dimen/margin_normal"
+                android:layout_toEndOf="@id/img_icon"
+                android:maxLines="1"
+                android:text="@string/title_installer"
+                android:textAlignment="viewStart"
+                android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
+        </RelativeLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:divider="@drawable/divider"
             android:orientation="vertical"
-            android:padding="@dimen/padding_large"
-            android:showDividers="middle">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/img_icon"
-                    android:layout_width="@dimen/icon_size_category"
-                    android:layout_height="@dimen/icon_size_category"
-                    android:layout_centerVertical="true"
-                    tools:src="@drawable/bg_placeholder" />
-
-                <TextView
-                    android:id="@+id/txt_header"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_marginStart="@dimen/margin_normal"
-                    android:layout_marginBottom="@dimen/margin_normal"
-                    android:layout_toEndOf="@id/img_icon"
-                    android:maxLines="1"
-                    android:text="@string/title_installer"
-                    android:textAlignment="viewStart"
-                    android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
-            </RelativeLayout>
+            android:paddingStart="@dimen/padding_normal"
+            android:paddingEnd="@dimen/padding_normal"
+            android:paddingBottom="@dimen/padding_normal">
 
             <TextView
                 android:id="@+id/txt_line1"
@@ -114,4 +115,4 @@
                 android:text="@string/action_ok" />
         </LinearLayout>
     </LinearLayout>
-</FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sheet_network.xml b/app/src/main/res/layout/sheet_network.xml
index d783a4648..dec6aa7ba 100644
--- a/app/src/main/res/layout/sheet_network.xml
+++ b/app/src/main/res/layout/sheet_network.xml
@@ -23,20 +23,20 @@
     android:layout_height="wrap_content"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/padding_normal">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/img"
-            android:layout_width="@dimen/icon_size_avatar"
-            android:layout_height="@dimen/icon_size_avatar"
+            android:layout_width="@dimen/icon_size_large"
+            android:layout_height="@dimen/icon_size_large"
             android:layout_marginTop="@dimen/margin_xlarge"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/ic_network"
-            app:tint="?android:attr/colorControlNormal" />
+            app:tint="?colorAccent" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/txt_warning"
@@ -44,18 +44,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/title_no_network"
-            android:textAlignment="center"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/img" />
+            android:textAlignment="center" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_action"
+            style="@style/Widget.Material3.Button.TonalButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/check_connectivity"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/txt_warning" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>
+            android:text="@string/check_connectivity" />
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file