diff --git a/app/build.gradle b/app/build.gradle
index 45a23f7d..f8ad4a6a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "io.lbry.browser"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 1602
-        versionName "0.16.2"
+        versionCode 1601
+        versionName "0.16.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -117,7 +117,6 @@ dependencies {
 
     implementation 'com.arthenica:mobile-ffmpeg-full-gpl:4.3.1.LTS'
 
-    implementation 'org.bitcoinj:bitcoinj-tools:0.14.7'
     implementation 'org.java-websocket:Java-WebSocket:1.5.1'
 
     compileOnly 'org.projectlombok:lombok:1.18.10'
@@ -128,8 +127,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-    __32bitImplementation 'io.lbry:lbrysdk32:0.81.0'
-    __64bitImplementation 'io.lbry:lbrysdk64:0.81.0'
+    __32bitImplementation 'io.lbry:lbrysdk32:0.80.0'
+    __64bitImplementation 'io.lbry:lbrysdk64:0.80.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 145b4940..306751c9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,6 +68,10 @@
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <data android:scheme="https" android:host="open.lbry.com"/>
+                <data android:scheme="https" android:host="lbry.tv"/>
+                <data android:scheme="https" android:host="lbry.lat"/>
+                <data android:scheme="https" android:host="lbry.fr"/>
+                <data android:scheme="https" android:host="lbry.in"/>
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
diff --git a/app/src/main/java/io/lbry/browser/FirstRunActivity.java b/app/src/main/java/io/lbry/browser/FirstRunActivity.java
index b6d6eecb..ad10a6ef 100644
--- a/app/src/main/java/io/lbry/browser/FirstRunActivity.java
+++ b/app/src/main/java/io/lbry/browser/FirstRunActivity.java
@@ -15,22 +15,12 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.text.HtmlCompat;
 import androidx.preference.PreferenceManager;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
 import io.lbry.browser.exceptions.AuthTokenInvalidatedException;
 import io.lbry.browser.utils.Helper;
 import io.lbry.browser.utils.Lbry;
 import io.lbry.browser.utils.LbryAnalytics;
 import io.lbry.browser.utils.Lbryio;
 import io.lbry.lbrysdk.LbrynetService;
-import io.lbry.lbrysdk.ServiceHelper;
-import io.lbry.lbrysdk.Utils;
 
 public class FirstRunActivity extends AppCompatActivity {
 
@@ -54,7 +44,12 @@ public class FirstRunActivity extends AppCompatActivity {
         });
 
         registerAuthReceiver();
-        findViewById(R.id.welcome_wait_container).setVisibility(View.VISIBLE);
+        if (!Lbry.SDK_READY) {
+            findViewById(R.id.welcome_wait_container).setVisibility(View.VISIBLE);
+        } else {
+            authenticate();
+        }
+
         IntentFilter filter = new IntentFilter();
         filter.addAction(MainActivity.ACTION_SDK_READY);
         filter.addAction(LbrynetService.ACTION_STOP_SERVICE);
@@ -67,38 +62,10 @@ public class FirstRunActivity extends AppCompatActivity {
                     authenticate();
                 } else if (LbrynetService.ACTION_STOP_SERVICE.equals(action)) {
                     finish();
-                    if (MainActivity.instance != null) {
-                        MainActivity.instance.finish();
-                    }
                 }
             }
         };
         registerReceiver(sdkReceiver, filter);
-
-        CheckInstallIdTask task = new CheckInstallIdTask(this, new CheckInstallIdTask.InstallIdHandler() {
-            @Override
-            public void onInstallIdChecked(boolean result) {
-                // start the sdk from FirstRun
-                boolean serviceRunning = MainActivity.isServiceRunning(MainActivity.instance, LbrynetService.class);
-                if (!serviceRunning) {
-                    Lbry.SDK_READY = false;
-                    ServiceHelper.start(MainActivity.instance, "", LbrynetService.class, "lbrynetservice");
-                }
-
-                if (result) {
-                    // install_id generated and validated, authenticate now
-                    authenticate();
-                    return;
-                }
-
-                // we weren't able to generate the install_id ourselves, depend on the sdk for that
-                if (Lbry.SDK_READY) {
-                    authenticate();
-                    return;
-                }
-            }
-        });
-        task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
     public void onResume() {
@@ -167,75 +134,6 @@ public class FirstRunActivity extends AppCompatActivity {
         super.onDestroy();
     }
 
-    private void generateIdAndAuthenticate() {
-
-    }
-
-    private static class CheckInstallIdTask extends AsyncTask<Void, Void, Boolean> {
-        private Context context;
-        private InstallIdHandler handler;
-        public CheckInstallIdTask(Context context, InstallIdHandler handler) {
-            this.context = context;
-            this.handler = handler;
-        }
-        protected Boolean doInBackground(Void... params) {
-            // Load the installation id from the file system
-            String lbrynetDir = String.format("%s/%s", Utils.getAppInternalStorageDir(context), "lbrynet");
-            File dir = new File(lbrynetDir);
-            boolean dirExists = dir.isDirectory();
-            if (!dirExists) {
-                dirExists = dir.mkdirs();
-            }
-
-            if (!dirExists) {
-                return false;
-            }
-
-            String installIdPath = String.format("%s/install_id", lbrynetDir);
-            File file = new File(installIdPath);
-            String installId  = null;
-            if (!file.exists()) {
-                // generate the install_id
-                installId = Lbry.generateId();
-                BufferedWriter writer = null;
-                try {
-                    writer = new BufferedWriter(new FileWriter(file));
-                    writer.write(installId);
-                    android.util.Log.d("LbryMain", "Generated install ID=" + installId);
-                } catch (IOException ex) {
-                    return false;
-                } finally {
-                    Helper.closeCloseable(writer);
-                }
-            } else {
-                // read the installation id from the file
-                BufferedReader reader = null;
-                try {
-                    reader = new BufferedReader(new InputStreamReader(new FileInputStream(installIdPath)));
-                    installId = reader.readLine();
-                } catch (IOException ex) {
-                    return false;
-                } finally {
-                    Helper.closeCloseable(reader);
-                }
-            }
-
-            if (!Helper.isNullOrEmpty(installId)) {
-                Lbry.INSTALLATION_ID = installId;
-            }
-            return !Helper.isNullOrEmpty(installId);
-        }
-        protected void onPostExecute(Boolean result) {
-            if (handler != null) {
-                handler.onInstallIdChecked(result);
-            }
-        }
-
-        public interface InstallIdHandler {
-            void onInstallIdChecked(boolean result);
-        }
-    }
-
     private static class AuthenticateTask extends AsyncTask<Void, Void, Void> {
         private Context context;
         public AuthenticateTask(Context context) {
diff --git a/app/src/main/java/io/lbry/browser/MainActivity.java b/app/src/main/java/io/lbry/browser/MainActivity.java
index bd7a7a26..110f01a1 100644
--- a/app/src/main/java/io/lbry/browser/MainActivity.java
+++ b/app/src/main/java/io/lbry/browser/MainActivity.java
@@ -211,7 +211,6 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
     private static final String SPECIAL_URL_PREFIX = "lbry://?";
     private static final int REMOTE_NOTIFICATION_REFRESH_TTL = 300000; // 5 minutes
     public static final String SKU_SKIP = "lbryskip";
-    public static MainActivity instance;
 
     private boolean shuttingDown;
     private Date remoteNotifcationsLastLoaded;
@@ -394,7 +393,6 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        instance = this;
         // workaround to fix dark theme because https://issuetracker.google.com/issues/37124582
         try {
             new WebView(this);
@@ -1142,14 +1140,12 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
         checkFirstRun();
         checkNowPlaying();
 
-        if (isFirstRunCompleted()) {
-            // check (and start) the LBRY SDK service
-            serviceRunning = isServiceRunning(this, LbrynetService.class);
-            if (!serviceRunning) {
-                Lbry.SDK_READY = false;
-                //findViewById(R.id.global_sdk_initializing_status).setVisibility(View.VISIBLE);
-                ServiceHelper.start(this, "", LbrynetService.class, "lbrynetservice");
-            }
+        // check (and start) the LBRY SDK service
+        serviceRunning = isServiceRunning(this, LbrynetService.class);
+        if (!serviceRunning) {
+            Lbry.SDK_READY = false;
+            //findViewById(R.id.global_sdk_initializing_status).setVisibility(View.VISIBLE);
+            ServiceHelper.start(this, "", LbrynetService.class, "lbrynetservice");
         }
         checkSdkReady();
         showSignedInUser();
@@ -1160,11 +1156,6 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
         }*/
     }
 
-    public boolean isFirstRunCompleted() {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
-        return sp.getBoolean(PREFERENCE_KEY_INTERNAL_FIRST_RUN_COMPLETED, false);
-    }
-
     private void checkPurchases() {
         if (billingClient != null) {
             Purchase.PurchasesResult result = billingClient.queryPurchases(BillingClient.SkuType.INAPP);
diff --git a/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java b/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
index 93b7958d..c36cbf3c 100644
--- a/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
@@ -323,7 +323,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
         int paddingBottom = position == getItemCount() - 1 ? 16 : 8;
         int paddingTopScaled = Helper.getScaledValue(paddingTop, scale);
         int paddingBottomScaled = Helper.getScaledValue(paddingBottom, scale);
-        vh.itemView.setPadding(vh.itemView.getPaddingStart(), paddingTopScaled, vh.itemView.getPaddingEnd(), paddingBottomScaled);
+        vh.itemView.setPadding(vh.itemView.getPaddingLeft(), paddingTopScaled, vh.itemView.getPaddingRight(), paddingBottomScaled);
 
         Claim original = items.get(position);
         boolean isRepost = Claim.TYPE_REPOST.equalsIgnoreCase(original.getValueType());
diff --git a/app/src/main/java/io/lbry/browser/adapter/CommentListAdapter.java b/app/src/main/java/io/lbry/browser/adapter/CommentListAdapter.java
index 740f6fc5..dbb0a8e5 100644
--- a/app/src/main/java/io/lbry/browser/adapter/CommentListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/CommentListAdapter.java
@@ -173,9 +173,9 @@ public class CommentListAdapter extends RecyclerView.Adapter<CommentListAdapter.
     public void onBindViewHolder(ViewHolder holder, int position) {
         Comment comment = items.get(position);
         holder.itemView.setPadding(
-                nested ? Helper.getScaledValue(56, scale) : holder.itemView.getPaddingStart(),
+                nested ? Helper.getScaledValue(56, scale) : holder.itemView.getPaddingLeft(),
                 holder.itemView.getPaddingTop(),
-                nested ? 0 : holder.itemView.getPaddingEnd(),
+                nested ? 0 : holder.itemView.getPaddingRight(),
                 holder.itemView.getPaddingBottom());
 
         holder.channelName.setText(comment.getChannelName());
diff --git a/app/src/main/java/io/lbry/browser/utils/Helper.java b/app/src/main/java/io/lbry/browser/utils/Helper.java
index e5ac6410..8fd0b416 100644
--- a/app/src/main/java/io/lbry/browser/utils/Helper.java
+++ b/app/src/main/java/io/lbry/browser/utils/Helper.java
@@ -20,6 +20,7 @@ import android.provider.MediaStore;
 import android.text.method.LinkMovementMethod;
 import android.view.ContextMenu;
 import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -31,7 +32,6 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.gms.common.util.Hex;
 
-import org.bitcoinj.core.Base58;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/app/src/main/java/io/lbry/browser/utils/Lbry.java b/app/src/main/java/io/lbry/browser/utils/Lbry.java
index fb499ffa..1d0a7f5c 100644
--- a/app/src/main/java/io/lbry/browser/utils/Lbry.java
+++ b/app/src/main/java/io/lbry/browser/utils/Lbry.java
@@ -2,15 +2,12 @@ package io.lbry.browser.utils;
 
 import android.util.Log;
 
-import org.bitcoinj.core.Base58;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
 import java.security.KeyStore;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -20,7 +17,6 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
 import io.lbry.browser.exceptions.ApiCallException;
@@ -526,20 +522,4 @@ public final class Lbry {
             }
         }
     }
-
-    public static String generateId() {
-        return generateId(64);
-    }
-    public static String generateId(int numBytes) {
-        byte[] arr = new byte[numBytes];
-        new Random().nextBytes(arr);
-        try {
-            MessageDigest md = MessageDigest.getInstance("SHA-384");
-            byte[] hash = md.digest(arr);
-            return Base58.encode(hash);
-        } catch (NoSuchAlgorithmException e) {
-            // pass
-            return null;
-        }
-    }
 }
diff --git a/app/src/main/java/io/lbry/browser/utils/LbryUri.java b/app/src/main/java/io/lbry/browser/utils/LbryUri.java
index 94458cfa..7b543bb6 100644
--- a/app/src/main/java/io/lbry/browser/utils/LbryUri.java
+++ b/app/src/main/java/io/lbry/browser/utils/LbryUri.java
@@ -18,7 +18,7 @@ public class LbryUri {
     public static final int CLAIM_ID_MAX_LENGTH = 40;
 
     private static final String REGEX_PART_PROTOCOL = "^((?:lbry://|https://)?)";
-    private static final String REGEX_PART_HOST = "((?:open.lbry.com/)?)";
+    private static final String REGEX_PART_HOST = "((?:open.lbry.com/|lbry.tv/|lbry.lat/|lbry.fr/|lbry.in/)?)";
     private static final String REGEX_PART_STREAM_OR_CHANNEL_NAME = "([^:$#/]*)";
     private static final String REGEX_PART_MODIFIER_SEPARATOR = "([:$#]?)([^/]*)";
     private static final String QUERY_STRING_BREAKER = "^([\\S]+)([?][\\S]*)";
@@ -128,9 +128,14 @@ public class LbryUri {
         boolean isChannel = includesChannel && Helper.isNullOrEmpty(possibleStreamName);
         String channelName = includesChannel && streamOrChannelName.length() > 1 ? streamOrChannelName.substring(1) : null;
 
-        // It would have thrown already on the RegEx parser if protocol value was incorrect
-        // open.lbry.com uses ':' as ModSeparators while lbry:// expects '#'
-        if (components.get(1).equals("open.lbry.com/")) {
+        /*
+         * It would have thrown already on the RegEx parser if protocol value was incorrect
+         * or HTTPS host was unknown to us.
+         *
+         * [https://] hosts use ':' as ModSeparators while [lbry://] protocol expects '#'
+         */
+
+        if (!components.get(1).isEmpty()) {
             if (primaryModSeparator.equals(":"))
                 primaryModSeparator = "#";
             if (secondaryModSeparator.equals(":"))
diff --git a/app/src/main/res/layout/activity_first_run.xml b/app/src/main/res/layout/activity_first_run.xml
index 3c4e7a41..181dc545 100644
--- a/app/src/main/res/layout/activity_first_run.xml
+++ b/app/src/main/res/layout/activity_first_run.xml
@@ -24,7 +24,7 @@
                     android:id="@+id/welcome_progress_bar"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
                     android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/welcome_wait_text"
diff --git a/app/src/main/res/layout/activity_verification.xml b/app/src/main/res/layout/activity_verification.xml
index 23ec89f3..95ef31fd 100644
--- a/app/src/main/res/layout/activity_verification.xml
+++ b/app/src/main/res/layout/activity_verification.xml
@@ -21,7 +21,7 @@
             android:visibility="gone"
             android:layout_width="36dp"
             android:layout_height="36dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
             android:layout_marginTop="8dp"
             android:background="?attr/selectableItemBackground"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 9a782b3d..6777cd17 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -33,17 +33,17 @@
                     android:id="@+id/wunderbar"
                     android:background="@android:color/transparent"
                     android:layout_centerVertical="true"
-                    android:drawableStart="@drawable/ic_search"
+                    android:drawableLeft="@drawable/ic_search"
                     android:drawablePadding="8dp"
                     android:drawableTint="@color/actionBarForeground"
                     android:fontFamily="@font/inter"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="24dp"
                     android:hint="@string/uri_placeholder"
                     android:imeOptions="actionGo"
                     android:inputType="textNoSuggestions"
-                    android:paddingEnd="36dp"
+                    android:paddingRight="36dp"
                     android:selectAllOnFocus="true"
                     android:singleLine="true"
                     android:textFontWeight="300"
@@ -54,8 +54,8 @@
                     android:background="?attr/selectableItemBackground"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="24dp"
-                    android:layout_alignParentEnd="true"
+                    android:layout_marginRight="24dp"
+                    android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:visibility="gone">
                     <ImageView
@@ -71,7 +71,7 @@
                     android:background="?attr/selectableItemBackground"
                     android:layout_width="48dp"
                     android:layout_height="match_parent"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:layout_centerVertical="true">
                     <ImageView
                         android:id="@+id/notifications_toggle_icon"
@@ -88,10 +88,10 @@
                         android:fontFamily="@font/inter"
                         android:gravity="center_horizontal"
                         android:minWidth="12dp"
-                        android:paddingStart="2dp"
-                        android:paddingEnd="2dp"
+                        android:paddingLeft="2dp"
+                        android:paddingRight="2dp"
                         android:layout_marginTop="12dp"
-                        android:layout_marginStart="24dp"
+                        android:layout_marginLeft="24dp"
                         android:textColor="@color/white"
                         android:textSize="10sp"
                         android:visibility="invisible"
@@ -171,7 +171,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
                     android:layout_gravity="center_vertical"
                     android:fontFamily="@font/inter"
                     android:text="@string/installation_id_loaded"
@@ -195,7 +195,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
                     android:layout_gravity="center_vertical"
                     android:fontFamily="@font/inter"
                     android:text="@string/known_tags_loaded"
@@ -219,7 +219,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
                     android:layout_gravity="center_vertical"
                     android:fontFamily="@font/inter"
                     android:text="@string/exchange_rate_loaded"
@@ -243,7 +243,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
                     android:layout_gravity="center_vertical"
                     android:fontFamily="@font/inter"
                     android:text="@string/user_authenticated"
@@ -267,7 +267,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
                     android:layout_gravity="center_vertical"
                     android:fontFamily="@font/inter"
                     android:text="@string/installation_registered"
@@ -291,7 +291,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
                     android:layout_gravity="center_vertical"
                     android:fontFamily="@font/inter"
                     android:text="@string/subscriptions_loaded"
@@ -315,7 +315,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
                     android:layout_gravity="center_vertical"
                     android:fontFamily="@font/inter"
                     android:text="@string/subscriptions_resolved"
diff --git a/app/src/main/res/layout/card_invites_by_email.xml b/app/src/main/res/layout/card_invites_by_email.xml
index ff3dcd84..fa78740a 100644
--- a/app/src/main/res/layout/card_invites_by_email.xml
+++ b/app/src/main/res/layout/card_invites_by_email.xml
@@ -47,14 +47,14 @@
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="24dp"
-                android:layout_toStartOf="@id/invites_email_button"
+                android:layout_marginRight="24dp"
+                android:layout_toLeftOf="@id/invites_email_button"
                 android:visibility="gone" />
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/invites_email_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:enabled="false"
                 android:fontFamily="@font/inter"
                 android:text="@string/invite" />
diff --git a/app/src/main/res/layout/card_invites_by_link.xml b/app/src/main/res/layout/card_invites_by_link.xml
index a02d92ba..82853634 100644
--- a/app/src/main/res/layout/card_invites_by_link.xml
+++ b/app/src/main/res/layout/card_invites_by_link.xml
@@ -24,7 +24,7 @@
                 android:id="@+id/invites_loading_channels_progress"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:visibility="gone" />
         </RelativeLayout>
@@ -54,11 +54,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toStartOf="@id/invites_copy_invite_link"
+                android:layout_toLeftOf="@id/invites_copy_invite_link"
                 android:paddingTop="8dp"
                 android:paddingBottom="8dp"
-                android:paddingStart="12dp"
-                android:paddingEnd="12dp">
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp">
                 <TextView
                     android:id="@+id/invites_invite_link"
                     android:clickable="true"
@@ -72,14 +72,14 @@
             </LinearLayout>
             <ImageButton
                 android:id="@+id/invites_copy_invite_link"
-                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_centerVertical="true"
                 android:background="@null"
                 android:src="@drawable/ic_copy"
                 android:tint="@color/lbryGreen"
-                android:layout_alignParentEnd="true" />
+                android:layout_alignParentRight="true" />
         </RelativeLayout>
 
         <TextView
diff --git a/app/src/main/res/layout/card_invites_history.xml b/app/src/main/res/layout/card_invites_history.xml
index e8bd189d..7965d4e6 100644
--- a/app/src/main/res/layout/card_invites_history.xml
+++ b/app/src/main/res/layout/card_invites_history.xml
@@ -23,7 +23,7 @@
                 android:id="@+id/invites_loading_status_progress"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:visibility="gone" />
         </RelativeLayout>
diff --git a/app/src/main/res/layout/card_reward_driver.xml b/app/src/main/res/layout/card_reward_driver.xml
index 08f427d9..93fb83b3 100644
--- a/app/src/main/res/layout/card_reward_driver.xml
+++ b/app/src/main/res/layout/card_reward_driver.xml
@@ -27,8 +27,8 @@
             android:layout_centerVertical="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_toEndOf="@id/reward_driver_icon"
+            android:layout_marginLeft="8dp"
+            android:layout_toRightOf="@id/reward_driver_icon"
             android:fontFamily="@font/inter"
             android:lineSpacingMultiplier="1.2"
             android:textColor="@color/white"
diff --git a/app/src/main/res/layout/card_wallet_balance.xml b/app/src/main/res/layout/card_wallet_balance.xml
index 15a22b27..550f8849 100644
--- a/app/src/main/res/layout/card_wallet_balance.xml
+++ b/app/src/main/res/layout/card_wallet_balance.xml
@@ -51,7 +51,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginLeft="4dp"
                     android:fontFamily="@font/inter"
                     android:text="@string/lbc"
                     android:textColor="@color/white"
@@ -76,8 +76,8 @@
             android:fontFamily="@font/inter"
             android:text="@string/buy_lbc"
             android:layout_marginTop="8dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="12dp"
             android:textSize="16sp" />
 
         <TextView
@@ -85,8 +85,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:fontFamily="@font/inter"
             android:text="@string/convert_credits"
             android:textColorLink="@color/lbryGreen"
@@ -97,7 +97,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:fontFamily="@font/inter"
             android:text="@string/convert_credits_bittrex"
             android:textColorLink="@color/lbryGreen"
@@ -115,8 +115,8 @@
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp">
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp">
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_weight="1"
@@ -129,7 +129,7 @@
                     android:textColor="@color/lbryGreen" />
                 <LinearLayout
                     android:orientation="vertical"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginLeft="4dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
                     <TextView
@@ -155,7 +155,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="2dp"
+                            android:layout_marginLeft="2dp"
                             android:fontFamily="@font/inter"
                             android:text="@string/lbc"
                             android:textAllCaps="true"
@@ -189,9 +189,9 @@
                             android:layout_centerVertical="true"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_toEndOf="@id/wallet_in_tips_label"
+                            android:layout_toRightOf="@id/wallet_in_tips_label"
                             android:fontFamily="@font/inter"
-                            android:layout_marginStart="24dp"
+                            android:layout_marginLeft="24dp"
                             android:text="@string/unlock"
                             android:textColor="@color/lbryGreen"
                             android:textSize="14sp"
@@ -201,8 +201,8 @@
                             android:layout_centerVertical="true"
                             android:layout_width="16dp"
                             android:layout_height="16dp"
-                            android:layout_marginStart="24dp"
-                            android:layout_toEndOf="@id/wallet_in_tips_label"
+                            android:layout_marginLeft="24dp"
+                            android:layout_toRightOf="@id/wallet_in_tips_label"
                             android:visibility="gone" />
 
                     </RelativeLayout>
@@ -232,7 +232,7 @@
                     android:textColor="@color/lbryGreen" />
                 <LinearLayout
                     android:orientation="vertical"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginLeft="4dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
                     <TextView
@@ -258,7 +258,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="2dp"
+                            android:layout_marginLeft="2dp"
                             android:fontFamily="@font/inter"
                             android:text="@string/lbc"
                             android:textAllCaps="true"
@@ -288,7 +288,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="2dp"
+                            android:layout_marginLeft="2dp"
                             android:fontFamily="@font/inter"
                             android:text="@string/lbc"
                             android:textAllCaps="true"
diff --git a/app/src/main/res/layout/card_wallet_receive_credits.xml b/app/src/main/res/layout/card_wallet_receive_credits.xml
index d1664aae..dc340eaf 100644
--- a/app/src/main/res/layout/card_wallet_receive_credits.xml
+++ b/app/src/main/res/layout/card_wallet_receive_credits.xml
@@ -36,7 +36,7 @@
                 android:id="@+id/wallet_receive_address"
                 android:clickable="true"
                 android:layout_centerVertical="true"
-                android:layout_toStartOf="@id/wallet_copy_receive_address"
+                android:layout_toLeftOf="@id/wallet_copy_receive_address"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
@@ -45,21 +45,21 @@
                 android:letterSpacing="0.05"
                 android:paddingTop="8dp"
                 android:paddingBottom="8dp"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
                 android:singleLine="true"
                 android:textAlignment="center"
                 android:ellipsize="middle" />
             <ImageButton
                 android:id="@+id/wallet_copy_receive_address"
-                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_centerVertical="true"
                 android:background="@null"
                 android:src="@drawable/ic_copy"
                 android:tint="@color/lbryGreen"
-                android:layout_alignParentEnd="true" />
+                android:layout_alignParentRight="true" />
         </RelativeLayout>
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/card_wallet_recent_transactions.xml b/app/src/main/res/layout/card_wallet_recent_transactions.xml
index 9fe093b2..3a67e1d5 100644
--- a/app/src/main/res/layout/card_wallet_recent_transactions.xml
+++ b/app/src/main/res/layout/card_wallet_recent_transactions.xml
@@ -12,8 +12,8 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:layout_marginTop="16dp">
             <TextView
                 android:layout_width="wrap_content"
@@ -63,7 +63,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
                     android:text="@string/loading_transactions"
                     android:fontFamily="@font/inter"
                     android:textSize="14sp"
diff --git a/app/src/main/res/layout/card_wallet_send_credits.xml b/app/src/main/res/layout/card_wallet_send_credits.xml
index 5a39b4d2..f4a4c966 100644
--- a/app/src/main/res/layout/card_wallet_send_credits.xml
+++ b/app/src/main/res/layout/card_wallet_send_credits.xml
@@ -52,10 +52,10 @@
 
             <TextView
                 android:id="@+id/wallet_input_currency"
-                android:layout_toEndOf="@id/wallet_input_layout_amount"
+                android:layout_toRightOf="@id/wallet_input_layout_amount"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
                 android:layout_marginTop="30dp"
                 android:fontFamily="@font/inter"
                 android:text="@string/lbc"
@@ -65,8 +65,8 @@
 
             <LinearLayout
                 android:id="@+id/wallet_inline_balance_container"
-                android:layout_toEndOf="@id/wallet_input_currency"
-                android:layout_marginStart="24dp"
+                android:layout_toRightOf="@id/wallet_input_currency"
+                android:layout_marginLeft="24dp"
                 android:layout_marginTop="28dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -82,21 +82,21 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
                     android:textFontWeight="300"
-                    android:layout_marginStart="2dp" />
+                    android:layout_marginLeft="2dp" />
             </LinearLayout>
 
             <ProgressBar
                 android:id="@+id/wallet_send_progress"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_toStartOf="@id/wallet_send"
+                android:layout_toLeftOf="@id/wallet_send"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
                 android:visibility="gone" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/wallet_send"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/card_wallet_sync.xml b/app/src/main/res/layout/card_wallet_sync.xml
index 9700c80c..9ba7e51d 100644
--- a/app/src/main/res/layout/card_wallet_sync.xml
+++ b/app/src/main/res/layout/card_wallet_sync.xml
@@ -12,7 +12,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_marginTop="16dp"
             android:fontFamily="@font/inter"
             android:textStyle="bold"
@@ -29,8 +29,8 @@
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:weightSum="10">
             <TextView
                 android:layout_weight="4"
@@ -66,8 +66,8 @@
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:weightSum="10">
             <TextView
                 android:layout_weight="4"
@@ -106,8 +106,8 @@
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:layout_marginBottom="12dp"
             android:weightSum="2">
             <TextView
diff --git a/app/src/main/res/layout/container_comment_form.xml b/app/src/main/res/layout/container_comment_form.xml
index d92f96af..4634c471 100644
--- a/app/src/main/res/layout/container_comment_form.xml
+++ b/app/src/main/res/layout/container_comment_form.xml
@@ -24,7 +24,7 @@
                 android:textFontWeight="300" />
             <ProgressBar
                 android:id="@+id/comment_form_channels_loading"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
@@ -57,12 +57,12 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp">
+                android:layout_marginLeft="8dp">
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:layout_marginEnd="40dp">
+                    android:layout_marginRight="40dp">
                     <TextView
                         android:id="@+id/comment_form_replying_to_text"
                         android:layout_width="wrap_content"
@@ -87,7 +87,7 @@
                     android:id="@+id/comment_form_clear_reply_to"
                     android:background="?attr/selectableItemBackground"
                     android:clickable="true"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:layout_width="36dp"
                     android:layout_height="36dp">
                     <ImageView
@@ -136,8 +136,8 @@
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_toEndOf="@id/comment_form_avatar_container"
-                android:layout_marginStart="16dp">
+                android:layout_toRightOf="@id/comment_form_avatar_container"
+                android:layout_marginLeft="16dp">
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/comment_form_body"
                     android:hint="@string/comment"
@@ -179,8 +179,8 @@
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/comment_form_post"
-                android:layout_marginStart="24dp"
+                android:layout_toRightOf="@id/comment_form_post"
+                android:layout_marginLeft="24dp"
                 android:visibility="gone" />
         </RelativeLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/container_inline_channel_form.xml b/app/src/main/res/layout/container_inline_channel_form.xml
index 76318b5a..f7900b74 100644
--- a/app/src/main/res/layout/container_inline_channel_form.xml
+++ b/app/src/main/res/layout/container_inline_channel_form.xml
@@ -42,10 +42,10 @@
 
         <TextView
             android:id="@+id/inline_channel_form_inline_currency"
-            android:layout_toEndOf="@id/inline_channel_form_layout_deposit"
+            android:layout_toRightOf="@id/inline_channel_form_layout_deposit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
             android:layout_marginTop="30dp"
             android:fontFamily="@font/inter"
             android:text="@string/lbc"
@@ -55,8 +55,8 @@
 
         <LinearLayout
             android:id="@+id/inline_channel_form_inline_balance_container"
-            android:layout_toEndOf="@id/inline_channel_form_inline_currency"
-            android:layout_marginStart="24dp"
+            android:layout_toRightOf="@id/inline_channel_form_inline_currency"
+            android:layout_marginLeft="24dp"
             android:layout_marginTop="28dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:textFontWeight="300"
-                android:layout_marginStart="2dp" />
+                android:layout_marginLeft="2dp" />
         </LinearLayout>
     </RelativeLayout>
 
@@ -105,15 +105,15 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_centerVertical="true"
-            android:layout_marginEnd="24dp"
-            android:layout_toStartOf="@id/inline_channel_form_create_button"
+            android:layout_marginRight="24dp"
+            android:layout_toLeftOf="@id/inline_channel_form_create_button"
             android:visibility="gone" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/inline_channel_form_create_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/create"/>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index ed30a9f0..a981e4d7 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -104,7 +104,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
                 android:fontFamily="@font/inter"
                 android:text="@string/sdk_initializing"
                 android:textSize="14sp"
@@ -118,8 +118,8 @@
         android:clickable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
         android:layout_marginBottom="4dp"
         android:visibility="gone"
         app:cardElevation="8dp"
@@ -133,9 +133,9 @@
                 android:layout_width="160dp"
                 android:layout_height="90dp" />
             <LinearLayout
-                android:layout_toEndOf="@id/global_now_playing_player_view"
-                android:layout_toStartOf="@id/global_now_playing_close"
-                android:layout_marginStart="8dp"
+                android:layout_toRightOf="@id/global_now_playing_player_view"
+                android:layout_toLeftOf="@id/global_now_playing_close"
+                android:layout_marginLeft="8dp"
                 android:layout_centerVertical="true"
                 android:orientation="vertical"
                 android:layout_width="match_parent"
@@ -165,7 +165,7 @@
                 android:layout_width="36dp"
                 android:layout_alignParentEnd="true"
                 android:clickable="true"
-                android:layout_marginStart="8dp">
+                android:layout_marginLeft="8dp">
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
diff --git a/app/src/main/res/layout/dialog_content_from.xml b/app/src/main/res/layout/dialog_content_from.xml
index 41729cb7..cf99a858 100644
--- a/app/src/main/res/layout/dialog_content_from.xml
+++ b/app/src/main/res/layout/dialog_content_from.xml
@@ -4,8 +4,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     <TextView
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -19,8 +19,8 @@
         android:layout_height="0.5dp"
         android:background="@color/divider"
         android:layout_marginTop="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp" />
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp" />
 
     <RelativeLayout
         android:id="@+id/content_from_past_24_hours_item"
@@ -41,7 +41,7 @@
             android:id="@+id/content_from_past_24_hours_item_selected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
             android:tint="@color/lbryGreen"
@@ -67,7 +67,7 @@
             android:id="@+id/content_from_past_week_item_selected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
             android:tint="@color/lbryGreen"
@@ -93,7 +93,7 @@
             android:id="@+id/content_from_past_month_item_selected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
             android:tint="@color/lbryGreen"
@@ -119,7 +119,7 @@
             android:id="@+id/content_from_past_year_item_selected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
             android:tint="@color/lbryGreen"
@@ -145,7 +145,7 @@
             android:id="@+id/content_from_all_time_item_selected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
             android:tint="@color/lbryGreen"
diff --git a/app/src/main/res/layout/dialog_content_scope.xml b/app/src/main/res/layout/dialog_content_scope.xml
index 7bef7653..cffafa04 100644
--- a/app/src/main/res/layout/dialog_content_scope.xml
+++ b/app/src/main/res/layout/dialog_content_scope.xml
@@ -4,8 +4,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     <TextView
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -19,8 +19,8 @@
         android:layout_height="0.5dp"
         android:background="@color/divider"
         android:layout_marginTop="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp" />
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp" />
 
     <RelativeLayout
         android:id="@+id/content_scope_everyone_item"
@@ -37,10 +37,10 @@
             android:layout_centerVertical="true"
             android:text="@string/fa_globe_americas" />
         <TextView
-            android:layout_toEndOf="@+id/content_scope_everyone_item_icon"
+            android:layout_toRightOf="@+id/content_scope_everyone_item_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/everyone"
@@ -50,7 +50,7 @@
             android:id="@+id/content_scope_everyone_item_selected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
             android:tint="@color/lbryGreen"
@@ -72,10 +72,10 @@
             android:layout_centerVertical="true"
             android:text="@string/fa_hashtag" />
         <TextView
-            android:layout_toEndOf="@+id/content_scope_tags_item_icon"
+            android:layout_toRightOf="@+id/content_scope_tags_item_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/tags_you_follow"
@@ -85,7 +85,7 @@
             android:id="@+id/content_scope_tags_item_selected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
             android:tint="@color/lbryGreen"
diff --git a/app/src/main/res/layout/dialog_content_sort.xml b/app/src/main/res/layout/dialog_content_sort.xml
index 194f476b..593bfd67 100644
--- a/app/src/main/res/layout/dialog_content_sort.xml
+++ b/app/src/main/res/layout/dialog_content_sort.xml
@@ -4,8 +4,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     <TextView
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -19,8 +19,8 @@
         android:layout_height="0.5dp"
         android:background="@color/divider"
         android:layout_marginTop="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp" />
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp" />
 
     <RelativeLayout
         android:id="@+id/sort_by_trending_item"
@@ -37,10 +37,10 @@
             android:src="@drawable/ic_trending"
             android:tint="@color/foreground" />
         <TextView
-            android:layout_toEndOf="@+id/sort_by_trending_item_icon"
+            android:layout_toRightOf="@+id/sort_by_trending_item_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/trending_content"
@@ -50,7 +50,7 @@
             android:id="@+id/sort_by_trending_item_selected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
             android:tint="@color/lbryGreen"
@@ -72,10 +72,10 @@
             android:src="@drawable/ic_new"
             android:tint="@color/foreground" />
         <TextView
-            android:layout_toEndOf="@+id/sort_by_new_item_icon"
+            android:layout_toRightOf="@+id/sort_by_new_item_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/new_content"
@@ -85,7 +85,7 @@
             android:id="@+id/sort_by_new_item_selected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
             android:tint="@color/lbryGreen"
@@ -107,10 +107,10 @@
             android:src="@drawable/ic_top"
             android:tint="@color/foreground" />
         <TextView
-            android:layout_toEndOf="@+id/sort_by_top_item_icon"
+            android:layout_toRightOf="@+id/sort_by_top_item_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/top_content"
@@ -120,7 +120,7 @@
             android:id="@+id/sort_by_top_item_selected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
             android:tint="@color/lbryGreen"
diff --git a/app/src/main/res/layout/dialog_create_support.xml b/app/src/main/res/layout/dialog_create_support.xml
index 23f04128..db693d94 100644
--- a/app/src/main/res/layout/dialog_create_support.xml
+++ b/app/src/main/res/layout/dialog_create_support.xml
@@ -50,7 +50,7 @@
                 android:text="@string/channel_to_show_support_as" />
             <ProgressBar
                 android:id="@+id/create_support_channel_progress"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
@@ -83,10 +83,10 @@
 
             <TextView
                 android:id="@+id/create_support_input_currency"
-                android:layout_toEndOf="@id/create_support_input_layout_amount"
+                android:layout_toRightOf="@id/create_support_input_layout_amount"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
                 android:layout_marginTop="30dp"
                 android:fontFamily="@font/inter"
                 android:text="@string/lbc"
@@ -96,8 +96,8 @@
 
             <LinearLayout
                 android:id="@+id/create_support_inline_balance_container"
-                android:layout_toEndOf="@id/create_support_input_currency"
-                android:layout_marginStart="24dp"
+                android:layout_toRightOf="@id/create_support_input_currency"
+                android:layout_marginLeft="24dp"
                 android:layout_marginTop="28dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -113,7 +113,7 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
                     android:textFontWeight="300"
-                    android:layout_marginStart="2dp" />
+                    android:layout_marginLeft="2dp" />
             </LinearLayout>
         </RelativeLayout>
 
@@ -148,9 +148,9 @@
                 android:id="@+id/create_support_progress"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_toStartOf="@id/create_support_send"
+                android:layout_toLeftOf="@id/create_support_send"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
                 android:visibility="gone" />
 
             <com.google.android.material.button.MaterialButton
@@ -159,7 +159,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:text="@string/send_lbc_tip"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true" />
         </RelativeLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_customize_tags.xml b/app/src/main/res/layout/dialog_customize_tags.xml
index 2efca530..b19a9ff9 100644
--- a/app/src/main/res/layout/dialog_customize_tags.xml
+++ b/app/src/main/res/layout/dialog_customize_tags.xml
@@ -8,8 +8,8 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
         <TextView
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             android:layout_marginTop="8dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,22 +23,22 @@
             android:layout_height="0.5dp"
             android:background="@color/divider"
             android:layout_marginTop="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
             android:layout_marginBottom="16dp"/>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/customize_tags_followed_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp" />
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp" />
         <TextView
             android:id="@+id/customize_no_followed_tags"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:layout_marginBottom="6dp"
             android:fontFamily="@font/inter"
             android:text="@string/no_followed_tags"
@@ -51,23 +51,23 @@
             android:layout_height="0.5dp"
             android:background="@color/divider"
             android:layout_marginTop="10dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
             android:layout_marginBottom="16dp"/>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/customize_tags_suggested_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp" />
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp" />
 
         <TextView
             android:id="@+id/customize_no_tag_results"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:layout_marginBottom="6dp"
             android:fontFamily="@font/inter"
             android:text="@string/no_tag_results"
@@ -79,8 +79,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:layout_marginBottom="16dp">
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/customize_tag_filter_input"
@@ -97,8 +97,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:layout_marginBottom="16dp"
             android:fontFamily="@font/inter"
             android:text="@string/done" />
diff --git a/app/src/main/res/layout/dialog_discover.xml b/app/src/main/res/layout/dialog_discover.xml
index 77386803..e9a32daf 100644
--- a/app/src/main/res/layout/dialog_discover.xml
+++ b/app/src/main/res/layout/dialog_discover.xml
@@ -22,7 +22,7 @@
             android:id="@+id/discover_loading"
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:visibility="gone" />
     </RelativeLayout>
@@ -46,8 +46,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:fontFamily="@font/inter"
         android:text="@string/done" />
 
diff --git a/app/src/main/res/layout/dialog_repost_claim.xml b/app/src/main/res/layout/dialog_repost_claim.xml
index ada26944..d35ca589 100644
--- a/app/src/main/res/layout/dialog_repost_claim.xml
+++ b/app/src/main/res/layout/dialog_repost_claim.xml
@@ -74,7 +74,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/repost_name_prefix"
+                android:layout_toRightOf="@id/repost_name_prefix"
                 android:fontFamily="@font/inter"
                 android:singleLine="true"
                 android:textSize="14sp"
@@ -107,10 +107,10 @@
 
                 <TextView
                     android:id="@+id/repost_input_currency"
-                    android:layout_toEndOf="@id/repost_input_layout_amount"
+                    android:layout_toRightOf="@id/repost_input_layout_amount"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
                     android:layout_marginTop="30dp"
                     android:fontFamily="@font/inter"
                     android:text="@string/lbc"
@@ -120,8 +120,8 @@
 
                 <LinearLayout
                     android:id="@+id/repost_inline_balance_container"
-                    android:layout_toEndOf="@id/repost_input_currency"
-                    android:layout_marginStart="24dp"
+                    android:layout_toRightOf="@id/repost_input_currency"
+                    android:layout_marginLeft="24dp"
                     android:layout_marginTop="28dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -137,7 +137,7 @@
                         android:layout_height="wrap_content"
                         android:fontFamily="@font/inter"
                         android:textFontWeight="300"
-                        android:layout_marginStart="2dp" />
+                        android:layout_marginLeft="2dp" />
                 </LinearLayout>
             </RelativeLayout>
         </LinearLayout>
@@ -165,8 +165,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="24dp"
-                android:layout_toStartOf="@id/repost_button"
+                android:layout_marginRight="24dp"
+                android:layout_toLeftOf="@id/repost_button"
                 android:fontFamily="@font/inter"
                 android:textSize="14sp"
                 android:text="@string/show_advanced" />
@@ -174,9 +174,9 @@
                 android:id="@+id/repost_progress"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_toStartOf="@id/repost_button"
+                android:layout_toLeftOf="@id/repost_button"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
                 android:visibility="gone" />
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/repost_button"
@@ -184,7 +184,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:text="@string/repost"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true" />
         </RelativeLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/exo_playback_control_view.xml b/app/src/main/res/layout/exo_playback_control_view.xml
index e5385779..235ae4b1 100644
--- a/app/src/main/res/layout/exo_playback_control_view.xml
+++ b/app/src/main/res/layout/exo_playback_control_view.xml
@@ -14,7 +14,7 @@
         android:layout_centerVertical="true"
         android:layout_width="72dp"
         android:layout_height="72dp"
-        android:layout_toStartOf="@id/player_play_pause">
+        android:layout_toLeftOf="@id/player_play_pause">
         <ImageView
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -66,7 +66,7 @@
         android:layout_centerVertical="true"
         android:layout_width="72dp"
         android:layout_height="72dp"
-        android:layout_toEndOf="@id/player_play_pause">
+        android:layout_toRightOf="@id/player_play_pause">
         <ImageView
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -84,7 +84,7 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:visibility="gone">
         <ImageView
             android:id="@+id/player_image_cast_toggle"
@@ -103,14 +103,14 @@
         android:layout_alignParentBottom="true"
         android:layout_width="56dp"
         android:layout_height="48dp"
-        android:layout_toStartOf="@id/player_toggle_fullscreen">
+        android:layout_toLeftOf="@id/player_toggle_fullscreen">
         <TextView
             android:id="@+id/player_playback_speed_label"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
             android:fontFamily="@font/inter"
             android:letterSpacing="0.05"
             android:singleLine="true"
@@ -126,7 +126,7 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true">
+        android:layout_alignParentRight="true">
         <ImageView
             android:id="@+id/player_image_full_screen_toggle"
             android:layout_width="24dp"
@@ -140,9 +140,9 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:layout_alignParentBottom="true"
-        android:layout_toStartOf="@id/player_playback_speed"
-        android:paddingStart="16dp"
-        android:paddingEnd="4dp">
+        android:layout_toLeftOf="@id/player_playback_speed"
+        android:paddingLeft="16dp"
+        android:paddingRight="4dp">
         <TextView
             android:id="@+id/player_duration_elapsed"
             android:layout_width="64dp"
@@ -155,12 +155,12 @@
             android:textSize="14sp" />
         <com.google.android.exoplayer2.ui.DefaultTimeBar
             android:id="@id/exo_progress"
-            android:layout_toStartOf="@id/player_duration_total"
-            android:layout_toEndOf="@id/player_duration_elapsed"
+            android:layout_toLeftOf="@id/player_duration_total"
+            android:layout_toRightOf="@id/player_duration_elapsed"
             android:layout_width="match_parent"
             android:layout_height="24dp"
-            android:layout_marginStart="4dp"
-            android:layout_marginEnd="4dp"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
             android:layout_centerVertical="true"
             app:scrubber_color="@color/scrubberColor"
             app:played_color="@color/playedColor"
@@ -170,7 +170,7 @@
             android:layout_width="64dp"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:gravity="end"
             android:fontFamily="@font/inter"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/floating_wallet_balance.xml b/app/src/main/res/layout/floating_wallet_balance.xml
index c64c1788..2ccb21c2 100644
--- a/app/src/main/res/layout/floating_wallet_balance.xml
+++ b/app/src/main/res/layout/floating_wallet_balance.xml
@@ -6,7 +6,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginBottom="8dp"
-    android:layout_marginEnd="8dp"
+    android:layout_marginRight="8dp"
     android:elevation="4dp"
     app:layout_constraintRight_toRightOf="parent"
     app:layout_constraintBottom_toBottomOf="parent">
@@ -19,8 +19,8 @@
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:paddingStart="8dp"
-        android:paddingEnd="44dp"
+        android:paddingLeft="8dp"
+        android:paddingRight="44dp"
         android:visibility="invisible">
         <io.lbry.browser.ui.controls.SolidIconView
             android:layout_width="16dp"
@@ -33,7 +33,7 @@
             android:id="@+id/floating_reward_value"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
+            android:layout_marginLeft="2dp"
             android:layout_gravity="center_vertical"
             android:fontFamily="@font/inter"
             android:textColor="@color/white"
@@ -51,11 +51,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/floating_reward_container"
-        android:layout_marginStart="-36dp"
+        android:layout_marginLeft="-36dp"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:paddingStart="12dp"
-        android:paddingEnd="16dp">
+        android:paddingLeft="12dp"
+        android:paddingRight="16dp">
         <io.lbry.browser.ui.controls.SolidIconView
             android:layout_width="16dp"
             android:layout_height="16dp"
@@ -73,7 +73,7 @@
             android:id="@+id/floating_balance_value"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
+            android:layout_marginLeft="2dp"
             android:layout_gravity="center_vertical"
             android:fontFamily="@font/inter"
             android:textColor="@color/white"
@@ -87,7 +87,7 @@
             android:layout_gravity="center_vertical"
             android:layout_width="16dp"
             android:layout_height="16dp"
-            android:layout_marginStart="2dp"  />
+            android:layout_marginLeft="2dp"  />
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/fragment_all_content.xml b/app/src/main/res/layout/fragment_all_content.xml
index 35b18a60..b1e8ef79 100644
--- a/app/src/main/res/layout/fragment_all_content.xml
+++ b/app/src/main/res/layout/fragment_all_content.xml
@@ -25,8 +25,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp">
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp">
             <TextView
                 android:id="@+id/all_content_page_title"
                 android:layout_width="wrap_content"
@@ -41,7 +41,7 @@
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:layout_centerVertical="true"
-                android:layout_alignParentEnd="true" />
+                android:layout_alignParentRight="true" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -50,8 +50,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
             android:layout_marginBottom="8dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:visibility="visible">
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -76,7 +76,7 @@
                     <ImageView
                         android:layout_width="16dp"
                         android:layout_height="16dp"
-                        android:layout_marginStart="2dp"
+                        android:layout_marginLeft="2dp"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
                         android:tint="@color/foreground" />
@@ -85,10 +85,10 @@
                 <TextView
                     android:id="@+id/all_content_for_prefix"
                     android:layout_centerVertical="true"
-                    android:layout_toEndOf="@id/all_content_sort_link"
+                    android:layout_toRightOf="@id/all_content_sort_link"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="2dp"
+                    android:layout_marginLeft="2dp"
                     android:fontFamily="@font/inter"
                     android:textFontWeight="300"
                     android:textSize="12sp"
@@ -96,12 +96,12 @@
                     android:visibility="gone" />
                 <LinearLayout
                     android:id="@+id/all_content_scope_link"
-                    android:layout_toEndOf="@id/all_content_sort_link"
+                    android:layout_toRightOf="@id/all_content_sort_link"
                     android:background="?attr/selectableItemBackground"
                     android:clickable="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="2dp"
+                    android:layout_marginLeft="2dp"
                     android:layout_centerVertical="true"
                     android:visibility="gone">
                     <TextView
@@ -109,7 +109,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginStart="4dp"
+                        android:layout_marginLeft="4dp"
                         android:fontFamily="@font/inter"
                         android:textFontWeight="300"
                         android:textSize="12sp"
@@ -117,7 +117,7 @@
                     <ImageView
                         android:layout_width="16dp"
                         android:layout_height="16dp"
-                        android:layout_marginStart="2dp"
+                        android:layout_marginLeft="2dp"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
                         android:tint="@color/foreground" />
@@ -126,10 +126,10 @@
                 <TextView
                     android:id="@+id/all_content_from_prefix"
                     android:layout_centerVertical="true"
-                    android:layout_toEndOf="@id/all_content_sort_link"
+                    android:layout_toRightOf="@id/all_content_sort_link"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="2dp"
+                    android:layout_marginLeft="2dp"
                     android:fontFamily="@font/inter"
                     android:textFontWeight="300"
                     android:textSize="12sp"
@@ -142,15 +142,15 @@
                     android:clickable="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="2dp"
-                    android:layout_toEndOf="@id/all_content_sort_link"
+                    android:layout_marginLeft="2dp"
+                    android:layout_toRightOf="@id/all_content_sort_link"
                     android:visibility="gone">
                     <TextView
                         android:id="@+id/all_content_time_link_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginStart="4dp"
+                        android:layout_marginLeft="4dp"
                         android:fontFamily="@font/inter"
                         android:textFontWeight="300"
                         android:textSize="12sp"
@@ -158,7 +158,7 @@
                     <ImageView
                         android:layout_width="16dp"
                         android:layout_height="16dp"
-                        android:layout_marginStart="2dp"
+                        android:layout_marginLeft="2dp"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
                         android:tint="@color/foreground" />
@@ -170,7 +170,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:clickable="true"
                 android:fontFamily="@font/inter"
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index 9cd5b5a1..7602a54a 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -19,7 +19,7 @@
             <ProgressBar
                 android:layout_width="16dp"
                 android:layout_height="16dp"
-                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
                 android:layout_gravity="center_vertical" />
             <TextView
                 android:layout_width="wrap_content"
@@ -53,18 +53,18 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
+                android:layout_marginLeft="12dp"
+                android:layout_marginRight="12dp"
                 android:layout_above="@+id/channel_view_tabs"
-                android:layout_toEndOf="@id/channel_view_icon_container"
+                android:layout_toRightOf="@id/channel_view_icon_container"
                 android:orientation="vertical">
                 <TextView
                     android:id="@+id/channel_view_title"
                     android:background="@color/channelCoverBackground"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="4dp"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
                     android:paddingTop="2dp"
                     android:paddingBottom="2dp"
                     android:ellipsize="end"
@@ -80,8 +80,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="2dp"
                     android:layout_marginBottom="2dp"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="4dp"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
                     android:paddingTop="2dp"
                     android:paddingBottom="2dp"
                     android:fontFamily="@font/inter"
@@ -95,7 +95,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
-                android:paddingStart="110dp"
+                android:paddingLeft="110dp"
                 app:tabGravity="fill"
                 app:tabMode="scrollable"/>
             <RelativeLayout
@@ -103,7 +103,7 @@
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:layout_alignParentBottom="true"
-                android:layout_marginStart="12dp"
+                android:layout_marginLeft="12dp"
                 android:layout_marginBottom="12dp">
                 <RelativeLayout
                     android:layout_centerHorizontal="true"
@@ -143,7 +143,7 @@
                 android:elevation="4dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:padding="8dp">
                 <RelativeLayout
                     android:id="@+id/channel_view_edit"
@@ -151,7 +151,7 @@
                     android:background="?attr/selectableItemBackground"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
-                    android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
                     android:visibility="gone">
                     <ImageView
                         android:layout_centerInParent="true"
@@ -166,7 +166,7 @@
                     android:background="?attr/selectableItemBackground"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
-                    android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
                     android:visibility="gone">
                     <ImageView
                         android:layout_centerInParent="true"
@@ -181,7 +181,7 @@
                     android:background="?attr/selectableItemBackground"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
-                    android:layout_marginEnd="8dp">
+                    android:layout_marginRight="8dp">
                     <ImageView
                         android:layout_centerInParent="true"
                         android:layout_width="22dp"
@@ -195,7 +195,7 @@
                     android:clickable="true"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
-                    android:layout_marginEnd="8dp">
+                    android:layout_marginRight="8dp">
                     <io.lbry.browser.ui.controls.SolidIconView
                         android:layout_centerInParent="true"
                         android:layout_width="24dp"
diff --git a/app/src/main/res/layout/fragment_channel_comments.xml b/app/src/main/res/layout/fragment_channel_comments.xml
index d2c65ea2..172ed96e 100644
--- a/app/src/main/res/layout/fragment_channel_comments.xml
+++ b/app/src/main/res/layout/fragment_channel_comments.xml
@@ -8,8 +8,8 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp">
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp">
         <ProgressBar
             android:id="@+id/channel_comments_progress"
             android:layout_width="20dp"
@@ -31,16 +31,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="0dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
                 android:layout_marginBottom="16dp" />
 
             <TextView
                 android:id="@+id/channel_no_comments"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
                 android:layout_marginTop="8dp"
                 android:fontFamily="@font/inter"
                 android:text="@string/no_comments"
@@ -52,8 +52,8 @@
                 android:id="@+id/channel_comments_sdk_initializing"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
                 android:layout_marginTop="8dp"
                 android:fontFamily="@font/inter"
                 android:text="@string/sdk_initializing_comments"
diff --git a/app/src/main/res/layout/fragment_channel_content.xml b/app/src/main/res/layout/fragment_channel_content.xml
index 15e11fbd..9c30d04f 100644
--- a/app/src/main/res/layout/fragment_channel_content.xml
+++ b/app/src/main/res/layout/fragment_channel_content.xml
@@ -27,8 +27,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
             android:layout_marginBottom="8dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:visibility="visible">
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -53,7 +53,7 @@
                     <ImageView
                         android:layout_width="16dp"
                         android:layout_height="16dp"
-                        android:layout_marginStart="2dp"
+                        android:layout_marginLeft="2dp"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
                         android:tint="@color/foreground" />
@@ -66,15 +66,15 @@
                     android:clickable="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
-                    android:layout_toEndOf="@id/channel_content_sort_link"
+                    android:layout_marginLeft="24dp"
+                    android:layout_toRightOf="@id/channel_content_sort_link"
                     android:visibility="gone">
                     <TextView
                         android:id="@+id/channel_content_time_link_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginStart="4dp"
+                        android:layout_marginLeft="4dp"
                         android:fontFamily="@font/inter"
                         android:textFontWeight="300"
                         android:textSize="12sp"
@@ -82,7 +82,7 @@
                     <ImageView
                         android:layout_width="16dp"
                         android:layout_height="16dp"
-                        android:layout_marginStart="2dp"
+                        android:layout_marginLeft="2dp"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
                         android:tint="@color/foreground" />
diff --git a/app/src/main/res/layout/fragment_channel_form.xml b/app/src/main/res/layout/fragment_channel_form.xml
index 6ba62998..4b5630eb 100644
--- a/app/src/main/res/layout/fragment_channel_form.xml
+++ b/app/src/main/res/layout/fragment_channel_form.xml
@@ -29,7 +29,7 @@
                 android:background="@drawable/bg_small_icon"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:layout_marginStart="16dp"
+                android:layout_marginLeft="16dp"
                 android:layout_marginBottom="16dp"
                 android:layout_alignParentBottom="true">
                 <ImageView
@@ -45,16 +45,16 @@
             <LinearLayout
                 android:id="@+id/channel_form_upload_progress"
                 android:background="@color/channelCoverBackground"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
+                android:layout_marginLeft="4dp"
                 android:layout_marginTop="4dp"
                 android:orientation="horizontal"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
                 android:visibility="gone">
                 <ProgressBar
                     android:layout_width="16dp"
@@ -62,7 +62,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginLeft="4dp"
                     android:fontFamily="@font/inter"
                     android:text="@string/uploading"
                     android:textColor="@color/white"
@@ -103,7 +103,7 @@
                     android:background="@drawable/bg_small_icon"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
                     android:layout_marginBottom="16dp"
                     android:layout_alignParentBottom="true"
                     android:layout_centerHorizontal="true">
@@ -169,7 +169,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="28dp"
-                            android:layout_marginStart="12dp"
+                            android:layout_marginLeft="12dp"
                             android:text="@string/at"
                             android:visibility="gone" />
                     </RelativeLayout>
@@ -195,10 +195,10 @@
 
                         <TextView
                             android:id="@+id/channel_form_input_currency"
-                            android:layout_toEndOf="@id/channel_form_input_layout_deposit"
+                            android:layout_toRightOf="@id/channel_form_input_layout_deposit"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="8dp"
+                            android:layout_marginLeft="8dp"
                             android:layout_marginTop="30dp"
                             android:fontFamily="@font/inter"
                             android:text="@string/lbc"
@@ -208,8 +208,8 @@
 
                         <LinearLayout
                             android:id="@+id/channel_form_inline_balance_container"
-                            android:layout_toEndOf="@id/channel_form_input_currency"
-                            android:layout_marginStart="24dp"
+                            android:layout_toRightOf="@id/channel_form_input_currency"
+                            android:layout_marginLeft="24dp"
                             android:layout_marginTop="28dp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -225,7 +225,7 @@
                                 android:layout_height="wrap_content"
                                 android:fontFamily="@font/inter"
                                 android:textFontWeight="300"
-                                android:layout_marginStart="2dp" />
+                                android:layout_marginLeft="2dp" />
                         </LinearLayout>
                     </RelativeLayout>
 
@@ -323,8 +323,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
-                            android:layout_marginEnd="24dp"
-                            android:layout_toStartOf="@id/channel_form_save_button"
+                            android:layout_marginRight="24dp"
+                            android:layout_toLeftOf="@id/channel_form_save_button"
                             android:fontFamily="@font/inter"
                             android:textSize="14sp"
                             android:text="@string/show_optional_fields" />
@@ -333,14 +333,14 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_centerVertical="true"
-                            android:layout_marginEnd="24dp"
-                            android:layout_toStartOf="@+id/channel_form_save_button"
+                            android:layout_marginRight="24dp"
+                            android:layout_toLeftOf="@+id/channel_form_save_button"
                             android:visibility="gone" />
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/channel_form_save_button"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
+                            android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
                             android:fontFamily="@font/inter"
                             android:text="@string/save" />
diff --git a/app/src/main/res/layout/fragment_channel_manager.xml b/app/src/main/res/layout/fragment_channel_manager.xml
index 7cd6a948..f53e3429 100644
--- a/app/src/main/res/layout/fragment_channel_manager.xml
+++ b/app/src/main/res/layout/fragment_channel_manager.xml
@@ -15,9 +15,9 @@
         android:id="@+id/channel_manager_list_loading"
         android:layout_width="20dp"
         android:layout_height="20dp"
-        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:visibility="gone" />
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/channel_manager_list"
@@ -66,9 +66,9 @@
         android:id="@+id/channel_manager_fab_new_channel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
         android:src="@drawable/ic_add"
         android:visibility="gone" />
diff --git a/app/src/main/res/layout/fragment_file_view.xml b/app/src/main/res/layout/fragment_file_view.xml
index 2bc6e115..46ad0a64 100644
--- a/app/src/main/res/layout/fragment_file_view.xml
+++ b/app/src/main/res/layout/fragment_file_view.xml
@@ -19,7 +19,7 @@
             <ProgressBar
                 android:layout_width="16dp"
                 android:layout_height="16dp"
-                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
                 android:layout_gravity="center_vertical" />
             <TextView
                 android:layout_width="wrap_content"
@@ -75,13 +75,13 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:layout_marginTop="4dp"
-                    android:layout_marginEnd="4dp"
+                    android:layout_marginRight="4dp"
                     android:paddingTop="2dp"
                     android:paddingBottom="2dp"
-                    android:paddingStart="6dp"
-                    android:paddingEnd="7dp"
+                    android:paddingLeft="6dp"
+                    android:paddingRight="7dp"
                     android:visibility="gone">
                     <io.lbry.browser.ui.controls.SolidIconView
                         android:layout_width="12dp"
@@ -95,7 +95,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginStart="1dp"
+                        android:layout_marginLeft="1dp"
                         android:fontFamily="@font/inter"
                         android:textColor="@android:color/black"
                         android:textSize="14sp"
@@ -136,11 +136,11 @@
                     android:layout_centerVertical="true"
                     android:layout_height="wrap_content" />
                 <LinearLayout
-                    android:layout_toEndOf="@id/file_view_unsupported_gerbil"
+                    android:layout_toRightOf="@id/file_view_unsupported_gerbil"
                     android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
+                    android:layout_marginLeft="24dp"
                     android:layout_centerVertical="true">
                     <TextView
                         android:layout_width="wrap_content"
@@ -183,15 +183,15 @@
                     android:background="?attr/selectableItemBackground"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="4dp">
+                    android:paddingLeft="16dp"
+                    android:paddingRight="4dp">
                     <LinearLayout
                         android:id="@+id/file_view_title_layout"
                         android:orientation="vertical"
                         android:layout_centerVertical="true"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="48dp">
+                        android:layout_marginRight="48dp">
                         <TextView
                             android:id="@+id/file_view_title"
                             android:layout_width="wrap_content"
@@ -208,7 +208,7 @@
                                 android:id="@+id/file_view_view_count"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginEnd="16dp"
+                                android:layout_marginRight="16dp"
                                 android:fontFamily="@font/inter"
                                 android:textSize="12sp"
                                 android:textFontWeight="300"
@@ -226,8 +226,8 @@
                     <ImageView
                         android:id="@+id/file_view_desc_toggle_arrow"
                         android:src="@drawable/ic_arrow_dropdown"
-                        android:layout_toStartOf="@+id/file_view_title_layout"
-                        android:layout_alignParentEnd="true"
+                        android:layout_toLeftOf="@+id/file_view_title_layout"
+                        android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
@@ -482,15 +482,15 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingTop="12dp"
-                        android:paddingStart="16dp"
+                        android:paddingLeft="16dp"
                         android:paddingBottom="12dp"
-                        android:layout_toStartOf="@id/file_view_icon_follow">
+                        android:layout_toLeftOf="@id/file_view_icon_follow">
                         <RelativeLayout
                             android:id="@+id/file_view_publisher_avatar"
                             android:layout_width="50dp"
                             android:layout_height="50dp"
                             android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="16dp"
+                            android:layout_marginRight="16dp"
                             android:visibility="gone">
                             <RelativeLayout
                                 android:layout_centerHorizontal="true"
@@ -545,12 +545,12 @@
                         android:id="@+id/file_view_icon_follow"
                         android:clickable="true"
                         android:background="?attr/selectableItemBackground"
-                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginRight="16dp"
                         android:text="@string/fa_heart"
                         android:textColor="@color/red"
                         android:textSize="20dp" />
@@ -559,12 +559,12 @@
                         android:id="@+id/file_view_icon_unfollow"
                         android:clickable="true"
                         android:background="?attr/selectableItemBackground"
-                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginRight="16dp"
                         android:text="@string/fa_heart_broken"
                         android:textSize="20dp"
                         android:visibility="invisible" />
@@ -591,8 +591,8 @@
                         android:autoLink="all"
                         android:textColorLink="@color/lbryGreen"
                         android:textFontWeight="300"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp" />
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginRight="16dp" />
                     <LinearLayout
                         android:id="@+id/file_view_tag_area"
                         android:orientation="horizontal"
@@ -600,8 +600,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="10"
                         android:paddingTop="36dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp">
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginRight="16dp">
                         <TextView
                             android:layout_weight="2"
                             android:layout_width="0dp"
@@ -613,7 +613,7 @@
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/file_view_tag_list"
                             android:layout_weight="8"
-                            android:layout_marginStart="8dp"
+                            android:layout_marginLeft="8dp"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content" />
                     </LinearLayout>
@@ -635,8 +635,8 @@
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp">
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginRight="16dp">
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -657,8 +657,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginRight="16dp"
                         android:fontFamily="@font/inter"
                         android:text="@string/no_related_content"
                         android:textSize="14sp"
@@ -687,8 +687,8 @@
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp">
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginRight="16dp">
                         <ProgressBar
                             android:id="@+id/file_view_comments_progress"
                             android:layout_width="16dp"
@@ -712,8 +712,8 @@
                         android:id="@+id/file_view_no_comments"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginRight="16dp"
                         android:layout_marginTop="8dp"
                         android:fontFamily="@font/inter"
                         android:text="@string/no_comments"
diff --git a/app/src/main/res/layout/fragment_following.xml b/app/src/main/res/layout/fragment_following.xml
index dc0f2b54..61a46dff 100644
--- a/app/src/main/res/layout/fragment_following.xml
+++ b/app/src/main/res/layout/fragment_following.xml
@@ -26,8 +26,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="6dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp">
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp">
             <TextView
                 android:id="@+id/following_page_title"
                 android:layout_width="wrap_content"
@@ -41,14 +41,14 @@
                 android:layout_height="16dp"
                 android:visibility="gone"
                 android:layout_centerVertical="true"
-                android:layout_alignParentEnd="true" />
+                android:layout_alignParentRight="true" />
             <ProgressBar
                 android:id="@+id/following_content_progress"
                 android:visibility="gone"
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:layout_centerVertical="true"
-                android:layout_alignParentEnd="true" />
+                android:layout_alignParentRight="true" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -57,8 +57,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
             android:layout_marginBottom="8dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:visibility="gone">
             <LinearLayout
                 android:id="@+id/following_sort_link"
@@ -79,7 +79,7 @@
                 <ImageView
                     android:layout_width="16dp"
                     android:layout_height="16dp"
-                    android:layout_marginStart="2dp"
+                    android:layout_marginLeft="2dp"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_arrow_dropdown"
                     android:tint="@color/foreground" />
@@ -87,12 +87,12 @@
 
             <LinearLayout
                 android:id="@+id/following_time_link"
-                android:layout_toEndOf="@id/following_sort_link"
+                android:layout_toRightOf="@id/following_sort_link"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
                 android:layout_centerVertical="true"
                 android:visibility="gone">
                 <TextView
@@ -107,7 +107,7 @@
                 <ImageView
                     android:layout_width="16dp"
                     android:layout_height="16dp"
-                    android:layout_marginStart="2dp"
+                    android:layout_marginLeft="2dp"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_arrow_dropdown"
                     android:tint="@color/foreground" />
@@ -118,7 +118,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:clickable="true"
                 android:fontFamily="@font/inter"
@@ -131,8 +131,8 @@
             android:id="@+id/following_page_info"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:fontFamily="@font/inter"
             android:textFontWeight="300"
             android:text="@string/lbry_works_better"
@@ -188,8 +188,8 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/following_suggested_done_button"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="16dp"
diff --git a/app/src/main/res/layout/fragment_invites.xml b/app/src/main/res/layout/fragment_invites.xml
index d6e5fe0d..abda6d98 100644
--- a/app/src/main/res/layout/fragment_invites.xml
+++ b/app/src/main/res/layout/fragment_invites.xml
@@ -80,7 +80,7 @@
             android:layout_alignParentBottom="true">
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/invites_get_started_button"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index a5f6eb14..52df464d 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -8,8 +8,8 @@
         android:id="@+id/library_filter_card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginTop="16dp">
         <RelativeLayout
             android:layout_width="match_parent"
@@ -32,8 +32,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginStart="24dp"
-                android:layout_toEndOf="@id/library_filter_link_downloads"
+                android:layout_marginLeft="24dp"
+                android:layout_toRightOf="@id/library_filter_link_downloads"
                 android:fontFamily="@font/inter"
                 android:text="@string/purchases" />
             <TextView
@@ -43,8 +43,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginStart="24dp"
-                android:layout_toEndOf="@id/library_filter_link_purchases"
+                android:layout_marginLeft="24dp"
+                android:layout_toRightOf="@id/library_filter_link_purchases"
                 android:fontFamily="@font/inter"
                 android:text="@string/history"
                 android:textSize="14sp" />
@@ -52,7 +52,7 @@
                 android:id="@+id/library_list_loading"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:visibility="gone" />
             <TextView
@@ -61,7 +61,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:fontFamily="@font/inter"
                 android:text="@string/stats"
                 android:textColor="@color/lbryGreen"
@@ -75,8 +75,8 @@
         android:layout_below="@id/library_filter_card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginTop="16dp"
         android:visibility="gone">
         <LinearLayout
@@ -105,7 +105,7 @@
                         android:id="@+id/library_storage_stat_unit"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="3dp"
+                        android:layout_marginLeft="3dp"
                         android:fontFamily="@font/inter"
                         android:text="@string/mb"
                         android:textColor="@color/lbryGreen"
@@ -119,7 +119,7 @@
                     android:clickable="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:layout_marginTop="4dp"
                     android:fontFamily="@font/inter"
                     android:text="@string/hide"
@@ -174,13 +174,13 @@
                     android:layout_height="10dp"
                     android:layout_centerVertical="true" />
                 <TextView
-                    android:layout_toEndOf="@id/library_storage_legend_video_icon"
+                    android:layout_toRightOf="@id/library_storage_legend_video_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/video"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginLeft="4dp"
                     android:textFontWeight="300"
                     android:textSize="12sp" />
 
@@ -190,7 +190,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_centerVertical="true"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/zero_mb"
                     android:textFontWeight="300"
@@ -210,13 +210,13 @@
                     android:layout_height="10dp"
                     android:layout_centerVertical="true" />
                 <TextView
-                    android:layout_toEndOf="@id/library_storage_legend_audio_icon"
+                    android:layout_toRightOf="@id/library_storage_legend_audio_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/audio"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginLeft="4dp"
                     android:textFontWeight="300"
                     android:textSize="12sp" />
 
@@ -226,7 +226,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_centerVertical="true"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/zero_mb"
                     android:textFontWeight="300"
@@ -246,13 +246,13 @@
                     android:layout_height="10dp"
                     android:layout_centerVertical="true" />
                 <TextView
-                    android:layout_toEndOf="@id/library_storage_legend_image_icon"
+                    android:layout_toRightOf="@id/library_storage_legend_image_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/images"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginLeft="4dp"
                     android:textFontWeight="300"
                     android:textSize="12sp" />
 
@@ -262,7 +262,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_centerVertical="true"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/zero_mb"
                     android:textFontWeight="300"
@@ -282,13 +282,13 @@
                     android:layout_height="10dp"
                     android:layout_centerVertical="true" />
                 <TextView
-                    android:layout_toEndOf="@id/library_storage_legend_other_icon"
+                    android:layout_toRightOf="@id/library_storage_legend_other_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/other"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginLeft="4dp"
                     android:textFontWeight="300"
                     android:textSize="12sp" />
 
@@ -298,7 +298,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_centerVertical="true"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/zero_mb"
                     android:textFontWeight="300"
diff --git a/app/src/main/res/layout/fragment_publish.xml b/app/src/main/res/layout/fragment_publish.xml
index d474f74a..4c7f637b 100644
--- a/app/src/main/res/layout/fragment_publish.xml
+++ b/app/src/main/res/layout/fragment_publish.xml
@@ -26,7 +26,7 @@
                 android:layout_weight="1"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_marginStart="-1.5dp">
+                android:layout_marginLeft="-1.5dp">
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -64,7 +64,7 @@
                     android:clickable="true"
                     android:background="@android:color/black"
                     android:foreground="?attr/selectableItemBackground"
-                    android:layout_toEndOf="@id/publish_vertical_divider"
+                    android:layout_toRightOf="@id/publish_vertical_divider"
                     android:layout_width="match_parent"
                     android:layout_height="148.5dp">
                     <LinearLayout
@@ -106,7 +106,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_below="@id/publish_photo_upload_divider"
-                    android:layout_toEndOf="@id/publish_vertical_divider">
+                    android:layout_toRightOf="@id/publish_vertical_divider">
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -168,7 +168,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
                 android:fontFamily="@font/inter"
                 android:text="@string/loading_videos"
                 android:textColor="@color/white"
diff --git a/app/src/main/res/layout/fragment_publish_form.xml b/app/src/main/res/layout/fragment_publish_form.xml
index 48078daf..b088bae9 100644
--- a/app/src/main/res/layout/fragment_publish_form.xml
+++ b/app/src/main/res/layout/fragment_publish_form.xml
@@ -29,16 +29,16 @@
                 <LinearLayout
                     android:id="@+id/publish_form_thumbnail_upload_progress"
                     android:background="@color/channelCoverBackground"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginLeft="4dp"
                     android:layout_marginTop="4dp"
                     android:orientation="horizontal"
                     android:paddingTop="2dp"
                     android:paddingBottom="2dp"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="8dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
                     android:visibility="gone">
                     <ProgressBar
                         android:layout_width="16dp"
@@ -46,7 +46,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
+                        android:layout_marginLeft="4dp"
                         android:fontFamily="@font/inter"
                         android:text="@string/uploading"
                         android:textColor="@color/white"
@@ -58,7 +58,7 @@
                     android:background="@drawable/bg_small_icon"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
                     android:layout_marginBottom="16dp"
                     android:layout_alignParentBottom="true"
                     android:layout_centerHorizontal="true">
@@ -149,7 +149,7 @@
                                 android:layout_centerVertical="true"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_alignParentEnd="true"
+                                android:layout_alignParentRight="true"
                                 android:fontFamily="@font/inter"
                                 android:textFontWeight="300"
                                 android:textSize="16sp" />
@@ -183,7 +183,7 @@
                                 android:layout_width="20dp"
                                 android:layout_height="20dp"
                                 android:layout_centerVertical="true"
-                                android:layout_marginEnd="16dp"
+                                android:layout_marginRight="16dp"
                                 android:visibility="gone" />
 
                             <TextView
@@ -191,7 +191,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_centerVertical="true"
-                                android:layout_toEndOf="@id/publish_form_video_opt_progress"
+                                android:layout_toRightOf="@id/publish_form_video_opt_progress"
                                 android:fontFamily="@font/inter"
                                 android:textFontWeight="300"
                                 android:textSize="14sp" />
@@ -243,7 +243,7 @@
                                 android:id="@+id/publish_form_loading_channels"
                                 android:layout_width="20dp"
                                 android:layout_height="20dp"
-                                android:layout_alignParentEnd="true"
+                                android:layout_alignParentRight="true"
                                 android:layout_centerVertical="true"
                                 android:visibility="gone" />
                         </RelativeLayout>
@@ -280,7 +280,7 @@
                                 android:id="@+id/publish_form_price_switch"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_alignParentEnd="true"
+                                android:layout_alignParentRight="true"
                                 android:layout_centerVertical="true" />
                         </RelativeLayout>
 
@@ -318,8 +318,8 @@
                                 android:entries="@array/publish_currencies"
                                 android:layout_width="110dp"
                                 android:layout_height="wrap_content"
-                                android:layout_toEndOf="@+id/publish_form_price_layout"
-                                android:layout_marginStart="4dp"
+                                android:layout_toRightOf="@+id/publish_form_price_layout"
+                                android:layout_marginLeft="4dp"
                                 android:layout_marginTop="24dp" />
                         </RelativeLayout>
                     </LinearLayout>
@@ -349,7 +349,7 @@
                                 android:id="@+id/publish_form_generate_address"
                                 android:background="?attr/selectableItemBackground"
                                 android:clickable="true"
-                                android:layout_alignParentEnd="true"
+                                android:layout_alignParentRight="true"
                                 android:layout_centerVertical="true"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -416,10 +416,10 @@
 
                             <TextView
                                 android:id="@+id/publish_form_input_currency"
-                                android:layout_toEndOf="@id/publish_form_input_layout_deposit"
+                                android:layout_toRightOf="@id/publish_form_input_layout_deposit"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
+                                android:layout_marginLeft="8dp"
                                 android:layout_marginTop="30dp"
                                 android:fontFamily="@font/inter"
                                 android:text="@string/lbc"
@@ -429,8 +429,8 @@
 
                             <LinearLayout
                                 android:id="@+id/publish_form_inline_balance_container"
-                                android:layout_toEndOf="@id/publish_form_input_currency"
-                                android:layout_marginStart="24dp"
+                                android:layout_toRightOf="@id/publish_form_input_currency"
+                                android:layout_marginLeft="24dp"
                                 android:layout_marginTop="28dp"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -446,7 +446,7 @@
                                     android:layout_height="wrap_content"
                                     android:fontFamily="@font/inter"
                                     android:textFontWeight="300"
-                                    android:layout_marginStart="2dp" />
+                                    android:layout_marginLeft="2dp" />
                             </LinearLayout>
                         </RelativeLayout>
 
@@ -538,7 +538,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:layout_marginTop="24dp"
-                android:layout_marginEnd="16dp"
+                android:layout_marginRight="16dp"
                 android:fontFamily="@font/inter"
                 android:text="@string/show_extra_fields"
                 android:textFontWeight="300" />
@@ -546,8 +546,8 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:layout_marginTop="24dp">
                 <TextView
                     android:id="@+id/publish_form_cancel"
@@ -567,14 +567,14 @@
                     android:layout_centerVertical="true"
                     android:layout_width="20dp"
                     android:layout_height="20dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_toStartOf="@id/publish_form_publish_button"
+                    android:layout_marginRight="16dp"
+                    android:layout_toLeftOf="@id/publish_form_publish_button"
                     android:visibility="gone" />
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/publish_form_publish_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/publish" />
diff --git a/app/src/main/res/layout/fragment_publishes.xml b/app/src/main/res/layout/fragment_publishes.xml
index 9168ccc2..ce375030 100644
--- a/app/src/main/res/layout/fragment_publishes.xml
+++ b/app/src/main/res/layout/fragment_publishes.xml
@@ -15,9 +15,9 @@
         android:id="@+id/publishes_list_loading"
         android:layout_width="20dp"
         android:layout_height="20dp"
-        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:visibility="gone" />
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/publishes_list"
@@ -66,9 +66,9 @@
         android:id="@+id/publishes_fab_new_publish"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
         android:src="@drawable/ic_add"
         android:visibility="gone" />
diff --git a/app/src/main/res/layout/fragment_rewards.xml b/app/src/main/res/layout/fragment_rewards.xml
index 9d9e82ef..46838086 100644
--- a/app/src/main/res/layout/fragment_rewards.xml
+++ b/app/src/main/res/layout/fragment_rewards.xml
@@ -8,8 +8,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp">
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
         <androidx.cardview.widget.CardView
             android:id="@+id/rewards_filter_card"
             android:layout_width="match_parent"
@@ -35,8 +35,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:layout_marginStart="16dp"
-                    android:layout_toEndOf="@id/rewards_filter_link_unclaimed"
+                    android:layout_marginLeft="16dp"
+                    android:layout_toRightOf="@id/rewards_filter_link_unclaimed"
                     android:fontFamily="@font/inter"
                     android:text="@string/all"
                     android:textSize="14sp" />
@@ -44,7 +44,7 @@
                     android:id="@+id/rewards_list_loading"
                     android:layout_width="20dp"
                     android:layout_height="20dp"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:visibility="gone" />
             </RelativeLayout>
@@ -87,7 +87,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
                     android:fontFamily="@font/inter"
                     android:textSize="24sp"
                     android:textColor="@color/white" />
@@ -143,7 +143,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/rewards_get_started_button"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 761835c6..b8126321 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -11,7 +11,7 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintRight_toRightOf="parent"/>
 
diff --git a/app/src/main/res/layout/fragment_transaction_history.xml b/app/src/main/res/layout/fragment_transaction_history.xml
index 0c545eac..2762311d 100644
--- a/app/src/main/res/layout/fragment_transaction_history.xml
+++ b/app/src/main/res/layout/fragment_transaction_history.xml
@@ -9,8 +9,8 @@
         android:id="@+id/transaction_history_no_transactions"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:fontFamily="@font/inter"
         android:textSize="14sp"
         android:text="@string/no_transactions"
diff --git a/app/src/main/res/layout/fragment_verification_phone.xml b/app/src/main/res/layout/fragment_verification_phone.xml
index 266de2b5..d517ba5e 100644
--- a/app/src/main/res/layout/fragment_verification_phone.xml
+++ b/app/src/main/res/layout/fragment_verification_phone.xml
@@ -136,8 +136,8 @@
                 android:id="@+id/verification_phone_verify_progress"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:layout_toEndOf="@id/verification_phone_verify_button"
-                android:layout_marginStart="16dp"
+                android:layout_toRightOf="@id/verification_phone_verify_button"
+                android:layout_marginLeft="16dp"
                 android:layout_centerVertical="true"
                 android:visibility="gone" />
 
@@ -149,7 +149,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:fontFamily="@font/inter"
                 android:text="@string/edit"
                 android:textColor="@color/white"
diff --git a/app/src/main/res/layout/fragment_verification_wallet.xml b/app/src/main/res/layout/fragment_verification_wallet.xml
index 0c6d6eff..dbed136c 100644
--- a/app/src/main/res/layout/fragment_verification_wallet.xml
+++ b/app/src/main/res/layout/fragment_verification_wallet.xml
@@ -33,7 +33,7 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_gravity="center"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:layout_marginTop="24dp" />
             </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml
index 4b0fff98..762e2866 100644
--- a/app/src/main/res/layout/fragment_wallet.xml
+++ b/app/src/main/res/layout/fragment_wallet.xml
@@ -95,7 +95,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/wallet_sign_up_button"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/list_item_channel.xml b/app/src/main/res/layout/list_item_channel.xml
index 685370c2..0469c640 100644
--- a/app/src/main/res/layout/list_item_channel.xml
+++ b/app/src/main/res/layout/list_item_channel.xml
@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
     android:clickable="true"
@@ -32,7 +32,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
+            android:layout_marginLeft="4dp"
             android:fontFamily="@font/inter"
             android:textColor="@color/lightForeground"
             android:textFontWeight="300"
@@ -41,7 +41,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
+            android:layout_marginLeft="4dp"
             android:fontFamily="@font/inter"
             android:text="@string/reposted"
             android:textColor="@color/lightForeground"
@@ -83,13 +83,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_marginTop="4dp"
-                android:layout_marginEnd="4dp"
+                android:layout_marginRight="4dp"
                 android:paddingTop="1dp"
                 android:paddingBottom="1dp"
-                android:paddingStart="2dp"
-                android:paddingEnd="2dp"
+                android:paddingLeft="2dp"
+                android:paddingRight="2dp"
                 android:visibility="gone">
                 <io.lbry.browser.ui.controls.SolidIconView
                     android:layout_width="16dp"
@@ -102,7 +102,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="2dp"
+                    android:layout_marginLeft="2dp"
                     android:fontFamily="@font/inter"
                     android:textSize="14sp"
                     android:textFontWeight="300" />
@@ -128,8 +128,8 @@
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:layout_centerVertical="true"
-            android:layout_marginStart="16dp"
-            android:layout_toEndOf="@id/claim_media_container">
+            android:layout_marginLeft="16dp"
+            android:layout_toRightOf="@id/claim_media_container">
             <TextView
                 android:id="@+id/claim_vanity_url"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/list_item_channel_filter.xml b/app/src/main/res/layout/list_item_channel_filter.xml
index cc2290ce..63970ca2 100644
--- a/app/src/main/res/layout/list_item_channel_filter.xml
+++ b/app/src/main/res/layout/list_item_channel_filter.xml
@@ -7,7 +7,7 @@
     android:background="@drawable/bg_selected_item"
     android:layout_width="100dp"
     android:layout_height="wrap_content"
-    android:layout_marginEnd="2dp">
+    android:layout_marginRight="2dp">
     <RelativeLayout
         android:id="@+id/channel_filter_media_container"
         android:layout_width="80dp"
diff --git a/app/src/main/res/layout/list_item_comment.xml b/app/src/main/res/layout/list_item_comment.xml
index ab1584fc..bf068177 100644
--- a/app/src/main/res/layout/list_item_comment.xml
+++ b/app/src/main/res/layout/list_item_comment.xml
@@ -7,8 +7,8 @@
     android:focusable="true"
     android:orientation="vertical"
     android:paddingBottom="8dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:paddingTop="8dp">
 
     <RelativeLayout
@@ -46,8 +46,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_toEndOf="@id/comment_avatar_container"
-            android:layout_marginStart="16dp"
+            android:layout_toRightOf="@id/comment_avatar_container"
+            android:layout_marginLeft="16dp"
             android:orientation="vertical">
 
             <RelativeLayout
@@ -66,7 +66,7 @@
                     android:id="@+id/comment_time"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:layout_centerInParent="true"
                     android:fontFamily="@font/inter"
                     android:textColor="@color/lightGrey"
diff --git a/app/src/main/res/layout/list_item_editors_choice.xml b/app/src/main/res/layout/list_item_editors_choice.xml
index 49aad7f6..e69a8873 100644
--- a/app/src/main/res/layout/list_item_editors_choice.xml
+++ b/app/src/main/res/layout/list_item_editors_choice.xml
@@ -9,8 +9,8 @@
         android:id="@+id/editors_choice_header_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
         android:fontFamily="@font/inter"
         android:textSize="24sp"
@@ -22,8 +22,8 @@
         android:foreground="?attr/selectableItemBackground"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp">
         <LinearLayout
             android:layout_width="match_parent"
@@ -49,10 +49,10 @@
                     android:layout_centerVertical="true"/>
                 <TextView
                     android:id="@+id/editors_choice_content_description"
-                    android:layout_toEndOf="@id/editors_choice_content_thumbnail"
+                    android:layout_toRightOf="@id/editors_choice_content_thumbnail"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
                     android:lineSpacingMultiplier="1.2"
                     android:fontFamily="@font/inter"
                     android:ellipsize="end"
diff --git a/app/src/main/res/layout/list_item_featured_search_result.xml b/app/src/main/res/layout/list_item_featured_search_result.xml
index 5ba51b2b..0804a85d 100644
--- a/app/src/main/res/layout/list_item_featured_search_result.xml
+++ b/app/src/main/res/layout/list_item_featured_search_result.xml
@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
     android:clickable="true"
@@ -27,7 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
+            android:layout_marginLeft="4dp"
             android:clickable="true"
             android:fontFamily="@font/inter"
             android:textFontWeight="300"
@@ -36,7 +36,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
+            android:layout_marginLeft="4dp"
             android:fontFamily="@font/inter"
             android:text="@string/reposted"
             android:textSize="12sp"
@@ -78,8 +78,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginEnd="4dp"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="4dp"
                 android:layout_marginBottom="4dp"
                 android:fontFamily="@font/inter"
                 android:textColor="@android:color/white"
@@ -93,13 +93,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_marginTop="4dp"
-                android:layout_marginEnd="4dp"
+                android:layout_marginRight="4dp"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
-                android:paddingStart="6dp"
-                android:paddingEnd="7dp"
+                android:paddingLeft="6dp"
+                android:paddingRight="7dp"
                 android:visibility="gone">
                 <io.lbry.browser.ui.controls.SolidIconView
                     android:layout_width="12dp"
@@ -113,7 +113,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="1dp"
+                    android:layout_marginLeft="1dp"
                     android:fontFamily="@font/inter"
                     android:textColor="@android:color/black"
                     android:textSize="14sp"
@@ -139,8 +139,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_marginStart="16dp"
-            android:layout_toEndOf="@id/claim_media_container">
+            android:layout_marginLeft="16dp"
+            android:layout_toRightOf="@id/claim_media_container">
             <TextView
                 android:id="@+id/claim_vanity_url"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/list_item_gallery.xml b/app/src/main/res/layout/list_item_gallery.xml
index 02577a3e..d18d75ed 100644
--- a/app/src/main/res/layout/list_item_gallery.xml
+++ b/app/src/main/res/layout/list_item_gallery.xml
@@ -16,8 +16,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginEnd="4dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="4dp"
         android:layout_marginBottom="4dp"
         android:fontFamily="@font/inter"
         android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/list_item_nav_menu_group.xml b/app/src/main/res/layout/list_item_nav_menu_group.xml
index 720d31ce..fb402dea 100644
--- a/app/src/main/res/layout/list_item_nav_menu_group.xml
+++ b/app/src/main/res/layout/list_item_nav_menu_group.xml
@@ -4,8 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="16dp"
-    android:layout_marginStart="16dp"
-    android:layout_marginEnd="16dp"
+    android:layout_marginLeft="16dp"
+    android:layout_marginRight="16dp"
     android:layout_marginBottom="4dp">
     <TextView
         android:id="@+id/nav_menu_title"
diff --git a/app/src/main/res/layout/list_item_nav_menu_item.xml b/app/src/main/res/layout/list_item_nav_menu_item.xml
index 06021870..19fe7943 100644
--- a/app/src/main/res/layout/list_item_nav_menu_item.xml
+++ b/app/src/main/res/layout/list_item_nav_menu_item.xml
@@ -5,8 +5,8 @@
     android:layout_height="wrap_content"
     android:paddingTop="12dp"
     android:paddingBottom="12dp"
-    android:paddingStart="20dp"
-    android:paddingEnd="20dp"
+    android:paddingLeft="20dp"
+    android:paddingRight="20dp"
     android:clickable="true"
     android:focusable="true"
     android:background="@drawable/bg_selected_nav_item"
@@ -22,7 +22,7 @@
     <TextView
         android:id="@+id/nav_menu_title"
         android:fontFamily="@font/inter"
-        android:layout_marginStart="12dp"
+        android:layout_marginLeft="12dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/layout/list_item_notification.xml b/app/src/main/res/layout/list_item_notification.xml
index a8c8254e..423d7fe4 100644
--- a/app/src/main/res/layout/list_item_notification.xml
+++ b/app/src/main/res/layout/list_item_notification.xml
@@ -5,8 +5,8 @@
     android:clickable="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="8dp"
-    android:layout_marginEnd="8dp"
+    android:layout_marginLeft="8dp"
+    android:layout_marginRight="8dp"
     android:layout_marginBottom="8dp">
     <LinearLayout
         android:id="@+id/notification_layout"
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
         <RelativeLayout
-            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center_vertical">
diff --git a/app/src/main/res/layout/list_item_stream.xml b/app/src/main/res/layout/list_item_stream.xml
index be24eeae..6e73ec64 100644
--- a/app/src/main/res/layout/list_item_stream.xml
+++ b/app/src/main/res/layout/list_item_stream.xml
@@ -3,8 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
     android:clickable="true"
@@ -32,7 +32,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
+            android:layout_marginLeft="4dp"
             android:fontFamily="@font/inter"
             android:textColor="@color/lightForeground"
             android:textFontWeight="300"
@@ -41,7 +41,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
+            android:layout_marginLeft="4dp"
             android:fontFamily="@font/inter"
             android:text="@string/reposted"
             android:textColor="@color/lightForeground"
@@ -83,8 +83,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginEnd="4dp"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="4dp"
                 android:layout_marginBottom="4dp"
                 android:fontFamily="@font/inter"
                 android:textColor="@android:color/white"
@@ -98,13 +98,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
                 android:layout_marginTop="4dp"
-                android:layout_marginEnd="4dp"
+                android:layout_marginRight="4dp"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
-                android:paddingStart="6dp"
-                android:paddingEnd="7dp"
+                android:paddingLeft="6dp"
+                android:paddingRight="7dp"
                 android:visibility="gone">
                 <io.lbry.browser.ui.controls.SolidIconView
                     android:layout_width="12dp"
@@ -118,7 +118,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="1dp"
+                    android:layout_marginLeft="1dp"
                     android:fontFamily="@font/inter"
                     android:textColor="@android:color/black"
                     android:textSize="14sp"
@@ -151,8 +151,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_marginStart="16dp"
-            android:layout_toEndOf="@id/claim_media_container">
+            android:layout_marginLeft="16dp"
+            android:layout_toRightOf="@id/claim_media_container">
             <LinearLayout
                 android:id="@+id/claim_text_loading_placeholder_1"
                 android:background="@color/lighterGrey"
@@ -217,7 +217,7 @@
                     android:id="@+id/claim_file_size"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:fontFamily="@font/inter"
                     android:textSize="11sp"
                     android:textFontWeight="300" />
diff --git a/app/src/main/res/layout/list_item_suggested_channel.xml b/app/src/main/res/layout/list_item_suggested_channel.xml
index 49ebf048..9c461b53 100644
--- a/app/src/main/res/layout/list_item_suggested_channel.xml
+++ b/app/src/main/res/layout/list_item_suggested_channel.xml
@@ -10,8 +10,8 @@
     android:focusable="true"
     android:paddingTop="12dp"
     android:paddingBottom="12dp"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp">
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp">
     <RelativeLayout
         android:id="@+id/suggested_media_container"
         android:layout_width="80dp"
@@ -64,6 +64,6 @@
         android:textSize="12sp"
         android:paddingTop="2dp"
         android:paddingBottom="3dp"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp" />
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_tag.xml b/app/src/main/res/layout/list_item_tag.xml
index f37e1d6c..9881babe 100644
--- a/app/src/main/res/layout/list_item_tag.xml
+++ b/app/src/main/res/layout/list_item_tag.xml
@@ -5,19 +5,19 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginBottom="6dp"
-    android:layout_marginEnd="6dp"
+    android:layout_marginRight="6dp"
     android:orientation="horizontal"
     android:paddingTop="4dp"
     android:paddingBottom="4dp"
-    android:paddingStart="8dp"
-    android:paddingEnd="12dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="12dp"
     android:foreground="?attr/selectableItemBackground">
     <ImageView
         android:id="@+id/tag_action"
         android:layout_width="16dp"
         android:layout_height="16dp"
         android:layout_gravity="center_vertical"
-        android:layout_marginEnd="4dp"
+        android:layout_marginRight="4dp"
         android:tint="@color/darkForeground" />
     <TextView
         android:id="@+id/tag_name"
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:fontFamily="@font/inter"
-        android:layout_marginStart="4dp"
+        android:layout_marginLeft="4dp"
         android:textSize="12sp"
         android:textFontWeight="300" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_url_suggestion.xml b/app/src/main/res/layout/list_item_url_suggestion.xml
index 2be0703e..335c865e 100644
--- a/app/src/main/res/layout/list_item_url_suggestion.xml
+++ b/app/src/main/res/layout/list_item_url_suggestion.xml
@@ -2,8 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent" android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp"
+    android:paddingLeft="12dp"
+    android:paddingRight="12dp"
     android:paddingTop="12dp"
     android:paddingBottom="12dp"
     android:clickable="true"
@@ -18,9 +18,9 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/url_suggestion_icon"
+        android:layout_toRightOf="@id/url_suggestion_icon"
         android:layout_centerVertical="true"
-        android:layout_marginStart="12dp"
+        android:layout_marginLeft="12dp"
         android:orientation="vertical">
         <TextView
             android:id="@+id/url_suggestion_title"
diff --git a/app/src/main/res/layout/popup_webview.xml b/app/src/main/res/layout/popup_webview.xml
index 4384b454..f58d2423 100644
--- a/app/src/main/res/layout/popup_webview.xml
+++ b/app/src/main/res/layout/popup_webview.xml
@@ -15,6 +15,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         style="@style/Widget.MaterialComponents.Button.TextButton"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/test/java/io/lbry/browser/utils/LbryUriTest.java b/app/src/test/java/io/lbry/browser/utils/LbryUriTest.java
new file mode 100644
index 00000000..36ce5b49
--- /dev/null
+++ b/app/src/test/java/io/lbry/browser/utils/LbryUriTest.java
@@ -0,0 +1,130 @@
+package io.lbry.browser.utils;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.Before;
+import org.junit.Test;
+
+import io.lbry.browser.exceptions.LbryUriException;
+
+import static org.junit.Assert.assertEquals;
+
+public class LbryUriTest {
+    private LbryUri expected;
+
+    /*
+     * Create an LbryUri object and assign fields manually using class methods. This object will be
+     * compared with LbryUri.parse() returned object on each test.
+     */
+    @Before
+    public void createExpected() {
+        expected = new LbryUri();
+        expected.setChannelName("@lbry");
+        expected.setStreamName("lbryturns4");
+
+        try {
+            LbryUri.UriModifier primaryMod = LbryUri.UriModifier.parse("#", "3f");
+            LbryUri.UriModifier secondaryMod = LbryUri.UriModifier.parse("#", "6");
+            expected.setChannelClaimId(primaryMod.getClaimId());
+            expected.setStreamClaimId(secondaryMod.getClaimId());
+        } catch (LbryUriException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void parseOpenLbryComWithChannel() {
+        LbryUri obtained = new LbryUri();
+
+        try {
+            obtained = LbryUri.parse("https://open.lbry.com/@lbry:3f/lbryturns4:6",false);
+        } catch (LbryUriException e) {
+            e.printStackTrace();
+        }
+
+        assertEquals(expected, obtained);
+    }
+
+    @Test
+    public void parseLbryTvWithChannel() {
+        LbryUri obtained = new LbryUri();
+
+        try {
+            obtained = LbryUri.parse("https://lbry.tv/@lbry:3f/lbryturns4:6",false);
+        } catch (LbryUriException e) {
+            e.printStackTrace();
+        }
+
+        assertEquals(expected, obtained);
+    }
+
+    @Test
+    public void parseLbryAlterWithChannel() {
+        LbryUri obtained = new LbryUri();
+
+        try {
+            obtained = LbryUri.parse("https://lbry.lat/@lbry:3f/lbryturns4:6",false);
+        } catch (LbryUriException e) {
+            e.printStackTrace();
+        }
+
+        assertEquals(expected, obtained);
+    }
+
+    @Test
+    public void parseLbryProtocolWithChannel() {
+        LbryUri obtained = new LbryUri();
+
+        try {
+            obtained = LbryUri.parse("lbry://@lbry#3f/lbryturns4#6",false);
+        } catch (LbryUriException e) {
+            e.printStackTrace();
+        }
+
+        assertEquals(expected, obtained);
+    }
+
+    @Test
+    public void parseLbryProtocolOnlyChannel() {
+        LbryUri expectedForChannel = sinthesizeExpected();
+
+        LbryUri obtained = new LbryUri();
+
+        try {
+            obtained = LbryUri.parse("lbry://@UCBerkeley#d",false);
+        } catch (LbryUriException e) {
+            e.printStackTrace();
+        }
+
+        assertEquals(expectedForChannel, obtained);
+    }
+
+    @Test
+    public void parseLbryTvProtocolOnlyChannel() {
+        LbryUri expectedForChannel = sinthesizeExpected();
+
+        LbryUri obtained = new LbryUri();
+
+        try {
+            obtained = LbryUri.parse("https://lbry.tv/@UCBerkeley:d",false);
+        } catch (LbryUriException e) {
+            e.printStackTrace();
+        }
+
+        assertEquals(expectedForChannel, obtained);
+    }
+
+    @NotNull
+    private LbryUri sinthesizeExpected() {
+        LbryUri expectedForChannel = new LbryUri();
+        expectedForChannel.setChannelName("@UCBerkeley");
+        expectedForChannel.setChannel(true);
+
+        try {
+            LbryUri.UriModifier primaryMod = LbryUri.UriModifier.parse("#", "d");
+            expectedForChannel.setChannelClaimId(primaryMod.getClaimId());
+        } catch (LbryUriException e) {
+            e.printStackTrace();
+        }
+        return expectedForChannel;
+    }
+}
\ No newline at end of file