diff --git a/ultrasonic/lint-baseline.xml b/ultrasonic/lint-baseline.xml
index 53d2ef0e..8347a5e7 100644
--- a/ultrasonic/lint-baseline.xml
+++ b/ultrasonic/lint-baseline.xml
@@ -320,28 +320,6 @@
             column="25"/>
     </issue>
 
-    <issue
-        id="MissingDefaultResource"
-        message="The layout &quot;download&quot; in layout-land has no declaration in the base `layout` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
-        errorLine1="&lt;LinearLayout xmlns:a=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2=" ~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout-land/download.xml"
-            line="2"
-            column="2"/>
-    </issue>
-
-    <issue
-        id="MissingDefaultResource"
-        message="The layout &quot;download&quot; in layout-port has no declaration in the base `layout` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
-        errorLine1="&lt;LinearLayout xmlns:a=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2=" ~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout-port/download.xml"
-            line="2"
-            column="2"/>
-    </issue>
-
     <issue
         id="SdCardPath"
         message="Do not hardcode &quot;/sdcard/&quot;; use `Environment.getExternalStorageDirectory().getPath()` instead"
@@ -2430,61 +2408,6 @@
             column="4"/>
     </issue>
 
-    <issue
-        id="ContentDescription"
-        message="Missing `contentDescription` attribute on image"
-        errorLine1="&lt;ImageView"
-        errorLine2=" ~~~~~~~~~">
-        <location
-            file="src/main/res/layout/media_buttons.xml"
-            line="12"
-            column="2"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="Missing `contentDescription` attribute on image"
-        errorLine1="    &lt;ImageView"
-        errorLine2="     ~~~~~~~~~">
-        <location
-            file="src/main/res/layout/media_buttons.xml"
-            line="32"
-            column="6"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="Missing `contentDescription` attribute on image"
-        errorLine1="    &lt;ImageView"
-        errorLine2="     ~~~~~~~~~">
-        <location
-            file="src/main/res/layout/media_buttons.xml"
-            line="42"
-            column="6"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="Missing `contentDescription` attribute on image"
-        errorLine1="    &lt;ImageView"
-        errorLine2="     ~~~~~~~~~">
-        <location
-            file="src/main/res/layout/media_buttons.xml"
-            line="52"
-            column="6"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="Missing `contentDescription` attribute on image"
-        errorLine1="    &lt;ImageView"
-        errorLine2="     ~~~~~~~~~">
-        <location
-            file="src/main/res/layout/media_buttons.xml"
-            line="72"
-            column="6"/>
-    </issue>
-
     <issue
         id="ContentDescription"
         message="Missing `contentDescription` attribute on image"
diff --git a/ultrasonic/src/main/res/layout-port/download.xml b/ultrasonic/src/main/res/layout/download.xml
similarity index 100%
rename from ultrasonic/src/main/res/layout-port/download.xml
rename to ultrasonic/src/main/res/layout/download.xml
diff --git a/ultrasonic/src/main/res/layout/media_buttons.xml b/ultrasonic/src/main/res/layout/media_buttons.xml
index c1f299dd..20c5b020 100644
--- a/ultrasonic/src/main/res/layout/media_buttons.xml
+++ b/ultrasonic/src/main/res/layout/media_buttons.xml
@@ -17,7 +17,8 @@
         a:adjustViewBounds="true"
         a:focusable="true"
         a:scaleType="fitCenter"
-        a:src="?attr/media_shuffle" />
+        a:src="?attr/media_shuffle"
+        a:contentDescription="@string/buttons.shuffle" />
 
     <org.moire.ultrasonic.view.AutoRepeatButton
         a:id="@+id/download_previous"
@@ -28,7 +29,8 @@
         a:adjustViewBounds="true"
         a:focusable="true"
         a:scaleType="fitCenter"
-        a:src="?attr/media_previous" />
+        a:src="?attr/media_previous"
+        a:contentDescription="@string/buttons.previous" />
 
     <ImageView
         a:id="@+id/download_start"
@@ -39,7 +41,8 @@
         a:focusable="true"
         a:scaleType="fitCenter"
         a:src="?attr/media_play"
-        tools:visibility="gone" />
+        tools:visibility="gone"
+        a:contentDescription="@string/buttons.play" />
 
     <ImageView
         a:id="@+id/download_pause"
@@ -49,7 +52,8 @@
         a:adjustViewBounds="true"
         a:focusable="true"
         a:scaleType="fitCenter"
-        a:src="?attr/media_pause" />
+        a:src="?attr/media_pause"
+        a:contentDescription="@string/buttons.pause" />
 
     <ImageView
         a:id="@+id/download_stop"
@@ -60,7 +64,8 @@
         a:focusable="true"
         a:scaleType="fitCenter"
         a:src="?attr/media_stop"
-        tools:visibility="gone" />
+        tools:visibility="gone"
+        a:contentDescription="@string/buttons.stop" />
 
     <org.moire.ultrasonic.view.AutoRepeatButton
         a:id="@+id/download_next"
@@ -71,7 +76,8 @@
         a:adjustViewBounds="true"
         a:focusable="true"
         a:scaleType="fitCenter"
-        a:src="?attr/media_next" />
+        a:src="?attr/media_next"
+        a:contentDescription="@string/buttons.next"/>
 
     <ImageView
         a:id="@+id/download_repeat"
@@ -82,6 +88,7 @@
         a:adjustViewBounds="true"
         a:focusable="true"
         a:scaleType="fitCenter"
-        a:src="?attr/media_repeat_off" />
+        a:src="?attr/media_repeat_off"
+        a:contentDescription="@string/buttons.repeat" />
 
     </LinearLayout>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/values/strings.xml b/ultrasonic/src/main/res/values/strings.xml
index 4da395e3..aac3afd0 100644
--- a/ultrasonic/src/main/res/values/strings.xml
+++ b/ultrasonic/src/main/res/values/strings.xml
@@ -15,6 +15,13 @@
     <string name="button_bar.chat">Chat</string>
     <string name="button_bar.home">Ultrasonic Main</string>
     <string name="button_bar.now_playing">Now Playing</string>
+    <string name="buttons.play">Play</string>
+    <string name="buttons.pause">Pause</string>
+    <string name="buttons.repeat">Repeat</string>
+    <string name="buttons.shuffle">Shuffle</string>
+    <string name="buttons.stop">Stop</string>
+    <string name="buttons.next">Next</string>
+    <string name="buttons.previous">Previous</string>
     <string name="podcasts.label">Podcast</string>
     <string name="podcasts_channels.empty">No podcasts channels registered</string>
     <string name="button_bar.podcasts">Podcast</string>