diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index e24fbf99f..c96a6201e 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -38,15 +38,13 @@
                 android:text="@string/server_protocol"
                 android:id="@+id/label_server_protocol"
                 android:layout_centerVertical="true"
-                android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true" />
 
             <Spinner
                 android:id="@+id/clone_protocol"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_toEndOf="@+id/label_server_protocol"
-                android:layout_toRightOf="@+id/label_server_protocol" />
+                android:layout_toEndOf="@+id/label_server_protocol" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -61,7 +59,6 @@
                 android:text="@string/server_user"
                 android:id="@+id/label_server_user"
                 android:layout_centerVertical="true"
-                android:layout_alignParentLeft="true"
                 android:paddingBottom="8dp"
                 android:layout_alignParentStart="true" />
 
@@ -70,11 +67,8 @@
                 android:layout_height="wrap_content"
                 android:hint="@string/server_user_hint"
                 android:id="@+id/server_user"
-                android:layout_marginLeft="8dp"
                 android:layout_marginStart="8dp"
                 android:layout_toEndOf="@+id/label_server_user"
-                android:layout_toRightOf="@+id/label_server_user"
-                android:layout_alignParentRight="true"
                 android:layout_alignParentEnd="true"
                 android:inputType="textWebEmailAddress"/>
         </RelativeLayout>
@@ -91,7 +85,6 @@
                 android:paddingBottom="8dp"
                 android:id="@+id/label_server_url"
                 android:layout_centerVertical="true"
-                android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true" />
 
             <EditText
@@ -99,11 +92,8 @@
                 android:layout_height="wrap_content"
                 android:hint="@string/server_url_hint"
                 android:id="@+id/server_url"
-                android:layout_marginLeft="8dp"
                 android:layout_marginStart="8dp"
                 android:layout_toEndOf="@+id/label_server_url"
-                android:layout_toRightOf="@+id/label_server_url"
-                android:layout_toLeftOf="@+id/label_server_port"
                 android:layout_toStartOf="@+id/label_server_port"
                 android:inputType="textWebEmailAddress"
                 tools:ignore="TextFields" />
@@ -113,7 +103,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/server_port"
                 android:layout_toStartOf="@+id/server_port"
                 android:paddingBottom="8dp"
                 android:text=":"
@@ -124,7 +113,6 @@
                 android:layout_height="wrap_content"
                 android:hint="@string/server_port_hint"
                 android:id="@+id/server_port"
-                android:layout_alignParentRight="true"
                 android:layout_alignParentEnd="true"
                 android:inputType="number"/>
 
@@ -143,19 +131,15 @@
                 android:paddingBottom="8dp"
                 android:id="@+id/label_server_path"
                 android:layout_centerVertical="true"
-                android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true" />
 
             <EditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/server_path_hint"
-                android:layout_marginLeft="8dp"
                 android:layout_marginStart="8dp"
                 android:id="@+id/server_path"
                 android:layout_toEndOf="@+id/label_server_path"
-                android:layout_toRightOf="@+id/label_server_path"
-                android:layout_alignParentRight="true"
                 android:layout_alignParentEnd="true"
                 android:inputType="textWebEmailAddress"/>
         </RelativeLayout>
@@ -201,15 +185,13 @@
                 android:text="@string/connection_mode"
                 android:id="@+id/label_connection_mode"
                 android:layout_centerVertical="true"
-                android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true" />
 
             <Spinner
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:id="@+id/connection_mode"
-                android:layout_toEndOf="@+id/label_connection_mode"
-                android:layout_toRightOf="@+id/label_connection_mode" />
+                android:layout_toEndOf="@+id/label_connection_mode" />
         </RelativeLayout>
 
         <Button
diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml
index ec835aabc..2283353b7 100644
--- a/app/src/main/res/layout/activity_git_config.xml
+++ b/app/src/main/res/layout/activity_git_config.xml
@@ -15,7 +15,6 @@
         style="@android:style/TextAppearance.Large"
         android:layout_width="344dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:background="@drawable/bottom_line"
@@ -32,7 +31,6 @@
         android:id="@+id/label_git_user_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
         android:paddingBottom="8dp"
         android:text="@string/git_user_name"
@@ -68,7 +66,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:layout_marginTop="8dp"
         android:hint="@string/git_user_email_hint"
         android:inputType="textWebEmailAddress"
@@ -82,7 +79,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:layout_marginTop="8dp"
         android:onClick="applyGitConfigs"
         android:text="@string/crypto_save"
@@ -111,7 +107,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:onClick="abortRebase"
@@ -129,8 +124,7 @@
         android:layout_marginTop="8dp"
         android:text="@string/commit_hash"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView6"
-        android:layout_marginLeft="8dp" />
+        app:layout_constraintTop_toBottomOf="@+id/textView6" />
 
     <TextView
         android:id="@+id/git_commit_hash"
@@ -143,7 +137,6 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintStart_toEndOf="@+id/textView7"
-        android:layout_marginLeft="16dp"
         tools:ignore="HardcodedText" />
 
 
diff --git a/app/src/main/res/layout/autofill_recycler_view.xml b/app/src/main/res/layout/autofill_recycler_view.xml
index c947d58a7..c0bbacdbd 100644
--- a/app/src/main/res/layout/autofill_recycler_view.xml
+++ b/app/src/main/res/layout/autofill_recycler_view.xml
@@ -32,6 +32,5 @@
         app:borderWidth="0dp"
         android:layout_margin="@dimen/fab_compat_margin"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index de3d0f03a..4536042a5 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -23,39 +23,33 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="16dp"
                 android:layout_marginStart="16dp"
-                android:text="CATEGORY HERE"
                 android:textColor="@color/grey_500"
                 android:textIsSelectable="false"
                 android:textSize="18sp"
-                tools:ignore="HardcodedText" />
+                tools:text="CATEGORY HERE" />
 
             <TextView
                 android:id="@+id/crypto_password_file"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginStart="@dimen/activity_horizontal_margin"
-                android:text="PASSWORD FILE NAME HERE"
                 android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
                 android:textColor="@color/accent"
                 android:textSize="24sp"
                 android:textStyle="bold"
-                tools:ignore="HardcodedText" />
+                tools:text="PASSWORD FILE NAME HERE" />
 
             <TextView
                 android:id="@+id/crypto_password_last_changed"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="16dp"
                 android:layout_marginStart="16dp"
-                android:text="LAST CHANGED HERE"
                 android:textColor="@color/grey_500"
                 android:textIsSelectable="false"
                 android:textSize="18sp"
-                tools:ignore="HardcodedText" />
+                tools:text="LAST CHANGED HERE" />
         </LinearLayout>
 
         <ImageView
@@ -133,7 +127,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
                     android:layout_alignParentTop="true"
                     android:background="@color/background"
                     android:contentDescription="@string/copy_username"
@@ -144,10 +137,8 @@
                     android:id="@+id/crypto_username_show_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:layout_alignParentTop="true"
-                    android:layout_toLeftOf="@id/crypto_copy_username"
                     android:layout_toStartOf="@id/crypto_copy_username"
                     android:text="@string/username"
                     android:textColor="@android:color/black"
@@ -158,10 +149,8 @@
                     android:id="@+id/crypto_username_show"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:layout_below="@id/crypto_username_show_label"
-                    android:layout_toLeftOf="@id/crypto_copy_username"
                     android:layout_toStartOf="@id/crypto_copy_username"
                     android:textColor="@android:color/black"
                     android:textIsSelectable="true"
@@ -173,7 +162,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
                     android:layout_below="@id/crypto_username_show"
                     android:background="@color/background"
                     android:contentDescription="@string/copy_otp"
@@ -184,10 +172,8 @@
                     android:id="@+id/crypto_otp_show_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:layout_below="@id/crypto_username_show"
-                    android:layout_toLeftOf="@id/crypto_copy_otp"
                     android:layout_toStartOf="@id/crypto_copy_otp"
                     android:text="@string/otp"
                     android:textColor="@android:color/black"
@@ -197,10 +183,8 @@
                     android:id="@+id/crypto_otp_show"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:layout_below="@id/crypto_otp_show_label"
-                    android:layout_toLeftOf="@id/crypto_copy_otp"
                     android:layout_toStartOf="@id/crypto_copy_otp"
                     android:textColor="@android:color/black"
                     android:textIsSelectable="true"
@@ -210,7 +194,6 @@
                     android:id="@+id/crypto_extra_show_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:layout_below="@id/crypto_otp_show"
                     android:text="@string/extra_content"
@@ -221,7 +204,6 @@
                     android:id="@+id/crypto_extra_show"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:layout_below="@id/crypto_extra_show_label"
                     android:textColor="@android:color/black"
@@ -235,7 +217,6 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/crypto_extra_show"
                     android:layout_alignParentStart="true"
-                    android:layout_alignParentLeft="true"
                     android:checked="false"
                     android:paddingTop="8dp"
                     android:textOff="@string/show_extra"
diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml
index 39cfb80e2..f84792e88 100644
--- a/app/src/main/res/layout/encrypt_layout.xml
+++ b/app/src/main/res/layout/encrypt_layout.xml
@@ -26,13 +26,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginStart="@dimen/activity_horizontal_margin"
-                android:text="CATEGORY HERE"
                 android:textColor="@color/grey_500"
                 android:textIsSelectable="false"
                 android:textSize="18sp"
-                tools:ignore="HardcodedText" />
+                tools:text="CATEGORY HERE" />
 
             <EditText
                 android:id="@+id/crypto_password_file_edit"
@@ -49,9 +47,6 @@
                 android:id="@+id/textView2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
                 android:text="@string/crypto_pass_label"
                 android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/fragment_to_clone_or_not.xml b/app/src/main/res/layout/fragment_to_clone_or_not.xml
index cfeb529ca..7d9341baf 100644
--- a/app/src/main/res/layout/fragment_to_clone_or_not.xml
+++ b/app/src/main/res/layout/fragment_to_clone_or_not.xml
@@ -40,9 +40,7 @@
             android:text="@string/action_settings"
             android:textColor="@android:color/white"
             android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
-            android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginEnd="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_margin"
             android:textAllCaps="true"
@@ -65,7 +63,6 @@
             android:text="@string/initialize"
             android:id="@+id/button"
             android:layout_alignTop="@+id/main_clone_button"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:textSize="12sp" />
         <Button
@@ -77,7 +74,6 @@
             android:onClick="cloneExistingRepository"
             android:text="@string/clone"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
             android:textSize="12sp"
             tools:ignore="RelativeOverlap" />
diff --git a/app/src/main/res/layout/git_passphrase_layout.xml b/app/src/main/res/layout/git_passphrase_layout.xml
index b1bda9208..fb0c05140 100644
--- a/app/src/main/res/layout/git_passphrase_layout.xml
+++ b/app/src/main/res/layout/git_passphrase_layout.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linearLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -25,7 +24,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:text="@string/remember_the_passphrase"
diff --git a/app/src/main/res/layout/otp_confirm_layout.xml b/app/src/main/res/layout/otp_confirm_layout.xml
index e9bcfbc58..261875bfb 100644
--- a/app/src/main/res/layout/otp_confirm_layout.xml
+++ b/app/src/main/res/layout/otp_confirm_layout.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -10,7 +9,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:text="@string/dialog_update_check"
diff --git a/app/src/main/res/layout/password_recycler_view.xml b/app/src/main/res/layout/password_recycler_view.xml
index 679267d2a..d10db5fc2 100644
--- a/app/src/main/res/layout/password_recycler_view.xml
+++ b/app/src/main/res/layout/password_recycler_view.xml
@@ -26,6 +26,5 @@
         app:borderWidth="0dp"
         android:layout_margin="@dimen/fab_compat_margin"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"/>
 </RelativeLayout>