diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/NowPlayingFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/NowPlayingFragment.kt
index 87c63d62..0b697297 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/NowPlayingFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/NowPlayingFragment.kt
@@ -67,7 +67,7 @@ class NowPlayingFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         playButton = view.findViewById(R.id.now_playing_control_play)
         nowPlayingAlbumArtImage = view.findViewById(R.id.now_playing_image)
-        nowPlayingTrack = view.findViewById(R.id.now_playing_trackname)
+        nowPlayingTrack = view.findViewById(R.id.now_playing_title)
         nowPlayingArtist = view.findViewById(R.id.now_playing_artist)
         rxBusSubscription = RxBus.playerStateObservable.subscribe { update() }
     }
diff --git a/ultrasonic/src/main/res/layout/list_layout_track.xml b/ultrasonic/src/main/res/layout/list_layout_track.xml
index 117592a2..742d50b4 100644
--- a/ultrasonic/src/main/res/layout/list_layout_track.xml
+++ b/ultrasonic/src/main/res/layout/list_layout_track.xml
@@ -6,6 +6,6 @@
 
     <include layout="@layout/list_parts_empty_view" />
     <include layout="@layout/list_parts_recycler" />
-    <include layout="@layout/album_buttons" />
+    <include layout="@layout/track_buttons" />
 
 </LinearLayout>
diff --git a/ultrasonic/src/main/res/layout/media_buttons.xml b/ultrasonic/src/main/res/layout/media_buttons.xml
index 1f972e9c..60c8f9bb 100644
--- a/ultrasonic/src/main/res/layout/media_buttons.xml
+++ b/ultrasonic/src/main/res/layout/media_buttons.xml
@@ -12,15 +12,16 @@
         a:id="@+id/button_shuffle"
         style="@style/Widget.Material3.Button.IconButton"
         a:layout_width="0dip"
-        a:layout_height="26dp"
+        a:layout_height="48dp"
         a:layout_gravity="center"
         a:layout_weight="1"
         a:adjustViewBounds="true"
+        a:contentDescription="@string/buttons.shuffle"
         a:focusable="true"
         a:scaleType="fitCenter"
-        a:contentDescription="@string/buttons.shuffle"
         app:icon="@drawable/media_shuffle"
-        app:iconGravity="textTop" />
+        app:iconGravity="textTop"
+        app:iconSize="20dp" />
 
     <org.moire.ultrasonic.view.AutoRepeatButton
         a:id="@+id/button_previous"
@@ -100,14 +101,15 @@
         a:id="@+id/button_repeat"
         style="@style/Widget.Material3.Button.IconButton"
         a:layout_width="0dip"
-        a:layout_height="26dp"
+        a:layout_height="48dp"
         a:layout_gravity="center"
         a:layout_weight="1"
         a:adjustViewBounds="true"
+        a:contentDescription="@string/buttons.repeat"
         a:focusable="true"
         a:scaleType="fitCenter"
-        a:contentDescription="@string/buttons.repeat"
         app:icon="@drawable/media_repeat_off"
-        app:iconGravity="textTop" />
+        app:iconGravity="textTop"
+        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 b75598cc..b8e28468 100644
--- a/ultrasonic/src/main/res/layout/now_playing.xml
+++ b/ultrasonic/src/main/res/layout/now_playing.xml
@@ -27,13 +27,15 @@
         a:paddingStart="11.0dip">
 
         <TextView
-            a:id="@+id/now_playing_trackname"
+            a:id="@+id/now_playing_title"
             a:layout_width="wrap_content"
             a:layout_height="wrap_content"
             a:layout_gravity="start"
             a:ellipsize="marquee"
             a:singleLine="true"
-            a:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+            a:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+            a:textSize="20sp"
+            tools:text="Title" />
 
         <TextView
             a:id="@+id/now_playing_artist"
@@ -43,6 +45,7 @@
             a:ellipsize="end"
             a:scrollHorizontally="true"
             a:singleLine="true"
+            tools:text="Artist"
             a:textAppearance="@style/TextAppearance.Material3.BodyMedium" />
     </LinearLayout>
 
@@ -52,7 +55,6 @@
         a:layout_width="48dp"
         a:layout_height="48dp"
         a:layout_gravity="center|end"
-        a:layout_marginTop="2dip"
         a:layout_marginEnd="16dip"
         a:layout_weight="0.0"
         a:contentDescription="@string/buttons.play"
diff --git a/ultrasonic/src/main/res/layout/player_media_info.xml b/ultrasonic/src/main/res/layout/player_media_info.xml
index 49584fad..7ba566f3 100644
--- a/ultrasonic/src/main/res/layout/player_media_info.xml
+++ b/ultrasonic/src/main/res/layout/player_media_info.xml
@@ -25,36 +25,42 @@
 
     <TextView
         a:id="@+id/current_playing_artist"
-        a:layout_width="wrap_content"
+        a:layout_width="0dp"
         a:layout_height="wrap_content"
-        a:ellipsize="marquee"
+        a:layout_marginEnd="10dp"
+        a:ellipsize="end"
         a:gravity="left"
         a:singleLine="true"
         a:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        app:layout_constraintEnd_toStartOf="@+id/current_playing_track"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/current_playing_song"
         tools:text="Artist" />
 
     <TextView
         a:id="@+id/current_playing_album"
-        a:layout_width="wrap_content"
+        a:layout_width="0dp"
         a:layout_height="wrap_content"
-        a:ellipsize="start"
-        a:gravity="right"
+        a:layout_marginEnd="10dp"
+        a:ellipsize="end"
+        a:gravity="start|left"
         a:singleLine="true"
         a:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        app:layout_constraintEnd_toStartOf="@+id/current_total_duration"
         app:layout_constraintStart_toStartOf="@+id/current_playing_artist"
         app:layout_constraintTop_toBottomOf="@+id/current_playing_artist"
         tools:text="Album" />
 
     <TextView
         a:id="@+id/current_playing_genre"
-        a:layout_width="wrap_content"
+        a:layout_width="0dp"
         a:layout_height="wrap_content"
-        a:ellipsize="start"
-        a:gravity="right"
+        a:layout_marginEnd="10dp"
+        a:ellipsize="end"
+        a:gravity="left"
         a:singleLine="true"
         a:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        app:layout_constraintEnd_toStartOf="@+id/current_playing_bitrate_format"
         app:layout_constraintStart_toStartOf="@+id/current_playing_album"
         app:layout_constraintTop_toBottomOf="@+id/current_playing_album"
         tools:text="Genre" />
@@ -62,14 +68,14 @@
 
     <TextView
         a:id="@+id/current_playing_track"
-        a:layout_width="wrap_content"
+        a:layout_width="0dp"
         a:layout_height="wrap_content"
         a:ellipsize="start"
         a:gravity="right"
         a:text="0 / 0"
         a:textAppearance="@style/TextAppearance.Material3.BodyMedium"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/current_playing_song"
+        app:layout_constraintTop_toTopOf="@id/current_playing_artist"
         tools:ignore="HardcodedText" />
 
     <TextView
diff --git a/ultrasonic/src/main/res/layout/album_buttons.xml b/ultrasonic/src/main/res/layout/track_buttons.xml
similarity index 100%
rename from ultrasonic/src/main/res/layout/album_buttons.xml
rename to ultrasonic/src/main/res/layout/track_buttons.xml