diff --git a/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
index 5f41c763b..09cf1411a 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
@@ -13,7 +13,6 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.navigation.Navigation
 import androidx.navigation.findNavController
-import kotlinx.android.synthetic.main.fragment_installed_add_on_details.*
 import kotlinx.android.synthetic.main.fragment_installed_add_on_details.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
diff --git a/app/src/main/res/drawable/addon_textview_selector.xml b/app/src/main/res/drawable/addon_textview_selector.xml
index 9caeefd35..40ae58e43 100644
--- a/app/src/main/res/drawable/addon_textview_selector.xml
+++ b/app/src/main/res/drawable/addon_textview_selector.xml
@@ -3,6 +3,6 @@
    -  License, v. 2.0. If a copy of the MPL was not distributed with this
    -  file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" android:color="?android:attr/textColorPrimary" />
-    <item android:state_checked="false" android:color="@color/photonGrey40" />
+    <item android:state_enabled="false" android:color="@color/photonGrey40" />
+    <item android:color="?primaryText" />
 </selector>
diff --git a/app/src/main/res/layout/fragment_installed_add_on_details.xml b/app/src/main/res/layout/fragment_installed_add_on_details.xml
index 23fe79867..982ef446b 100644
--- a/app/src/main/res/layout/fragment_installed_add_on_details.xml
+++ b/app/src/main/res/layout/fragment_installed_add_on_details.xml
@@ -39,13 +39,13 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/enable_switch"
                 android:background="?android:attr/selectableItemBackground"
-                android:drawablePadding="10dp"
+                android:drawablePadding="12dp"
                 android:padding="16dp"
                 android:text="@string/mozac_feature_addons_settings"
                 android:textColor="@drawable/addon_textview_selector"
                 android:textSize="18sp"
                 app:drawableStartCompat="@drawable/mozac_ic_preferences"
-                app:drawableTint="?android:attr/textColorPrimary" />
+                app:drawableTint="?primaryText" />
 
             <TextView
                 android:id="@+id/details"
@@ -53,13 +53,13 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/settings"
                 android:background="?android:attr/selectableItemBackground"
-                android:drawablePadding="6dp"
+                android:drawablePadding="12dp"
                 android:padding="16dp"
                 android:text="@string/mozac_feature_addons_details"
                 android:textColor="@drawable/addon_textview_selector"
                 android:textSize="18sp"
                 app:drawableStartCompat="@drawable/mozac_ic_information"
-                app:drawableTint="?android:attr/textColorPrimary" />
+                app:drawableTint="?primaryText" />
 
             <TextView
                 android:id="@+id/permissions"
@@ -67,7 +67,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/details"
                 android:background="?android:attr/selectableItemBackground"
-                android:drawablePadding="6dp"
+                android:drawablePadding="12dp"
                 android:padding="16dp"
                 android:text="@string/mozac_feature_addons_permissions"
                 android:textColor="@drawable/addon_textview_selector"
@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/permissions"
                 android:layout_margin="12dp"
-                android:text="@string/mozac_feature_addons_remove"/>
+                android:text="@string/mozac_feature_addons_remove" />
         </RelativeLayout>
     </ScrollView>
 </FrameLayout>
diff --git a/app/src/main/res/layout/quicksettings_website_info.xml b/app/src/main/res/layout/quicksettings_website_info.xml
index bfe3fb35e..c337e8ff6 100644
--- a/app/src/main/res/layout/quicksettings_website_info.xml
+++ b/app/src/main/res/layout/quicksettings_website_info.xml
@@ -41,7 +41,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
-            android:src="@drawable/mozac_ic_lock"
+            app:srcCompat="@drawable/mozac_ic_lock"
             android:paddingEnd="8dp"/>
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/search_widget_small.xml b/app/src/main/res/layout/search_widget_small.xml
index b30041ec4..8680a3851 100644
--- a/app/src/main/res/layout/search_widget_small.xml
+++ b/app/src/main/res/layout/search_widget_small.xml
@@ -5,6 +5,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="100dp"
     android:layout_height="50dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/rounded_white_corners"
     android:orientation="horizontal">
 
@@ -19,6 +20,6 @@
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:padding="10dp"
-        android:src="@drawable/ic_microphone_widget"
+        app:srcCompat="@drawable/ic_microphone_widget"
         android:scaleType="centerInside" />
 </LinearLayout>