diff --git a/ultrasonic/src/main/res/layout/media_buttons.xml b/ultrasonic/src/main/res/layout/media_buttons.xml
index a9eef057..88332cb1 100644
--- a/ultrasonic/src/main/res/layout/media_buttons.xml
+++ b/ultrasonic/src/main/res/layout/media_buttons.xml
@@ -11,7 +11,6 @@
         a:id="@+id/button_shuffle"
         a:layout_width="0dip"
         a:layout_height="26dp"
-        a:layout_alignParentLeft="true"
         a:layout_gravity="center"
         a:layout_weight="1"
         a:adjustViewBounds="true"
diff --git a/ultrasonic/src/main/res/layout/player_media_info.xml b/ultrasonic/src/main/res/layout/player_media_info.xml
index 1851e4fa..fe23ebd9 100644
--- a/ultrasonic/src/main/res/layout/player_media_info.xml
+++ b/ultrasonic/src/main/res/layout/player_media_info.xml
@@ -18,7 +18,9 @@
             a:id="@+id/current_playing_song"
             a:layout_width="wrap_content"
             a:layout_height="wrap_content"
-            a:ellipsize="start"
+            a:layout_marginEnd="10dip"
+            a:paddingRight="30dip"
+            a:ellipsize="marquee"
             a:gravity="left"
             a:singleLine="true"
             a:textAppearance="?android:attr/textAppearanceLarge"
@@ -29,7 +31,7 @@
             a:id="@+id/current_playing_artist"
             a:layout_width="wrap_content"
             a:layout_height="wrap_content"
-            a:ellipsize="start"
+            a:ellipsize="marquee"
             a:gravity="left"
             a:singleLine="true"
             a:textAppearance="?android:attr/textAppearanceSmall"
@@ -62,7 +64,8 @@
             a:ellipsize="start"
             a:gravity="right"
             a:text="0 / 0"
-            a:textAppearance="?android:attr/textAppearanceSmall" />
+            a:textAppearance="?android:attr/textAppearanceSmall"
+            tools:ignore="HardcodedText" />
 
         <TextView
             a:id="@+id/current_total_duration"