diff --git a/app/src/main/res/drawable/controls_layout_bg.xml b/app/src/main/res/drawable/controls_layout_bg.xml
index 9e7c439b7..3bad7b604 100644
--- a/app/src/main/res/drawable/controls_layout_bg.xml
+++ b/app/src/main/res/drawable/controls_layout_bg.xml
@@ -4,7 +4,7 @@
     <corners android:radius="8dp" />
     <padding
         android:bottom="8dp"
-        android:left="8dp"
-        android:right="8dp"
+        android:left="2dp"
+        android:right="2dp"
         android:top="8dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_gesture_controls_view.xml b/app/src/main/res/layout/player_gesture_controls_view.xml
index 0b222f789..0af168b4e 100644
--- a/app/src/main/res/layout/player_gesture_controls_view.xml
+++ b/app/src/main/res/layout/player_gesture_controls_view.xml
@@ -7,7 +7,7 @@
 
     <LinearLayout
         android:id="@+id/volumeControlView"
-        android:layout_width="wrap_content"
+        android:layout_width="42dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="36dp"
         android:background="@drawable/controls_layout_bg"
@@ -22,9 +22,7 @@
         <TextView
             android:id="@+id/volume_textView"
             style="@style/SwipeControlString"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center" />
+            app:autoSizeTextType="uniform" />
 
         <ProgressBar
             android:id="@+id/volume_progressBar"
@@ -45,7 +43,7 @@
 
     <LinearLayout
         android:id="@+id/brightnessControlView"
-        android:layout_width="wrap_content"
+        android:layout_width="42dp"
         android:layout_height="wrap_content"
         android:layout_marginRight="36dp"
         android:background="@drawable/controls_layout_bg"
@@ -60,9 +58,7 @@
         <TextView
             android:id="@+id/brightness_textView"
             style="@style/SwipeControlString"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center" />
+            app:autoSizeTextType="uniform" />
 
         <ProgressBar
             android:id="@+id/brightness_progressBar"
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 72cbd129c..a7c729a0b 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -151,11 +151,11 @@
 
     <style name="SwipeControlString">
         <item name="android:gravity">center</item>
-        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_gravity">center_horizontal</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="paddingEnd">5dp</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:textSize">14sp</item>
+        <item name="android:lines">1</item>
         <item name="android:textStyle">normal</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:text">0</item>