diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index acb99fccf..2441aa62d 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -1,106 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:layout_margin="@dimen/card_margin"
-  xmlns:android="http://schemas.android.com/apk/res/android">
+  android:layout_margin="@dimen/card_margin">
 
-<LinearLayout
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:minHeight="?android:attr/listPreferredItemHeight"
-  android:orientation="horizontal"
-  android:paddingStart="@dimen/activity_horizontal_margin"
-  android:paddingTop="@dimen/activity_vertical_margin"
-  android:paddingEnd="@dimen/activity_horizontal_margin">
-
-  <ImageView
-    android:id="@+id/libraryDownloadFavicon"
-    android:layout_width="@dimen/favicon_width"
+  <LinearLayout xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:layout_marginEnd="@dimen/favicon_margin_right"
-    android:adjustViewBounds="true"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:scaleType="fitCenter"
-    android:src="@mipmap/ic_launcher"
-    tools:ignore="RtlHardcoded" />
+    android:orientation="horizontal"
+    android:paddingStart="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingEnd="@dimen/activity_horizontal_margin">
 
-  <LinearLayout
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:gravity="center"
-    android:orientation="vertical">
-
-    <TextView
-      android:id="@+id/libraryDownloadTitle"
-      android:layout_width="wrap_content"
+    <ImageView
+      android:id="@+id/libraryDownloadFavicon"
+      android:layout_width="@dimen/favicon_width"
       android:layout_height="wrap_content"
-      android:layout_gravity="start"
-      android:textAppearance="?android:attr/textAppearanceListItem"
-      tools:text="Title" />
-
-    <TextView
-      android:id="@+id/libraryDownloadDescription"
-      style="@style/list_item_body"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:textColor="?textSecondary"
-      android:layout_gravity="start"
-      tools:text="Description" />
-
-    <ProgressBar
-      android:id="@+id/downloadProgress"
-      style="?android:attr/progressBarStyleHorizontal"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:indeterminate="false"
-      android:padding="@dimen/download_progress_padding" />
+      android:layout_gravity="center"
+      android:layout_marginEnd="@dimen/favicon_margin_right"
+      android:adjustViewBounds="true"
+      android:minHeight="?android:attr/listPreferredItemHeight"
+      android:scaleType="fitCenter"
+      android:src="@mipmap/ic_launcher"
+      tools:ignore="RtlHardcoded" />
 
     <LinearLayout
-      android:layout_width="match_parent"
+      android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      android:layout_marginBottom="10dp">
+      android:layout_weight="1"
+      android:gravity="center"
+      android:orientation="vertical">
 
       <TextView
-        android:id="@+id/downloadState"
-        style="@style/list_item_body"
-        android:layout_width="0dp"
+        android:id="@+id/libraryDownloadTitle"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="?textTertiary"
-        android:layout_weight="1"
-        tools:text="In Progress" />
+        android:layout_gravity="start"
+        android:textAppearance="?android:attr/textAppearanceListItem"
+        tools:text="Title" />
 
       <TextView
-        android:id="@+id/eta"
+        android:id="@+id/libraryDownloadDescription"
         style="@style/list_item_body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="?textTertiary"
-        tools:text="1min 10secs" />
+        android:layout_gravity="start"
+        android:textColor="?textSecondary"
+        tools:text="Description" />
+
+      <ProgressBar
+        android:id="@+id/downloadProgress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="false"
+        android:padding="@dimen/download_progress_padding" />
+
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:orientation="horizontal">
+
+        <TextView
+          android:id="@+id/downloadState"
+          style="@style/list_item_body"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:textColor="?textTertiary"
+          tools:text="In Progress" />
+
+        <TextView
+          android:id="@+id/eta"
+          style="@style/list_item_body"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:textColor="?textTertiary"
+          tools:text="1min 10secs" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:orientation="horizontal">
+
+      <ImageView
+        android:id="@+id/stop"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="@dimen/stop_horizontal_margin"
+        android:layout_marginEnd="@dimen/stop_horizontal_margin"
+        android:layout_weight="0.5"
+        android:minWidth="@dimen/stop_min_width"
+        android:minHeight="@dimen/stop_min_height"
+        android:src="@drawable/ic_stop_24dp" />
     </LinearLayout>
   </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:orientation="horizontal">
-
-    <ImageView
-      android:id="@+id/stop"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_vertical"
-      android:layout_marginStart="@dimen/stop_horizontal_margin"
-      android:layout_marginEnd="@dimen/stop_horizontal_margin"
-      android:layout_weight="0.5"
-      android:minWidth="@dimen/stop_min_width"
-      android:minHeight="@dimen/stop_min_height"
-      app:srcCompat="@drawable/ic_stop_24dp" />
-  </LinearLayout>
-</LinearLayout>
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_intro_2.xml b/app/src/main/res/layout/item_intro_2.xml
index 671933680..de44d33e2 100644
--- a/app/src/main/res/layout/item_intro_2.xml
+++ b/app/src/main/res/layout/item_intro_2.xml
@@ -9,15 +9,15 @@
     android:id="@+id/airplane"
     android:layout_width="wrap_content"
     android:layout_height="0dp"
-    app:layout_constraintHeight_max="121dp"
-    android:scaleType="fitCenter"
     android:alpha="1.0"
     android:contentDescription="@string/save_books_offline"
+    android:scaleType="fitCenter"
+    android:src="@drawable/ic_airplane"
     android:visibility="invisible"
     app:layout_constraintBottom_toTopOf="@id/heading"
     app:layout_constraintEnd_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    app:srcCompat="@drawable/ic_airplane" />
+    app:layout_constraintHeight_max="121dp"
+    app:layout_constraintTop_toTopOf="parent" />
 
   <TextView
     android:id="@+id/heading"
diff --git a/app/src/main/res/layout/item_transfer_list.xml b/app/src/main/res/layout/item_transfer_list.xml
index 03e8b0067..96ad62bab 100644
--- a/app/src/main/res/layout/item_transfer_list.xml
+++ b/app/src/main/res/layout/item_transfer_list.xml
@@ -35,9 +35,9 @@
     android:paddingBottom="1dp"
     android:visibility="gone"
     app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintHorizontal_bias="1.0"
     app:layout_constraintStart_toEndOf="@id/text_view_file_item_name"
-    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent" />
 
   <ImageView
@@ -51,11 +51,11 @@
     android:paddingTop="1dp"
     android:paddingEnd="5dp"
     android:paddingBottom="1dp"
+    android:src="@drawable/ic_baseline_wait_24px"
     app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintHorizontal_bias="1.0"
     app:layout_constraintStart_toEndOf="@id/text_view_file_item_name"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    app:srcCompat="@drawable/ic_baseline_wait_24px" />
+    app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/buildSrc/src/main/kotlin/plugin/AppConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AppConfigurer.kt
index a4e76af1f..8ff35bb9a 100644
--- a/buildSrc/src/main/kotlin/plugin/AppConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AppConfigurer.kt
@@ -31,9 +31,6 @@ import java.io.File
 class AppConfigurer {
   fun configure(target: Project) {
     target.configureExtension<AppExtension> {
-      defaultConfig {
-        vectorDrawables.useSupportLibrary = true
-      }
       signingConfigs {
         create("releaseSigningConfig") {
           storeFile = File(target.rootDir, "kiwix-android.keystore")
diff --git a/core/src/main/res/layout/activity_help.xml b/core/src/main/res/layout/activity_help.xml
index b2d543623..a275cf467 100644
--- a/core/src/main/res/layout/activity_help.xml
+++ b/core/src/main/res/layout/activity_help.xml
@@ -15,9 +15,9 @@
     android:layout_height="wrap_content"
     android:contentDescription="@string/send_feedback"
     android:padding="@dimen/activity_horizontal_margin"
+    android:src="@drawable/ic_feedback_blue_24dp"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@+id/app_bar"
-    app:srcCompat="@drawable/ic_feedback_blue_24dp" />
+    app:layout_constraintTop_toBottomOf="@+id/app_bar" />
 
   <TextView
     android:id="@+id/activity_help_feedback_text_view"
@@ -44,9 +44,9 @@
     android:layout_height="wrap_content"
     android:contentDescription="@string/send_feedback"
     android:padding="@dimen/activity_horizontal_margin"
+    android:src="@drawable/ic_feedback_orange_24dp"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@+id/activity_help_feedback_divider"
-    app:srcCompat="@drawable/ic_feedback_orange_24dp" />
+    app:layout_constraintTop_toBottomOf="@+id/activity_help_feedback_divider" />
 
   <TextView
     android:id="@+id/activity_help_diagnostic_text_view"
diff --git a/core/src/main/res/layout/activity_kiwix_error.xml b/core/src/main/res/layout/activity_kiwix_error.xml
index 3e4a0e417..286554d0d 100644
--- a/core/src/main/res/layout/activity_kiwix_error.xml
+++ b/core/src/main/res/layout/activity_kiwix_error.xml
@@ -72,11 +72,11 @@
     android:layout_marginStart="8dp"
     android:layout_marginTop="12dp"
     android:layout_marginEnd="8dp"
+    android:src="@mipmap/ic_launcher"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintHorizontal_bias="0.0"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@+id/textView2"
-    app:srcCompat="@mipmap/ic_launcher" />
+    app:layout_constraintTop_toBottomOf="@+id/textView2" />
 
   <ScrollView
     android:layout_width="match_parent"
diff --git a/core/src/main/res/layout/bottom_toolbar.xml b/core/src/main/res/layout/bottom_toolbar.xml
index 76f7f7cec..09386ee7e 100644
--- a/core/src/main/res/layout/bottom_toolbar.xml
+++ b/core/src/main/res/layout/bottom_toolbar.xml
@@ -19,57 +19,55 @@
       android:layout_width="0dp"
       android:layout_height="match_parent"
       android:contentDescription="@string/bookmarks"
+      android:src="@drawable/ic_bookmark_border_24dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toStartOf="@id/bottom_toolbar_arrow_back"
       app:layout_constraintHorizontal_chainStyle="spread"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/ic_bookmark_border_24dp" />
+      app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
       android:id="@+id/bottom_toolbar_arrow_back"
       android:layout_width="0dp"
       android:layout_height="0dp"
       android:contentDescription="@string/go_to_previous_page"
+      android:src="@drawable/ic_keyboard_arrow_left_24dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toStartOf="@id/bottom_toolbar_home"
       app:layout_constraintStart_toEndOf="@id/bottom_toolbar_bookmark"
-      app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/ic_keyboard_arrow_left_24dp" />
+      app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
       android:id="@+id/bottom_toolbar_home"
       android:layout_width="0dp"
       android:layout_height="0dp"
       android:contentDescription="@string/menu_home"
+      android:src="@drawable/action_home"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toStartOf="@id/bottom_toolbar_arrow_forward"
       app:layout_constraintStart_toEndOf="@id/bottom_toolbar_arrow_back"
-      app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/action_home" />
+      app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
       android:id="@+id/bottom_toolbar_arrow_forward"
       android:layout_width="0dp"
       android:layout_height="0dp"
       android:contentDescription="@string/go_to_next_page"
+      android:src="@drawable/ic_keyboard_arrow_right_24dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toStartOf="@id/bottom_toolbar_toc"
       app:layout_constraintStart_toEndOf="@id/bottom_toolbar_home"
-      app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/ic_keyboard_arrow_right_24dp" />
+      app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
       android:id="@+id/bottom_toolbar_toc"
       android:layout_width="0dp"
       android:layout_height="0dp"
       android:contentDescription="@string/table_of_contents"
+      android:src="@drawable/ic_toc_24dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toEndOf="@id/bottom_toolbar_arrow_forward"
-      app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/ic_toc_24dp" />
+      app:layout_constraintTop_toTopOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
-
-
 </com.google.android.material.bottomappbar.BottomAppBar>
diff --git a/core/src/main/res/layout/item_help.xml b/core/src/main/res/layout/item_help.xml
index 12cc0e52b..f7f99f2e6 100644
--- a/core/src/main/res/layout/item_help.xml
+++ b/core/src/main/res/layout/item_help.xml
@@ -21,11 +21,11 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:contentDescription="@string/expand"
+    android:src="@drawable/action_find_next"
     android:tint="?colorOnSurface"
     app:layout_constraintBottom_toBottomOf="@id/item_help_title"
     app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintTop_toTopOf="@id/item_help_title"
-    app:srcCompat="@drawable/action_find_next" />
+    app:layout_constraintTop_toTopOf="@id/item_help_title" />
 
   <TextView
     android:id="@+id/item_help_description"
diff --git a/core/src/main/res/layout/kiwix_search_widget.xml b/core/src/main/res/layout/kiwix_search_widget.xml
index 666440178..0ec337062 100644
--- a/core/src/main/res/layout/kiwix_search_widget.xml
+++ b/core/src/main/res/layout/kiwix_search_widget.xml
@@ -1,6 +1,5 @@
 <?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="@dimen/kiwix_search_widget_layout_id_height"
   android:layout_marginStart="@dimen/kiwix_search_widget_margin"
@@ -30,13 +29,13 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_weight="0.1"
-    app:srcCompat="@drawable/ic_stars_black_24dp" />
+    android:src="@drawable/ic_stars_black_24dp" />
 
   <ImageView
     android:id="@+id/search_widget_mic"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_weight="0.1"
-    app:srcCompat="@drawable/ic_mic_black_24dp" />
+    android:src="@drawable/ic_mic_black_24dp" />
 
 </LinearLayout>
diff --git a/core/src/main/res/layout/list_item_search.xml b/core/src/main/res/layout/list_item_search.xml
index fe4973bff..b3dff691a 100644
--- a/core/src/main/res/layout/list_item_search.xml
+++ b/core/src/main/res/layout/list_item_search.xml
@@ -42,7 +42,7 @@
     android:layout_width="wrap_content"
     android:layout_height="0dp"
     android:contentDescription="@string/search_open_in_new_tab"
-    app:srcCompat="@drawable/ic_open_in_new_24dp"
+    android:src="@drawable/ic_open_in_new_24dp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent" />
diff --git a/core/src/main/res/layout/main_fragment_content.xml b/core/src/main/res/layout/main_fragment_content.xml
index 6f12daf8a..195a27732 100644
--- a/core/src/main/res/layout/main_fragment_content.xml
+++ b/core/src/main/res/layout/main_fragment_content.xml
@@ -71,11 +71,11 @@
     android:layout_margin="@dimen/fullscreen_control_button_margin"
     android:background="?colorOnSurface"
     android:contentDescription="@string/menu_exit_full_screen"
+    android:src="@drawable/fullscreen_exit"
     android:tint="?colorSurface"
     android:visibility="gone"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent"
-    app:srcCompat="@drawable/fullscreen_exit"
     tools:visibility="visible" />
 
   <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -84,11 +84,11 @@
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/activity_horizontal_margin"
     android:layout_marginBottom="?attr/actionBarSize"
+    android:src="@drawable/action_find_previous"
     android:visibility="gone"
     app:fabSize="mini"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
-    app:srcCompat="@drawable/action_find_previous"
     tools:visibility="visible" />
 
   <Button
diff --git a/core/src/main/res/layout/nav_main.xml b/core/src/main/res/layout/nav_main.xml
index 124f5eab5..a4209d38e 100644
--- a/core/src/main/res/layout/nav_main.xml
+++ b/core/src/main/res/layout/nav_main.xml
@@ -17,7 +17,6 @@
   -->
 
 <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">
 
@@ -25,5 +24,5 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:fitsSystemWindows="true"
-    app:srcCompat="@drawable/ic_home_kiwix_banner" />
+    android:src="@drawable/ic_home_kiwix_banner" />
 </LinearLayout>
diff --git a/core/src/main/res/layout/tab_switcher.xml b/core/src/main/res/layout/tab_switcher.xml
index e8542dab4..4ae09a4e5 100644
--- a/core/src/main/res/layout/tab_switcher.xml
+++ b/core/src/main/res/layout/tab_switcher.xml
@@ -18,8 +18,8 @@
     android:layout_height="wrap_content"
     android:layout_marginBottom="24dp"
     android:contentDescription="@string/close_all_tabs"
+    android:src="@drawable/ic_close_black_24dp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:srcCompat="@drawable/ic_close_black_24dp" />
+    app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>