diff --git a/app/lint.xml b/app/lint.xml
index 9b706ddf7..bab976a18 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -40,6 +40,8 @@
 
     <issue id="PluralsCandidate" severity="error"/>
     <issue id="HardcodedText" severity="error"/>
+    <issue id="RtlCompat" severity="error"/>
+    <issue id="RtlEnabled" severity="error"/>
 
     <!-- both the correct and deprecated locales need to be present for
          them to be recognized on all devices -->
diff --git a/app/src/full/res/layout/swap_confirm_receive.xml b/app/src/full/res/layout/swap_confirm_receive.xml
index bb92ad9b1..a65d43043 100644
--- a/app/src/full/res/layout/swap_confirm_receive.xml
+++ b/app/src/full/res/layout/swap_confirm_receive.xml
@@ -54,7 +54,6 @@
             android:layout_marginTop="45dp">
         <!-- 80px * 0.56 = 45dp -->
 
-        <!-- TODO: Remove associated style files style="@style/SwapTheme.Wizard.ReceiveSwap.Deny"-->
         <Button
                 android:id="@+id/confirm_receive_yes"
                 android:text="@string/no"
@@ -65,7 +64,6 @@
                 android:layout_marginRight="25dp"
                 tools:ignore="UnusedAttribute"/>
 
-        <!-- TODO: Remove associated style files style="@style/SwapTheme.Wizard.ReceiveSwap.Confirm" -->
         <Button
                 android:id="@+id/confirm_receive_no"
                 android:text="@string/yes"
diff --git a/app/src/full/res/layout/swap_start_swap.xml b/app/src/full/res/layout/swap_start_swap.xml
index 7a2137e32..2eb22f17a 100644
--- a/app/src/full/res/layout/swap_start_swap.xml
+++ b/app/src/full/res/layout/swap_start_swap.xml
@@ -1,9 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!-- TODO: Add paddingStart in places where there is only paddingLeft. However Android Studio lint
-     gives an error, which is discussed here:
-     http://stackoverflow.com/questions/27449776/conflicting-lint-messages-regarding-paddingstart-usage?lq=1
-     -->
 <org.fdroid.fdroid.views.swap.StartSwapView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
@@ -31,6 +26,7 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:tint="@color/swap_grey_icon"
+                android:contentDescription="@string/use_bluetooth"
                 android:src="@drawable/ic_bluetooth_white"/>
 
         <LinearLayout
@@ -79,6 +75,7 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:tint="@color/swap_grey_icon"
+                android:contentDescription="@string/wifi"
                 android:src="@drawable/ic_network_wifi_white"/>
 
         <LinearLayout
@@ -168,6 +165,7 @@
                 android:drawablePadding="10dp"
                 android:paddingLeft="25dp"
                 android:paddingRight="25dp"
+                android:paddingStart="25dp"
                 android:paddingEnd="25dp"
                 android:background="@android:color/transparent"/>
 
@@ -181,6 +179,7 @@
                 android:drawablePadding="10dp"
                 android:paddingLeft="25dp"
                 android:paddingRight="25dp"
+                android:paddingStart="25dp"
                 android:paddingEnd="25dp"
                 android:background="@android:color/transparent"/>
 
diff --git a/app/src/main/res/layout/app_details2_version_item.xml b/app/src/main/res/layout/app_details2_version_item.xml
index 194a08489..452f8cd64 100644
--- a/app/src/main/res/layout/app_details2_version_item.xml
+++ b/app/src/main/res/layout/app_details2_version_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RelativeLayout
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
@@ -11,6 +10,8 @@
     android:paddingBottom="5dp"
     android:paddingLeft="10dp"
     android:paddingRight="4dp"
+    android:paddingStart="10dp"
+    android:paddingEnd="4dp"
     android:background="?attr/selectableItemBackground">
 
     <LinearLayout android:id="@+id/basic_layout"
diff --git a/app/src/main/res/layout/updateable_app_status_item.xml b/app/src/main/res/layout/updateable_app_status_item.xml
index 3906b848d..c8918bea8 100644
--- a/app/src/main/res/layout/updateable_app_status_item.xml
+++ b/app/src/main/res/layout/updateable_app_status_item.xml
@@ -76,7 +76,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="8dp"
+            android:paddingRight="8dp"
             android:paddingStart="8dp"
+            android:paddingEnd="8dp"
             android:src="@drawable/ic_cancel"
             android:contentDescription="@string/cancel"
             android:background="@android:color/transparent"