diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
index 7b5d65c5a..93a349e51 100644
--- a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
@@ -196,7 +196,7 @@ internal class CustomExoPlayerView(
     }
 
     private fun cancelHideControllerTask() {
-        handler.removeCallbacksAndMessages(HIDE_CONTROLLER_TOKEN)
+        handler?.removeCallbacksAndMessages(HIDE_CONTROLLER_TOKEN)
     }
 
     override fun hideController() {
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index e06e93f56..3d2884f8e 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -39,17 +39,10 @@
             android:id="@+id/website"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_region" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/website" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/website"
+                app:drawableStartCompat="@drawable/ic_region" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -57,17 +50,10 @@
             android:id="@+id/github"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_github" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/github" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/github"
+                app:drawableStartCompat="@drawable/ic_github" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -75,17 +61,10 @@
             android:id="@+id/piped"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_piped" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/piped" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/piped"
+                app:drawableStartCompat="@drawable/ic_piped" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -93,17 +72,10 @@
             android:id="@+id/translate"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_weblate" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/translate" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/translate"
+                app:drawableStartCompat="@drawable/ic_weblate" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -111,17 +83,10 @@
             android:id="@+id/license"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_license" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/license" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/license"
+                app:drawableStartCompat="@drawable/ic_license" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -129,17 +94,10 @@
             android:id="@+id/device"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_device" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/device_info" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/device_info"
+                app:drawableStartCompat="@drawable/ic_device" />
 
         </com.google.android.material.card.MaterialCardView>
 
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
index e7fea8bd7..f3b5559d2 100644
--- a/app/src/main/res/layout/activity_help.xml
+++ b/app/src/main/res/layout/activity_help.xml
@@ -29,17 +29,10 @@
             android:id="@+id/faq"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_help" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/faq" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/faq"
+                app:drawableStartCompat="@drawable/ic_help" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -47,17 +40,10 @@
             android:id="@+id/matrix"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_matrix" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/matrix" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/matrix"
+                app:drawableStartCompat="@drawable/ic_matrix" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -65,17 +51,10 @@
             android:id="@+id/telegram"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_telegram" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/telegram" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/telegram"
+                app:drawableStartCompat="@drawable/ic_telegram" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -83,17 +62,10 @@
             android:id="@+id/discord"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_discord" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/discord" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/discord"
+                app:drawableStartCompat="@drawable/ic_discord" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -101,17 +73,10 @@
             android:id="@+id/reddit"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_reddit" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/reddit" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/reddit"
+                app:drawableStartCompat="@drawable/ic_reddit" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -119,17 +84,10 @@
             android:id="@+id/twitter"
             style="@style/AboutCard">
 
-            <LinearLayout style="@style/AboutItem">
-
-                <ImageView
-                    style="@style/AboutImageView"
-                    android:src="@drawable/ic_twitter" />
-
-                <TextView
-                    style="@style/AboutTextView"
-                    android:text="@string/twitter" />
-
-            </LinearLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="@string/twitter"
+                app:drawableStartCompat="@drawable/ic_twitter" />
 
         </com.google.android.material.card.MaterialCardView>
 
diff --git a/app/src/main/res/layout/bottom_sheet_item.xml b/app/src/main/res/layout/bottom_sheet_item.xml
index dbcd835d2..1a8584f8d 100644
--- a/app/src/main/res/layout/bottom_sheet_item.xml
+++ b/app/src/main/res/layout/bottom_sheet_item.xml
@@ -6,6 +6,7 @@
     android:background="?attr/selectableItemBackground"
     android:orientation="horizontal"
     android:paddingHorizontal="30dp"
+    android:gravity="center_vertical"
     android:paddingVertical="12dp">
 
     <ImageView
@@ -20,8 +21,8 @@
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:textSize="16sp"
+        android:textAlignment="viewStart"
         tools:text="Option" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/comments_row.xml b/app/src/main/res/layout/comments_row.xml
index 1c619b9f7..fb5427e30 100644
--- a/app/src/main/res/layout/comments_row.xml
+++ b/app/src/main/res/layout/comments_row.xml
@@ -45,10 +45,11 @@
 
                     <TextView
                         android:id="@+id/comment_infos"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:maxLines="2"
+                        android:textAlignment="viewStart"
                         android:textSize="14sp"
                         android:textColor="?android:attr/textColorSecondary"
                         tools:text="Author and Time" />
@@ -80,6 +81,7 @@
                     android:layout_marginBottom="8dp"
                     android:textSize="15sp"
                     android:autoLink="web"
+                    android:textAlignment="viewStart"
                     tools:text="Comment Text" />
 
                 <LinearLayout
diff --git a/app/src/main/res/layout/comments_sheet.xml b/app/src/main/res/layout/comments_sheet.xml
index 197927b86..c79509a14 100644
--- a/app/src/main/res/layout/comments_sheet.xml
+++ b/app/src/main/res/layout/comments_sheet.xml
@@ -49,6 +49,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:layout_marginHorizontal="10dp"
+                    android:textAlignment="viewStart"
                     tools:text="Title" />
 
                 <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 105509636..752a8d331 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -15,7 +15,7 @@
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -43,6 +43,7 @@
                             android:text="@string/watch_history"
                             android:textSize="18sp"
                             android:textStyle="bold"
+                            android:textAlignment="viewStart"
                             app:drawableStartCompat="@drawable/ic_time_outlined" />
 
                         <TextView
@@ -56,6 +57,7 @@
                             android:text="@string/downloads"
                             android:textSize="18sp"
                             android:textStyle="bold"
+                            android:textAlignment="viewStart"
                             app:drawableStartCompat="@drawable/ic_download" />
 
                     </LinearLayout>
@@ -82,6 +84,7 @@
                             android:text="@string/playlists"
                             android:padding="8dp"
                             android:textSize="18sp"
+                            android:textAlignment="viewStart"
                             android:textStyle="bold" />
 
                         <RelativeLayout
@@ -113,7 +116,7 @@
                             android:id="@+id/playlist_recView"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:nestedScrollingEnabled="false"/>
+                            android:nestedScrollingEnabled="false" />
 
                     </LinearLayout>
 
@@ -147,7 +150,7 @@
                             android:id="@+id/bookmarks_recView"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:nestedScrollingEnabled="false"/>
+                            android:nestedScrollingEnabled="false" />
 
                     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 73c3f7e2f..15c0083ad 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -210,26 +210,25 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginHorizontal="5dp"
+                    android:layout_gravity="start|center_vertical"
+                    android:layout_marginStart="5dp"
+                    android:layout_marginEnd="8dp"
                     android:layout_weight="1"
                     android:layoutDirection="locale"
                     android:orientation="vertical">
 
                     <TextView
                         android:id="@+id/player_channelName"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:textSize="15sp" />
 
                     <TextView
                         android:id="@+id/player_channelSubCount"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:textSize="11sp"
@@ -263,30 +262,14 @@
                 android:layout_margin="16dp"
                 app:cardCornerRadius="18dp">
 
-                <LinearLayout
+                <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_margin="8dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/commentsToggle_textView"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
-                        android:layout_weight="1"
-                        android:text="@string/comments"
-                        android:textSize="17sp" />
-
-                    <ImageView
-                        android:id="@+id/commentsToggle_imageView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginEnd="3dp"
-                        android:src="@drawable/ic_arrow_up_down" />
-
-                </LinearLayout>
+                    android:paddingHorizontal="8dp"
+                    android:text="@string/comments"
+                    android:textAlignment="viewStart"
+                    app:drawableEndCompat="@drawable/ic_arrow_up_down" />
 
             </com.google.android.material.card.MaterialCardView>
 
diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml
index 94ed78fbd..8ecf17855 100644
--- a/app/src/main/res/layout/fragment_subscriptions.xml
+++ b/app/src/main/res/layout/fragment_subscriptions.xml
@@ -69,27 +69,14 @@
                     android:layout_marginBottom="12dp"
                     app:cardCornerRadius="18dp">
 
-                    <LinearLayout
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="8dp">
-
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="8dp"
-                            android:layout_weight="1"
-                            android:text="@string/subscriptions"
-                            android:textSize="17sp" />
-
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginEnd="3dp"
-                            android:src="@drawable/ic_arrow_up_down" />
-
-                    </LinearLayout>
+                        android:layout_margin="8dp"
+                        android:paddingHorizontal="8dp"
+                        android:text="@string/subscriptions"
+                        android:textAlignment="viewStart"
+                        app:drawableEndCompat="@drawable/ic_arrow_up_down" />
 
                 </com.google.android.material.card.MaterialCardView>
 
diff --git a/app/src/main/res/layout/searchhistory_row.xml b/app/src/main/res/layout/searchhistory_row.xml
index e8cb42e26..f6fbee759 100644
--- a/app/src/main/res/layout/searchhistory_row.xml
+++ b/app/src/main/res/layout/searchhistory_row.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="?android:attr/selectableItemBackground"
     android:paddingHorizontal="16dp"
     android:paddingVertical="8dp">
@@ -22,10 +23,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
+        android:textAlignment="viewStart"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/delete_history"
         app:layout_constraintStart_toEndOf="@id/history_icon"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="History item"/>
 
     <ImageView
         android:id="@+id/delete_history"
diff --git a/app/src/main/res/layout/searchsuggestion_row.xml b/app/src/main/res/layout/searchsuggestion_row.xml
index 589932d99..912e15718 100644
--- a/app/src/main/res/layout/searchsuggestion_row.xml
+++ b/app/src/main/res/layout/searchsuggestion_row.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="?android:attr/selectableItemBackground"
     android:paddingHorizontal="16dp"
     android:paddingVertical="8dp">
@@ -22,10 +23,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
+        android:textAlignment="viewStart"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/arrow"
         app:layout_constraintStart_toEndOf="@id/search_icon"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Suggestion item"/>
 
     <ImageView
         android:id="@+id/arrow"
diff --git a/app/src/main/res/layout/trending_row.xml b/app/src/main/res/layout/trending_row.xml
index f965f2a3d..4a3580733 100644
--- a/app/src/main/res/layout/trending_row.xml
+++ b/app/src/main/res/layout/trending_row.xml
@@ -75,6 +75,7 @@
         android:maxLines="2"
         android:textSize="15sp"
         android:textStyle="bold"
+        android:textAlignment="viewStart"
         app:layout_constraintEnd_toEndOf="@+id/thumbnailcard"
         app:layout_constraintStart_toEndOf="@+id/channel_image"
         app:layout_constraintTop_toBottomOf="@+id/thumbnailcard"
@@ -87,6 +88,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:paddingBottom="16dp"
+        android:textAlignment="viewStart"
         app:layout_constraintEnd_toEndOf="@+id/textView_title"
         app:layout_constraintStart_toStartOf="@+id/textView_title"
         app:layout_constraintTop_toBottomOf="@+id/textView_title"
diff --git a/app/src/main/res/layout/video_row.xml b/app/src/main/res/layout/video_row.xml
index 02a33a4f7..ba752d7c6 100644
--- a/app/src/main/res/layout/video_row.xml
+++ b/app/src/main/res/layout/video_row.xml
@@ -74,6 +74,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:ellipsize="end"
+        android:textAlignment="viewStart"
         android:maxLines="2"
         app:layout_constraintEnd_toStartOf="@id/delete_video"
         app:layout_constraintStart_toEndOf="@id/thumbnail_card"
@@ -84,6 +85,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
+        android:textAlignment="viewStart"
         android:maxLines="1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/thumbnail_card"
@@ -98,7 +100,8 @@
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guideline"
-        app:layout_constraintTop_toBottomOf="@id/video_info">
+        app:layout_constraintTop_toBottomOf="@id/video_info"
+        android:layout_gravity="start|center_vertical">
 
         <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/channel_image"
@@ -108,9 +111,8 @@
 
         <TextView
             android:id="@+id/channel_name"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
             android:layout_marginStart="8dp"
             android:ellipsize="end"
             android:maxLines="1" />
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 5518e107e..6d2f47d50 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -17,8 +17,8 @@
 
     <style name="AboutCard" parent="Widget.Material3.CardView.Elevated">
 
-        <item name="android:layout_marginLeft">10dp</item>
-        <item name="android:layout_marginRight">5dp</item>
+        <item name="android:layout_marginStart">10dp</item>
+        <item name="android:layout_marginEnd">10dp</item>
         <item name="android:layout_marginBottom">5dp</item>
         <item name="android:layout_marginTop">10dp</item>
         <item name="strokeWidth">0dp</item>
@@ -31,32 +31,16 @@
 
     <style name="AboutItem">
 
-        <item name="android:orientation">horizontal</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginLeft">20dp</item>
-        <item name="android:layout_marginRight">20dp</item>
-        <item name="android:layout_marginTop">15dp</item>
-        <item name="android:layout_marginBottom">15dp</item>
-
-    </style>
-
-    <style name="AboutTextView">
-
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_gravity">center</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textStyle">bold</item>
-
-    </style>
-
-    <style name="AboutImageView">
-
-        <item name="android:layout_height">24dp</item>
-        <item name="android:layout_width">24dp</item>
-        <item name="android:layout_marginRight">10dp</item>
-
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:drawablePadding">20dp</item>
+        <item name="android:paddingStart">15dp</item>
+        <item name="android:paddingEnd">15dp</item>
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingBottom">10dp</item>
     </style>
 
     <style name="CustomDialogButton" parent="@style/Widget.Material3.Button.TextButton">
@@ -181,10 +165,7 @@
 
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingLeft">6dp</item>
-        <item name="android:paddingRight">6dp</item>
-        <item name="android:paddingTop">8dp</item>
-        <item name="android:paddingBottom">8dp</item>
+        <item name="android:padding">8dp</item>
         <item name="android:background">@drawable/rounded_ripple</item>
         <item name="android:orientation">horizontal</item>
 
@@ -231,6 +212,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">20sp</item>
         <item name="android:textColor">?attr/colorControlNormal</item>
+        <item name="android:textAlignment">viewStart</item>
         <item name="android:padding">15dp</item>
         <item name="android:background">?attr/selectableItemBackground</item>
         <item name="android:visibility">gone</item>