diff --git a/app/src/main/res/layout/activity_player_settings.xml b/app/src/main/res/layout/activity_player_settings.xml
index bab80224..6ae585a4 100644
--- a/app/src/main/res/layout/activity_player_settings.xml
+++ b/app/src/main/res/layout/activity_player_settings.xml
@@ -83,8 +83,7 @@
                     android:layout_height="64dp"
                     android:fontFamily="@font/poppins_bold"
                     android:gravity="center_vertical"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/video"
                     android:textColor="?attr/colorSecondary"
                     app:drawableEndCompat="@drawable/ic_round_arrow_drop_down_24"
@@ -100,8 +99,7 @@
                     android:fontFamily="@font/poppins_bold"
                     android:insetTop="0dp"
                     android:insetBottom="0dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/default_playback_speed"
                     android:textAlignment="viewStart"
                     android:textAllCaps="false"
@@ -122,8 +120,7 @@
                     android:elegantTextHeight="false"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/cursed_speeds"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -141,8 +138,7 @@
                     android:fontFamily="@font/poppins_bold"
                     android:insetTop="0dp"
                     android:insetBottom="0dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/resize_mode_button"
                     android:textAlignment="viewStart"
                     android:textAllCaps="false"
@@ -164,8 +160,7 @@
                     android:layout_height="64dp"
                     android:fontFamily="@font/poppins_bold"
                     android:gravity="center_vertical"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/subtitles"
                     android:textColor="?attr/colorSecondary"
                     app:drawableEndCompat="@drawable/ic_round_arrow_drop_down_24"
@@ -182,8 +177,7 @@
                     android:elegantTextHeight="false"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/subtitle_toggle"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -201,8 +195,7 @@
                     android:fontFamily="@font/poppins_bold"
                     android:insetTop="0dp"
                     android:insetBottom="0dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/primary_sub_color_select"
                     android:textAlignment="viewStart"
                     android:textAllCaps="false"
@@ -221,8 +214,7 @@
                     android:fontFamily="@font/poppins_bold"
                     android:insetTop="0dp"
                     android:insetBottom="0dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/secondary_sub_color_select"
                     android:textAlignment="viewStart"
                     android:textAllCaps="false"
@@ -241,8 +233,7 @@
                     android:fontFamily="@font/poppins_bold"
                     android:insetTop="0dp"
                     android:insetBottom="0dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/secondary_sub_outline_type_select"
                     android:textAlignment="viewStart"
                     android:textAllCaps="false"
@@ -261,8 +252,7 @@
                     android:fontFamily="@font/poppins_bold"
                     android:insetTop="0dp"
                     android:insetBottom="0dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/sub_background_color_select"
                     android:textAlignment="viewStart"
                     android:textAllCaps="false"
@@ -281,8 +271,7 @@
                     android:fontFamily="@font/poppins_bold"
                     android:insetTop="0dp"
                     android:insetBottom="0dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/sub_window_color_select"
                     android:textAlignment="viewStart"
                     android:textAllCaps="false"
@@ -299,8 +288,7 @@
                     android:layout_marginBottom="8dp"
                     android:alpha="0.58"
                     android:fontFamily="@font/poppins_family"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/sub_window_color_info"
                     android:textSize="14sp" />
 
@@ -313,8 +301,7 @@
                     android:fontFamily="@font/poppins_bold"
                     android:insetTop="0dp"
                     android:insetBottom="0dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/sub_font_select"
                     android:textAlignment="viewStart"
                     android:textAllCaps="false"
@@ -328,8 +315,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="64dp"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="32dp"
-                    android:layout_marginEnd="32dp"
+                    android:layout_marginHorizontal="32dp"
                     android:layout_marginBottom="8dp"
                     android:gravity="center"
                     android:orientation="horizontal">
@@ -394,8 +380,7 @@
                     android:layout_marginBottom="8dp"
                     android:alpha="0.58"
                     android:fontFamily="@font/poppins_family"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/sub_color_info"
                     android:textSize="14sp" />
 
@@ -411,8 +396,7 @@
                     android:layout_height="64dp"
                     android:fontFamily="@font/poppins_bold"
                     android:gravity="center_vertical"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/timestamps"
                     android:textColor="?attr/colorSecondary"
                     app:drawableEndCompat="@drawable/ic_round_arrow_drop_down_24"
@@ -429,8 +413,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/always_load_time_stamps"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -450,8 +433,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/auto_hide_time_stamps"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -467,9 +449,8 @@
                     android:layout_marginBottom="8dp"
                     android:alpha="0.58"
                     android:fontFamily="@font/poppins_family"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
-                    android:text="Make the skip time stamp button disappear after 5 seconds"
+                    android:paddingHorizontal="32dp"
+                    android:text="@string/hide_skip_button"
                     android:textSize="14sp" />
 
                 <com.google.android.material.materialswitch.MaterialSwitch
@@ -483,8 +464,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/timestamp_proxy"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -501,8 +481,7 @@
                     android:layout_marginBottom="8dp"
                     android:alpha="0.58"
                     android:fontFamily="@font/poppins_family"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/timestamp_proxy_desc"
                     android:textSize="14sp" />
 
@@ -517,8 +496,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/show_skip_time_stamp_button"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -541,8 +519,7 @@
                     android:layout_height="64dp"
                     android:fontFamily="@font/poppins_bold"
                     android:gravity="center_vertical"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/auto"
                     android:textColor="?attr/colorSecondary"
                     app:drawableEndCompat="@drawable/ic_round_arrow_drop_down_24"
@@ -559,8 +536,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/auto_skip_op_ed"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -576,8 +552,7 @@
                     android:layout_marginBottom="8dp"
                     android:alpha="0.58"
                     android:fontFamily="@font/poppins_family"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/requires_time_stamps_to_be_enabled"
                     android:textSize="14sp" />
 
@@ -592,8 +567,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/auto_play_next_episode"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -611,8 +585,7 @@
                     android:layout_marginBottom="8dp"
                     android:alpha="0.58"
                     android:fontFamily="@font/poppins_family"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/auto_play_next_episode_info"
                     android:textSize="14sp" />
 
@@ -627,8 +600,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/auto_skip_fillers"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -646,8 +618,7 @@
                     android:layout_marginBottom="8dp"
                     android:alpha="0.58"
                     android:fontFamily="@font/poppins_family"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/auto_skip_fillers_info"
                     android:textSize="14sp" />
 
@@ -663,8 +634,7 @@
                     android:layout_height="64dp"
                     android:fontFamily="@font/poppins_bold"
                     android:gravity="center_vertical"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/update_progress"
                     android:textColor="?attr/colorSecondary"
                     app:drawableEndCompat="@drawable/ic_round_arrow_drop_down_24"
@@ -681,8 +651,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/ask_update_progress_anime"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -700,8 +669,7 @@
                     android:layout_marginBottom="8dp"
                     android:alpha="0.58"
                     android:fontFamily="@font/poppins_family"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/ask_update_progress_info_ep"
                     android:textSize="14sp" />
 
@@ -716,8 +684,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/ask_update_progress_chapter_zero"
                     android:textAlignment="viewStart"
                     android:textColor="?attr/colorOnBackground"
@@ -735,8 +702,7 @@
                     android:layout_marginBottom="8dp"
                     android:alpha="0.58"
                     android:fontFamily="@font/poppins_family"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/ask_update_progress_info_zero"
                     android:textSize="14sp" />
 
@@ -751,8 +717,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/ask_update_progress_hentai"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -769,8 +734,7 @@
                     android:layout_marginTop="16dp"
                     android:drawablePadding="16dp"
                     android:fontFamily="@font/poppins_bold"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/watch_complete_percentage"
                     app:drawableStartCompat="@drawable/ic_round_sync_24"
                     app:drawableTint="?attr/colorPrimary" />
@@ -779,8 +743,7 @@
                     android:id="@+id/playerSettingsCompletePercentage"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
-                    android:layout_marginEnd="32dp"
+                    android:layout_marginHorizontal="32dp"
                     android:stepSize="1"
                     android:value="20.0"
                     android:valueFrom="0.0"
@@ -798,8 +761,7 @@
                     android:layout_marginBottom="8dp"
                     android:alpha="0.58"
                     android:fontFamily="@font/poppins_family"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/watch_complete_percentage_info"
                     android:textSize="14sp" />
 
@@ -815,8 +777,7 @@
                     android:layout_height="64dp"
                     android:fontFamily="@font/poppins_bold"
                     android:gravity="center_vertical"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/behaviour"
                     android:textColor="?attr/colorSecondary"
                     app:drawableEndCompat="@drawable/ic_round_arrow_drop_down_24"
@@ -833,8 +794,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/always_continue"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -855,8 +815,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/pause_video_focus"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -877,8 +836,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/gestures"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -900,8 +858,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/fast_forward"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -923,8 +880,7 @@
                     android:elegantTextHeight="true"
                     android:fontFamily="@font/poppins_bold"
                     android:minHeight="64dp"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/double_tap"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
@@ -942,8 +898,7 @@
                     android:layout_marginBottom="8dp"
                     android:alpha="0.58"
                     android:fontFamily="@font/poppins_family"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/double_tap_info"
                     android:textSize="14sp" />
 
@@ -953,8 +908,7 @@
                     android:layout_marginTop="16dp"
                     android:drawablePadding="16dp"
                     android:fontFamily="@font/poppins_bold"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/seek_time"
                     app:drawableStartCompat="@drawable/ic_round_fast_rewind_24"
                     app:drawableTint="?attr/colorPrimary" />
@@ -963,8 +917,7 @@
                     android:id="@+id/playerSettingsSeekTime"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
-                    android:layout_marginEnd="32dp"
+                    android:layout_marginHorizontal="32dp"
                     android:stepSize="5.0"
                     android:value="15.0"
                     android:valueFrom="5.0"
@@ -982,8 +935,7 @@
                     android:layout_marginBottom="8dp"
                     android:alpha="0.58"
                     android:fontFamily="@font/poppins_family"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/seek_time_info"
                     android:textSize="14sp" />
 
@@ -991,8 +943,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="64dp"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="32dp"
-                    android:layout_marginEnd="32dp"
+                    android:layout_marginHorizontal="32dp"
                     android:layout_marginBottom="8dp"
                     android:gravity="center"
                     android:orientation="horizontal">
@@ -1075,8 +1026,7 @@
                     android:layout_marginBottom="8dp"
                     android:alpha="0.58"
                     android:fontFamily="@font/poppins_family"
-                    android:paddingStart="32dp"
-                    android:paddingEnd="32dp"
+                    android:paddingHorizontal="32dp"
                     android:text="@string/skip_time_info"
                     android:textSize="14sp" />
 
@@ -1088,9 +1038,8 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/poppins_bold"
                 android:gravity="center_vertical"
-                android:paddingStart="32dp"
+                android:paddingHorizontal="32dp"
                 android:paddingTop="20dp"
-                android:paddingEnd="32dp"
                 android:text="@string/other"
                 android:textColor="?attr/colorSecondary"
                 tools:ignore="TextContrastCheck" />
@@ -1105,8 +1054,7 @@
                 android:elegantTextHeight="true"
                 android:fontFamily="@font/poppins_bold"
                 android:minHeight="64dp"
-                android:paddingStart="32dp"
-                android:paddingEnd="32dp"
+                android:paddingHorizontal="32dp"
                 android:text="@string/picture_in_picture"
                 android:textAlignment="viewStart"
                 android:textColor="@color/bg_opp"
@@ -1128,8 +1076,7 @@
                 android:elegantTextHeight="true"
                 android:fontFamily="@font/poppins_bold"
                 android:minHeight="64dp"
-                android:paddingStart="32dp"
-                android:paddingEnd="32dp"
+                android:paddingHorizontal="32dp"
                 android:text="@string/show_cast_button"
                 android:textAlignment="viewStart"
                 android:textColor="@color/bg_opp"
@@ -1150,8 +1097,7 @@
                 android:elegantTextHeight="true"
                 android:fontFamily="@font/poppins_bold"
                 android:minHeight="64dp"
-                android:paddingStart="32dp"
-                android:paddingEnd="32dp"
+                android:paddingHorizontal="32dp"
                 android:text="@string/try_internal_cast_experimental"
                 android:textAlignment="viewStart"
                 android:textColor="@color/bg_opp"
@@ -1173,8 +1119,7 @@
                 android:elegantTextHeight="true"
                 android:fontFamily="@font/poppins_bold"
                 android:minHeight="64dp"
-                android:paddingStart="32dp"
-                android:paddingEnd="32dp"
+                android:paddingHorizontal="32dp"
                 android:text="@string/show_rotate_button"
                 android:textAlignment="viewStart"
                 android:textColor="@color/bg_opp"
@@ -1192,8 +1137,7 @@
                 android:layout_marginBottom="8dp"
                 android:alpha="0.58"
                 android:fontFamily="@font/poppins_family"
-                android:paddingStart="32dp"
-                android:paddingEnd="32dp"
+                android:paddingHorizontal="32dp"
                 android:text=""
                 android:textSize="14sp" />