diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 204d9575..89c2aaa6 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -16,8 +16,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:layout_marginStart="@dimen/spacer_activity_sides"
-            android:layout_marginEnd="@dimen/spacer_activity_sides"
+            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
             app:contentInsetStartWithNavigation="0dp"
             app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
             app:titleMarginStart="0dp"
@@ -36,7 +35,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
-        android:paddingStart="@dimen/spacer_1x"
-        android:paddingEnd="@dimen/spacer_1x" />
+        android:paddingHorizontal="@dimen/spacer_1x" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml
index 1fcff7ca..8948c076 100644
--- a/app/src/main/res/layout/activity_edit.xml
+++ b/app/src/main/res/layout/activity_edit.xml
@@ -15,8 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:layout_marginStart="@dimen/spacer_activity_sides"
-            android:layout_marginEnd="@dimen/spacer_activity_sides"
+            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
             app:contentInsetStartWithNavigation="0dp"
             app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
             app:titleMarginStart="0dp"
diff --git a/app/src/main/res/layout/activity_exception.xml b/app/src/main/res/layout/activity_exception.xml
index 919f7dfd..ce352cc6 100644
--- a/app/src/main/res/layout/activity_exception.xml
+++ b/app/src/main/res/layout/activity_exception.xml
@@ -11,8 +11,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:layout_marginStart="@dimen/spacer_activity_sides"
-        android:layout_marginEnd="@dimen/spacer_activity_sides"
+        android:layout_marginHorizontal="@dimen/spacer_activity_sides"
         app:contentInsetStartWithNavigation="0dp"
         app:elevation="4dp"
         app:titleMarginStart="0dp"
@@ -56,8 +55,7 @@
             <HorizontalScrollView
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginStart="@dimen/spacer_2x"
-                android:layout_marginEnd="@dimen/spacer_2x"
+                android:layout_marginHorizontal="@dimen/spacer_2x"
                 android:layout_weight="1">
 
                 <TextView
@@ -95,8 +93,7 @@
             style="@style/Widget.Material3.Button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
+            android:layout_marginVertical="6dp"
             android:layout_weight=".5"
             android:text="@string/simple_copy"
             app:backgroundTint="@color/defaultBrand"
diff --git a/app/src/main/res/layout/activity_formatting_help.xml b/app/src/main/res/layout/activity_formatting_help.xml
index 2557f7c1..99dbb182 100644
--- a/app/src/main/res/layout/activity_formatting_help.xml
+++ b/app/src/main/res/layout/activity_formatting_help.xml
@@ -16,8 +16,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:layout_marginStart="@dimen/spacer_activity_sides"
-            android:layout_marginEnd="@dimen/spacer_activity_sides"
+            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
             app:contentInsetStartWithNavigation="0dp"
             app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
             app:title="@string/action_formatting_help"
@@ -34,8 +33,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacer_activity_sides"
-            android:layout_marginEnd="@dimen/spacer_activity_sides"
+            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
             android:orientation="vertical"
             android:padding="@dimen/spacer_2x">
 
diff --git a/app/src/main/res/layout/activity_import_account.xml b/app/src/main/res/layout/activity_import_account.xml
index 85a0b217..630990e2 100644
--- a/app/src/main/res/layout/activity_import_account.xml
+++ b/app/src/main/res/layout/activity_import_account.xml
@@ -43,10 +43,8 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/welcome_text"
             android:layout_centerHorizontal="true"
-            android:paddingStart="32dp"
-            android:paddingTop="24dp"
-            android:paddingEnd="32dp"
-            android:paddingBottom="24dp"
+            android:paddingHorizontal="32dp"
+            android:paddingVertical="@dimen/spacer_3x"
             android:text="@string/choose_account"
             app:backgroundTint="@color/defaultBrand" />
 
diff --git a/app/src/main/res/layout/activity_manage_accounts.xml b/app/src/main/res/layout/activity_manage_accounts.xml
index 7e01326b..17cd73cc 100644
--- a/app/src/main/res/layout/activity_manage_accounts.xml
+++ b/app/src/main/res/layout/activity_manage_accounts.xml
@@ -16,8 +16,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:layout_marginStart="@dimen/spacer_activity_sides"
-            android:layout_marginEnd="@dimen/spacer_activity_sides"
+            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
             app:contentInsetStartWithNavigation="0dp"
             app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
             app:title="@string/manage_accounts"
diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml
index 5286b2f0..c18db2dd 100644
--- a/app/src/main/res/layout/activity_notes_list_view.xml
+++ b/app/src/main/res/layout/activity_notes_list_view.xml
@@ -24,10 +24,8 @@
                 <com.google.android.material.card.MaterialCardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/spacer_activity_sides"
-                    android:layout_marginTop="@dimen/spacer_1hx"
-                    android:layout_marginEnd="@dimen/spacer_activity_sides"
-                    android:layout_marginBottom="@dimen/spacer_1hx"
+                    android:layout_marginHorizontal="@dimen/spacer_activity_sides"
+                    android:layout_marginVertical="@dimen/spacer_1hx"
                     app:cardBackgroundColor="@color/appbar"
                     app:cardCornerRadius="@dimen/spacer_4x"
                     app:cardElevation="2dp"
@@ -88,8 +86,7 @@
                     android:id="@+id/search_toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginStart="@dimen/spacer_activity_sides"
-                    android:layout_marginEnd="@dimen/spacer_activity_sides"
+                    android:layout_marginHorizontal="@dimen/spacer_activity_sides"
                     android:visibility="gone"
                     app:contentInsetStartWithNavigation="0dp"
                     app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml
index 77f9ff03..ec4cce0c 100644
--- a/app/src/main/res/layout/activity_preferences.xml
+++ b/app/src/main/res/layout/activity_preferences.xml
@@ -14,8 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:layout_marginStart="@dimen/spacer_activity_sides"
-            android:layout_marginEnd="@dimen/spacer_activity_sides"
+            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
             app:contentInsetStartWithNavigation="0dp"
             app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
             app:title="@string/action_settings"
diff --git a/app/src/main/res/layout/dialog_account_switcher.xml b/app/src/main/res/layout/dialog_account_switcher.xml
index 965f1df8..f75d0f20 100644
--- a/app/src/main/res/layout/dialog_account_switcher.xml
+++ b/app/src/main/res/layout/dialog_account_switcher.xml
@@ -14,8 +14,7 @@
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:padding="@dimen/spacer_2x"
-        android:paddingStart="@dimen/spacer_1x"
-        android:paddingEnd="@dimen/spacer_1x">
+        android:paddingHorizontal="@dimen/spacer_1x">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/currentAccountItemAvatar"
diff --git a/app/src/main/res/layout/dialog_exception.xml b/app/src/main/res/layout/dialog_exception.xml
index 88a2495f..450ade9d 100644
--- a/app/src/main/res/layout/dialog_exception.xml
+++ b/app/src/main/res/layout/dialog_exception.xml
@@ -31,8 +31,7 @@
             android:id="@+id/stacktrace"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_marginTop="@dimen/spacer_2x"
-            android:layout_marginBottom="@dimen/spacer_2x"
+            android:layout_marginVertical="@dimen/spacer_2x"
             android:layout_weight="1"
             android:background="@color/bg_highlighted"
             android:padding="@dimen/spacer_1x"
diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml
index 7ad83d80..0b868cec 100644
--- a/app/src/main/res/layout/drawer_layout.xml
+++ b/app/src/main/res/layout/drawer_layout.xml
@@ -63,8 +63,7 @@
                     android:id="@+id/navigationList"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingTop="@dimen/spacer_1x"
-                    android:paddingBottom="@dimen/spacer_1x"
+                    android:paddingVertical="@dimen/spacer_1x"
                     app:layoutManager="LinearLayoutManager"
                     tools:itemCount="6"
                     tools:listitem="@layout/item_navigation" />
@@ -73,8 +72,7 @@
                     android:id="@+id/navigationMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingTop="@dimen/spacer_1x"
-                    android:paddingBottom="@dimen/spacer_1x"
+                    android:paddingVertical="@dimen/spacer_1x"
                     app:layoutManager="LinearLayoutManager"
                     tools:itemCount="3"
                     tools:listitem="@layout/item_navigation" />
diff --git a/app/src/main/res/layout/fragment_about_credits_tab.xml b/app/src/main/res/layout/fragment_about_credits_tab.xml
index 35dcae9f..fad03f62 100644
--- a/app/src/main/res/layout/fragment_about_credits_tab.xml
+++ b/app/src/main/res/layout/fragment_about_credits_tab.xml
@@ -14,8 +14,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginTop="30dp"
-            android:layout_marginBottom="30dp"
+            android:layout_marginVertical="30dp"
             android:text="@string/app_name"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/fg_default_low"
diff --git a/app/src/main/res/layout/fragment_note_edit.xml b/app/src/main/res/layout/fragment_note_edit.xml
index 4e11a3c2..75e6ab84 100644
--- a/app/src/main/res/layout/fragment_note_edit.xml
+++ b/app/src/main/res/layout/fragment_note_edit.xml
@@ -27,16 +27,13 @@
             android:id="@+id/editContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacer_activity_sides"
-            android:layout_marginEnd="@dimen/spacer_activity_sides"
+            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
             android:background="?attr/colorPrimary"
             android:ems="10"
             android:gravity="top"
             android:inputType="textMultiLine|textCapSentences"
             android:lineSpacingMultiplier="@dimen/note_line_spacing"
             android:padding="@dimen/spacer_2x"
-            android:paddingStart="@dimen/spacer_2x"
-            android:paddingEnd="@dimen/spacer_2x"
             android:textColor="@color/fg_default"
             tools:text="@tools:sample/lorem/random" />
     </ScrollView>
diff --git a/app/src/main/res/layout/fragment_note_preview.xml b/app/src/main/res/layout/fragment_note_preview.xml
index 68d0175b..bd9aabef 100644
--- a/app/src/main/res/layout/fragment_note_preview.xml
+++ b/app/src/main/res/layout/fragment_note_preview.xml
@@ -24,12 +24,10 @@
                 android:id="@+id/single_note_content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/spacer_activity_sides"
-                android:layout_marginEnd="@dimen/spacer_activity_sides"
+                android:layout_marginHorizontal="@dimen/spacer_activity_sides"
                 android:lineSpacingMultiplier="@dimen/note_line_spacing"
                 android:padding="@dimen/spacer_2x"
-                android:paddingStart="@dimen/spacer_2x"
-                android:paddingEnd="@dimen/spacer_2x"
+                android:paddingHorizontal="@dimen/spacer_2x"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="@color/fg_default"
                 android:textIsSelectable="true"
diff --git a/app/src/main/res/layout/item_account_choose.xml b/app/src/main/res/layout/item_account_choose.xml
index 8cfbd4be..30458288 100644
--- a/app/src/main/res/layout/item_account_choose.xml
+++ b/app/src/main/res/layout/item_account_choose.xml
@@ -8,8 +8,7 @@
     android:gravity="center"
     android:orientation="horizontal"
     android:padding="@dimen/spacer_2x"
-    android:paddingStart="@dimen/spacer_1x"
-    android:paddingEnd="@dimen/spacer_1x">
+    android:paddingHorizontal="@dimen/spacer_1x">
 
     <FrameLayout
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/item_notes_list_note_item_grid.xml b/app/src/main/res/layout/item_notes_list_note_item_grid.xml
index 7f26b263..d9325f19 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_grid.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_grid.xml
@@ -21,15 +21,13 @@
             android:id="@+id/noteTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacer_2x"
+            android:layout_marginHorizontal="@dimen/spacer_2x"
             android:layout_marginTop="@dimen/spacer_2x"
-            android:layout_marginEnd="@dimen/spacer_2x"
             android:layout_marginBottom="@dimen/spacer_1x"
             android:hyphenationFrequency="full"
             android:textAppearance="?attr/textAppearanceHeadline5"
             android:textColor="@color/fg_default"
             tools:maxLength="50"
-            tools:targetApi="m"
             tools:text="@tools:sample/lorem/random" />
 
 
@@ -37,8 +35,7 @@
             android:id="@+id/noteExcerpt"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacer_2x"
-            android:layout_marginEnd="@dimen/spacer_2x"
+            android:layout_marginHorizontal="@dimen/spacer_2x"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/fg_default"
             tools:maxLength="200"
diff --git a/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml b/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml
index 9e7d0f3b..f60e5292 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml
@@ -55,7 +55,6 @@
             android:textAppearance="?attr/textAppearanceHeadline5"
             android:textColor="@color/fg_default"
             tools:maxLength="50"
-            tools:targetApi="m"
             tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml b/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
index 966f4b66..384a674b 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
@@ -65,9 +65,8 @@
             android:layout_weight="1"
             android:orientation="vertical"
             android:paddingStart="0dp"
-            android:paddingTop="@dimen/spacer_2x"
-            android:paddingEnd="@dimen/spacer_2x"
-            android:paddingBottom="@dimen/spacer_2x">
+            android:paddingVertical="@dimen/spacer_2x"
+            android:paddingEnd="@dimen/spacer_2x">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -97,8 +96,7 @@
                     android:layout_weight="1"
                     android:ellipsize="end"
                     android:maxLines="1"
-                    android:paddingTop="1dp"
-                    android:paddingBottom="1dp"
+                    android:paddingVertical="1dp"
                     android:textSize="@dimen/secondary_font_size"
                     tools:text="@tools:sample/lorem/random" />
 
@@ -109,10 +107,8 @@
                     android:layout_marginStart="@dimen/spacer_1x"
                     android:background="@drawable/border"
                     android:maxLines="1"
-                    android:paddingStart="@dimen/spacer_1x"
-                    android:paddingTop="1dp"
-                    android:paddingEnd="@dimen/spacer_1x"
-                    android:paddingBottom="1dp"
+                    android:paddingVertical="1dp"
+                    android:paddingHorizontal="@dimen/spacer_1x"
                     android:singleLine="true"
                     android:textColor="?android:textColorPrimary"
                     android:textSize="@dimen/secondary_font_size"
diff --git a/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml b/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
index 91232a01..f7e42863 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
@@ -63,13 +63,11 @@
             android:id="@+id/noteTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10sp"
-            android:layout_marginBottom="10sp"
+            android:layout_marginVertical="10sp"
             android:layout_weight="1"
             android:ellipsize="end"
             android:maxLines="1"
-            android:paddingTop="@dimen/spacer_2x"
-            android:paddingBottom="@dimen/spacer_2x"
+            android:paddingVertical="@dimen/spacer_2x"
             android:textColor="?android:textColorPrimary"
             android:textSize="@dimen/primary_font_size"
             tools:text="@tools:sample/lorem/random" />
@@ -83,8 +81,7 @@
             android:layout_marginEnd="@dimen/spacer_2x"
             android:background="@drawable/border"
             android:maxLines="1"
-            android:paddingStart="@dimen/spacer_1x"
-            android:paddingEnd="@dimen/spacer_1x"
+            android:paddingHorizontal="@dimen/spacer_1x"
             android:paddingBottom="1dp"
             android:singleLine="true"
             android:textColor="?android:textColorPrimary"
diff --git a/app/src/main/res/layout/item_pref.xml b/app/src/main/res/layout/item_pref.xml
index 1d84737b..82295748 100644
--- a/app/src/main/res/layout/item_pref.xml
+++ b/app/src/main/res/layout/item_pref.xml
@@ -4,8 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingStart="@dimen/spacer_activity_sides"
-    android:paddingEnd="@dimen/spacer_activity_sides"
+    android:paddingHorizontal="@dimen/spacer_activity_sides"
     android:minHeight="?android:attr/listPreferredItemHeight">
 
     <ImageView
diff --git a/app/src/main/res/layout/item_tip.xml b/app/src/main/res/layout/item_tip.xml
index 2177d013..96696725 100644
--- a/app/src/main/res/layout/item_tip.xml
+++ b/app/src/main/res/layout/item_tip.xml
@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingTop="@dimen/spacer_1x"
-    android:paddingBottom="@dimen/spacer_1x">
+    android:paddingVertical="@dimen/spacer_1x">
 
     <TextView
         android:id="@+id/tip"
diff --git a/app/src/main/res/layout/widget_entry.xml b/app/src/main/res/layout/widget_entry.xml
index 460a255b..25f763f4 100644
--- a/app/src/main/res/layout/widget_entry.xml
+++ b/app/src/main/res/layout/widget_entry.xml
@@ -6,10 +6,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingTop="@dimen/spacer_1x"
+    android:paddingVertical="@dimen/spacer_1x"
     android:paddingStart="@null"
-    android:paddingEnd="@dimen/spacer_1hx"
-    android:paddingBottom="@dimen/spacer_1x">
+    android:paddingEnd="@dimen/spacer_1hx">
 
     <ImageView
         android:id="@+id/widget_entry_fav_icon"
diff --git a/app/src/main/res/layout/widget_entry_add.xml b/app/src/main/res/layout/widget_entry_add.xml
index 0c7787e7..901096b6 100644
--- a/app/src/main/res/layout/widget_entry_add.xml
+++ b/app/src/main/res/layout/widget_entry_add.xml
@@ -31,8 +31,7 @@
         android:layout_gravity="center_vertical"
         android:contentDescription="@string/widget_entry_fav_contentDescription"
         android:foregroundGravity="center_vertical"
-        android:paddingStart="@dimen/spacer_1x"
-        android:paddingEnd="@dimen/spacer_1x"
+        android:paddingHorizontal="@dimen/spacer_1x"
         android:paddingBottom="@dimen/spacer_1x"
         app:srcCompat="@drawable/ic_add_blue_24dp" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_note_list.xml b/app/src/main/res/layout/widget_note_list.xml
index a3e7e163..a34f14cd 100644
--- a/app/src/main/res/layout/widget_note_list.xml
+++ b/app/src/main/res/layout/widget_note_list.xml
@@ -5,10 +5,8 @@
     android:layout_height="match_parent"
     android:background="@drawable/widget_background"
     android:orientation="vertical"
-    android:paddingStart="@dimen/widget_inner_padding_horizontal"
-    android:paddingTop="@dimen/widget_inner_padding_vertical"
-    android:paddingEnd="@dimen/widget_inner_padding_horizontal"
-    android:paddingBottom="@dimen/widget_inner_padding_vertical">
+    android:paddingVertical="@dimen/widget_inner_padding_vertical"
+    android:paddingHorizontal="@dimen/widget_inner_padding_horizontal">
 
     <ListView
         android:id="@+id/note_list_widget_lv"
diff --git a/app/src/main/res/layout/widget_single_note.xml b/app/src/main/res/layout/widget_single_note.xml
index 053a059d..ac137083 100644
--- a/app/src/main/res/layout/widget_single_note.xml
+++ b/app/src/main/res/layout/widget_single_note.xml
@@ -9,10 +9,8 @@
         android:id="@+id/single_note_widget_lv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingStart="@dimen/widget_inner_padding_horizontal"
-        android:paddingTop="@dimen/widget_inner_padding_vertical"
-        android:paddingEnd="@dimen/widget_inner_padding_horizontal"
-        android:paddingBottom="@dimen/widget_inner_padding_vertical"
+        android:paddingVertical="@dimen/widget_inner_padding_vertical"
+        android:paddingHorizontal="@dimen/widget_inner_padding_horizontal"
         tools:listitem="@layout/widget_single_note_content" />
 
     <TextView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 73abd4db..b280b7f9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,16 +18,11 @@
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
 
         <item name="actionModeStyle">@style/actionModeStyle</item>
-        <item name="toolbarStyle">@style/toolbarStyle</item>
         <item name="tabStyle">@style/tabStyle</item>
     </style>
 
     <style name="AppTheme" parent="BaseTheme" />
 
-    <style name="toolbarStyle" parent="@style/Widget.Material3.Toolbar">
-        <item name="android:background">?attr/colorPrimary</item>
-    </style>
-
     <style name="actionModeStyle" parent="@style/Widget.Material3.ActionMode">
         <item name="android:paddingStart">@dimen/spacer_activity_sides</item>
         <item name="android:paddingEnd">@dimen/spacer_activity_sides</item>