diff --git a/app/src/main/res/layout/activity_language.xml b/app/src/main/res/layout/activity_language.xml
index 5773161cd..4962800ce 100644
--- a/app/src/main/res/layout/activity_language.xml
+++ b/app/src/main/res/layout/activity_language.xml
@@ -5,7 +5,7 @@
   android:layout_height="match_parent"
   android:fitsSystemWindows="true">
 
-  <include layout="@layout/layout_standard_app_bar"/>
+  <include layout="@layout/layout_standard_app_bar" />
 
   <androidx.recyclerview.widget.RecyclerView
     android:id="@+id/language_recycler_view"
diff --git a/app/src/main/res/layout/activity_library.xml b/app/src/main/res/layout/activity_library.xml
index 20d55a105..7fca04727 100644
--- a/app/src/main/res/layout/activity_library.xml
+++ b/app/src/main/res/layout/activity_library.xml
@@ -5,30 +5,26 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:animateLayoutChanges="true"
-  tools:context="org.kiwix.kiwixmobile.zim_manager.library_view.LibraryFragment"
-  >
+  tools:context="org.kiwix.kiwixmobile.zim_manager.library_view.LibraryFragment">
 
   <TextView
     android:id="@+id/libraryErrorText"
-    tools:ignore="MissingConstraints"
     style="@style/no_list_content_text"
-    />
+    tools:ignore="MissingConstraints" />
 
 
   <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
     android:id="@+id/librarySwipeRefresh"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:layout_constraintTop_toTopOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    >
+    app:layout_constraintTop_toTopOf="parent">
 
     <androidx.recyclerview.widget.RecyclerView
       android:id="@+id/libraryList"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      app:layout_behavior="@string/appbar_scrolling_view_behavior"
-      />
+      app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
   </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml
index 410e01913..058c8fc8a 100644
--- a/app/src/main/res/layout/download_item.xml
+++ b/app/src/main/res/layout/download_item.xml
@@ -38,10 +38,10 @@
 
     <TextView
       android:id="@+id/description"
+      style="@style/list_item_body"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="start"
-      style="@style/list_item_body"
       tools:text="Description" />
 
     <ProgressBar
@@ -59,17 +59,17 @@
 
       <TextView
         android:id="@+id/downloadState"
+        style="@style/list_item_body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        style="@style/list_item_body"
         tools:text="In Progress" />
 
       <TextView
         android:id="@+id/eta"
+        style="@style/list_item_body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        style="@style/list_item_body"
         tools:text="1min 10secs" />
     </LinearLayout>
   </LinearLayout>
diff --git a/app/src/main/res/layout/header_date.xml b/app/src/main/res/layout/header_date.xml
index 19fa6847d..cfe515c17 100644
--- a/app/src/main/res/layout/header_date.xml
+++ b/app/src/main/res/layout/header_date.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="wrap_content"
-  >
+  android:layout_height="wrap_content">
 
   <TextView
     android:id="@+id/header_date"
@@ -16,6 +15,5 @@
     android:textSize="16sp"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
-    tools:text="English"
-    />
+    tools:text="English" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_language.xml b/app/src/main/res/layout/item_language.xml
index edfe738f0..97412615c 100644
--- a/app/src/main/res/layout/item_language.xml
+++ b/app/src/main/res/layout/item_language.xml
@@ -17,12 +17,12 @@
 
   <TextView
     android:id="@+id/item_language_name"
+    style="@style/list_item_title"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/activity_horizontal_margin"
     android:layout_marginEnd="@dimen/activity_horizontal_margin"
     android:alpha="0.87"
-    style="@style/list_item_title"
     app:layout_constraintBottom_toTopOf="@id/item_language_localized_name"
     app:layout_constraintStart_toEndOf="@id/item_language_checkbox"
     app:layout_constraintTop_toTopOf="parent"
@@ -31,10 +31,10 @@
 
   <TextView
     android:id="@+id/item_language_localized_name"
+    style="@style/list_item_body"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:alpha="0.54"
-    style="@style/list_item_body"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintStart_toStartOf="@id/item_language_name"
     app:layout_constraintTop_toBottomOf="@id/item_language_name"
@@ -42,12 +42,12 @@
 
   <TextView
     android:id="@+id/item_language_books_count"
+    style="@style/list_item_body"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/activity_horizontal_margin"
     android:layout_marginEnd="@dimen/activity_horizontal_margin"
     android:alpha="0.54"
-    style="@style/list_item_body"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_transfer_list.xml b/app/src/main/res/layout/item_transfer_list.xml
index c1f477e8c..fc3ab7532 100644
--- a/app/src/main/res/layout/item_transfer_list.xml
+++ b/app/src/main/res/layout/item_transfer_list.xml
@@ -1,68 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  android:padding="10dp"
-  >
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:padding="10dp">
 
   <TextView
     android:id="@+id/text_view_file_item_name"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:background="@android:color/transparent"
     android:gravity="center_vertical"
-    tools:hint="File name"
+    android:paddingLeft="5dp"
+    android:paddingTop="1dp"
+    android:paddingRight="5dp"
+    android:paddingBottom="1dp"
     android:textIsSelectable="true"
     android:textSize="14sp"
-    android:background="@android:color/transparent"
-    android:paddingTop="1dp"
-    android:paddingBottom="1dp"
-    android:paddingLeft="5dp"
-    android:paddingRight="5dp"
-    app:layout_constraintTop_toTopOf="parent"
     app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintLeft_toLeftOf="parent"
     app:layout_constraintHorizontal_bias="0.0"
-    />
+    app:layout_constraintLeft_toLeftOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    tools:hint="File name" />
 
   <ProgressBar
     android:id="@+id/progress_bar_transferring_file"
     android:layout_width="wrap_content"
     android:layout_height="0dp"
     android:background="@android:color/transparent"
-    android:paddingTop="1dp"
-    android:paddingBottom="1dp"
     android:paddingLeft="5dp"
-    android:paddingRight="5dp"
+    android:paddingTop="1dp"
     android:paddingEnd="5dp"
-    app:layout_constraintTop_toTopOf="parent"
-    app:layout_constraintLeft_toRightOf="@id/text_view_file_item_name"
-    app:layout_constraintRight_toRightOf="parent"
+    android:paddingRight="5dp"
+    android:paddingBottom="1dp"
+    android:visibility="gone"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintHorizontal_bias="1.0"
-    android:visibility="gone"
-    />
+    app:layout_constraintLeft_toRightOf="@id/text_view_file_item_name"
+    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintTop_toTopOf="parent" />
 
   <ImageView
     android:id="@+id/image_view_file_transferred"
-    android:contentDescription="@string/status"
     android:layout_width="wrap_content"
     android:layout_height="0dp"
-    android:background="@android:color/transparent"
-    android:paddingTop="1dp"
-    android:paddingBottom="1dp"
-    android:paddingLeft="5dp"
-    android:paddingRight="5dp"
-    android:paddingEnd="5dp"
-    android:layout_marginRight="12dp"
     android:layout_marginEnd="12dp"
-    app:layout_constraintTop_toTopOf="parent"
-    app:layout_constraintLeft_toRightOf="@id/text_view_file_item_name"
-    app:layout_constraintRight_toRightOf="parent"
+    android:layout_marginRight="12dp"
+    android:background="@android:color/transparent"
+    android:contentDescription="@string/status"
+    android:paddingLeft="5dp"
+    android:paddingTop="1dp"
+    android:paddingEnd="5dp"
+    android:paddingRight="5dp"
+    android:paddingBottom="1dp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintHorizontal_bias="1.0"
-    app:srcCompat="@drawable/ic_baseline_wait_24px"
-    />
+    app:layout_constraintLeft_toRightOf="@id/text_view_file_item_name"
+    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:srcCompat="@drawable/ic_baseline_wait_24px" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_download_management.xml b/app/src/main/res/layout/layout_download_management.xml
index 6fa3194a2..3ce77bd61 100644
--- a/app/src/main/res/layout/layout_download_management.xml
+++ b/app/src/main/res/layout/layout_download_management.xml
@@ -1,27 +1,24 @@
 <?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"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/zim_download_root"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical"
   android:animateLayoutChanges="true"
-  >
+  android:orientation="vertical">
 
   <TextView
     android:id="@+id/download_management_no_downloads"
-    android:text="@string/no_downloads_here"
-    tools:ignore="MissingConstraints"
     style="@style/no_list_content_text"
-    />
+    android:text="@string/no_downloads_here"
+    tools:ignore="MissingConstraints" />
 
   <androidx.recyclerview.widget.RecyclerView
     android:id="@+id/zim_downloader_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:layout_constraintTop_toTopOf="parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    />
+    app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/library_divider.xml b/app/src/main/res/layout/library_divider.xml
index eefdb9d1a..225ae2536 100644
--- a/app/src/main/res/layout/library_divider.xml
+++ b/app/src/main/res/layout/library_divider.xml
@@ -4,17 +4,15 @@
   android:layout_height="wrap_content"
   android:minHeight="?android:attr/listPreferredItemHeight"
   android:orientation="horizontal"
-  android:paddingBottom="@dimen/dimen_medium_padding"
   android:paddingLeft="@dimen/activity_horizontal_margin"
-  android:paddingRight="@dimen/activity_horizontal_margin"
   android:paddingTop="@dimen/activity_vertical_margin"
-  >
+  android:paddingRight="@dimen/activity_horizontal_margin"
+  android:paddingBottom="@dimen/dimen_medium_padding">
 
   <TextView
     android:id="@+id/divider_text"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:textAppearance="?android:textAppearanceLarge"
-    />
+    android:textAppearance="?android:textAppearanceLarge" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/row_peer_device.xml b/app/src/main/res/layout/row_peer_device.xml
index 92f1857a5..b824cce1e 100644
--- a/app/src/main/res/layout/row_peer_device.xml
+++ b/app/src/main/res/layout/row_peer_device.xml
@@ -1,27 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  android:orientation="horizontal"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:padding="10dp"
-  >
+  android:orientation="horizontal"
+  android:padding="10dp">
 
   <TextView
     android:id="@+id/row_device_name"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_weight="3"
-    android:gravity="center_horizontal"
-    tools:hint="Device Name"
-    android:textIsSelectable="false"
-    android:textStyle="bold"
     android:background="@android:color/transparent"
-    android:textSize="17sp"
-    android:paddingTop="1dp"
-    android:paddingBottom="1dp"
+    android:gravity="center_horizontal"
     android:paddingLeft="5dp"
+    android:paddingTop="1dp"
     android:paddingRight="5dp"
-    />
+    android:paddingBottom="1dp"
+    android:textIsSelectable="false"
+    android:textSize="17sp"
+    android:textStyle="bold"
+    tools:hint="Device Name" />
 
 </LinearLayout>