diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 63a02374..0e9c5b12 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ preferences            = "1.2.0"
 media3                 = "f3e450e783"
 
 androidSupport         = "1.5.0"
-materialDesign         = "1.6.1"
+materialDesign         = "1.7.0"
 constraintLayout       = "2.1.4"
 multidex               = "2.0.1"
 room                   = "2.5.0"
diff --git a/ultrasonic/src/main/res/layout/media_buttons.xml b/ultrasonic/src/main/res/layout/media_buttons.xml
index 60c8f9bb..d4140399 100644
--- a/ultrasonic/src/main/res/layout/media_buttons.xml
+++ b/ultrasonic/src/main/res/layout/media_buttons.xml
@@ -20,7 +20,7 @@
         a:focusable="true"
         a:scaleType="fitCenter"
         app:icon="@drawable/media_shuffle"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="20dp" />
 
     <org.moire.ultrasonic.view.AutoRepeatButton
@@ -35,7 +35,7 @@
         a:focusable="true"
         a:scaleType="fitCenter"
         app:icon="@drawable/media_backward"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="32dp" />
 
     <Button
@@ -50,7 +50,7 @@
         tools:visibility="gone"
         a:contentDescription="@string/buttons.play"
         app:icon="@drawable/media_start"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="48dp" />
 
     <Button
@@ -64,7 +64,7 @@
         a:focusable="true"
         a:scaleType="fitCenter"
         app:icon="@drawable/media_pause"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="48dp" />
 
     <Button
@@ -79,7 +79,7 @@
         tools:visibility="gone"
         a:contentDescription="@string/buttons.stop"
         app:icon="@drawable/media_stop"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="48dp" />
 
     <org.moire.ultrasonic.view.AutoRepeatButton
@@ -94,7 +94,7 @@
         a:focusable="true"
         a:scaleType="fitCenter"
         app:icon="@drawable/media_forward"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="32dp" />
 
     <Button
@@ -109,7 +109,7 @@
         a:focusable="true"
         a:scaleType="fitCenter"
         app:icon="@drawable/media_repeat_off"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="20dp" />
 
     </LinearLayout>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/layout/now_playing.xml b/ultrasonic/src/main/res/layout/now_playing.xml
index b8e28468..1ae4955d 100644
--- a/ultrasonic/src/main/res/layout/now_playing.xml
+++ b/ultrasonic/src/main/res/layout/now_playing.xml
@@ -61,7 +61,7 @@
         a:focusable="false"
         a:scaleType="fitCenter"
         app:icon="@drawable/media_pause"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="42dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/layout/track_buttons.xml b/ultrasonic/src/main/res/layout/track_buttons.xml
index 391f946c..04708fcc 100644
--- a/ultrasonic/src/main/res/layout/track_buttons.xml
+++ b/ultrasonic/src/main/res/layout/track_buttons.xml
@@ -17,7 +17,7 @@
         android:visibility="gone"
         android:contentDescription="@string/common.select_all"
         app:icon="@drawable/ic_menu_select_all"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="26dp" />
 
     <Button
@@ -30,7 +30,7 @@
         android:visibility="gone"
         android:contentDescription="@string/common.play_now"
         app:icon="@drawable/media_start"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="26dp" />
     
     <Button
@@ -43,7 +43,7 @@
         android:visibility="gone"
         android:contentDescription="@string/common.play_next"
         app:icon="@drawable/ic_play_next"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="26dp" />
 
     <Button
@@ -56,7 +56,7 @@
         android:visibility="gone"
         android:contentDescription="@string/common.play_last"
         app:icon="@drawable/ic_play_last"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="26dp" />
 
     <Button
@@ -69,7 +69,7 @@
         android:visibility="gone"
         android:contentDescription="@string/common.pin"
         app:icon="@drawable/ic_menu_pin"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="26dp" />
 
     <Button
@@ -82,7 +82,7 @@
         android:visibility="gone"
         android:contentDescription="@string/common.unpin"
         app:icon="@drawable/ic_menu_unpin"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="26dp" />
     
     <Button
@@ -95,7 +95,7 @@
         android:visibility="gone"
         android:contentDescription="@string/common.download"
         app:icon="@drawable/ic_menu_download"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="26dp" />
 
     <Button
@@ -108,7 +108,7 @@
         android:visibility="gone"
         android:contentDescription="@string/common.delete"
         app:icon="@drawable/ic_menu_close"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="26dp" />
 
     <Button
@@ -121,7 +121,7 @@
         android:visibility="gone"
         android:contentDescription="@string/search.more"
         app:icon="@drawable/media_forward"
-        app:iconGravity="textTop"
+        app:iconGravity="textEnd"
         app:iconSize="26dp" />
 
 </LinearLayout>