diff --git a/ultrasonic/lint-baseline.xml b/ultrasonic/lint-baseline.xml
index e9795cea..d4b7fda1 100644
--- a/ultrasonic/lint-baseline.xml
+++ b/ultrasonic/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0" client="gradle" variant="release" version="4.2.0">
+<issues format="5" by="lint 4.2.2" client="gradle" variant="release" version="4.2.2">
 
     <issue
         id="ScopedStorage"
@@ -8,43 +8,10 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/AndroidManifest.xml"
-            line="9"
+            line="10"
             column="36"/>
     </issue>
 
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `toLowerCase(Locale)` instead. For strings meant to be internal use `Locale.ROOT`, otherwise `Locale.getDefault()`."
-        errorLine1="  return index == -1 ? &quot;&quot; : name.substring(index + 1).toLowerCase();"
-        errorLine2="                                                      ~~~~~~~~~~~">
-        <location
-            file="src/main/java/org/moire/ultrasonic/util/FileUtil.java"
-            line="445"
-            column="55"/>
-    </issue>
-
-    <issue
-        id="InlinedApi"
-        message="Field requires API level 16 (current min is 14): `android.Manifest.permission#READ_EXTERNAL_STORAGE`"
-        errorLine1="                        Manifest.permission.READ_EXTERNAL_STORAGE)"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/org/moire/ultrasonic/util/PermissionUtil.java"
-            line="101"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="InlinedApi"
-        message="Field requires API level 16 (current min is 14): `android.Manifest.permission#READ_EXTERNAL_STORAGE`"
-        errorLine1="                        Manifest.permission.READ_EXTERNAL_STORAGE)"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/org/moire/ultrasonic/util/PermissionUtil.java"
-            line="148"
-            column="25"/>
-    </issue>
-
     <issue
         id="NotificationIconCompatibility"
         message="Notification icon ic_stat_play_dark has to have a raster image to support Android versions below 5.0 (API 21)">
@@ -99,61 +66,6 @@
             column="14"/>
     </issue>
 
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `usesCleartextTraffic` is only used in API level 23 and higher (current min is 14)"
-        errorLine1="        android:usesCleartextTraffic=&quot;true&quot;>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/AndroidManifest.xml"
-            line="29"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `widgetCategory` is only used in API level 17 and higher (current min is 14)"
-        errorLine1="                    a:widgetCategory=&quot;home_screen|keyguard&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/xml/appwidget_info_4x1.xml"
-            line="8"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `widgetCategory` is only used in API level 17 and higher (current min is 14)"
-        errorLine1="                    a:widgetCategory=&quot;home_screen|keyguard&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/xml/appwidget_info_4x2.xml"
-            line="8"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `widgetCategory` is only used in API level 17 and higher (current min is 14)"
-        errorLine1="                    a:widgetCategory=&quot;home_screen|keyguard&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/xml/appwidget_info_4x3.xml"
-            line="8"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `widgetCategory` is only used in API level 17 and higher (current min is 14)"
-        errorLine1="                    a:widgetCategory=&quot;home_screen|keyguard&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/xml/appwidget_info_4x4.xml"
-            line="8"
-            column="21"/>
-    </issue>
-
     <issue
         id="IncludeLayoutParam"
         message="Layout parameter `layout_gravity` ignored unless both `layout_width` and `layout_height` are also specified on `&lt;include>` tag"
@@ -183,87 +95,10 @@
         errorLine2="                                                                           ^">
         <location
             file="src/main/res/values-de/strings.xml"
-            line="294"
+            line="292"
             column="76"/>
     </issue>
 
-    <issue
-        id="ImpliedQuantity"
-        message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
-        errorLine1="        &lt;item quantity=&quot;one&quot;>1 titre&lt;/item>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values-fr/strings.xml"
-            line="427"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ImpliedQuantity"
-        message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
-        errorLine1="        &lt;item quantity=&quot;one&quot;>1 titre sélectionné pour être épinglé.&lt;/item>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values-fr/strings.xml"
-            line="431"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ImpliedQuantity"
-        message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
-        errorLine1="        &lt;item quantity=&quot;one&quot;>1 titre sélectionné pour être téléchargé.&lt;/item>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values-fr/strings.xml"
-            line="435"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ImpliedQuantity"
-        message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
-        errorLine1="        &lt;item quantity=&quot;one&quot;>1 titre sélectionné pour être désépinglé.&lt;/item>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values-fr/strings.xml"
-            line="439"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ImpliedQuantity"
-        message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
-        errorLine1="        &lt;item quantity=&quot;one&quot;>1 titre ajouté à la fin de la file d\&apos;attente de lecture.&lt;/item>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values-fr/strings.xml"
-            line="443"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ImpliedQuantity"
-        message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
-        errorLine1="        &lt;item quantity=&quot;one&quot;>1 titre inséré après le titre actuel.&lt;/item>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values-fr/strings.xml"
-            line="447"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ImpliedQuantity"
-        message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
-        errorLine1="        &lt;item quantity=&quot;one&quot;>1 jour restant à la période d\&apos;essai&lt;/item>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values-fr/strings.xml"
-            line="451"
-            column="9"/>
-    </issue>
-
     <issue
         id="PluralsCandidate"
         message="Formatting %d followed by words (&quot;Artists&quot;): This should probably be a plural rather than a string"
@@ -297,83 +132,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="UnusedQuantity"
-        message="For language &quot;cs&quot; (Czech) the following quantities are not relevant: `many`"
-        errorLine1="    &lt;plurals name=&quot;select_album_n_songs&quot;>"
-        errorLine2="    ^">
-        <location
-            file="src/main/res/values-cs/strings.xml"
-            line="422"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnusedQuantity"
-        message="For language &quot;cs&quot; (Czech) the following quantities are not relevant: `many`"
-        errorLine1="    &lt;plurals name=&quot;select_album_n_songs_pinned&quot;>"
-        errorLine2="    ^">
-        <location
-            file="src/main/res/values-cs/strings.xml"
-            line="428"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnusedQuantity"
-        message="For language &quot;cs&quot; (Czech) the following quantities are not relevant: `many`"
-        errorLine1="    &lt;plurals name=&quot;select_album_n_songs_downloaded&quot;>"
-        errorLine2="    ^">
-        <location
-            file="src/main/res/values-cs/strings.xml"
-            line="434"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnusedQuantity"
-        message="For language &quot;cs&quot; (Czech) the following quantities are not relevant: `many`"
-        errorLine1="    &lt;plurals name=&quot;select_album_n_songs_unpinned&quot;>"
-        errorLine2="    ^">
-        <location
-            file="src/main/res/values-cs/strings.xml"
-            line="440"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnusedQuantity"
-        message="For language &quot;cs&quot; (Czech) the following quantities are not relevant: `many`"
-        errorLine1="    &lt;plurals name=&quot;select_album_n_songs_added&quot;>"
-        errorLine2="    ^">
-        <location
-            file="src/main/res/values-cs/strings.xml"
-            line="446"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnusedQuantity"
-        message="For language &quot;cs&quot; (Czech) the following quantities are not relevant: `many`"
-        errorLine1="    &lt;plurals name=&quot;select_album_n_songs_play_next&quot;>"
-        errorLine2="    ^">
-        <location
-            file="src/main/res/values-cs/strings.xml"
-            line="452"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnusedQuantity"
-        message="For language &quot;cs&quot; (Czech) the following quantities are not relevant: `many`"
-        errorLine1="    &lt;plurals name=&quot;select_album_donate_dialog_n_trial_days_left&quot;>"
-        errorLine2="    ^">
-        <location
-            file="src/main/res/values-cs/strings.xml"
-            line="458"
-            column="5"/>
-    </issue>
-
     <issue
         id="AllowAllHostnameVerifier"
         message="Using the `AllowAllHostnameVerifier` HostnameVerifier is unsafe because it always returns true, which could cause insecure network traffic due to trusting TLS/SSL server certificates for wrong hostnames"
@@ -403,7 +161,7 @@
         errorLine2="         ~~~~~~~~">
         <location
             file="src/main/AndroidManifest.xml"
-            line="124"
+            line="146"
             column="10"/>
     </issue>
 
@@ -414,7 +172,7 @@
         errorLine2="         ~~~~~~~~">
         <location
             file="src/main/AndroidManifest.xml"
-            line="59"
+            line="81"
             column="10"/>
     </issue>
 
@@ -451,28 +209,6 @@
             column="9"/>
     </issue>
 
-    <issue
-        id="StaticFieldLeak"
-        message="This `AsyncTask` class should be static or leaks might occur (org.moire.ultrasonic.service.DownloadQueueSerializer.SerializeTask)"
-        errorLine1="    private class SerializeTask extends AsyncTask&lt;Object, Void, Void>"
-        errorLine2="                  ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/org/moire/ultrasonic/service/DownloadQueueSerializer.java"
-            line="67"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="StaticFieldLeak"
-        message="This `AsyncTask` class should be static or leaks might occur (org.moire.ultrasonic.service.DownloadQueueSerializer.DeserializeTask)"
-        errorLine1="    private class DeserializeTask extends AsyncTask&lt;Object, Void, Void>"
-        errorLine2="                  ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/org/moire/ultrasonic/service/DownloadQueueSerializer.java"
-            line="88"
-            column="19"/>
-    </issue>
-
     <issue
         id="UseCompoundDrawables"
         message="This tag and its children can be replaced by one `&lt;TextView/>` and a compound drawable"
@@ -661,7 +397,7 @@
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="99"
+            line="109"
             column="13"/>
         <location
             file="src/main/res/values-hu/strings.xml"
@@ -685,11 +421,11 @@
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="99"
+            line="109"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="96"
+            line="109"
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
@@ -716,11 +452,11 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="120"
+            line="122"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="110"
+            line="122"
             column="13"/>
         <location
             file="src/main/res/values-hu/strings.xml"
@@ -744,11 +480,11 @@
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="110"
+            line="122"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="107"
+            line="122"
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
@@ -775,11 +511,11 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="125"
+            line="127"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="115"
+            line="127"
             column="13"/>
         <location
             file="src/main/res/values-hu/strings.xml"
@@ -803,11 +539,11 @@
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="115"
+            line="127"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="111"
+            line="127"
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
@@ -834,11 +570,11 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="126"
+            line="128"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="116"
+            line="128"
             column="13"/>
         <location
             file="src/main/res/values-hu/strings.xml"
@@ -862,11 +598,11 @@
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="116"
+            line="128"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="112"
+            line="128"
             column="13"/>
     </issue>
 
@@ -889,11 +625,11 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="127"
+            line="129"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="117"
+            line="129"
             column="13"/>
         <location
             file="src/main/res/values-hu/strings.xml"
@@ -917,11 +653,11 @@
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="117"
+            line="129"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="113"
+            line="129"
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
@@ -948,11 +684,11 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="128"
+            line="130"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="118"
+            line="130"
             column="13"/>
         <location
             file="src/main/res/values-hu/strings.xml"
@@ -976,11 +712,11 @@
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="118"
+            line="130"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="114"
+            line="130"
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
@@ -1007,11 +743,11 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="133"
+            line="135"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="123"
+            line="135"
             column="13"/>
         <location
             file="src/main/res/values-hu/strings.xml"
@@ -1035,11 +771,11 @@
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="123"
+            line="135"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="119"
+            line="135"
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
@@ -1066,11 +802,11 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="139"
+            line="141"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="129"
+            line="141"
             column="13"/>
         <location
             file="src/main/res/values-hu/strings.xml"
@@ -1094,11 +830,11 @@
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="129"
+            line="141"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="125"
+            line="141"
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
@@ -1125,11 +861,11 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="152"
+            line="154"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="142"
+            line="154"
             column="13"/>
         <location
             file="src/main/res/values-hu/strings.xml"
@@ -1153,11 +889,11 @@
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="142"
+            line="154"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="138"
+            line="154"
             column="13"/>
     </issue>
 
@@ -1202,11 +938,11 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="168"
+            line="170"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="158"
+            line="170"
             column="13"/>
         <location
             file="src/main/res/values-hu/strings.xml"
@@ -1230,11 +966,11 @@
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="158"
+            line="170"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="154"
+            line="170"
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
@@ -1261,11 +997,11 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="220"
+            line="222"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="210"
+            line="222"
             column="13"/>
         <location
             file="src/main/res/values-hu/strings.xml"
@@ -1289,11 +1025,11 @@
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="210"
+            line="222"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="206"
+            line="222"
             column="13"/>
     </issue>
 
@@ -1308,11 +1044,11 @@
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
-            line="277"
+            line="275"
             column="13"/>
         <location
             file="src/main/res/values-de/strings.xml"
-            line="276"
+            line="274"
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
@@ -1320,35 +1056,35 @@
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="277"
+            line="289"
             column="13"/>
         <location
             file="src/main/res/values-hu/strings.xml"
-            line="289"
+            line="287"
             column="13"/>
         <location
             file="src/main/res/values-it/strings.xml"
-            line="270"
+            line="268"
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="289"
+            line="287"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
-            line="275"
+            line="273"
             column="13"/>
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="275"
+            line="273"
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="277"
+            line="289"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="271"
+            line="289"
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
@@ -1367,11 +1103,11 @@
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
-            line="280"
+            line="278"
             column="13"/>
         <location
             file="src/main/res/values-de/strings.xml"
-            line="279"
+            line="277"
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
@@ -1379,35 +1115,35 @@
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="280"
+            line="292"
             column="13"/>
         <location
             file="src/main/res/values-hu/strings.xml"
-            line="292"
+            line="290"
             column="13"/>
         <location
             file="src/main/res/values-it/strings.xml"
-            line="273"
+            line="271"
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="292"
+            line="290"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
-            line="278"
+            line="276"
             column="13"/>
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="278"
+            line="276"
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="280"
+            line="292"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="274"
+            line="292"
             column="13"/>
     </issue>
 
@@ -1429,43 +1165,47 @@
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="468"
+            line="469"
             column="14"/>
         <location
             file="src/main/res/values-cs/strings.xml"
-            line="458"
-            column="14"/>
-        <location
-            file="src/main/res/values-de/strings.xml"
-            line="393"
-            column="14"/>
-        <location
-            file="src/main/res/values-es/strings.xml"
-            line="462"
-            column="14"/>
-        <location
-            file="src/main/res/values-fr/strings.xml"
             line="450"
             column="14"/>
+        <location
+            file="src/main/res/values-de/strings.xml"
+            line="391"
+            column="14"/>
+        <location
+            file="src/main/res/values-es/strings.xml"
+            line="463"
+            column="14"/>
+        <location
+            file="src/main/res/values-fr/strings.xml"
+            line="463"
+            column="14"/>
         <location
             file="src/main/res/values-hu/strings.xml"
-            line="460"
+            line="458"
             column="14"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="462"
+            line="460"
             column="14"/>
         <location
             file="src/main/res/values-pl/strings.xml"
-            line="406"
+            line="404"
             column="14"/>
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="393"
+            line="391"
             column="14"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="448"
+            line="463"
+            column="14"/>
+        <location
+            file="src/main/res/values-ru/strings.xml"
+            line="475"
             column="14"/>
     </issue>
 
@@ -1509,18 +1249,7 @@
         errorLine2="                                ^">
         <location
             file="src/main/res/values-it/strings.xml"
-            line="314"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="TypographyDashes"
-        message="Replace &quot;--&quot; with an &quot;em dash&quot; character (—, &amp;#8212;) ?"
-        errorLine1="    &lt;string name=&quot;util.no_time&quot;>-:--&lt;/string>"
-        errorLine2="                                ^">
-        <location
-            file="src/main/res/values-ru/strings.xml"
-            line="318"
+            line="312"
             column="33"/>
     </issue>
 
@@ -1531,7 +1260,7 @@
         errorLine2="                                ^">
         <location
             file="src/main/res/values-de/strings.xml"
-            line="325"
+            line="323"
             column="33"/>
     </issue>
 
@@ -1542,7 +1271,7 @@
         errorLine2="                                ^">
         <location
             file="src/main/res/values-pl/strings.xml"
-            line="325"
+            line="323"
             column="33"/>
     </issue>
 
@@ -1553,29 +1282,7 @@
         errorLine2="                                ^">
         <location
             file="src/main/res/values-cs/strings.xml"
-            line="328"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="TypographyDashes"
-        message="Replace &quot;--&quot; with an &quot;em dash&quot; character (—, &amp;#8212;) ?"
-        errorLine1="    &lt;string name=&quot;util.no_time&quot;>-:--&lt;/string>"
-        errorLine2="                                ^">
-        <location
-            file="src/main/res/values-pt-rBR/strings.xml"
-            line="330"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="TypographyDashes"
-        message="Replace &quot;--&quot; with an &quot;em dash&quot; character (—, &amp;#8212;) ?"
-        errorLine1="    &lt;string name=&quot;util.no_time&quot;>-:--&lt;/string>"
-        errorLine2="                                ^">
-        <location
-            file="src/main/res/values-es/strings.xml"
-            line="342"
+            line="326"
             column="33"/>
     </issue>
 
@@ -1586,7 +1293,7 @@
         errorLine2="                                ^">
         <location
             file="src/main/res/values-hu/strings.xml"
-            line="342"
+            line="340"
             column="33"/>
     </issue>
 
@@ -1597,7 +1304,7 @@
         errorLine2="                                ^">
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="342"
+            line="340"
             column="33"/>
     </issue>
 
@@ -1705,7 +1412,7 @@
         errorLine2="             ~~~~~~~~~">
         <location
             file="src/main/java/org/moire/ultrasonic/view/AlbumView.java"
-            line="39"
+            line="40"
             column="14"/>
     </issue>
 
@@ -1727,7 +1434,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/org/moire/ultrasonic/fragment/NowPlayingFragment.java"
-            line="132"
+            line="133"
             column="42"/>
     </issue>
 
@@ -1837,7 +1544,7 @@
         errorLine2="     ~~~~~~~~~">
         <location
             file="src/main/res/layout/album_list_item.xml"
-            line="63"
+            line="61"
             column="6"/>
     </issue>
 
@@ -2277,7 +1984,7 @@
         errorLine2="         ~~~~~~~~~">
         <location
             file="src/main/res/layout/now_playing.xml"
-            line="57"
+            line="55"
             column="10"/>
     </issue>
 
@@ -2310,7 +2017,7 @@
         errorLine2="     ~~~~~~~~~~~">
         <location
             file="src/main/res/layout/server_row.xml"
-            line="37"
+            line="35"
             column="6"/>
     </issue>
 
@@ -2325,61 +2032,6 @@
             column="6"/>
     </issue>
 
-    <issue
-        id="ContentDescription"
-        message="Missing `contentDescription` attribute on image"
-        errorLine1="        &lt;ImageView"
-        errorLine2="         ~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_list_item.xml"
-            line="27"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="Missing `contentDescription` attribute on image"
-        errorLine1="        &lt;ImageView"
-        errorLine2="         ~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_list_item.xml"
-            line="37"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="Missing `contentDescription` attribute on image"
-        errorLine1="        &lt;ImageView"
-        errorLine2="         ~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_list_item.xml"
-            line="47"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="Missing `contentDescription` attribute on image"
-        errorLine1="        &lt;ImageView"
-        errorLine2="         ~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_list_item.xml"
-            line="57"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="Missing `contentDescription` attribute on image"
-        errorLine1="        &lt;ImageView"
-        errorLine2="         ~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_list_item.xml"
-            line="67"
-            column="10"/>
-    </issue>
-
     <issue
         id="ContentDescription"
         message="Missing `contentDescription` attribute on image"
@@ -2387,10 +2039,65 @@
         errorLine2="     ~~~~~~~~~">
         <location
             file="src/main/res/layout/song_list_item.xml"
-            line="80"
+            line="10"
             column="6"/>
     </issue>
 
+    <issue
+        id="ContentDescription"
+        message="Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="         ~~~~~~~~~">
+        <location
+            file="src/main/res/layout/song_list_item.xml"
+            line="39"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="         ~~~~~~~~~">
+        <location
+            file="src/main/res/layout/song_list_item.xml"
+            line="49"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="         ~~~~~~~~~">
+        <location
+            file="src/main/res/layout/song_list_item.xml"
+            line="59"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="         ~~~~~~~~~">
+        <location
+            file="src/main/res/layout/song_list_item.xml"
+            line="69"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="Missing `contentDescription` attribute on image"
+        errorLine1="        &lt;ImageView"
+        errorLine2="         ~~~~~~~~~">
+        <location
+            file="src/main/res/layout/song_list_item.xml"
+            line="79"
+            column="10"/>
+    </issue>
+
     <issue
         id="ContentDescription"
         message="Missing `contentDescription` attribute on image"
@@ -2398,7 +2105,7 @@
         errorLine2="     ~~~~~~~~~">
         <location
             file="src/main/res/layout/song_list_item.xml"
-            line="90"
+            line="92"
             column="6"/>
     </issue>
 
@@ -2415,7 +2122,7 @@
 
     <issue
         id="LabelFor"
-        message="Missing accessibility label: where minSdk &lt; 17, you should provide an `android:hint`"
+        message="Missing accessibility label: provide either a view with an `android:labelFor` that references this view or provide an `android:hint`"
         errorLine1="    &lt;EditText"
         errorLine2="     ~~~~~~~~">
         <location
@@ -2426,7 +2133,7 @@
 
     <issue
         id="LabelFor"
-        message="Missing accessibility label: where minSdk &lt; 17, you should provide an `android:hint`"
+        message="Missing accessibility label: provide either a view with an `android:labelFor` that references this view or provide an `android:hint`"
         errorLine1="        &lt;EditText"
         errorLine2="         ~~~~~~~~">
         <location
@@ -2437,7 +2144,7 @@
 
     <issue
         id="LabelFor"
-        message="Missing accessibility label: where minSdk &lt; 17, you should provide an `android:hint`"
+        message="Missing accessibility label: provide either a view with an `android:labelFor` that references this view or provide an `android:hint`"
         errorLine1="        &lt;EditText"
         errorLine2="         ~~~~~~~~">
         <location
@@ -2552,7 +2259,7 @@
         errorLine2="        ~~~~~~~~~~">
         <location
             file="src/main/res/layout/artist_list_item.xml"
-            line="22"
+            line="20"
             column="9"/>
     </issue>
 
@@ -2633,1650 +2340,4 @@
             column="6"/>
     </issue>
 
-    <issue
-        id="RtlCompat"
-        message="To support older versions than API 17 (project specifies 14) you should **also** add `a:layout_toRightOf=&quot;@id/chat_avatar&quot;`"
-        errorLine1="        a:layout_toEndOf=&quot;@id/chat_avatar&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item.xml"
-            line="16"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlCompat"
-        message="To support older versions than API 17 (project specifies 14) you should **also** add `a:layout_alignParentRight=&quot;false&quot;`"
-        errorLine1="        a:layout_alignParentEnd=&quot;false&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="12"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlCompat"
-        message="To support older versions than API 17 (project specifies 14) you should **also** add `a:layout_toLeftOf=&quot;@id/chat_avatar&quot;`"
-        errorLine1="        a:layout_toStartOf=&quot;@id/chat_avatar&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="13"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlCompat"
-        message="To support older versions than API 17 (project specifies 14) you should **also** add `a:layout_alignParentRight=&quot;true&quot;`"
-        errorLine1="        a:layout_alignParentEnd=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="68"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlCompat"
-        message="To support older versions than API 17 (project specifies 14) you should **also** add `a:layout_toLeftOf=&quot;@id/chat_avatar&quot;`"
-        errorLine1="        a:layout_toStartOf=&quot;@id/chat_avatar&quot;/>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="69"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlCompat"
-        message="To support older versions than API 17 (project specifies 14) you should **also** add `android:layout_alignParentRight=&quot;false&quot;`"
-        errorLine1="            android:layout_alignParentEnd=&quot;false&quot;/>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/time_span_dialog.xml"
-            line="40"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
-        errorLine1="        a:paddingRight=&quot;3dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/album_list_item.xml"
-            line="73"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingEnd` you should probably also define `paddingStart` for right-to-left symmetry"
-        errorLine1="        a:paddingEnd=&quot;3dip&quot; />"
-        errorLine2="        ~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/album_list_item.xml"
-            line="79"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="        a:paddingLeft=&quot;3dip&quot; />"
-        errorLine2="        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/album_list_item_legacy.xml"
-            line="13"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
-        errorLine1="        a:paddingRight=&quot;3dip&quot; />"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/album_list_item_legacy.xml"
-            line="49"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="                a:paddingLeft=&quot;5dip&quot;"
-        errorLine2="                ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/appwidget4x3.xml"
-            line="64"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="                a:paddingLeft=&quot;5dip&quot;"
-        errorLine2="                ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/appwidget4x4.xml"
-            line="65"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="  a:paddingLeft=&quot;10dp&quot; a:layout_width=&quot;fill_parent&quot; a:layout_height=&quot;wrap_content&quot;"
-        errorLine2="  ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/main_buttons.xml"
-            line="7"
-            column="3"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="  a:gravity=&quot;center_vertical&quot; a:paddingLeft=&quot;6dp&quot; a:textAllCaps=&quot;true&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/main_buttons.xml"
-            line="40"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="  a:gravity=&quot;center_vertical&quot; a:paddingLeft=&quot;6dp&quot; a:textAllCaps=&quot;true&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/main_buttons.xml"
-            line="61"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="  a:gravity=&quot;center_vertical&quot; a:paddingLeft=&quot;6dp&quot; a:textAllCaps=&quot;true&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/main_buttons.xml"
-            line="77"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="  a:gravity=&quot;center_vertical&quot; a:paddingLeft=&quot;6dp&quot; a:textAllCaps=&quot;true&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/main_buttons.xml"
-            line="123"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
-        errorLine1="            a:paddingStart=&quot;16dp&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/navigation_header.xml"
-            line="35"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="            a:paddingLeft=&quot;16dp&quot;"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/navigation_header.xml"
-            line="36"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="            android:paddingLeft=&quot;11.0dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/now_playing.xml"
-            line="33"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
-        errorLine1="            android:paddingStart=&quot;11.0dip&quot;>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/now_playing.xml"
-            line="34"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="            a:paddingLeft=&quot;4dp&quot;/>"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/search_buttons.xml"
-            line="27"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="            a:paddingLeft=&quot;4dp&quot;/>"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/search_buttons.xml"
-            line="39"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="            a:paddingLeft=&quot;4dp&quot;/>"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/search_buttons.xml"
-            line="51"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="23"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="35"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="46"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="57"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="68"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="79"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="    a:paddingLeft=&quot;6dp&quot;"
-        errorLine2="    ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_folder_header.xml"
-            line="9"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="            a:paddingLeft=&quot;4dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/share_list_item.xml"
-            line="41"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
-        errorLine1="            a:paddingRight=&quot;6dip&quot;/>"
-        errorLine2="            ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="42"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="            a:paddingLeft=&quot;4dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="58"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;/>"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_list_item.xml"
-            line="15"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
-        errorLine1="        a:paddingRight=&quot;8dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_list_item.xml"
-            line="87"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="        a:paddingLeft=&quot;1dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/video_list_item.xml"
-            line="13"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingRight` you should probably also define `paddingLeft` for right-to-left symmetry"
-        errorLine1="        a:paddingRight=&quot;8dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/video_list_item.xml"
-            line="26"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        a:layout_gravity=&quot;left|center_vertical&quot;"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/album_list_item_legacy.xml"
-            line="12"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;3dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingLeft=&quot;3dip&quot; />"
-        errorLine2="        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/album_list_item_legacy.xml"
-            line="13"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        a:layout_gravity=&quot;left|center_vertical&quot;"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/album_list_item_legacy.xml"
-            line="20"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;6dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingLeft=&quot;6dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/album_list_item_legacy.xml"
-            line="21"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;3dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingRight=&quot;3dip&quot;>"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/album_list_item_legacy.xml"
-            line="22"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;3dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingRight=&quot;3dip&quot; />"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/album_list_item_legacy.xml"
-            line="49"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;5dip&quot;` to better support right-to-left layouts"
-        errorLine1="                a:paddingLeft=&quot;5dip&quot;"
-        errorLine2="                ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/appwidget4x3.xml"
-            line="64"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;5dip&quot;` to better support right-to-left layouts"
-        errorLine1="                a:paddingLeft=&quot;5dip&quot;"
-        errorLine2="                ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/appwidget4x4.xml"
-            line="65"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:layout_gravity=&quot;left&quot;"
-        errorLine2="                              ~~~~">
-        <location
-            file="src/main/res/layout/chat_item.xml"
-            line="30"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:gravity=&quot;center_vertical|left&quot;/>"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item.xml"
-            line="31"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:gravity=&quot;center_vertical|left&quot;"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item.xml"
-            line="39"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:layout_gravity=&quot;left&quot;>"
-        errorLine2="                              ~~~~">
-        <location
-            file="src/main/res/layout/chat_item.xml"
-            line="40"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_marginStart=&quot;6dip&quot;` to better support right-to-left layouts"
-        errorLine1="                a:layout_marginLeft=&quot;6dip&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item.xml"
-            line="46"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                a:gravity=&quot;left&quot;/>"
-        errorLine2="                           ~~~~">
-        <location
-            file="src/main/res/layout/chat_item.xml"
-            line="50"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                a:gravity=&quot;left&quot;/>"
-        errorLine2="                           ~~~~">
-        <location
-            file="src/main/res/layout/chat_item.xml"
-            line="63"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        a:layout_gravity=&quot;right&quot;"
-        errorLine2="                          ~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="11"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        a:gravity=&quot;center_vertical|right&quot;>"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="14"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_marginEnd=&quot;6dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:layout_marginRight=&quot;6dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="20"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:gravity=&quot;center_vertical|right&quot;"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="21"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:layout_gravity=&quot;right&quot;"
-        errorLine2="                              ~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="22"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:layout_gravity=&quot;right|end&quot;"
-        errorLine2="                              ~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="34"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:gravity=&quot;center_vertical|right&quot;>"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="35"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_marginStart=&quot;6dip&quot;` to better support right-to-left layouts"
-        errorLine1="                a:layout_marginLeft=&quot;6dip&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="41"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                a:gravity=&quot;center_vertical|right&quot;"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="43"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                a:layout_gravity=&quot;right&quot;/>"
-        errorLine2="                                  ~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="46"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                a:gravity=&quot;center_vertical|right&quot;"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="59"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                a:layout_gravity=&quot;right&quot;/>"
-        errorLine2="                                  ~~~~~">
-        <location
-            file="src/main/res/layout/chat_item_reverse.xml"
-            line="60"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:gravity=&quot;left&quot;"
-        errorLine2="                       ~~~~">
-        <location
-            file="src/main/res/layout-land/current_playing.xml"
-            line="18"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="            a:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/equalizer_bar.xml"
-            line="14"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:gravity=&quot;right&quot;"
-        errorLine2="                       ~~~~~">
-        <location
-            file="src/main/res/layout/equalizer_bar.xml"
-            line="22"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_alignParentEnd=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="            a:layout_alignParentRight=&quot;true&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/equalizer_bar.xml"
-            line="26"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_toEndOf=&quot;@+id/equalizer.frequency&quot;` to better support right-to-left layouts"
-        errorLine1="            a:layout_toRightOf=&quot;@+id/equalizer.frequency&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/equalizer_bar.xml"
-            line="27"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;10dp&quot;` to better support right-to-left layouts"
-        errorLine1="  a:paddingLeft=&quot;10dp&quot; a:layout_width=&quot;fill_parent&quot; a:layout_height=&quot;wrap_content&quot;"
-        errorLine2="  ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/main_buttons.xml"
-            line="7"
-            column="3"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_marginStart=&quot;10dip&quot;` to better support right-to-left layouts"
-        errorLine1="    a:layout_marginLeft=&quot;10dip&quot;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/main_buttons.xml"
-            line="22"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_marginStart=&quot;10dip&quot;` to better support right-to-left layouts"
-        errorLine1="    a:layout_marginLeft=&quot;10dip&quot;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/main_buttons.xml"
-            line="31"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;6dp&quot;` to better support right-to-left layouts"
-        errorLine1="  a:gravity=&quot;center_vertical&quot; a:paddingLeft=&quot;6dp&quot; a:textAllCaps=&quot;true&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/main_buttons.xml"
-            line="40"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;6dp&quot;` to better support right-to-left layouts"
-        errorLine1="  a:gravity=&quot;center_vertical&quot; a:paddingLeft=&quot;6dp&quot; a:textAllCaps=&quot;true&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/main_buttons.xml"
-            line="61"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;6dp&quot;` to better support right-to-left layouts"
-        errorLine1="  a:gravity=&quot;center_vertical&quot; a:paddingLeft=&quot;6dp&quot; a:textAllCaps=&quot;true&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/main_buttons.xml"
-            line="77"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;6dp&quot;` to better support right-to-left layouts"
-        errorLine1="  a:gravity=&quot;center_vertical&quot; a:paddingLeft=&quot;6dp&quot; a:textAllCaps=&quot;true&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/main_buttons.xml"
-            line="123"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        a:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/media_buttons.xml"
-            line="14"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                android:layout_gravity=&quot;left&quot;"
-        errorLine2="                                        ~~~~">
-        <location
-            file="src/main/res/layout/now_playing.xml"
-            line="40"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                android:layout_gravity=&quot;left&quot;"
-        errorLine2="                                        ~~~~">
-        <location
-            file="src/main/res/layout/now_playing.xml"
-            line="50"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:layout_gravity=&quot;center|right&quot;"
-        errorLine2="                                    ~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/now_playing.xml"
-            line="61"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginEnd=&quot;16dip&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_marginRight=&quot;16dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/now_playing.xml"
-            line="63"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        a:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/player_media_info.xml"
-            line="14"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:gravity=&quot;left&quot;"
-        errorLine2="                       ~~~~">
-        <location
-            file="src/main/res/layout/player_media_info.xml"
-            line="22"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:gravity=&quot;left&quot;"
-        errorLine2="                       ~~~~">
-        <location
-            file="src/main/res/layout/player_media_info.xml"
-            line="33"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:gravity=&quot;right&quot;"
-        errorLine2="                       ~~~~~">
-        <location
-            file="src/main/res/layout/player_media_info.xml"
-            line="43"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_alignParentEnd=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        a:layout_alignParentRight=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/player_media_info.xml"
-            line="53"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        a:gravity=&quot;right&quot;"
-        errorLine2="                   ~~~~~">
-        <location
-            file="src/main/res/layout/player_media_info.xml"
-            line="55"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:gravity=&quot;right&quot;"
-        errorLine2="                       ~~~~~">
-        <location
-            file="src/main/res/layout/player_media_info.xml"
-            line="63"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:gravity=&quot;right&quot;"
-        errorLine2="                       ~~~~~">
-        <location
-            file="src/main/res/layout/player_media_info.xml"
-            line="72"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="            a:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/player_slider.xml"
-            line="24"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_marginStart=&quot;12dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:layout_marginLeft=&quot;12dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/player_slider.xml"
-            line="25"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_alignParentEnd=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="            a:layout_alignParentRight=&quot;true&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/player_slider.xml"
-            line="33"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_marginEnd=&quot;12dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:layout_marginRight=&quot;12dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/player_slider.xml"
-            line="34"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="  android:gravity=&quot;left|center_vertical&quot;"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/playlist_list_item.xml"
-            line="13"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;4dp&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingLeft=&quot;4dp&quot;/>"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/search_buttons.xml"
-            line="27"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;4dp&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingLeft=&quot;4dp&quot;/>"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/search_buttons.xml"
-            line="39"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;4dp&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingLeft=&quot;4dp&quot;/>"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/search_buttons.xml"
-            line="51"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        a:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="10"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_marginEnd=&quot;10dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:layout_marginRight=&quot;10dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="12"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_toEndOf=&quot;@+id/select_album_art&quot;` to better support right-to-left layouts"
-        errorLine1="        a:layout_toRightOf=&quot;@+id/select_album_art&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="21"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;4dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="23"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_toEndOf=&quot;@+id/select_album_art&quot;` to better support right-to-left layouts"
-        errorLine1="        a:layout_toRightOf=&quot;@+id/select_album_art&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="33"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;4dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="35"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_toEndOf=&quot;@+id/select_album_art&quot;` to better support right-to-left layouts"
-        errorLine1="        a:layout_toRightOf=&quot;@+id/select_album_art&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="44"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;4dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="46"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_toEndOf=&quot;@+id/select_album_art&quot;` to better support right-to-left layouts"
-        errorLine1="        a:layout_toRightOf=&quot;@+id/select_album_art&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="55"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;4dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="57"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_toEndOf=&quot;@+id/select_album_art&quot;` to better support right-to-left layouts"
-        errorLine1="        a:layout_toRightOf=&quot;@+id/select_album_art&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="66"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;4dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="68"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_toEndOf=&quot;@+id/select_album_art&quot;` to better support right-to-left layouts"
-        errorLine1="        a:layout_toRightOf=&quot;@+id/select_album_art&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="77"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;4dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_album_header.xml"
-            line="79"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;6dp&quot;` to better support right-to-left layouts"
-        errorLine1="    a:paddingLeft=&quot;6dp&quot;"
-        errorLine2="    ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_folder_header.xml"
-            line="9"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_marginStart=&quot;10dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:layout_marginLeft=&quot;10dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_folder_header.xml"
-            line="30"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_marginStart=&quot;10dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:layout_marginLeft=&quot;10dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/select_folder_header.xml"
-            line="39"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:layout_gravity=&quot;left|center_vertical&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/share_list_item.xml"
-            line="22"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:layout_gravity=&quot;left|center_vertical&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/share_list_item.xml"
-            line="38"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;4dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingLeft=&quot;4dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/share_list_item.xml"
-            line="41"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_marginStart=&quot;4dp&quot;` to better support right-to-left layouts"
-        errorLine1="    a:layout_marginLeft=&quot;4dp&quot;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="7"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:layout_gravity=&quot;left|center_vertical&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="20"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:layout_gravity=&quot;left|center_vertical&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="27"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;4dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingLeft=&quot;4dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="31"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;2dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingRight=&quot;2dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="32"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:layout_gravity=&quot;right|center_vertical&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="40"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;6dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingRight=&quot;6dip&quot;/>"
-        errorLine2="            ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="42"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:layout_gravity=&quot;left|center_vertical&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="55"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;4dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingLeft=&quot;4dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="58"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:layout_gravity=&quot;right|center_vertical&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="66"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;3dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingLeft=&quot;3dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="67"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;9dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingRight=&quot;9dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_details.xml"
-            line="68"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;4dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingRight=&quot;4dip&quot;/>"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_list_item.xml"
-            line="15"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:layout_marginEnd=&quot;8dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:layout_marginRight=&quot;8dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_list_item.xml"
-            line="71"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;8dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingRight=&quot;8dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/song_list_item.xml"
-            line="87"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;left&quot;"
-        errorLine2="                             ~~~~">
-        <location
-            file="src/main/res/layout/time_span_dialog.xml"
-            line="38"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_toEndOf=&quot;@+id/timeSpanEditText&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_toRightOf=&quot;@+id/timeSpanEditText&quot;/>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/time_span_dialog.xml"
-            line="47"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;4dp&quot;` to better support right-to-left layouts"
-        errorLine1="   android:layout_marginLeft=&quot;4dp&quot;"
-        errorLine2="   ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/update_playlist.xml"
-            line="15"
-            column="4"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;4dp&quot;` to better support right-to-left layouts"
-        errorLine1="   android:layout_marginLeft=&quot;4dp&quot;"
-        errorLine2="   ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/update_playlist.xml"
-            line="24"
-            column="4"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;4dp&quot;` to better support right-to-left layouts"
-        errorLine1="   android:layout_marginLeft=&quot;4dp&quot;"
-        errorLine2="   ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/update_playlist.xml"
-            line="37"
-            column="4"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;4dp&quot;` to better support right-to-left layouts"
-        errorLine1="   android:layout_marginLeft=&quot;4dp&quot;"
-        errorLine2="   ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/update_playlist.xml"
-            line="46"
-            column="4"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;4dp&quot;` to better support right-to-left layouts"
-        errorLine1="   android:layout_marginLeft=&quot;4dp&quot;"
-        errorLine2="   ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/update_playlist.xml"
-            line="59"
-            column="4"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;4dp&quot;` to better support right-to-left layouts"
-        errorLine1="   android:layout_marginLeft=&quot;4dp&quot;"
-        errorLine2="   ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/update_playlist.xml"
-            line="67"
-            column="4"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:layout_gravity=&quot;left|center_vertical&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/video_details.xml"
-            line="19"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;4dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingLeft=&quot;4dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/video_details.xml"
-            line="22"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;2dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingRight=&quot;2dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/video_details.xml"
-            line="23"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            a:layout_gravity=&quot;right|center_vertical&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/video_details.xml"
-            line="31"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;2dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingLeft=&quot;2dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/video_details.xml"
-            line="32"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;6dip&quot;` to better support right-to-left layouts"
-        errorLine1="            a:paddingRight=&quot;6dip&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/video_details.xml"
-            line="33"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingStart=&quot;1dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingLeft=&quot;1dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/video_list_item.xml"
-            line="13"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `a:paddingEnd=&quot;8dip&quot;` to better support right-to-left layouts"
-        errorLine1="        a:paddingRight=&quot;8dip&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/video_list_item.xml"
-            line="26"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlEnabled"
-        message="The project references RTL attributes, but does not explicitly enable or disable RTL support with `android:supportsRtl` in the manifest">
-        <location
-            file="src/main/AndroidManifest.xml"/>
-    </issue>
-
 </issues>
diff --git a/ultrasonic/src/main/AndroidManifest.xml b/ultrasonic/src/main/AndroidManifest.xml
index 5ae6be6b..8b709fbd 100644
--- a/ultrasonic/src/main/AndroidManifest.xml
+++ b/ultrasonic/src/main/AndroidManifest.xml
@@ -28,6 +28,7 @@
         android:name=".app.UApp"
         android:label="@string/common.appname"
         android:usesCleartextTraffic="true"
+        android:supportsRtl="false"
         tools:ignore="UnusedAttribute">
 
         <meta-data android:name="com.google.android.gms.car.application"
diff --git a/ultrasonic/src/main/res/drawable/thumb.xml b/ultrasonic/src/main/res/drawable/thumb.xml
index 078a12c1..52b0f8dc 100644
--- a/ultrasonic/src/main/res/drawable/thumb.xml
+++ b/ultrasonic/src/main/res/drawable/thumb.xml
@@ -9,8 +9,8 @@
         android:bottomLeftRadius="44dp" />
 
     <padding
-        android:paddingLeft="22dp"
-        android:paddingRight="22dp" />
+        android:paddingStart="22dp"
+        android:paddingEnd="22dp" />
 
     <solid android:color="@color/selected_color_dark" />
 
diff --git a/ultrasonic/src/main/res/layout-land/current_playing.xml b/ultrasonic/src/main/res/layout-land/current_playing.xml
index 2235bb65..a3028829 100644
--- a/ultrasonic/src/main/res/layout-land/current_playing.xml
+++ b/ultrasonic/src/main/res/layout-land/current_playing.xml
@@ -110,8 +110,8 @@
                     a:layout_width="fill_parent"
                     a:layout_height="60dip"
                     a:layout_gravity="bottom|center_horizontal"
-                    a:layout_marginLeft="60dip"
-                    a:layout_marginRight="60dip"
+                    a:layout_marginStart="60dip"
+                    a:layout_marginEnd="60dip"
                     a:background="@color/translucent"
                     a:orientation="vertical"/>
 
diff --git a/ultrasonic/src/main/res/layout/album_list_item.xml b/ultrasonic/src/main/res/layout/album_list_item.xml
index 5e66c129..e3e971d1 100644
--- a/ultrasonic/src/main/res/layout/album_list_item.xml
+++ b/ultrasonic/src/main/res/layout/album_list_item.xml
@@ -15,7 +15,6 @@
         a:layout_height="64dp"
         a:layout_gravity="center_horizontal|center_vertical"
         a:layout_marginStart="6dp"
-        a:layout_marginLeft="6dp"
         a:layout_marginTop="6dp"
         a:scaleType="fitCenter"
         a:src="@drawable/unknown_album"
@@ -28,13 +27,12 @@
         a:layout_width="0dp"
         a:layout_height="74dp"
         a:layout_marginStart="10dp"
-        a:layout_marginLeft="10dp"
         a:drawablePadding="6dip"
         a:gravity="center_vertical"
         a:minHeight="56dip"
         a:orientation="vertical"
-        a:paddingLeft="3dip"
-        a:paddingRight="3dip"
+        a:paddingStart="3dip"
+        a:paddingEnd="3dip"
         a:textAppearance="?android:attr/textAppearanceMedium"
         app:layout_constraintEnd_toStartOf="@+id/album_star"
         app:layout_constraintLeft_toRightOf="@+id/album_coverart"
@@ -65,10 +63,8 @@
         a:layout_width="38dp"
         a:layout_height="38dp"
         a:layout_marginStart="16dp"
-        a:layout_marginLeft="16dp"
         a:layout_marginTop="16dp"
         a:layout_marginEnd="20dp"
-        a:layout_marginRight="20dp"
         a:background="@android:color/transparent"
         a:gravity="center_horizontal"
         a:src="?attr/star_hollow"
diff --git a/ultrasonic/src/main/res/layout/album_list_item_legacy.xml b/ultrasonic/src/main/res/layout/album_list_item_legacy.xml
index e4129ff1..f8e244a2 100644
--- a/ultrasonic/src/main/res/layout/album_list_item_legacy.xml
+++ b/ultrasonic/src/main/res/layout/album_list_item_legacy.xml
@@ -9,17 +9,17 @@
         a:id="@+id/album_coverart"
         a:layout_width="64dp"
         a:layout_height="64dp"
-        a:layout_gravity="left|center_vertical"
-        a:paddingLeft="3dip" />
+        a:layout_gravity="start|center_vertical"
+        a:paddingStart="3dip" />
 
     <LinearLayout
         a:orientation="vertical"
         a:layout_width="0dip"
         a:layout_height="wrap_content"
         a:layout_weight="1"
-        a:layout_gravity="left|center_vertical"
-        a:paddingLeft="6dip"
-        a:paddingRight="3dip">
+        a:layout_gravity="start|center_vertical"
+        a:paddingStart="6dip"
+        a:paddingEnd="3dip">
 
         <TextView
             a:id="@+id/album_title"
@@ -46,6 +46,6 @@
         a:background="@android:color/transparent"
         a:src="?attr/star_hollow"
         a:focusable="false"
-        a:paddingRight="3dip" />
+        a:paddingEnd="3dip" />
 
 </LinearLayout>
diff --git a/ultrasonic/src/main/res/layout/appwidget4x1.xml b/ultrasonic/src/main/res/layout/appwidget4x1.xml
index 8234544e..d46d1858 100644
--- a/ultrasonic/src/main/res/layout/appwidget4x1.xml
+++ b/ultrasonic/src/main/res/layout/appwidget4x1.xml
@@ -38,8 +38,8 @@
                 a:fadingEdge="horizontal"
                 a:fadingEdgeLength="20dip"
                 a:minHeight="16sp"
-                a:paddingLeft="4dip"
-                a:paddingRight="4dip"
+                a:paddingStart="4dip"
+                a:paddingEnd="4dip"
                 a:paddingTop="4dip"
                 a:singleLine="true"
                 a:gravity="center_horizontal"
@@ -57,8 +57,8 @@
                 a:fadingEdgeLength="10dip"
                 a:minHeight="12sp"
                 a:paddingBottom="4dip"
-                a:paddingLeft="4dip"
-                a:paddingRight="4dip"
+                a:paddingStart="4dip"
+                a:paddingEnd="4dip"
                 a:singleLine="true"
                 a:gravity="center_horizontal"
                 a:text="Artist"
diff --git a/ultrasonic/src/main/res/layout/appwidget4x2.xml b/ultrasonic/src/main/res/layout/appwidget4x2.xml
index dbee8569..51c4bcbf 100644
--- a/ultrasonic/src/main/res/layout/appwidget4x2.xml
+++ b/ultrasonic/src/main/res/layout/appwidget4x2.xml
@@ -40,8 +40,8 @@
                 a:fadingEdge="horizontal"
                 a:fadingEdgeLength="20dip"
                 a:minHeight="16sp"
-                a:paddingLeft="4dip"
-                a:paddingRight="4dip"
+                a:paddingStart="4dip"
+                a:paddingEnd="4dip"
                 a:paddingTop="4dip"
                 a:singleLine="true"
                 a:gravity="center_horizontal"
@@ -58,8 +58,8 @@
                 a:fadingEdge="horizontal"
                 a:fadingEdgeLength="10dip"
                 a:minHeight="12sp"
-                a:paddingLeft="4dip"
-                a:paddingRight="4dip"
+                a:paddingStart="4dip"
+                a:paddingEnd="4dip"
                 a:singleLine="true"
                 a:gravity="center_horizontal"
                 a:text="Artist"
@@ -75,8 +75,8 @@
                 a:fadingEdgeLength="10dip"
                 a:minHeight="12sp"
                 a:paddingBottom="4dip"
-                a:paddingLeft="4dip"
-                a:paddingRight="4dip"
+                a:paddingStart="4dip"
+                a:paddingEnd="4dip"
                 a:singleLine="true"
                 a:gravity="center_horizontal"
                 a:text="Album"
diff --git a/ultrasonic/src/main/res/layout/appwidget4x3.xml b/ultrasonic/src/main/res/layout/appwidget4x3.xml
index 411dba03..ff103795 100644
--- a/ultrasonic/src/main/res/layout/appwidget4x3.xml
+++ b/ultrasonic/src/main/res/layout/appwidget4x3.xml
@@ -42,8 +42,8 @@
                 a:fadingEdge="horizontal"
                 a:fadingEdgeLength="20dip"
                 a:minHeight="16sp"
-                a:paddingLeft="5dip"
-                a:paddingRight="5dip"
+                a:paddingStart="5dip"
+                a:paddingEnd="5dip"
                 a:singleLine="true"
                 a:textColor="@color/appwidget_text"
                 a:textSize="16sp"
@@ -61,7 +61,7 @@
                 a:fadingEdgeLength="10dip"
                 a:minHeight="12sp"
                 a:paddingBottom="2dip"
-                a:paddingLeft="5dip"
+                a:paddingStart="5dip"
                 a:singleLine="true"
                 a:text="Artist"
                 a:layout_gravity="center_horizontal"
diff --git a/ultrasonic/src/main/res/layout/appwidget4x4.xml b/ultrasonic/src/main/res/layout/appwidget4x4.xml
index b5aa402b..a7975b1d 100644
--- a/ultrasonic/src/main/res/layout/appwidget4x4.xml
+++ b/ultrasonic/src/main/res/layout/appwidget4x4.xml
@@ -43,8 +43,8 @@
                 a:fadingEdge="horizontal"
                 a:fadingEdgeLength="20dip"
                 a:minHeight="16sp"
-                a:paddingLeft="5dip"
-                a:paddingRight="5dip"
+                a:paddingStart="5dip"
+                a:paddingEnd="5dip"
                 a:singleLine="true"
                 a:textColor="@color/appwidget_text"
                 a:textSize="16sp"
@@ -62,7 +62,7 @@
                 a:fadingEdgeLength="10dip"
                 a:minHeight="12sp"
                 a:paddingBottom="2dip"
-                a:paddingLeft="5dip"
+                a:paddingStart="5dip"
                 a:singleLine="true"
                 a:text="Artist"
                 a:layout_gravity="center_horizontal"
diff --git a/ultrasonic/src/main/res/layout/artist_list_item.xml b/ultrasonic/src/main/res/layout/artist_list_item.xml
index 26a4d7a1..527523c8 100644
--- a/ultrasonic/src/main/res/layout/artist_list_item.xml
+++ b/ultrasonic/src/main/res/layout/artist_list_item.xml
@@ -16,9 +16,7 @@
         a:minWidth="56dip"
         a:minHeight="56dip"
         a:paddingStart="8dip"
-        a:paddingLeft="8dip"
         a:paddingEnd="8dip"
-        a:paddingRight="8dip"
         a:text="A"
         a:textAppearance="?android:attr/textAppearanceLarge"
         a:textColor="@color/cyan" />
@@ -30,11 +28,8 @@
         a:layout_gravity="center_horizontal|center_vertical"
         a:layout_marginTop="8dp"
         a:layout_marginStart="2dp"
-        a:layout_marginLeft="2dp"
         a:layout_marginEnd="10dp"
-        a:layout_marginRight="10dp"
         a:layout_toEndOf="@+id/row_section"
-        a:layout_toRightOf="@+id/row_section"
         a:scaleType="fitCenter"
         a:src="@drawable/ic_contact_picture"
         app:shapeAppearanceOverlay="@style/roundedImageView" />
@@ -44,13 +39,12 @@
         a:layout_width="fill_parent"
         a:layout_height="wrap_content"
         a:layout_toEndOf="@+id/artist_coverart"
-        a:layout_toRightOf="@+id/artist_coverart"
         a:drawablePadding="6dip"
         a:gravity="center_vertical"
         a:minHeight="56dip"
-        a:paddingLeft="3dip"
-        a:paddingRight="3dip"
-        a:layout_marginRight="12dp"
+        a:paddingStart="3dip"
+        a:paddingEnd="3dip"
         a:layout_marginEnd="12dp"
+
         a:textAppearance="?android:attr/textAppearanceMedium" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/layout/chat_item.xml b/ultrasonic/src/main/res/layout/chat_item.xml
index 3dad7870..8497995d 100644
--- a/ultrasonic/src/main/res/layout/chat_item.xml
+++ b/ultrasonic/src/main/res/layout/chat_item.xml
@@ -20,8 +20,8 @@
             a:id="@+id/chat_username"
             a:layout_width="wrap_content"
             a:layout_height="wrap_content"
-            a:layout_marginLeft="6dip"
-            a:layout_marginRight="6dip"
+            a:layout_marginStart="6dip"
+            a:layout_marginEnd="6dip"
             a:ellipsize="marquee"
             a:singleLine="true"
             a:textIsSelectable="true"
@@ -43,7 +43,7 @@
                 a:id="@+id/chat_time"
                 a:layout_width="wrap_content"
                 a:layout_height="wrap_content"
-                a:layout_marginLeft="6dip"
+                a:layout_marginStart="6dip"
                 a:singleLine="true"
                 a:textIsSelectable="true"
                 a:textAppearance="?android:attr/textAppearanceMedium"
@@ -53,8 +53,8 @@
                 a:id="@+id/chat_message"
                 a:layout_width="wrap_content"
                 a:layout_height="wrap_content"
-                a:layout_marginLeft="6dip"
-                a:layout_marginRight="6dip"
+                a:layout_marginStart="6dip"
+                a:layout_marginEnd="6dip"
                 a:textIsSelectable="true"
                 a:linksClickable="true"
                 a:singleLine="false"
diff --git a/ultrasonic/src/main/res/layout/chat_item_reverse.xml b/ultrasonic/src/main/res/layout/chat_item_reverse.xml
index 39ca0b0f..a7684a43 100644
--- a/ultrasonic/src/main/res/layout/chat_item_reverse.xml
+++ b/ultrasonic/src/main/res/layout/chat_item_reverse.xml
@@ -17,7 +17,7 @@
             a:id="@+id/chat_username"
             a:layout_width="wrap_content"
             a:layout_height="wrap_content"
-            a:layout_marginRight="6dip"
+            a:layout_marginEnd="6dip"
             a:gravity="center_vertical|right"
             a:layout_gravity="right"
             a:ellipsize="marquee"
@@ -38,7 +38,7 @@
                 a:id="@+id/chat_time"
                 a:layout_width="wrap_content"
                 a:layout_height="wrap_content"
-                a:layout_marginLeft="6dip"
+                a:layout_marginStart="6dip"
                 a:singleLine="true"
                 a:gravity="center_vertical|right"
                 a:textIsSelectable="true"
@@ -49,8 +49,8 @@
                 a:id="@+id/chat_message"
                 a:layout_width="wrap_content"
                 a:layout_height="wrap_content"
-                a:layout_marginLeft="6dip"
-                a:layout_marginRight="6dip"
+                a:layout_marginStart="6dip"
+                a:layout_marginEnd="6dip"
                 a:linksClickable="true"
                 a:singleLine="false"
                 a:autoLink="all"
diff --git a/ultrasonic/src/main/res/layout/current_playing.xml b/ultrasonic/src/main/res/layout/current_playing.xml
index 43c5d843..806ceb04 100644
--- a/ultrasonic/src/main/res/layout/current_playing.xml
+++ b/ultrasonic/src/main/res/layout/current_playing.xml
@@ -110,8 +110,8 @@
                     a:layout_height="60dip"
                     a:layout_gravity="center"
                     a:background="@color/translucent"
-                    a:layout_marginLeft="80dip"
-                    a:layout_marginRight="80dip"
+                    a:layout_marginStart="80dip"
+                    a:layout_marginEnd="80dip"
                     a:orientation="vertical"
                     />
 
diff --git a/ultrasonic/src/main/res/layout/equalizer.xml b/ultrasonic/src/main/res/layout/equalizer.xml
index a1f3ecba..63aea6d2 100644
--- a/ultrasonic/src/main/res/layout/equalizer.xml
+++ b/ultrasonic/src/main/res/layout/equalizer.xml
@@ -36,8 +36,8 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:layout_marginTop="20dip"
-                    android:paddingLeft="40dip"
-                    android:paddingRight="40dip"/>
+                    android:paddingStart="40dip"
+                    android:paddingEnd="40dip"/>
 
         </LinearLayout>
     </ScrollView>
diff --git a/ultrasonic/src/main/res/layout/equalizer_bar.xml b/ultrasonic/src/main/res/layout/equalizer_bar.xml
index 6b75b623..b76d8e75 100644
--- a/ultrasonic/src/main/res/layout/equalizer_bar.xml
+++ b/ultrasonic/src/main/res/layout/equalizer_bar.xml
@@ -24,7 +24,7 @@
             a:layout_height="wrap_content"
             a:layout_marginTop="8dp"
             a:layout_alignParentRight="true"
-            a:layout_toRightOf="@+id/equalizer.frequency"
+            a:layout_toEndOf="@+id/equalizer.frequency"
             />
 
     <SeekBar
diff --git a/ultrasonic/src/main/res/layout/filepicker_dialog_main.xml b/ultrasonic/src/main/res/layout/filepicker_dialog_main.xml
index aed2057e..fb860179 100644
--- a/ultrasonic/src/main/res/layout/filepicker_dialog_main.xml
+++ b/ultrasonic/src/main/res/layout/filepicker_dialog_main.xml
@@ -29,10 +29,8 @@
         a:layout_height="wrap_content"
         a:layout_alignParentBottom="true"
         a:layout_marginStart="10dp"
-        a:layout_marginLeft="10dp"
         a:layout_marginTop="10dp"
         a:layout_marginEnd="10dp"
-        a:layout_marginRight="10dp"
         a:layout_marginBottom="10dp"
         a:drawableStart="?attr/filepicker_create_new_folder"
         a:drawableLeft="?attr/filepicker_create_new_folder"
diff --git a/ultrasonic/src/main/res/layout/filepicker_item_file_lister.xml b/ultrasonic/src/main/res/layout/filepicker_item_file_lister.xml
index e4c0fed2..96fa314e 100644
--- a/ultrasonic/src/main/res/layout/filepicker_item_file_lister.xml
+++ b/ultrasonic/src/main/res/layout/filepicker_item_file_lister.xml
@@ -19,7 +19,6 @@
         a:layout_height="wrap_content"
         a:layout_gravity="center_vertical"
         a:layout_marginStart="20dp"
-        a:layout_marginLeft="20dp"
         a:gravity="center_vertical"
         a:text=""
         a:textSize="18sp" />
diff --git a/ultrasonic/src/main/res/layout/generic_text_list_item.xml b/ultrasonic/src/main/res/layout/generic_text_list_item.xml
index 05b31407..560f794a 100644
--- a/ultrasonic/src/main/res/layout/generic_text_list_item.xml
+++ b/ultrasonic/src/main/res/layout/generic_text_list_item.xml
@@ -6,6 +6,6 @@
     a:layout_height="wrap_content"
     a:textAppearance="?android:attr/textAppearanceMedium"
     a:gravity="center_vertical"
-    a:paddingLeft="3dip"
-    a:paddingRight="3dip"
+    a:paddingStart="3dip"
+    a:paddingEnd="3dip"
     a:minHeight="50dip"/>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/layout/jukebox_volume.xml b/ultrasonic/src/main/res/layout/jukebox_volume.xml
index 6e00ed96..81adf6ad 100644
--- a/ultrasonic/src/main/res/layout/jukebox_volume.xml
+++ b/ultrasonic/src/main/res/layout/jukebox_volume.xml
@@ -14,8 +14,8 @@
             a:textColor="#ffffffff"
             a:shadowColor="#bb000000"
             a:shadowRadius="2.75"
-            a:paddingLeft="32dp"
-            a:paddingRight="32dp"
+            a:paddingStart="32dp"
+            a:paddingEnd="32dp"
             a:paddingBottom="12dp"
             />
       
diff --git a/ultrasonic/src/main/res/layout/lyrics.xml b/ultrasonic/src/main/res/layout/lyrics.xml
index 6880d374..0495dd9c 100644
--- a/ultrasonic/src/main/res/layout/lyrics.xml
+++ b/ultrasonic/src/main/res/layout/lyrics.xml
@@ -28,8 +28,8 @@
                         a:gravity="center_horizontal"
                         a:layout_width="fill_parent"
                         a:layout_height="wrap_content"
-                        a:paddingLeft="10dip"
-                        a:paddingRight="10dip"
+                        a:paddingStart="10dip"
+                        a:paddingEnd="10dip"
                         a:paddingTop="10dip"
                         a:paddingBottom="4dip"
                         />
@@ -40,8 +40,8 @@
                         a:gravity="center_horizontal"
                         a:layout_width="fill_parent"
                         a:layout_height="wrap_content"
-                        a:paddingLeft="10dip"
-                        a:paddingRight="10dip"
+                        a:paddingStart="10dip"
+                        a:paddingEnd="10dip"
                         />
 
                 <TextView
@@ -51,8 +51,8 @@
                         a:layout_width="fill_parent"
                         a:layout_height="wrap_content"
                         a:paddingTop="32dip"
-                        a:paddingLeft="10dip"
-                        a:paddingRight="10dip"
+                        a:paddingStart="10dip"
+                        a:paddingEnd="10dip"
                         />
 
             </LinearLayout>
diff --git a/ultrasonic/src/main/res/layout/main_buttons.xml b/ultrasonic/src/main/res/layout/main_buttons.xml
index cbdd8ca6..d5be2f11 100644
--- a/ultrasonic/src/main/res/layout/main_buttons.xml
+++ b/ultrasonic/src/main/res/layout/main_buttons.xml
@@ -4,7 +4,7 @@
 
 	<LinearLayout a:id="@+id/main_select_server"
 		a:orientation="horizontal" a:paddingTop="2dip" a:paddingBottom="2dip"
-		a:paddingLeft="10dp" a:layout_width="fill_parent" a:layout_height="wrap_content"
+		a:paddingStart="10dp" a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:minHeight="?android:attr/listPreferredItemHeight">
 
 		<ImageView a:layout_width="wrap_content" a:layout_height="wrap_content"
@@ -19,7 +19,7 @@
 				a:id="@+id/main.select_server_1"
 				a:layout_width="fill_parent"
 				a:layout_height="wrap_content"
-				a:layout_marginLeft="10dip"
+				a:layout_marginStart="10dip"
 				a:layout_marginTop="6dip"
 				a:text="@string/main.select_server"
 				a:textAppearance="?android:attr/textAppearanceLarge" />
@@ -28,7 +28,7 @@
 				a:id="@+id/main.select_server_2"
 				a:layout_width="fill_parent"
 				a:layout_height="wrap_content"
-				a:layout_marginLeft="10dip"
+				a:layout_marginStart="10dip"
 				a:textAppearance="?android:attr/textAppearanceSmall" />
 
 		</LinearLayout>
@@ -37,95 +37,95 @@
 	<TextView a:id="@+id/main_music" a:text="@string/main.music"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceSmall" a:textColor="@color/cyan"
-		a:gravity="center_vertical" a:paddingLeft="6dp" a:textAllCaps="true"
+		a:gravity="center_vertical" a:paddingStart="6dp" a:textAllCaps="true"
 		a:textStyle="bold" />
 	
 	<TextView a:id="@+id/main_artists_button" a:text="@string/main.artists_title"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceMedium" a:gravity="center_vertical"
-		a:paddingLeft="6dip" a:paddingRight="6dip" a:minHeight="40dip" />
+		a:paddingStart="6dip" a:paddingEnd="6dip" a:minHeight="40dip" />
 	
 	<TextView a:id="@+id/main_albums_button" a:text="@string/main.albums_title"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceMedium" a:gravity="center_vertical"
-		a:paddingLeft="6dip" a:paddingRight="6dip" a:minHeight="40dip" />
+		a:paddingStart="6dip" a:paddingEnd="6dip" a:minHeight="40dip" />
 	
 	<TextView a:id="@+id/main_genres_button" a:text="@string/main.genres_title"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceMedium" a:gravity="center_vertical"
-		a:paddingLeft="6dip" a:paddingRight="6dip" a:minHeight="40dip" />			
+		a:paddingStart="6dip" a:paddingEnd="6dip" a:minHeight="40dip" />
 	
 	<TextView a:id="@+id/main_songs" a:text="@string/main.songs_title"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceSmall" a:textColor="@color/cyan"
-		a:gravity="center_vertical" a:paddingLeft="6dp" a:textAllCaps="true"
+		a:gravity="center_vertical" a:paddingStart="6dp" a:textAllCaps="true"
 		a:textStyle="bold" />
 	
 	<TextView a:id="@+id/main_songs_button" a:text="@string/main.songs_random"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceMedium" a:gravity="center_vertical"
-		a:paddingLeft="6dip" a:paddingRight="6dip" a:minHeight="40dip" />	
+		a:paddingStart="6dip" a:paddingEnd="6dip" a:minHeight="40dip" />
 	
 	<TextView a:id="@+id/main_songs_starred" a:text="@string/main.songs_starred"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceMedium" a:gravity="center_vertical"
-		a:paddingLeft="6dip" a:paddingRight="6dip" a:minHeight="40dip" />
+		a:paddingStart="6dip" a:paddingEnd="6dip" a:minHeight="40dip" />
 	
 	<TextView a:id="@+id/main_albums" a:text="@string/main.albums_title"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceSmall" a:textColor="@color/cyan"
-		a:gravity="center_vertical" a:paddingLeft="6dp" a:textAllCaps="true"
+		a:gravity="center_vertical" a:paddingStart="6dp" a:textAllCaps="true"
 		a:textStyle="bold" />
 	
 	<TextView a:id="@+id/main_albums_newest" a:text="@string/main.albums_newest"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceMedium" a:gravity="center_vertical"
-		a:paddingLeft="6dip" a:paddingRight="6dip" a:minHeight="40dip" />
+		a:paddingStart="6dip" a:paddingEnd="6dip" a:minHeight="40dip" />
 	
 	<TextView a:id="@+id/main_albums_recent" a:text="@string/main.albums_recent"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceMedium" a:gravity="center_vertical"
-		a:paddingLeft="6dip" a:paddingRight="6dip" a:minHeight="40dip" />
+		a:paddingStart="6dip" a:paddingEnd="6dip" a:minHeight="40dip" />
 	
 	<TextView a:id="@+id/main_albums_frequent" a:text="@string/main.albums_frequent"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceMedium" a:gravity="center_vertical"
-		a:paddingLeft="6dip" a:paddingRight="6dip" a:minHeight="40dip" />	
+		a:paddingStart="6dip" a:paddingEnd="6dip" a:minHeight="40dip" />
 	
 	<TextView a:id="@+id/main_albums_highest" a:text="@string/main.albums_highest"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceMedium" a:gravity="center_vertical"
-		a:paddingLeft="6dip" a:paddingRight="6dip" a:minHeight="40dip" />
+		a:paddingStart="6dip" a:paddingEnd="6dip" a:minHeight="40dip" />
 				
 	<TextView a:id="@+id/main_albums_random" a:text="@string/main.albums_random"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceMedium" a:gravity="center_vertical"
-		a:paddingLeft="6dip" a:paddingRight="6dip" a:minHeight="40dip" />
+		a:paddingStart="6dip" a:paddingEnd="6dip" a:minHeight="40dip" />
 	
 	<TextView a:id="@+id/main_albums_starred" a:layout_width="fill_parent"
 		a:layout_height="wrap_content" a:gravity="center_vertical"
-		a:minHeight="40dip" a:paddingLeft="6dip" a:paddingRight="6dip"
+		a:minHeight="40dip" a:paddingStart="6dip" a:paddingEnd="6dip"
 		a:text="@string/main.albums_starred" a:textAppearance="?android:attr/textAppearanceMedium" />
 	
 	<TextView a:id="@+id/main_albums_alphaByName" a:layout_width="fill_parent"
 		a:layout_height="wrap_content" a:gravity="center_vertical"
-		a:minHeight="40dip" a:paddingLeft="6dip" a:paddingRight="6dip"
+		a:minHeight="40dip" a:paddingStart="6dip" a:paddingEnd="6dip"
 		a:text="@string/main.albums_alphaByName" a:textAppearance="?android:attr/textAppearanceMedium" />
 	
 	<TextView a:id="@+id/main_albums_alphaByArtist" a:layout_width="fill_parent"
 		a:layout_height="wrap_content" a:gravity="center_vertical"
-		a:minHeight="40dip" a:paddingLeft="6dip" a:paddingRight="6dip"
+		a:minHeight="40dip" a:paddingStart="6dip" a:paddingEnd="6dip"
 		a:text="@string/main.albums_alphaByArtist" a:textAppearance="?android:attr/textAppearanceMedium" />
 
 	<TextView a:id="@+id/main_videos_title" a:text="@string/main.videos"
 		a:layout_width="fill_parent" a:layout_height="wrap_content"
 		a:textAppearance="?android:attr/textAppearanceSmall" a:textColor="@color/cyan"
-		a:gravity="center_vertical" a:paddingLeft="6dp" a:textAllCaps="true"
+		a:gravity="center_vertical" a:paddingStart="6dp" a:textAllCaps="true"
 		a:textStyle="bold" />		
 		
 	<TextView a:id="@+id/main_videos" a:layout_width="fill_parent"
 		a:layout_height="wrap_content" a:gravity="center_vertical"
-		a:minHeight="40dip" a:paddingLeft="6dip" a:paddingRight="6dip"
+		a:minHeight="40dip" a:paddingStart="6dip" a:paddingEnd="6dip"
 		a:text="@string/main.videos" a:textAppearance="?android:attr/textAppearanceMedium" />	
 			
 </LinearLayout>
diff --git a/ultrasonic/src/main/res/layout/media_buttons.xml b/ultrasonic/src/main/res/layout/media_buttons.xml
index 92f02e91..a9eef057 100644
--- a/ultrasonic/src/main/res/layout/media_buttons.xml
+++ b/ultrasonic/src/main/res/layout/media_buttons.xml
@@ -4,8 +4,8 @@
     a:layout_width="fill_parent"
     a:layout_height="wrap_content"
     a:orientation="horizontal"
-    a:layout_marginLeft="12dp"
-    a:layout_marginRight="12dp" >
+    a:layout_marginStart="12dp"
+    a:layout_marginEnd="12dp" >
 
     <ImageView
         a:id="@+id/button_shuffle"
diff --git a/ultrasonic/src/main/res/layout/navigation_header.xml b/ultrasonic/src/main/res/layout/navigation_header.xml
index 0fa1c393..a7a505e4 100644
--- a/ultrasonic/src/main/res/layout/navigation_header.xml
+++ b/ultrasonic/src/main/res/layout/navigation_header.xml
@@ -33,7 +33,6 @@
             a:layout_height="match_parent"
             a:gravity="center_vertical"
             a:paddingStart="16dp"
-            a:paddingLeft="16dp"
             a:text="@string/common.appname"
             a:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
diff --git a/ultrasonic/src/main/res/layout/now_playing.xml b/ultrasonic/src/main/res/layout/now_playing.xml
index ebbd4d65..5cf76272 100644
--- a/ultrasonic/src/main/res/layout/now_playing.xml
+++ b/ultrasonic/src/main/res/layout/now_playing.xml
@@ -19,7 +19,6 @@
             android:id="@+id/now_playing_image"
             android:layout_width="64.0dip"
             android:layout_height="64.0dip"
-            android:layout_marginLeft="6dp"
             android:focusable="true"
             android:gravity="center"
             android:layout_marginStart="6dp" />
@@ -30,14 +29,13 @@
             android:layout_gravity="center_vertical"
             android:layout_weight="1.0"
             android:orientation="vertical"
-            android:paddingLeft="11.0dip"
             android:paddingStart="11.0dip">
 
             <TextView
                 android:id="@+id/now_playing_trackname"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="left"
+                android:layout_gravity="start"
                 android:ellipsize="marquee"
                 android:singleLine="true"
                 android:textAppearance="?android:attr/textAppearanceMedium"
@@ -47,7 +45,7 @@
                 android:id="@+id/now_playing_artist"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="left"
+                android:layout_gravity="start"
                 android:ellipsize="end"
                 android:scrollHorizontally="true"
                 android:singleLine="true"
@@ -58,9 +56,9 @@
             android:id="@+id/now_playing_control_play"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_gravity="center|right"
+            android:layout_gravity="center|end"
             android:layout_marginTop="2dip"
-            android:layout_marginRight="16dip"
+            android:layout_marginEnd="16dip"
             android:layout_weight="0.0"
             android:focusable="false"
             android:scaleType="fitCenter"
diff --git a/ultrasonic/src/main/res/layout/player_media_info.xml b/ultrasonic/src/main/res/layout/player_media_info.xml
index 6704b6b3..1851e4fa 100644
--- a/ultrasonic/src/main/res/layout/player_media_info.xml
+++ b/ultrasonic/src/main/res/layout/player_media_info.xml
@@ -5,8 +5,8 @@
     a:layout_width="fill_parent"
     a:layout_height="wrap_content"
     a:layout_marginTop="10dp"
-    a:layout_marginLeft="12dp"
-    a:layout_marginRight="12dp" >
+    a:layout_marginStart="12dp"
+    a:layout_marginEnd="12dp" >
 
     <LinearLayout
         a:layout_width="wrap_content"
diff --git a/ultrasonic/src/main/res/layout/player_slider.xml b/ultrasonic/src/main/res/layout/player_slider.xml
index f30d9dd5..9e6408c2 100644
--- a/ultrasonic/src/main/res/layout/player_slider.xml
+++ b/ultrasonic/src/main/res/layout/player_slider.xml
@@ -4,8 +4,8 @@
     a:layout_height="wrap_content"
     a:orientation="vertical"
     a:layout_marginTop="10dp"
-    a:layout_marginLeft="12dp"
-    a:layout_marginRight="12dp" >
+    a:layout_marginStart="12dp"
+    a:layout_marginEnd="12dp" >
     
     <SeekBar
         a:id="@+id/current_playing_progress_bar"
@@ -22,7 +22,7 @@
             a:layout_width="wrap_content"
             a:layout_height="wrap_content"
             a:layout_alignParentLeft="true"
-            a:layout_marginLeft="12dip"
+            a:layout_marginStart="12dip"
             a:text="@string/util.no_time"
             a:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -31,7 +31,7 @@
             a:layout_width="wrap_content"
             a:layout_height="wrap_content"
             a:layout_alignParentRight="true"
-            a:layout_marginRight="12dip"
+            a:layout_marginEnd="12dip"
             a:text="@string/util.no_time"
             a:textAppearance="?android:attr/textAppearanceSmall" />
 
diff --git a/ultrasonic/src/main/res/layout/playlist_list_item.xml b/ultrasonic/src/main/res/layout/playlist_list_item.xml
index 3bcc8489..410837ad 100644
--- a/ultrasonic/src/main/res/layout/playlist_list_item.xml
+++ b/ultrasonic/src/main/res/layout/playlist_list_item.xml
@@ -11,8 +11,8 @@
 		android:layout_weight="1"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:gravity="left|center_vertical"
-		android:paddingLeft="6dip"
-		android:paddingRight="6dip"
+		android:paddingStart="6dip"
+		android:paddingEnd="6dip"
 		android:minHeight="50dip"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/layout/search_buttons.xml b/ultrasonic/src/main/res/layout/search_buttons.xml
index 89742b70..66b82755 100644
--- a/ultrasonic/src/main/res/layout/search_buttons.xml
+++ b/ultrasonic/src/main/res/layout/search_buttons.xml
@@ -24,7 +24,7 @@
             a:textStyle="bold"
             a:background="#ff555555"
             a:gravity="center_vertical"
-            a:paddingLeft="4dp"/>
+            a:paddingStart="4dp"/>
 
     <TextView
             a:id="@+id/search_albums"
@@ -36,7 +36,7 @@
             a:textStyle="bold"
             a:background="#ff555555"
             a:gravity="center_vertical"
-            a:paddingLeft="4dp"/>
+            a:paddingStart="4dp"/>
 
     <TextView
             a:id="@+id/search_songs"
@@ -48,7 +48,7 @@
             a:textStyle="bold"
             a:background="#ff555555"
             a:gravity="center_vertical"
-            a:paddingLeft="4dp"/>
+            a:paddingStart="4dp"/>
 
     <TextView
             a:id="@+id/search_more_artists"
diff --git a/ultrasonic/src/main/res/layout/select_album_header.xml b/ultrasonic/src/main/res/layout/select_album_header.xml
index c9f06791..95e3096e 100644
--- a/ultrasonic/src/main/res/layout/select_album_header.xml
+++ b/ultrasonic/src/main/res/layout/select_album_header.xml
@@ -9,7 +9,7 @@
         a:layout_height="160dip"
         a:layout_alignParentLeft="true"
         a:layout_alignParentTop="true"
-        a:layout_marginRight="10dip"
+        a:layout_marginEnd="10dip"
         a:contentDescription="@null"
         a:scaleType="fitCenter"
         a:src="@drawable/unknown_album"/>
@@ -18,9 +18,9 @@
         a:id="@+id/select_album_title"
         a:layout_width="wrap_content"
         a:layout_height="wrap_content"
-        a:layout_toRightOf="@+id/select_album_art"
+        a:layout_toEndOf="@+id/select_album_art"
         a:ellipsize="end"
-        a:paddingRight="4dip"
+        a:paddingEnd="4dip"
         a:paddingTop="10dip"
         a:singleLine="true"
         a:textAppearance="?android:attr/textAppearanceMedium"/>
@@ -30,9 +30,9 @@
         a:layout_width="wrap_content"
         a:layout_height="wrap_content"
         a:layout_below="@+id/select_album_title"
-        a:layout_toRightOf="@+id/select_album_art"
+        a:layout_toEndOf="@+id/select_album_art"
         a:ellipsize="end"
-        a:paddingRight="4dip"
+        a:paddingEnd="4dip"
         a:singleLine="true"
         a:textAppearance="?android:attr/textAppearanceSmall"/>
 
@@ -41,9 +41,9 @@
         a:layout_width="wrap_content"
         a:layout_height="wrap_content"
         a:layout_below="@+id/select_album_artist"
-        a:layout_toRightOf="@+id/select_album_art"
+        a:layout_toEndOf="@+id/select_album_art"
         a:ellipsize="end"
-        a:paddingRight="4dip"
+        a:paddingEnd="4dip"
         a:singleLine="true"
         a:textAppearance="?android:attr/textAppearanceSmall"/>
 
@@ -52,9 +52,9 @@
         a:layout_width="wrap_content"
         a:layout_height="wrap_content"
         a:layout_below="@+id/select_album_genre"
-        a:layout_toRightOf="@+id/select_album_art"
+        a:layout_toEndOf="@+id/select_album_art"
         a:ellipsize="end"
-        a:paddingRight="4dip"
+        a:paddingEnd="4dip"
         a:singleLine="true"
         a:textAppearance="?android:attr/textAppearanceSmall"/>
 
@@ -63,9 +63,9 @@
         a:layout_width="wrap_content"
         a:layout_height="wrap_content"
         a:layout_below="@+id/select_album_year"
-        a:layout_toRightOf="@+id/select_album_art"
+        a:layout_toEndOf="@+id/select_album_art"
         a:ellipsize="none"
-        a:paddingRight="4dip"
+        a:paddingEnd="4dip"
         a:singleLine="true"
         a:textAppearance="?android:attr/textAppearanceSmall"/>
 
@@ -74,9 +74,9 @@
         a:layout_width="wrap_content"
         a:layout_height="wrap_content"
         a:layout_below="@+id/select_album_song_count"
-        a:layout_toRightOf="@+id/select_album_art"
+        a:layout_toEndOf="@+id/select_album_art"
         a:ellipsize="none"
-        a:paddingRight="4dip"
+        a:paddingEnd="4dip"
         a:singleLine="true"
         a:textAppearance="?android:attr/textAppearanceSmall"/>
 
diff --git a/ultrasonic/src/main/res/layout/select_folder_header.xml b/ultrasonic/src/main/res/layout/select_folder_header.xml
index 68538369..6eefae31 100644
--- a/ultrasonic/src/main/res/layout/select_folder_header.xml
+++ b/ultrasonic/src/main/res/layout/select_folder_header.xml
@@ -6,7 +6,7 @@
     a:minHeight="?android:attr/listPreferredItemHeight"
     a:orientation="horizontal"
     a:paddingBottom="2dip"
-    a:paddingLeft="6dp"
+    a:paddingStart="6dp"
     a:paddingTop="2dip"
     a:background="?android:attr/selectableItemBackground"
     a:clickable="true"
@@ -27,7 +27,7 @@
             a:id="@+id/select_folder_title"
             a:layout_width="fill_parent"
             a:layout_height="wrap_content"
-            a:layout_marginLeft="10dip"
+            a:layout_marginStart="10dip"
             a:layout_marginTop="6dip"
             a:text="@string/select_artist.folder"
             a:textAppearance="?android:attr/textAppearanceLarge" />
@@ -36,7 +36,7 @@
             a:id="@+id/select_folder_name"
             a:layout_width="fill_parent"
             a:layout_height="wrap_content"
-            a:layout_marginLeft="10dip"
+            a:layout_marginStart="10dip"
             a:textAppearance="?android:attr/textAppearanceSmall" />
     </LinearLayout>
 
diff --git a/ultrasonic/src/main/res/layout/server_edit.xml b/ultrasonic/src/main/res/layout/server_edit.xml
index 1058c3f6..a90ae7f3 100644
--- a/ultrasonic/src/main/res/layout/server_edit.xml
+++ b/ultrasonic/src/main/res/layout/server_edit.xml
@@ -110,7 +110,6 @@
         a:layout_width="0dp"
         a:layout_height="wrap_content"
         a:layout_marginStart="5dp"
-        a:layout_marginLeft="5dp"
         a:text="@string/settings.title.allow_self_signed_certificate"
         app:layout_constraintBottom_toTopOf="@id/edit_ldap_title"
         app:layout_constraintStart_toStartOf="parent"
@@ -121,9 +120,7 @@
         a:layout_width="0dp"
         a:layout_height="wrap_content"
         a:layout_marginStart="8dp"
-        a:layout_marginLeft="8dp"
         a:layout_marginEnd="5dp"
-        a:layout_marginRight="5dp"
         a:layout_marginBottom="8dp"
         a:checked="false"
         app:layout_constraintBottom_toTopOf="@id/edit_ldap_title"
@@ -137,7 +134,6 @@
         a:layout_width="0dp"
         a:layout_height="wrap_content"
         a:layout_marginStart="5dp"
-        a:layout_marginLeft="5dp"
         a:text="@string/settings.title.enable_ldap_users_support"
         app:layout_constraintBottom_toTopOf="@id/edit_ldap_description"
         app:layout_constraintStart_toStartOf="parent"
@@ -149,7 +145,6 @@
         a:layout_width="0dp"
         a:layout_height="wrap_content"
         a:layout_marginStart="5dp"
-        a:layout_marginLeft="5dp"
         a:text="@string/settings.summary.enable_ldap_users_support"
         app:layout_constraintBottom_toTopOf="@id/edit_jukebox"
         app:layout_constraintEnd_toStartOf="@id/edit_ldap"
@@ -161,8 +156,6 @@
         a:layout_width="wrap_content"
         a:layout_height="wrap_content"
         a:layout_marginEnd="5dp"
-        a:layout_marginRight="5dp"
-        a:layout_marginLeft="8dp"
         a:layout_marginStart="8dp"
         a:checked="false"
         app:layout_constraintBottom_toBottomOf="@id/edit_ldap_description"
@@ -176,7 +169,6 @@
         a:layout_width="0dp"
         a:layout_height="wrap_content"
         a:layout_marginStart="5dp"
-        a:layout_marginLeft="5dp"
         a:layout_marginTop="8dp"
         a:text="@string/jukebox.is_default"
         app:layout_constraintStart_toStartOf="parent"
@@ -187,10 +179,8 @@
         a:layout_width="0dp"
         a:layout_height="wrap_content"
         a:layout_marginStart="8dp"
-        a:layout_marginLeft="8dp"
         a:layout_marginTop="8dp"
         a:layout_marginEnd="5dp"
-        a:layout_marginRight="5dp"
         a:checked="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/edit_jukebox_title"
diff --git a/ultrasonic/src/main/res/layout/server_row.xml b/ultrasonic/src/main/res/layout/server_row.xml
index 0a4c1ed5..fc4643e2 100644
--- a/ultrasonic/src/main/res/layout/server_row.xml
+++ b/ultrasonic/src/main/res/layout/server_row.xml
@@ -21,7 +21,6 @@
         a:layout_height="wrap_content"
         a:textAppearance="?android:attr/textAppearanceListItem"
         a:paddingTop="10dp"
-        a:layout_toRightOf="@id/server_image"
         a:layout_toEndOf="@id/server_image" />
 
     <TextView
@@ -31,7 +30,6 @@
         a:textAppearance="?android:attr/textAppearanceSmall"
         a:layout_below="@id/server_name"
         a:paddingBottom="10dp"
-        a:layout_toRightOf="@id/server_image"
         a:layout_toEndOf="@id/server_image" />
 
     <ImageButton
@@ -43,7 +41,7 @@
         a:layout_centerVertical="true"
         a:layout_gravity="end"
         a:layout_marginEnd="15dp"
-        a:layout_marginRight="15dp"
+
         a:focusable="false"
         a:src="?attr/more_vert"
         a:padding="5dp" />
diff --git a/ultrasonic/src/main/res/layout/share_list_item.xml b/ultrasonic/src/main/res/layout/share_list_item.xml
index a1580129..f72ba4df 100644
--- a/ultrasonic/src/main/res/layout/share_list_item.xml
+++ b/ultrasonic/src/main/res/layout/share_list_item.xml
@@ -4,8 +4,8 @@
               a:layout_height="wrap_content"
               a:layout_gravity="center_vertical"
               a:layout_weight="1"
-              a:paddingLeft="6dip"
-              a:paddingRight="6dip"
+              a:paddingStart="6dip"
+              a:paddingEnd="6dip"
               a:minHeight="44dip"
               a:orientation="vertical">
 
@@ -38,7 +38,7 @@
             a:layout_gravity="left|center_vertical"
             a:layout_weight="1"
             a:ellipsize="middle"
-            a:paddingLeft="4dip"
+            a:paddingStart="4dip"
             a:singleLine="true"
             a:textAppearance="?android:attr/textAppearanceSmall"/>
 
diff --git a/ultrasonic/src/main/res/layout/song_details.xml b/ultrasonic/src/main/res/layout/song_details.xml
index c2ed8e16..7cab9d5f 100644
--- a/ultrasonic/src/main/res/layout/song_details.xml
+++ b/ultrasonic/src/main/res/layout/song_details.xml
@@ -4,7 +4,7 @@
     a:layout_height="wrap_content"
     a:layout_gravity="center_vertical"
     a:layout_weight="1"
-    a:layout_marginLeft="4dp"
+    a:layout_marginStart="4dp"
     a:orientation="vertical">
 
     <LinearLayout
@@ -28,8 +28,8 @@
             a:layout_weight="1"
             a:drawablePadding="6dip"
             a:ellipsize="end"
-            a:paddingLeft="4dip"
-            a:paddingRight="2dip"
+            a:paddingStart="4dip"
+            a:paddingEnd="2dip"
             a:singleLine="true"
             a:textAppearance="?android:attr/textAppearanceMedium"/>
 
@@ -39,7 +39,7 @@
             a:layout_height="wrap_content"
             a:layout_gravity="right|center_vertical"
             a:drawablePadding="6dip"
-            a:paddingRight="6dip"/>
+            a:paddingEnd="6dip"/>
     </LinearLayout>
 
     <LinearLayout
@@ -55,7 +55,7 @@
             a:layout_gravity="left|center_vertical"
             a:layout_weight="1"
             a:ellipsize="middle"
-            a:paddingLeft="4dip"
+            a:paddingStart="4dip"
             a:singleLine="true"
             a:textAppearance="?android:attr/textAppearanceSmall"/>
 
@@ -64,8 +64,8 @@
             a:layout_width="wrap_content"
             a:layout_height="wrap_content"
             a:layout_gravity="right|center_vertical"
-            a:paddingLeft="3dip"
-            a:paddingRight="9dip"
+            a:paddingStart="3dip"
+            a:paddingEnd="9dip"
             a:singleLine="true"
             a:textAppearance="?android:attr/textAppearanceSmall"/>
     </LinearLayout>
diff --git a/ultrasonic/src/main/res/layout/song_list_item.xml b/ultrasonic/src/main/res/layout/song_list_item.xml
index 53c33ccf..ad7a325a 100644
--- a/ultrasonic/src/main/res/layout/song_list_item.xml
+++ b/ultrasonic/src/main/res/layout/song_list_item.xml
@@ -11,9 +11,7 @@
         a:id="@+id/song_drag"
         a:layout_width="wrap_content"
         a:layout_height="fill_parent"
-        a:paddingLeft="5dip"
         a:paddingStart="5dip"
-        a:paddingRight="0dip"
         a:paddingEnd="0dip"
         a:background="@android:color/transparent"
         a:focusable="false"
@@ -26,7 +24,7 @@
         a:layout_height="fill_parent"
         a:checkMark="?attr/button_check_custom"
         a:gravity="center_vertical"
-        a:paddingRight="4dip"/>
+        a:paddingEnd="4dip"/>
 
     <include layout="@layout/song_details" />
 
@@ -82,7 +80,7 @@
             a:id="@+id/song_five_star_5"
             a:layout_width="10dip"
             a:layout_height="fill_parent"
-            a:layout_marginRight="8dip"
+            a:layout_marginEnd="8dip"
             a:background="@android:color/transparent"
             a:focusable="false"
             a:gravity="center_vertical"
@@ -98,7 +96,7 @@
         a:background="@android:color/transparent"
         a:focusable="false"
         a:gravity="center_vertical"
-        a:paddingRight="8dip"
+        a:paddingEnd="8dip"
         a:src="?attr/star_hollow" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/layout/time_span_dialog.xml b/ultrasonic/src/main/res/layout/time_span_dialog.xml
index 30b9be60..920a87b6 100644
--- a/ultrasonic/src/main/res/layout/time_span_dialog.xml
+++ b/ultrasonic/src/main/res/layout/time_span_dialog.xml
@@ -44,7 +44,7 @@
             android:layout_height="wrap_content"
             android:id="@+id/timeSpanSpinner"
             android:layout_alignBottom="@+id/timeSpanEditText"
-            android:layout_toRightOf="@+id/timeSpanEditText"/>
+            android:layout_toEndOf="@+id/timeSpanEditText"/>
     </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/layout/update_playlist.xml b/ultrasonic/src/main/res/layout/update_playlist.xml
index 57664f99..cc33e81e 100644
--- a/ultrasonic/src/main/res/layout/update_playlist.xml
+++ b/ultrasonic/src/main/res/layout/update_playlist.xml
@@ -12,7 +12,7 @@
 			android:id="@+id/get_playlist_name_label"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="4dp"
+			android:layout_marginStart="4dp"
 			android:textSize="20sp"
 			android:text="@string/common.name" />
 		<EditText
@@ -21,7 +21,7 @@
 			android:layout_width="0dip"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:layout_marginLeft="4dp"
+			android:layout_marginStart="4dp"
 			android:hint="@string/common.name" />
 	</LinearLayout>
 		
@@ -34,7 +34,7 @@
 			android:id="@+id/get_playlist_comment_label"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="4dp"
+			android:layout_marginStart="4dp"
 			android:textSize="20sp"
 			android:text="@string/common.comment" />
 		<EditText
@@ -43,7 +43,7 @@
 			android:layout_width="0dip"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:layout_marginLeft="4dp"
+			android:layout_marginStart="4dp"
 			android:hint="@string/common.comment" />
 	</LinearLayout>
 
@@ -56,7 +56,7 @@
 			android:id="@+id/get_playlist_public_label"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="4dp"
+			android:layout_marginStart="4dp"
 			android:textSize="20sp"
 			android:text="@string/common.public" />
 		<CheckBox
@@ -64,7 +64,7 @@
 			android:layout_width="0dip"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:layout_marginLeft="4dp"
+			android:layout_marginStart="4dp"
 			android:checked="false"/>
 	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/layout/video_details.xml b/ultrasonic/src/main/res/layout/video_details.xml
index 08ac014e..2ea9473c 100644
--- a/ultrasonic/src/main/res/layout/video_details.xml
+++ b/ultrasonic/src/main/res/layout/video_details.xml
@@ -19,8 +19,8 @@
             a:layout_gravity="left|center_vertical"
             a:layout_weight="1"
             a:ellipsize="end"
-            a:paddingLeft="4dip"
-            a:paddingRight="2dip"
+            a:paddingStart="4dip"
+            a:paddingEnd="2dip"
             a:singleLine="true"
             a:textAppearance="?android:attr/textAppearanceMedium"/>
 
@@ -29,8 +29,8 @@
             a:layout_width="wrap_content"
             a:layout_height="wrap_content"
             a:layout_gravity="right|center_vertical"
-            a:paddingLeft="2dip"
-            a:paddingRight="6dip"
+            a:paddingStart="2dip"
+            a:paddingEnd="6dip"
             a:singleLine="true"
             a:textAppearance="?android:attr/textAppearanceSmall"/>
     </LinearLayout>
diff --git a/ultrasonic/src/main/res/layout/video_list_item.xml b/ultrasonic/src/main/res/layout/video_list_item.xml
index 0066fb2d..5851bbca 100644
--- a/ultrasonic/src/main/res/layout/video_list_item.xml
+++ b/ultrasonic/src/main/res/layout/video_list_item.xml
@@ -10,7 +10,7 @@
         a:layout_width="wrap_content"
         a:layout_height="fill_parent"
         a:gravity="center_vertical"
-        a:paddingLeft="1dip"
+        a:paddingStart="1dip"
         a:visibility="gone" />
 
     <include layout="@layout/video_details"
@@ -23,7 +23,7 @@
         a:background="@android:color/transparent"
         a:focusable="false"
         a:gravity="center_vertical"
-        a:paddingRight="8dip"
+        a:paddingEnd="8dip"
         a:src="?attr/star_hollow" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/values/styles.xml b/ultrasonic/src/main/res/values/styles.xml
index d3f040f1..b90b338a 100644
--- a/ultrasonic/src/main/res/values/styles.xml
+++ b/ultrasonic/src/main/res/values/styles.xml
@@ -15,7 +15,7 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingStart">16dp</item>
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">end</item>
     </style>