diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 3f75b5561..2683ecbf5 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -165,7 +165,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1932"
+            line="1937"
             column="36"/>
     </issue>
 
@@ -176,7 +176,7 @@
         errorLine2="          ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1245"
+            line="1248"
             column="11"/>
     </issue>
 
@@ -187,7 +187,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\AndroidManifest.xml"
-            line="21"
+            line="28"
             column="5"/>
     </issue>
 
@@ -341,7 +341,7 @@
         errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="192"
+            line="216"
             column="3"/>
     </issue>
 
@@ -352,7 +352,7 @@
         errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="19"
+            line="20"
             column="3"/>
         <location
             file="src\main\res\values-ka\strings.xml"
@@ -400,7 +400,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1556"
+            line="1559"
             column="5"/>
     </issue>
 
@@ -411,7 +411,7 @@
         errorLine2="     ~~~~~~~~">
         <location
             file="src\main\AndroidManifest.xml"
-            line="163"
+            line="171"
             column="6"/>
     </issue>
 
@@ -422,7 +422,7 @@
         errorLine2="   ~~~~~~~~~~~">
         <location
             file="src\main\AndroidManifest.xml"
-            line="15"
+            line="22"
             column="4"/>
     </issue>
 
@@ -433,7 +433,7 @@
         errorLine2="  ^">
         <location
             file="src\main\AndroidManifest.xml"
-            line="15"
+            line="22"
             column="3"/>
     </issue>
 
@@ -571,17 +571,13 @@
 
     <issue
         id="UnusedResources"
-        message="The resource `R.drawable.ic_pause_black_24dp` appears to be unused">
+        message="The resource `R.drawable.ic_pause_black_24dp` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
         <location
-            file="src\main\res\drawable-hdpi\ic_pause_black_24dp.png"/>
-        <location
-            file="src\main\res\drawable-mdpi\ic_pause_black_24dp.png"/>
-        <location
-            file="src\main\res\drawable-xhdpi\ic_pause_black_24dp.png"/>
-        <location
-            file="src\main\res\drawable-xxhdpi\ic_pause_black_24dp.png"/>
-        <location
-            file="src\main\res\drawable-xxxhdpi\ic_pause_black_24dp.png"/>
+            file="src\main\res\drawable\ic_pause_black_24dp.xml"
+            line="1"
+            column="1"/>
     </issue>
 
     <issue
@@ -626,7 +622,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="87"
+            line="111"
             column="11"/>
         <location
             file="src\main\res\values-ar\strings.xml"
@@ -801,7 +797,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="88"
+            line="112"
             column="11"/>
         <location
             file="src\main\res\values-ar\strings.xml"
@@ -952,7 +948,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="89"
+            line="113"
             column="11"/>
         <location
             file="src\main\res\values-ar\strings.xml"
@@ -1111,7 +1107,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="90"
+            line="114"
             column="11"/>
         <location
             file="src\main\res\values-ar\strings.xml"
@@ -1270,7 +1266,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="92"
+            line="116"
             column="11"/>
         <location
             file="src\main\res\values-ar\strings.xml"
@@ -1429,7 +1425,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="95"
+            line="119"
             column="11"/>
         <location
             file="src\main\res\values-ar\strings.xml"
@@ -1584,7 +1580,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="96"
+            line="120"
             column="11"/>
         <location
             file="src\main\res\values-ar\strings.xml"
@@ -1731,7 +1727,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="100"
+            line="124"
             column="11"/>
         <location
             file="src\main\res\values-ar\strings.xml"
@@ -1882,7 +1878,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="121"
+            line="145"
             column="11"/>
         <location
             file="src\main\res\values-ar\strings.xml"
@@ -1993,7 +1989,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="123"
+            line="147"
             column="11"/>
         <location
             file="src\main\res\values-ar\strings.xml"
@@ -2140,7 +2136,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="133"
+            line="157"
             column="11"/>
         <location
             file="src\main\res\values-ar\strings.xml"
@@ -2283,7 +2279,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="156"
+            line="180"
             column="11"/>
     </issue>
 
@@ -2294,7 +2290,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="157"
+            line="181"
             column="11"/>
     </issue>
 
@@ -2305,7 +2301,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="158"
+            line="182"
             column="11"/>
     </issue>
 
@@ -2316,7 +2312,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="174"
+            line="198"
             column="11"/>
     </issue>
 
@@ -2327,7 +2323,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="225"
+            line="249"
             column="11"/>
     </issue>
 
@@ -2338,7 +2334,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="226"
+            line="250"
             column="11"/>
     </issue>
 
@@ -2349,7 +2345,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="227"
+            line="251"
             column="11"/>
     </issue>
 
@@ -2360,7 +2356,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="228"
+            line="252"
             column="11"/>
     </issue>
 
@@ -2371,7 +2367,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="229"
+            line="253"
             column="11"/>
     </issue>
 
@@ -2382,7 +2378,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="230"
+            line="254"
             column="11"/>
     </issue>
 
@@ -2393,7 +2389,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="231"
+            line="255"
             column="11"/>
     </issue>
 
@@ -2404,7 +2400,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="232"
+            line="256"
             column="11"/>
     </issue>
 
@@ -2415,7 +2411,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="233"
+            line="257"
             column="11"/>
     </issue>
 
@@ -2426,7 +2422,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="234"
+            line="258"
             column="11"/>
     </issue>
 
@@ -2437,7 +2433,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="235"
+            line="259"
             column="11"/>
     </issue>
 
@@ -2448,7 +2444,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="236"
+            line="260"
             column="11"/>
     </issue>
 
@@ -2459,7 +2455,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="237"
+            line="261"
             column="11"/>
     </issue>
 
@@ -2470,7 +2466,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="238"
+            line="262"
             column="11"/>
     </issue>
 
@@ -2953,8 +2949,8 @@
         errorLine1="      updater.onNext { fetchDownloadDao.update(download) }"
         errorLine2="      ~~~~~~~">
         <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\FetchDownloadMonitor.kt"
-            line="97"
+            file="src\main\java\org\kiwix\kiwixmobile\downloader\fetch\FetchDownloadMonitor.kt"
+            line="98"
             column="7"/>
     </issue>
 
@@ -2964,8 +2960,8 @@
         errorLine1="      updater.onNext { fetchDownloadDao.delete(download) }"
         errorLine2="      ~~~~~~~">
         <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\FetchDownloadMonitor.kt"
-            line="101"
+            file="src\main\java\org\kiwix\kiwixmobile\downloader\fetch\FetchDownloadMonitor.kt"
+            line="102"
             column="7"/>
     </issue>
 
@@ -3625,7 +3621,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="447"
+            line="446"
             column="9"/>
     </issue>
 
@@ -3636,7 +3632,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="449"
+            line="448"
             column="11"/>
     </issue>
 
@@ -3647,7 +3643,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="451"
+            line="450"
             column="11"/>
     </issue>
 
@@ -3658,7 +3654,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="453"
+            line="452"
             column="40"/>
     </issue>
 
@@ -3669,7 +3665,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="453"
+            line="452"
             column="9"/>
     </issue>
 
@@ -3680,7 +3676,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="454"
+            line="453"
             column="9"/>
     </issue>
 
@@ -3691,7 +3687,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="459"
+            line="458"
             column="9"/>
     </issue>
 
@@ -3702,7 +3698,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="460"
+            line="459"
             column="9"/>
     </issue>
 
@@ -3713,7 +3709,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="469"
+            line="468"
             column="9"/>
     </issue>
 
@@ -3724,7 +3720,7 @@
         errorLine2="        ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="470"
+            line="469"
             column="9"/>
     </issue>
 
@@ -3735,7 +3731,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="473"
+            line="472"
             column="9"/>
     </issue>
 
@@ -3746,7 +3742,7 @@
         errorLine2="        ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="478"
+            line="477"
             column="9"/>
     </issue>
 
@@ -3757,7 +3753,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="495"
+            line="494"
             column="9"/>
     </issue>
 
@@ -3768,7 +3764,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="517"
+            line="516"
             column="15"/>
     </issue>
 
@@ -3779,7 +3775,7 @@
         errorLine2="        ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="686"
+            line="683"
             column="9"/>
     </issue>
 
@@ -3790,7 +3786,7 @@
         errorLine2="          ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="688"
+            line="685"
             column="11"/>
     </issue>
 
@@ -3801,7 +3797,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="689"
+            line="686"
             column="25"/>
     </issue>
 
@@ -3812,7 +3808,7 @@
         errorLine2="        ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="696"
+            line="693"
             column="9"/>
     </issue>
 
@@ -3823,7 +3819,7 @@
         errorLine2="          ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="698"
+            line="695"
             column="11"/>
     </issue>
 
@@ -3834,7 +3830,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="699"
+            line="696"
             column="25"/>
     </issue>
 
@@ -3926,6 +3922,72 @@
             column="9"/>
     </issue>
 
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` field `hotspotReservation` of class `WifiHotspotManager` requires synthetic accessor"
+        errorLine1="        hotspotReservation = reservation;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\wifi_hotspot\WifiHotspotManager.java"
+            line="39"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` field `hotspotReservation` of class `WifiHotspotManager` requires synthetic accessor"
+        errorLine1="        WifiConfiguration currentConfig = hotspotReservation.getWifiConfiguration();"
+        errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\wifi_hotspot\WifiHotspotManager.java"
+            line="40"
+            column="43"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `printCurrentConfig` of class `WifiHotspotManager` requires synthetic accessor"
+        errorLine1="        printCurrentConfig(currentConfig);"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\wifi_hotspot\WifiHotspotManager.java"
+            line="42"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` field `hotspotStateListener` of class `WifiHotspotManager` requires synthetic accessor"
+        errorLine1="        hotspotStateListener.onHotspotTurnedOn(currentConfig);"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\wifi_hotspot\WifiHotspotManager.java"
+            line="43"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` field `hotspotStateListener` of class `WifiHotspotManager` requires synthetic accessor"
+        errorLine1="        hotspotStateListener.onHotspotStopped();"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\wifi_hotspot\WifiHotspotManager.java"
+            line="50"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` field `hotspotStateListener` of class `WifiHotspotManager` requires synthetic accessor"
+        errorLine1="        hotspotStateListener.onHotspotFailedToStart();"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\wifi_hotspot\WifiHotspotManager.java"
+            line="57"
+            column="9"/>
+    </issue>
+
     <issue
         id="SyntheticAccessor"
         message="Access to `private` method `getFilePath` of class `ZimContentProvider` requires synthetic accessor"
@@ -3937,6 +3999,28 @@
             column="25"/>
     </issue>
 
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` field `hotspotService` of class `ZimHostActivity` requires synthetic accessor"
+        errorLine1="        hotspotService = ((HotspotService.HotspotBinder) service).getService();"
+        errorLine2="        ~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\webserver\ZimHostActivity.java"
+            line="112"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` field `hotspotService` of class `ZimHostActivity` requires synthetic accessor"
+        errorLine1="        hotspotService.registerCallBack(ZimHostActivity.this);"
+        errorLine2="        ~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\webserver\ZimHostActivity.java"
+            line="113"
+            column="9"/>
+    </issue>
+
     <issue
         id="RedundantNamespace"
         message="This namespace declaration is redundant"
@@ -3988,7 +4072,7 @@
         errorLine2="                               ^">
         <location
             file="src\main\res\values\strings.xml"
-            line="138"
+            line="162"
             column="32"/>
     </issue>
 
@@ -4006,34 +4090,6 @@
             file="src\main\res\drawable\search_widget_preview.png"/>
     </issue>
 
-    <issue
-        id="IconDensities"
-        message="Missing the following drawables in `drawable-hdpi`: ic_action_back.png, ic_action_delete.png, ic_action_forward.png, ic_action_plus.png">
-        <location
-            file="src\main\res\drawable-hdpi"/>
-    </issue>
-
-    <issue
-        id="IconDensities"
-        message="Missing the following drawables in `drawable-mdpi`: ic_action_back.png, ic_action_delete.png, ic_action_forward.png, ic_action_plus.png">
-        <location
-            file="src\main\res\drawable-mdpi"/>
-    </issue>
-
-    <issue
-        id="IconDensities"
-        message="Missing the following drawables in `drawable-xhdpi`: ic_action_back.png, ic_action_delete.png, ic_action_forward.png, ic_action_plus.png">
-        <location
-            file="src\main\res\drawable-xhdpi"/>
-    </issue>
-
-    <issue
-        id="IconDensities"
-        message="Missing the following drawables in `drawable-xxxhdpi`: ic_action_back.png, ic_action_delete.png, ic_action_forward.png, ic_action_plus.png, kiwix_notification.png">
-        <location
-            file="src\main\res\drawable-xxxhdpi"/>
-    </issue>
-
     <issue
         id="SelectableText"
         message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
@@ -4085,7 +4141,7 @@
         errorLine2="     ~~~~~~~~">
         <location
             file="src\main\res\layout\download_item.xml"
-            line="38"
+            line="31"
             column="6"/>
     </issue>
 
@@ -4096,7 +4152,7 @@
         errorLine2="     ~~~~~~~~">
         <location
             file="src\main\res\layout\download_item.xml"
-            line="46"
+            line="39"
             column="6"/>
     </issue>
 
@@ -4107,7 +4163,7 @@
         errorLine2="       ~~~~~~~~">
         <location
             file="src\main\res\layout\download_item.xml"
-            line="59"
+            line="60"
             column="8"/>
     </issue>
 
@@ -4118,7 +4174,7 @@
         errorLine2="       ~~~~~~~~">
         <location
             file="src\main\res\layout\download_item.xml"
-            line="67"
+            line="68"
             column="8"/>
     </issue>
 
@@ -4327,7 +4383,7 @@
         errorLine2="             ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="158"
+            line="160"
             column="14"/>
     </issue>
 
@@ -4360,7 +4416,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1412"
+            line="1415"
             column="50"/>
     </issue>
 
@@ -4371,7 +4427,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1592"
+            line="1595"
             column="41"/>
     </issue>
 
@@ -4382,7 +4438,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1593"
+            line="1596"
             column="39"/>
     </issue>
 
@@ -4452,7 +4508,7 @@
         errorLine2="   ~~~~~~~~~">
         <location
             file="src\main\res\layout\download_item.xml"
-            line="12"
+            line="13"
             column="4"/>
     </issue>
 
@@ -4551,7 +4607,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\layout\download_item.xml"
-            line="17"
+            line="18"
             column="5"/>
     </issue>
 
@@ -4617,7 +4673,7 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ActivityBindingModule.java"
-            line="32"
+            line="34"
             column="19"/>
     </issue>
 
@@ -4628,7 +4684,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ActivityBindingModule.java"
-            line="36"
+            line="38"
             column="19"/>
     </issue>
 
@@ -4639,7 +4695,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ActivityBindingModule.java"
-            line="40"
+            line="42"
             column="19"/>
     </issue>
 
@@ -4650,7 +4706,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ActivityBindingModule.java"
-            line="44"
+            line="46"
             column="19"/>
     </issue>
 
@@ -4661,7 +4717,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ActivityBindingModule.java"
-            line="48"
+            line="50"
             column="19"/>
     </issue>
 
@@ -4672,7 +4728,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ActivityBindingModule.java"
-            line="52"
+            line="54"
             column="19"/>
     </issue>
 
@@ -4683,7 +4739,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ActivityBindingModule.java"
-            line="56"
+            line="58"
             column="19"/>
     </issue>
 
@@ -4694,7 +4750,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ActivityBindingModule.java"
-            line="60"
+            line="62"
             column="19"/>
     </issue>
 
@@ -4705,7 +4761,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ActivityBindingModule.java"
-            line="64"
+            line="66"
             column="19"/>
     </issue>
 
@@ -4716,7 +4772,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ActivityBindingModule.java"
-            line="68"
+            line="70"
             column="19"/>
     </issue>
 
@@ -4727,7 +4783,18 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ActivityBindingModule.java"
-            line="72"
+            line="74"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  public abstract ZimHostActivity provideZimHostActivity();"
+        errorLine2="                  ~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\di\modules\ActivityBindingModule.java"
+            line="78"
             column="19"/>
     </issue>
 
@@ -4885,6 +4952,17 @@
             column="3"/>
     </issue>
 
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  ServiceComponent.Builder serviceComponent();"
+        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\di\components\ApplicationComponent.java"
+            line="55"
+            column="3"/>
+    </issue>
+
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -4892,7 +4970,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\components\ApplicationComponent.java"
-            line="55"
+            line="57"
             column="15"/>
     </issue>
 
@@ -4903,7 +4981,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\components\ApplicationComponent.java"
-            line="57"
+            line="59"
             column="15"/>
     </issue>
 
@@ -4914,7 +4992,7 @@
         errorLine2="              ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\components\ApplicationComponent.java"
-            line="59"
+            line="61"
             column="15"/>
     </issue>
 
@@ -4925,7 +5003,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\components\ApplicationComponent.java"
-            line="61"
+            line="63"
             column="15"/>
     </issue>
 
@@ -4936,7 +5014,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\components\ApplicationComponent.java"
-            line="63"
+            line="65"
             column="15"/>
     </issue>
 
@@ -6626,25 +6704,14 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public JNIKiwix providesJNIKiwix(Context context) {"
+        errorLine1="  public JNIKiwix providesJNIKiwix(@NonNull Context context) {"
         errorLine2="         ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\JNIModule.java"
-            line="33"
+            line="34"
             column="10"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public JNIKiwix providesJNIKiwix(Context context) {"
-        errorLine2="                                   ~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\di\modules\JNIModule.java"
-            line="33"
-            column="36"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -7961,7 +8028,7 @@
         errorLine2="                                       ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="857"
+            line="854"
             column="40"/>
     </issue>
 
@@ -7972,7 +8039,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1117"
+            line="1120"
             column="31"/>
     </issue>
 
@@ -7983,7 +8050,7 @@
         errorLine2="                                        ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1317"
+            line="1320"
             column="41"/>
     </issue>
 
@@ -7994,7 +8061,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1499"
+            line="1502"
             column="30"/>
     </issue>
 
@@ -8005,7 +8072,7 @@
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1517"
+            line="1520"
             column="35"/>
     </issue>
 
@@ -8016,7 +8083,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1580"
+            line="1583"
             column="38"/>
     </issue>
 
@@ -8027,7 +8094,7 @@
         errorLine2="                                                                ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1613"
+            line="1616"
             column="65"/>
     </issue>
 
@@ -8038,7 +8105,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1698"
+            line="1702"
             column="38"/>
     </issue>
 
@@ -8049,7 +8116,7 @@
         errorLine2="                                      ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1731"
+            line="1735"
             column="39"/>
     </issue>
 
@@ -8060,7 +8127,7 @@
         errorLine2="                                   ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2046"
+            line="2051"
             column="36"/>
     </issue>
 
@@ -8071,7 +8138,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2069"
+            line="2074"
             column="35"/>
     </issue>
 
@@ -8082,7 +8149,7 @@
         errorLine2="                                     ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2093"
+            line="2098"
             column="38"/>
     </issue>
 
@@ -8093,7 +8160,7 @@
         errorLine2="                          ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2129"
+            line="2134"
             column="27"/>
     </issue>
 
@@ -8104,7 +8171,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2137"
+            line="2142"
             column="20"/>
     </issue>
 
@@ -8115,7 +8182,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2146"
+            line="2151"
             column="24"/>
     </issue>
 
@@ -8126,7 +8193,7 @@
         errorLine2="                           ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2162"
+            line="2167"
             column="28"/>
     </issue>
 
@@ -8731,7 +8798,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="106"
+            line="104"
             column="10"/>
     </issue>
 
@@ -8742,7 +8809,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="106"
+            line="104"
             column="37"/>
     </issue>
 
@@ -8753,7 +8820,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="115"
+            line="113"
             column="31"/>
     </issue>
 
@@ -8764,7 +8831,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="127"
+            line="125"
             column="35"/>
     </issue>
 
@@ -8775,7 +8842,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="131"
+            line="129"
             column="30"/>
     </issue>
 
@@ -8786,7 +8853,7 @@
         errorLine2="         ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="136"
+            line="134"
             column="10"/>
     </issue>
 
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
index 347a3acdc..e975f182b 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
@@ -166,8 +166,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
   public static boolean refresh;
   public static boolean wifiOnly;
   public static boolean nightMode;
-  private static Uri KIWIX_LOCAL_MARKET_URI;
-  private static Uri KIWIX_BROWSER_MARKET_URI;
   private final ArrayList<String> bookmarks = new ArrayList<>();
   private final List<KiwixWebView> webViewList = new ArrayList<>();
   @BindView(R.id.activity_main_root)
@@ -353,7 +351,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
 
     checkForRateDialog();
 
-    initPlayStoreUri();
     isHideToolbar = sharedPreferenceUtil.getPrefHideToolbar();
 
     addFileReader();
@@ -593,12 +590,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
     drawerLayout.openDrawer(GravityCompat.END);
   }
 
-  private void initPlayStoreUri() {
-    KIWIX_LOCAL_MARKET_URI = Uri.parse("market://details?id=" + getPackageName());
-    KIWIX_BROWSER_MARKET_URI =
-        Uri.parse("http://play.google.com/store/apps/details?id=" + getPackageName());
-  }
-
   private void checkForRateDialog() {
     isFirstRun = sharedPreferenceUtil.getPrefIsFirstRun();
     visitCounterPref = new RateAppCounter(this);
@@ -650,8 +641,12 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
   }
 
   private void goToRateApp() {
+      Uri kiwixLocalMarketUri = Uri.parse("market://details?id=" + getPackageName());
+      Uri kiwixBrowserMarketUri =
+              Uri.parse("http://play.google.com/store/apps/details?id=" + getPackageName());
 
-    Intent goToMarket = new Intent(Intent.ACTION_VIEW, KIWIX_LOCAL_MARKET_URI);
+
+      Intent goToMarket = new Intent(Intent.ACTION_VIEW, kiwixLocalMarketUri);
 
     goToMarket.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY |
         Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET |
@@ -661,7 +656,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
       startActivity(goToMarket);
     } catch (ActivityNotFoundException e) {
       startActivity(new Intent(Intent.ACTION_VIEW,
-          KIWIX_BROWSER_MARKET_URI));
+          kiwixBrowserMarketUri));
     }
   }
 
diff --git a/app/src/main/res/drawable-hdpi/ic_pause_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_pause_black_24dp.png
deleted file mode 100644
index 3539b4ef1..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_pause_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stop_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_stop_black_24dp.png
deleted file mode 100644
index 090ddaddc..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stop_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_pause_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_pause_black_24dp.png
deleted file mode 100644
index 6145664b4..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_pause_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stop_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_stop_black_24dp.png
deleted file mode 100644
index 0588f0b4c..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stop_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_pause_black_24dp.png
deleted file mode 100644
index 74068eae0..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_pause_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stop_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_stop_black_24dp.png
deleted file mode 100644
index b002ab78c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stop_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_back.png b/app/src/main/res/drawable-xxhdpi/ic_action_back.png
deleted file mode 100644
index 149909437..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_back.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_delete.png b/app/src/main/res/drawable-xxhdpi/ic_action_delete.png
deleted file mode 100644
index dfdc369c4..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_forward.png b/app/src/main/res/drawable-xxhdpi/ic_action_forward.png
deleted file mode 100644
index 41b61055e..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_forward.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_plus.png b/app/src/main/res/drawable-xxhdpi/ic_action_plus.png
deleted file mode 100644
index 75402a9f4..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_plus.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_pause_black_24dp.png
deleted file mode 100644
index bb707eab9..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_pause_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stop_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_stop_black_24dp.png
deleted file mode 100644
index 9d6b65da7..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stop_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_pause_black_24dp.png
deleted file mode 100644
index 792104ff3..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_pause_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stop_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_stop_black_24dp.png
deleted file mode 100644
index 5bc5a6cd1..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_stop_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_action_back.xml b/app/src/main/res/drawable/ic_action_back.xml
new file mode 100644
index 000000000..beafea395
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_back.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_delete.xml b/app/src/main/res/drawable/ic_action_delete.xml
new file mode 100644
index 000000000..39e64d698
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_delete.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_forward.xml b/app/src/main/res/drawable/ic_action_forward.xml
new file mode 100644
index 000000000..cf9e208e6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_forward.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_plus.xml b/app/src/main/res/drawable/ic_action_plus.xml
new file mode 100644
index 000000000..0258249cc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_plus.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_pause_black_24dp.xml b/app/src/main/res/drawable/ic_pause_black_24dp.xml
new file mode 100644
index 000000000..bb28a6c41
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pause_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_stop_black_24dp.xml b/app/src/main/res/drawable/ic_stop_black_24dp.xml
new file mode 100644
index 000000000..c428d728d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_stop_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,6h12v12H6z"/>
+</vector>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index f54ac79f1..03add67ef 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -1,63 +1,64 @@
 <?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"
+<androidx.core.widget.NestedScrollView
+  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">
+
+  <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/get_content_card"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
+    android:layout_height="match_parent">
 
   <androidx.cardview.widget.CardView
-      android:id="@+id/content_main_card"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_margin="8dp"
-      app:cardCornerRadius="4dp"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      >
+    android:id="@+id/content_main_card"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    app:cardCornerRadius="4dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
 
       <ImageView
-          android:id="@+id/content_main_card_image"
-          android:layout_width="0dp"
-          android:layout_height="144dp"
-          android:contentDescription="@string/kiwi"
-          android:scaleType="fitXY"
-          android:src="@drawable/ic_home_kiwix_banner"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent"
-          />
+        android:id="@+id/content_main_card_image"
+        android:layout_width="0dp"
+        android:layout_height="144dp"
+        android:contentDescription="@string/kiwi"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_home_kiwix_banner"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
       <!-- constraintRight_toRightOf is used as android:layoutDirection is supported from API 17 -->
       <androidx.appcompat.widget.AppCompatButton
-          android:id="@+id/content_main_card_download_button"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_margin="@dimen/activity_horizontal_margin"
-          android:text="@string/download_books"
-          android:textColor="@android:color/white"
-          app:backgroundTint="#1565c0"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintRight_toRightOf="parent"
-          />
+        android:id="@+id/content_main_card_download_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/activity_horizontal_margin"
+        android:text="@string/download_books"
+        android:textColor="@android:color/white"
+        app:backgroundTint="#1565c0"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
   </androidx.cardview.widget.CardView>
 
   <androidx.recyclerview.widget.RecyclerView
-      android:id="@+id/recycler_view"
-      android:layout_width="0dp"
-      android:layout_height="0dp"
-      app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/content_main_card"
-      />
-</androidx.constraintlayout.widget.ConstraintLayout>
+    android:id="@+id/recycler_view"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@id/content_main_card" />
+
+  </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml
index 6be0a0639..0775f4117 100644
--- a/app/src/main/res/layout/download_item.xml
+++ b/app/src/main/res/layout/download_item.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"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -88,7 +89,7 @@
       android:layout_weight="0.5"
       android:minWidth="@dimen/stop_min_width"
       android:minHeight="@dimen/stop_min_height"
-      android:src="@drawable/ic_stop_black_24dp"
-      android:text="@string/download_stop" />
+      android:text="@string/download_stop"
+      app:srcCompat="@drawable/ic_stop_black_24dp" />
   </LinearLayout>
 </LinearLayout>