diff --git a/app/src/main/java/io/lbry/browser/MainActivity.java b/app/src/main/java/io/lbry/browser/MainActivity.java
index 39ec4a90..991ce942 100644
--- a/app/src/main/java/io/lbry/browser/MainActivity.java
+++ b/app/src/main/java/io/lbry/browser/MainActivity.java
@@ -107,6 +107,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.handshake.ServerHandshake;
+import org.jetbrains.annotations.NotNull;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -221,6 +222,8 @@ import lombok.Setter;
 import lombok.SneakyThrows;
 import okhttp3.OkHttpClient;
 
+import static android.os.Build.VERSION_CODES.M;
+
 public class MainActivity extends AppCompatActivity implements SdkStatusListener,
         SharedPreferences.OnSharedPreferenceChangeListener,
         ActionMode.Callback, SelectionModeListener {
@@ -434,7 +437,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
         initKeyStore();
         loadAuthToken();
 
-        if (!isDarkMode()) {
+        if (Build.VERSION.SDK_INT >= M && !isDarkMode()) {
             getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
         }
         initSpecialRouteMap();
@@ -1315,7 +1318,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
     private void toggleUrlSuggestions(boolean visible) {
         View container = findViewById(R.id.url_suggestions_container);
         View closeIcon = findViewById(R.id.wunderbar_close);
-        EditText wunderbar = findViewById(R.id.wunderbar);
+        //EditText wunderbar = findViewById(R.id.wunderbar);
         //wunderbar.setPadding(0, 0, visible ? getScaledValue(36) : 0, 0);
 
         container.setVisibility(visible ? View.VISIBLE : View.GONE);
@@ -1863,17 +1866,13 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
                                 new DecimalFormat(Helper.LBC_CURRENCY_FORMAT_PATTERN).format(amountClaimed));
                     }
                     Snackbar.make(findViewById(R.id.content_main), message, Snackbar.LENGTH_LONG).show();
-                    if (sp != null) {
-                        sp.edit().putBoolean(PREFERENCE_KEY_INTERNAL_NEW_ANDROID_REWARD_CLAIMED, true).apply();
-                    }
+                    sp.edit().putBoolean(PREFERENCE_KEY_INTERNAL_NEW_ANDROID_REWARD_CLAIMED, true).apply();
                 }
 
                 @Override
                 public void onError(Exception error) {
                     // pass. fail silently
-                    if (sp != null) {
-                        sp.edit().putBoolean(PREFERENCE_KEY_INTERNAL_NEW_ANDROID_REWARD_CLAIMED, true).apply();
-                    }
+                    sp.edit().putBoolean(PREFERENCE_KEY_INTERNAL_NEW_ANDROID_REWARD_CLAIMED, true).apply();
                 }
             });
             task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -1958,7 +1957,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
             notificationListAdapter.setInSelectionMode(false);
             notificationListAdapter.notifyDataSetChanged();
         }
-        if (isDarkMode()) {
+        if (Build.VERSION.SDK_INT >= M && isDarkMode()) {
             getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
         }
         this.actionMode = null;
@@ -2022,8 +2021,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
             if (nowPlayingClaimUrl != null) {
                 Intent launchIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(nowPlayingClaimUrl));
                 launchIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-                PendingIntent intent = PendingIntent.getActivity(MainActivity.this, 0, launchIntent, 0);
-                return intent;
+                return PendingIntent.getActivity(MainActivity.this, 0, launchIntent, 0);
             }
             return null;
         }
@@ -2236,8 +2234,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
                 @Override
                 public void onSyncSetSuccess(String hash) {
                     Lbryio.lastRemoteHash = hash;
-                    WalletSync walletSync = new WalletSync(hash, data);
-                    Lbryio.lastWalletSync = walletSync;
+                    Lbryio.lastWalletSync = new WalletSync(hash, data);
 
                     if (pendingSyncSetQueue.size() > 0) {
                         fullSyncInProgress = true;
@@ -2417,8 +2414,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
                 pendingFollowingReload = true;
             }
             private void handleOpenChannelUrl(Intent intent) {
-                String url = intent.getStringExtra("url");
-                pendingChannelUrl = url;
+                pendingChannelUrl = intent.getStringExtra("url");
             }
         };
         registerReceiver(requestsReceiver, intentFilter);
@@ -2578,7 +2574,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, @NotNull String[] permissions, @NotNull int[] grantResults) {
         switch (requestCode) {
             case REQUEST_STORAGE_PERMISSION:
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
@@ -2613,7 +2609,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQUEST_FILE_PICKER) {
             startingFilePickerActivity = false;
-            if (resultCode == RESULT_OK) {
+            if (resultCode == RESULT_OK && data != null) {
                 Uri fileUri = data.getData();
                 String filePath = Helper.getRealPathFromURI_API19(this, fileUri);
                 for (FilePickerListener listener : filePickerListeners) {
@@ -2724,8 +2720,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
         int backCount = getSupportFragmentManager().getBackStackEntryCount();
         if (backCount > 0) {
             try {
-                Fragment fragment = getSupportFragmentManager().getFragments().get(backCount - 1);
-                return fragment;
+                return getSupportFragmentManager().getFragments().get(backCount - 1);
             } catch (IndexOutOfBoundsException ex) {
                 return null;
             }
@@ -2849,8 +2844,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
 
                             // resolve subscriptions
                             if (subUrls.size() > 0 && Lbryio.cacheResolvedSubscriptions.size() != Lbryio.subscriptions.size()) {
-                                List<Claim> resolvedSubs = Lbry.resolve(subUrls, Lbry.LBRY_TV_CONNECTION_STRING);
-                                Lbryio.cacheResolvedSubscriptions = resolvedSubs;
+                                Lbryio.cacheResolvedSubscriptions = Lbry.resolve(subUrls, Lbry.LBRY_TV_CONNECTION_STRING);
                             }
                             // if no exceptions occurred here, subscriptions have been loaded and resolved
                             startupStages.set(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED - 1, new StartupStage(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED, true));
diff --git a/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java b/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java
index 71547ae9..805c21f1 100644
--- a/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java
@@ -2168,7 +2168,6 @@ public class FileViewFragment extends BaseFragment implements
     }
 
     private void openClaimExternally(Claim claim, String mediaType) {
-        File file = new File(claim.getFile().getDownloadPath());
         Uri fileUri = Uri.parse(claim.getFile().getDownloadPath());
 
         Intent intent = new Intent();
diff --git a/app/src/main/res/layout/activity_verification.xml b/app/src/main/res/layout/activity_verification.xml
index 23ec89f3..c5017c9e 100644
--- a/app/src/main/res/layout/activity_verification.xml
+++ b/app/src/main/res/layout/activity_verification.xml
@@ -31,7 +31,7 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_close"
-                android:tint="@color/white" />
+                app:tint="@color/white" />
         </RelativeLayout>
 
         <ProgressBar
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index a27be78f..a5c63065 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -62,7 +62,7 @@
                         android:layout_width="24dp"
                         android:layout_height="24dp"
                         android:src="@drawable/ic_close"
-                        android:tint="@color/actionBarForeground" />
+                        app:tint="@color/actionBarForeground" />
                 </LinearLayout>
 
                 <RelativeLayout
@@ -79,7 +79,7 @@
                         android:layout_height="24dp"
                         android:layout_centerInParent="true"
                         android:src="@drawable/ic_notifications"
-                        android:tint="@color/actionBarForeground" />
+                        app:tint="@color/actionBarForeground" />
                     <TextView
                         android:id="@+id/notifications_badge_count"
                         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/container_comment_form.xml b/app/src/main/res/layout/container_comment_form.xml
index cca903d3..0e2a4f26 100644
--- a/app/src/main/res/layout/container_comment_form.xml
+++ b/app/src/main/res/layout/container_comment_form.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/comment_form_card"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -99,7 +100,7 @@
                         android:layout_height="24dp"
                         android:layout_centerInParent="true"
                         android:src="@drawable/ic_close"
-                        android:tint="@color/foreground" />
+                        app:tint="@color/foreground" />
                 </RelativeLayout>
             </RelativeLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 0edffd26..06bfa62f 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -174,9 +174,9 @@
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:tint="@color/foreground"
                     android:src="@drawable/ic_close"
-                    android:layout_centerInParent="true"/>
+                    android:layout_centerInParent="true"
+                    app:tint="@color/foreground" />
             </RelativeLayout>
         </RelativeLayout>
     </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/dialog_content_from.xml b/app/src/main/res/layout/dialog_content_from.xml
index 41729cb7..7bdc4161 100644
--- a/app/src/main/res/layout/dialog_content_from.xml
+++ b/app/src/main/res/layout/dialog_content_from.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -44,8 +45,8 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
-            android:tint="@color/lbryGreen"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:tint="@color/lbryGreen" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -70,8 +71,8 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
-            android:tint="@color/lbryGreen"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:tint="@color/lbryGreen" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -96,8 +97,8 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
-            android:tint="@color/lbryGreen"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:tint="@color/lbryGreen" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -122,8 +123,8 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
-            android:tint="@color/lbryGreen"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:tint="@color/lbryGreen" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -148,7 +149,7 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
-            android:tint="@color/lbryGreen"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:tint="@color/lbryGreen" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_content_scope.xml b/app/src/main/res/layout/dialog_content_scope.xml
index 7bef7653..b8b9211d 100644
--- a/app/src/main/res/layout/dialog_content_scope.xml
+++ b/app/src/main/res/layout/dialog_content_scope.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -53,8 +54,8 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
-            android:tint="@color/lbryGreen"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:tint="@color/lbryGreen" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -88,7 +89,7 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
-            android:tint="@color/lbryGreen"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:tint="@color/lbryGreen" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_content_sort.xml b/app/src/main/res/layout/dialog_content_sort.xml
index 194f476b..82e012d5 100644
--- a/app/src/main/res/layout/dialog_content_sort.xml
+++ b/app/src/main/res/layout/dialog_content_sort.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -35,7 +36,7 @@
             android:layout_height="18dp"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_trending"
-            android:tint="@color/foreground" />
+            app:tint="@color/foreground" />
         <TextView
             android:layout_toEndOf="@+id/sort_by_trending_item_icon"
             android:layout_width="wrap_content"
@@ -53,8 +54,8 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
-            android:tint="@color/lbryGreen"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:tint="@color/lbryGreen" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -70,7 +71,7 @@
             android:layout_height="18dp"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_new"
-            android:tint="@color/foreground" />
+            app:tint="@color/foreground" />
         <TextView
             android:layout_toEndOf="@+id/sort_by_new_item_icon"
             android:layout_width="wrap_content"
@@ -88,8 +89,8 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
-            android:tint="@color/lbryGreen"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:tint="@color/lbryGreen" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -105,7 +106,7 @@
             android:layout_height="18dp"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_top"
-            android:tint="@color/foreground" />
+            app:tint="@color/foreground" />
         <TextView
             android:layout_toEndOf="@+id/sort_by_top_item_icon"
             android:layout_width="wrap_content"
@@ -123,7 +124,7 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_check"
-            android:tint="@color/lbryGreen"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:tint="@color/lbryGreen" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
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..19d8310c 100644
--- a/app/src/main/res/layout/exo_playback_control_view.xml
+++ b/app/src/main/res/layout/exo_playback_control_view.xml
@@ -22,7 +22,7 @@
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="16dp"
             android:src="@drawable/ic_replay_10"
-            android:tint="@color/white" />
+            app:tint="@color/white" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -74,7 +74,7 @@
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="16dp"
             android:src="@drawable/ic_forward_10"
-            android:tint="@color/white" />
+            app:tint="@color/white" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -92,7 +92,7 @@
             android:layout_height="24dp"
             android:layout_centerInParent="true"
             android:src="@drawable/ic_cast"
-            android:tint="@color/white" />
+            app:tint="@color/white" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -133,7 +133,7 @@
             android:layout_height="24dp"
             android:layout_centerInParent="true"
             android:src="@drawable/ic_fullscreen"
-            android:tint="@color/white" />
+            app:tint="@color/white" />
     </RelativeLayout>
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_all_content.xml b/app/src/main/res/layout/fragment_all_content.xml
index 35b18a60..68477ace 100644
--- a/app/src/main/res/layout/fragment_all_content.xml
+++ b/app/src/main/res/layout/fragment_all_content.xml
@@ -79,7 +79,7 @@
                         android:layout_marginStart="2dp"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
-                        android:tint="@color/foreground" />
+                        app:tint="@color/foreground" />
                 </LinearLayout>
 
                 <TextView
@@ -120,7 +120,7 @@
                         android:layout_marginStart="2dp"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
-                        android:tint="@color/foreground" />
+                        app:tint="@color/foreground" />
                 </LinearLayout>
 
                 <TextView
@@ -161,7 +161,7 @@
                         android:layout_marginStart="2dp"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
-                        android:tint="@color/foreground" />
+                        app:tint="@color/foreground" />
                 </LinearLayout>
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index fa688fa6..058dcbfe 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -157,8 +157,8 @@
                         android:layout_centerInParent="true"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
-                        android:tint="@color/foreground"
-                        android:src="@drawable/ic_edit" />
+                        android:src="@drawable/ic_edit"
+                        app:tint="@color/foreground" />
                 </RelativeLayout>
                 <RelativeLayout
                     android:id="@+id/channel_view_delete"
@@ -172,8 +172,8 @@
                         android:layout_centerInParent="true"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
-                        android:tint="@color/foreground"
-                        android:src="@drawable/ic_delete" />
+                        android:src="@drawable/ic_delete"
+                        app:tint="@color/foreground" />
                 </RelativeLayout>
                 <RelativeLayout
                     android:id="@+id/channel_view_share"
@@ -186,8 +186,8 @@
                         android:layout_centerInParent="true"
                         android:layout_width="22dp"
                         android:layout_height="22dp"
-                        android:tint="@color/foreground"
-                        android:src="@drawable/ic_share" />
+                        android:src="@drawable/ic_share"
+                        app:tint="@color/foreground" />
                 </RelativeLayout>
                 <RelativeLayout
                     android:id="@+id/channel_view_tip"
diff --git a/app/src/main/res/layout/fragment_channel_content.xml b/app/src/main/res/layout/fragment_channel_content.xml
index 15e11fbd..701ed17c 100644
--- a/app/src/main/res/layout/fragment_channel_content.xml
+++ b/app/src/main/res/layout/fragment_channel_content.xml
@@ -56,7 +56,7 @@
                         android:layout_marginStart="2dp"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
-                        android:tint="@color/foreground" />
+                        app:tint="@color/foreground" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -85,7 +85,7 @@
                         android:layout_marginStart="2dp"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
-                        android:tint="@color/foreground" />
+                        app:tint="@color/foreground" />
                 </LinearLayout>
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_channel_form.xml b/app/src/main/res/layout/fragment_channel_form.xml
index 5549368d..bdce4273 100644
--- a/app/src/main/res/layout/fragment_channel_form.xml
+++ b/app/src/main/res/layout/fragment_channel_form.xml
@@ -38,7 +38,7 @@
                     android:layout_height="16dp"
                     android:layout_centerInParent="true"
                     android:src="@drawable/ic_edit"
-                    android:tint="@color/white" />
+                    app:tint="@color/white" />
             </RelativeLayout>
 
 
@@ -112,7 +112,7 @@
                         android:layout_height="16dp"
                         android:layout_centerInParent="true"
                         android:src="@drawable/ic_edit"
-                        android:tint="@color/white" />
+                        app:tint="@color/white" />
                 </RelativeLayout>
             </RelativeLayout>
         </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_file_view.xml b/app/src/main/res/layout/fragment_file_view.xml
index 974a527c..3b0930bc 100644
--- a/app/src/main/res/layout/fragment_file_view.xml
+++ b/app/src/main/res/layout/fragment_file_view.xml
@@ -261,7 +261,7 @@
                         android:layout_centerVertical="true"
                         android:layout_toStartOf="@+id/file_view_title_layout"
                         android:src="@drawable/ic_arrow_dropdown"
-                        android:tint="@color/foreground" />
+                        app:tint="@color/foreground" />
                 </RelativeLayout>
 
                 <LinearLayout
@@ -292,7 +292,7 @@
                                 android:layout_height="24dp"
                                 android:layout_centerInParent="true"
                                 android:src="@drawable/ic_share"
-                                android:tint="@color/foreground" />
+                                app:tint="@color/foreground" />
                         </RelativeLayout>
 
                         <TextView
@@ -395,7 +395,7 @@
                                 android:layout_height="24dp"
                                 android:layout_centerInParent="true"
                                 android:src="@drawable/ic_edit"
-                                android:tint="@color/foreground" />
+                                app:tint="@color/foreground" />
                         </RelativeLayout>
 
                         <TextView
@@ -437,7 +437,7 @@
                                 android:layout_height="20dp"
                                 android:layout_centerInParent="true"
                                 android:src="@drawable/ic_download"
-                                android:tint="@color/foreground" />
+                                app:tint="@color/foreground" />
                         </RelativeLayout>
 
                         <TextView
@@ -471,7 +471,7 @@
                                 android:layout_height="24dp"
                                 android:layout_centerInParent="true"
                                 android:src="@drawable/ic_delete"
-                                android:tint="@color/foreground" />
+                                app:tint="@color/foreground" />
                         </RelativeLayout>
 
                         <TextView
@@ -504,7 +504,7 @@
                                 android:layout_height="24dp"
                                 android:layout_centerInParent="true"
                                 android:src="@drawable/ic_unpublish"
-                                android:tint="@color/foreground" />
+                                app:tint="@color/foreground" />
                         </RelativeLayout>
 
                         <TextView
@@ -537,7 +537,7 @@
                                 android:layout_height="24dp"
                                 android:layout_centerInParent="true"
                                 android:src="@drawable/ic_report"
-                                android:tint="@color/foreground" />
+                                app:tint="@color/foreground" />
                         </RelativeLayout>
 
                         <TextView
@@ -891,4 +891,4 @@
 
     </RelativeLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_following.xml b/app/src/main/res/layout/fragment_following.xml
index dc0f2b54..d636c1b6 100644
--- a/app/src/main/res/layout/fragment_following.xml
+++ b/app/src/main/res/layout/fragment_following.xml
@@ -82,7 +82,7 @@
                     android:layout_marginStart="2dp"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_arrow_dropdown"
-                    android:tint="@color/foreground" />
+                    app:tint="@color/foreground" />
             </LinearLayout>
 
             <LinearLayout
@@ -110,7 +110,7 @@
                     android:layout_marginStart="2dp"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_arrow_dropdown"
-                    android:tint="@color/foreground" />
+                    app:tint="@color/foreground" />
             </LinearLayout>
 
             <TextView
diff --git a/app/src/main/res/layout/fragment_gallery.xml b/app/src/main/res/layout/fragment_gallery.xml
index 643fe254..e682f216 100644
--- a/app/src/main/res/layout/fragment_gallery.xml
+++ b/app/src/main/res/layout/fragment_gallery.xml
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.gallery.GalleryFragment">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/text_gallery"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index f3d9b08f..b4899f92 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.home.HomeFragment">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/text_home"
diff --git a/app/src/main/res/layout/fragment_publish.xml b/app/src/main/res/layout/fragment_publish.xml
index d474f74a..04ba7371 100644
--- a/app/src/main/res/layout/fragment_publish.xml
+++ b/app/src/main/res/layout/fragment_publish.xml
@@ -36,8 +36,8 @@
                         android:layout_width="48dp"
                         android:layout_height="48dp"
                         android:layout_gravity="center_horizontal"
-                        android:tint="@color/white"
-                        android:src="@drawable/ic_record" />
+                        android:src="@drawable/ic_record"
+                        app:tint="@color/white" />
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -76,8 +76,8 @@
                             android:layout_width="48dp"
                             android:layout_height="48dp"
                             android:layout_gravity="center_horizontal"
-                            android:tint="@color/white"
-                            android:src="@drawable/ic_photo" />
+                            android:src="@drawable/ic_photo"
+                            app:tint="@color/white" />
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -116,8 +116,8 @@
                             android:layout_width="48dp"
                             android:layout_height="48dp"
                             android:layout_gravity="center_horizontal"
-                            android:tint="@color/white"
-                            android:src="@drawable/ic_upload" />
+                            android:src="@drawable/ic_upload"
+                            app:tint="@color/white" />
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_publish_form.xml b/app/src/main/res/layout/fragment_publish_form.xml
index 6d7eed34..a5860792 100644
--- a/app/src/main/res/layout/fragment_publish_form.xml
+++ b/app/src/main/res/layout/fragment_publish_form.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/pageBackground">
@@ -67,7 +68,7 @@
                         android:layout_height="16dp"
                         android:layout_centerInParent="true"
                         android:src="@drawable/ic_edit"
-                        android:tint="@color/white" />
+                        app:tint="@color/white" />
                 </RelativeLayout>
             </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_shuffle.xml b/app/src/main/res/layout/fragment_shuffle.xml
index 2edce022..7025333a 100644
--- a/app/src/main/res/layout/fragment_shuffle.xml
+++ b/app/src/main/res/layout/fragment_shuffle.xml
@@ -80,8 +80,8 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_centerInParent="true"
-                android:tint="@color/white"
-                android:src="@drawable/ic_share" />
+                android:src="@drawable/ic_share"
+                app:tint="@color/white" />
         </RelativeLayout>
     </RelativeLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_channel.xml b/app/src/main/res/layout/list_item_channel.xml
index 81a9c997..bcb32887 100644
--- a/app/src/main/res/layout/list_item_channel.xml
+++ b/app/src/main/res/layout/list_item_channel.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="16dp"
@@ -118,7 +119,7 @@
                     android:layout_height="36dp"
                     android:layout_centerInParent="true"
                     android:src="@drawable/ic_check"
-                    android:tint="@color/nextLbryGreen" />
+                    app:tint="@color/nextLbryGreen" />
             </RelativeLayout>
         </RelativeLayout>
 
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 afb084b6..a6cffcee 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
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="16dp"
@@ -129,7 +130,7 @@
                     android:layout_height="36dp"
                     android:layout_centerInParent="true"
                     android:src="@drawable/ic_check"
-                    android:tint="@color/nextLbryGreen" />
+                    app:tint="@color/nextLbryGreen" />
             </RelativeLayout>
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/list_item_notification.xml b/app/src/main/res/layout/list_item_notification.xml
index ed5fbd00..3c478664 100644
--- a/app/src/main/res/layout/list_item_notification.xml
+++ b/app/src/main/res/layout/list_item_notification.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/selectableItemBackground"
     android:clickable="true"
     android:layout_width="match_parent"
@@ -40,7 +41,7 @@
                     android:layout_height="36dp"
                     android:layout_centerInParent="true"
                     android:src="@drawable/ic_check"
-                    android:tint="@color/nextLbryGreen" />
+                    app:tint="@color/nextLbryGreen" />
             </RelativeLayout>
         </RelativeLayout>
         <LinearLayout
diff --git a/app/src/main/res/layout/list_item_reward.xml b/app/src/main/res/layout/list_item_reward.xml
index fec233be..8e4a5b35 100644
--- a/app/src/main/res/layout/list_item_reward.xml
+++ b/app/src/main/res/layout/list_item_reward.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:clickable="true"
     android:foreground="?attr/selectableItemBackground"
     android:layout_width="match_parent"
@@ -23,9 +24,9 @@
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:layout_centerInParent="true"
-                android:tint="@color/lbryGreen"
                 android:src="@drawable/ic_check_circle"
-                android:visibility="invisible" />
+                android:visibility="invisible"
+                app:tint="@color/lbryGreen" />
             <ProgressBar
                 android:id="@+id/reward_item_loading"
                 android:layout_centerInParent="true"
diff --git a/app/src/main/res/layout/list_item_startupstage.xml b/app/src/main/res/layout/list_item_startupstage.xml
index 331f21ed..c168ac6f 100644
--- a/app/src/main/res/layout/list_item_startupstage.xml
+++ b/app/src/main/res/layout/list_item_startupstage.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools">
@@ -8,8 +9,8 @@
         android:layout_width="16dp"
         android:layout_height="16dp"
         android:layout_gravity="center_vertical"
-        android:tint="@color/white"
-        android:src="@drawable/ic_check" />
+        android:src="@drawable/ic_check"
+        app:tint="@color/white" />
     <TextView
         android:id="@+id/startup_stage_text"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/list_item_stream.xml b/app/src/main/res/layout/list_item_stream.xml
index d0c96384..50a45390 100644
--- a/app/src/main/res/layout/list_item_stream.xml
+++ b/app/src/main/res/layout/list_item_stream.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -134,7 +135,7 @@
                     android:layout_height="36dp"
                     android:layout_centerInParent="true"
                     android:src="@drawable/ic_check"
-                    android:tint="@color/nextLbryGreen" />
+                    app:tint="@color/nextLbryGreen" />
             </RelativeLayout>
             <LinearLayout
                 android:id="@+id/claim_thumbnail_placeholder"
diff --git a/app/src/main/res/layout/list_item_tag.xml b/app/src/main/res/layout/list_item_tag.xml
index f37e1d6c..f40fdc07 100644
--- a/app/src/main/res/layout/list_item_tag.xml
+++ b/app/src/main/res/layout/list_item_tag.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:clickable="true"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -18,7 +19,7 @@
         android:layout_height="16dp"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="4dp"
-        android:tint="@color/darkForeground" />
+        app:tint="@color/darkForeground" />
     <TextView
         android:id="@+id/tag_name"
         android:layout_width="wrap_content"