diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.kt b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.kt
index 09190900..4c4842fb 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.kt
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.kt
@@ -40,19 +40,20 @@ class MainActivity : AppCompatActivity() {
         viewModel.networkConnection.observe(this) { connected ->
             Log.d(TAG, "Observing Network Connection.")
             if (!connected) {
-                Snackbar.make(
-                    binding.fragmentCoordinator, R.string.not_connected, Snackbar.LENGTH_LONG
-                ).setAction(R.string.settings) {
-                    try {
-                        startActivity(Intent(Settings.ACTION_WIRELESS_SETTINGS))
-                    } catch (ex: android.content.ActivityNotFoundException) {
+                Snackbar
+                    .make(binding.fragmentCoordinator, R.string.not_connected, Snackbar.LENGTH_LONG)
+                    .setAnchorView(binding.bottomNavView) // Snackbar will appear above bottom nav view
+                    .setAction(R.string.settings) {
                         try {
-                            startActivity(Intent(Settings.ACTION_WIFI_SETTINGS))
+                            startActivity(Intent(Settings.ACTION_WIRELESS_SETTINGS))
                         } catch (ex: android.content.ActivityNotFoundException) {
-                            startActivity(Intent(Settings.ACTION_SETTINGS))
+                            try {
+                                startActivity(Intent(Settings.ACTION_WIFI_SETTINGS))
+                            } catch (ex: android.content.ActivityNotFoundException) {
+                                startActivity(Intent(Settings.ACTION_SETTINGS))
+                            }
                         }
-                    }
-                }.show()
+                    }.show()
             }
         }
 
diff --git a/app/src/main/res/layout-land/fragment_about.xml b/app/src/main/res/layout-land/fragment_about.xml
index 52a7a22b..711c17a0 100644
--- a/app/src/main/res/layout-land/fragment_about.xml
+++ b/app/src/main/res/layout-land/fragment_about.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
+    android:layout_marginBottom="80dp"
     android:gravity="start"
     tools:context=".fragments.about.AboutFragment"
     tools:theme="@style/Theme.Exodus">
@@ -13,60 +14,57 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:title="@string/title_about" />
 
-    <LinearLayout
-        android:orientation="horizontal"
-        android:gravity="start"
-        android:baselineAligned="false"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:gravity="center"
-            android:paddingHorizontal="20dp"
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/imageView"
-                android:layout_width="96dp"
-                android:layout_height="96dp"
-                android:contentDescription="@string/app_logo"
-                android:src="@drawable/ic_logo" />
-
-            <TextView
-                android:id="@+id/appNameTV"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/app_name"
-                android:textAlignment="center"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="20sp" />
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="96dp"
+        android:layout_height="96dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        android:layout_marginStart="50dp"
+        android:contentDescription="@string/app_logo"
+        android:src="@drawable/ic_logo" />
 
-            <TextView
-                android:id="@+id/appVersionTV"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="15dp"
-                android:textAlignment="center"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="15sp" />
-
-        </LinearLayout>
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/appNameTV"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@id/imageView"
+        app:layout_constraintEnd_toEndOf="@id/imageView"
+        app:layout_constraintTop_toBottomOf="@id/imageView"
+        android:text="@string/app_name"
+        android:textAlignment="center"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="20sp" />
 
-        <!--
-            Required ViewGroup for PreferenceFragmentCompat
-            False positive for id not in API < 24
-        -->
-        <FrameLayout
-            android:id="@android:id/list_container"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            tools:targetApi="n" />
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/appVersionTV"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@id/imageView"
+        app:layout_constraintEnd_toEndOf="@id/imageView"
+        app:layout_constraintTop_toBottomOf="@id/appNameTV"
+        android:layout_marginTop="4dp"
+        android:textAlignment="center"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="15sp" />
 
-    </LinearLayout>
+    <!--
+        Required ViewGroup for PreferenceFragmentCompat
+        False positive for id not in API < 24
+    -->
+    <FrameLayout
+        android:id="@android:id/list_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@id/imageView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        android:layout_marginStart="30dp"
+        tools:targetApi="n" />
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e4aecddb..3942066c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,33 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    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/fragmentCoordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     tools:context=".MainActivity"
     tools:theme="@style/Theme.Exodus">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/fragmentCoordinator"
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragmentContainerView"
+        android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/fragmentContainerView"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:defaultNavHost="true"
-            app:navGraph="@navigation/navigation_resource" />
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+        android:layout_height="match_parent"
+        app:defaultNavHost="true"
+        app:navGraph="@navigation/navigation_resource" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottomNavView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
         app:labelVisibilityMode="labeled"
-        app:menu="@menu/bottom_navigation" />
+        app:menu="@menu/bottom_navigation"
+        app:itemTextAppearanceActive="@style/Theme.Exodus.BottomNavTextActive"
+        app:itemTextAppearanceInactive="@style/Theme.Exodus.BottomNavTextInactive"/>
 
-</LinearLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_a_d_trackers.xml b/app/src/main/res/layout/fragment_a_d_trackers.xml
index 5105d571..fa07d000 100644
--- a/app/src/main/res/layout/fragment_a_d_trackers.xml
+++ b/app/src/main/res/layout/fragment_a_d_trackers.xml
@@ -1,42 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
     tools:context=".fragments.appdetail.subfrags.ADTrackersFragment"
     tools:theme="@style/Theme.Exodus">
 
-    <LinearLayout
-        android:id="@+id/trackerTitleTV"
-        android:layout_width="match_parent"
+    <com.google.android.material.chip.Chip
+        android:id="@+id/trackersChip"
+        style="@style/Theme.Exodus.Chip"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <com.google.android.material.chip.Chip
-            android:id="@+id/trackersChip"
-            style="@style/Theme.Exodus.Chip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:chipIcon="@drawable/ic_tracker"
-            tools:text="0" />
+        app:chipIcon="@drawable/ic_tracker"
+        tools:text="0" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@string/trackers"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="18sp" />
-    </LinearLayout>
+    <com.google.android.material.textview.MaterialTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@id/trackersChip"
+        app:layout_constraintTop_toTopOf="@id/trackersChip"
+        app:layout_constraintBottom_toBottomOf="@id/trackersChip"
+        android:layout_marginStart="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="@string/trackers"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="18sp" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/trackersStatusTV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/trackerTitleTV"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/trackersChip"
         android:layout_marginTop="5dp"
         android:text="@string/code_signature_not_found"
         android:textSize="15sp" />
@@ -45,25 +46,29 @@
         android:id="@+id/trackersRV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/trackersStatusTV"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/trackersStatusTV"
         android:layout_marginTop="10dp" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/trackersInfoTV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/trackersRV"
-        android:layout_marginTop="15dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/trackersRV"        android:layout_marginTop="15dp"
         android:text="@string/tracker_info"
         android:textSize="15sp" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/trackersLearnTV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/trackersInfoTV"
-        android:text="@string/learn_more"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/trackersInfoTV"        android:text="@string/learn_more"
         android:textColor="?android:textColorPrimary"
         android:textSize="15sp" />
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 47c3e198..b94612bd 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="80dp"
     android:gravity="center"
     android:orientation="vertical"
     tools:context=".fragments.about.AboutFragment"
@@ -22,7 +23,7 @@
         android:contentDescription="@string/app_logo"
         android:src="@drawable/ic_logo" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/appNameTV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -31,10 +32,11 @@
         android:textColor="?android:textColorPrimary"
         android:textSize="20sp" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/appVersionTV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
         android:layout_marginBottom="15dp"
         android:textAlignment="center"
         android:textColor="?android:textColorPrimary"
diff --git a/app/src/main/res/layout/fragment_app_detail.xml b/app/src/main/res/layout/fragment_app_detail.xml
index ef978411..30df9e3f 100644
--- a/app/src/main/res/layout/fragment_app_detail.xml
+++ b/app/src/main/res/layout/fragment_app_detail.xml
@@ -8,7 +8,7 @@
     tools:context=".fragments.appdetail.AppDetailFragment"
     tools:theme="@style/Theme.Exodus">
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -16,37 +16,30 @@
             android:id="@+id/toolbarAD"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             android:minHeight="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_back" />
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/appIconCV"
-            style="@style/Widget.Material3.CardView.Outlined"
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/appIconIV"
             android:layout_width="72dp"
             android:layout_height="72dp"
-            android:layout_below="@+id/toolbarAD"
-            android:layout_centerHorizontal="true"
-            app:cardCornerRadius="10dp">
-
-            <ImageView
-                android:id="@+id/appIconIV"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:contentDescription="@string/app_logo"
-                android:scaleType="fitXY"
-                tools:src="@drawable/ic_logo" />
-        </androidx.cardview.widget.CardView>
-
-        <TextView
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/toolbarAD"
+            android:contentDescription="@string/app_logo"
+            tools:src="@drawable/ic_logo"/>
+
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/appNameTV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/appIconCV"
-            android:layout_centerHorizontal="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appIconIV"
             android:layout_marginTop="10dp"
-            android:layout_marginBottom="20dp"
             android:ellipsize="end"
             android:maxLines="2"
             android:textAlignment="center"
@@ -54,159 +47,197 @@
             android:textSize="22sp"
             tools:text="@string/app_name" />
 
-        <LinearLayout
-            android:id="@+id/chipLayout"
+        <com.google.android.material.chip.Chip
+            android:id="@+id/trackersChip"
+            style="@style/Theme.Exodus.Chip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/permsChip"
+            app:layout_constraintTop_toBottomOf="@id/appNameTV"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            android:layout_marginTop="20dp"
+            app:chipIcon="@drawable/ic_tracker"
+            tools:text="0" />
+
+        <com.google.android.material.chip.Chip
+            android:id="@+id/permsChip"
+            style="@style/Theme.Exodus.Chip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/appNameTV"
-            android:layout_centerHorizontal="true"
-            tools:ignore="RtlSymmetry">
-
-            <com.google.android.material.chip.Chip
-                android:id="@+id/trackersChip"
-                style="@style/Theme.Exodus.Chip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:chipIcon="@drawable/ic_tracker"
-                tools:text="0" />
-
-            <com.google.android.material.chip.Chip
-                android:id="@+id/permsChip"
-                style="@style/Theme.Exodus.Chip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="5dp"
-                android:textColor="@color/colorPrimary"
-                app:chipIcon="@drawable/ic_permission"
-                app:chipIconTint="@color/colorPrimary"
-                tools:chipBackgroundColor="@color/colorYellow"
-                tools:text="3" />
-
-            <com.google.android.material.chip.Chip
-                android:id="@+id/sourceChip"
-                style="@style/Theme.Exodus.Chip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="5dp"
-                app:chipIcon="@drawable/ic_android"
-                tools:text="Google" />
-
-            <com.google.android.material.chip.Chip
-                android:id="@+id/versionChip"
-                style="@style/Theme.Exodus.Chip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:chipIcon="@drawable/ic_match"
-                app:textEndPadding="0dp"
-                app:textStartPadding="0dp" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/appInfoLayout"
+            app:layout_constraintStart_toEndOf="@+id/trackersChip"
+            app:layout_constraintEnd_toStartOf="@+id/sourceChip"
+            app:layout_constraintTop_toBottomOf="@id/appNameTV"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="5dp"
+            android:textColor="@color/colorPrimary"
+            app:chipIcon="@drawable/ic_permission"
+            app:chipIconTint="@color/colorPrimary"
+            tools:chipBackgroundColor="@color/colorYellow"
+            tools:text="3" />
+
+        <com.google.android.material.chip.Chip
+            android:id="@+id/sourceChip"
+            style="@style/Theme.Exodus.Chip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toEndOf="@+id/permsChip"
+            app:layout_constraintEnd_toStartOf="@+id/versionChip"
+            app:layout_constraintTop_toBottomOf="@id/appNameTV"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="5dp"
+            app:chipIcon="@drawable/ic_android"
+            tools:text="Google" />
+
+        <com.google.android.material.chip.Chip
+            android:id="@+id/versionChip"
+            style="@style/Theme.Exodus.Chip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toEndOf="@+id/sourceChip"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appNameTV"
+            android:layout_marginTop="20dp"
+            app:chipIcon="@drawable/ic_match"
+            app:textEndPadding="0dp"
+            app:textStartPadding="0dp" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/appIVTV"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/trackersChip"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="16dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@string/installed_version"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="15sp"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/appInstalledVersionTV"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appIVTV"
+            android:layout_marginStart="30dp"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:paddingHorizontal="5dp"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="17sp"
+            android:visibility="gone"
+            tools:visibility="visible"
+            tools:text="3.0.0" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/appAVTV"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appInstalledVersionTV"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="16dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@string/analyzed_version"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="15sp"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/appAnalyzedVersionTV"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appAVTV"
+            android:layout_marginStart="30dp"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:paddingHorizontal="5dp"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="17sp"
+            android:visibility="gone"
+            tools:visibility="visible"
+            tools:text="2.9.0" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/appVTV"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appAnalyzedVersionTV"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="16dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@string/version"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="15sp" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/appVersionTV"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appVTV"
+            android:layout_marginStart="30dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:paddingHorizontal="5dp"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="17sp"
+            tools:text="3.0.0" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/appSameVersionTV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/chipLayout"
-            android:layout_marginHorizontal="30dp"
-            android:layout_marginVertical="20dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/appIVTV"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="@string/installed_version"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="15sp"
-                android:visibility="gone" />
-
-            <TextView
-                android:id="@+id/appInstalledVersionTV"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="2"
-                android:paddingHorizontal="5dp"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="17sp"
-                android:visibility="gone"
-                tools:text="3.0.0" />
-
-            <TextView
-                android:id="@+id/appAVTV"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="@string/analyzed_version"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="15sp"
-                android:visibility="gone" />
-
-            <TextView
-                android:id="@+id/appAnalyzedVersionTV"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="2"
-                android:paddingHorizontal="5dp"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="17sp"
-                android:visibility="gone"
-                tools:text="2.9.0" />
-
-            <TextView
-                android:id="@+id/appVTV"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="@string/version"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="15sp" />
-
-            <TextView
-                android:id="@+id/appVersionTV"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:paddingHorizontal="5dp"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="17sp"
-                tools:text="3.0.0" />
-
-            <TextView
-                android:id="@+id/appSameVersionTV"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/appVersionTV"
-                android:layout_marginTop="10dp"
-                android:text="@string/same_version"
-                android:textSize="15sp"
-                android:visibility="gone" />
-
-            <TextView
-                android:id="@+id/appReportTV"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:ellipsize="end"
-                android:maxLines="2"
-                android:text="@string/report_date"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="15sp"
-                tools:text="Report created on April 26, 2022" />
-        </LinearLayout>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appVersionTV"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="12dp"
+            android:text="@string/same_version"
+            android:textSize="15sp"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/appReportTV"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appSameVersionTV"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="12dp"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:text="@string/report_date"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="15sp"
+            tools:text="Report created on April 26, 2022" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/appInfoLayout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appReportTV"
+            android:layout_marginTop="12dp"
             app:tabIndicatorFullWidth="true"
             app:tabInlineLabel="true" />
 
@@ -214,9 +245,11 @@
             android:id="@+id/viewPager"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/tabLayout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tabLayout"
             android:paddingHorizontal="30dp"
             android:paddingVertical="10dp" />
-    </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_apps.xml b/app/src/main/res/layout/fragment_apps.xml
index 469e3416..3978972b 100644
--- a/app/src/main/res/layout/fragment_apps.xml
+++ b/app/src/main/res/layout/fragment_apps.xml
@@ -1,23 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".fragments.apps.AppsFragment"
+    android:layout_marginBottom="80dp"
     tools:theme="@style/Theme.Exodus">
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbarApps"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:title="@string/title_apps" />
 
     <com.facebook.shimmer.ShimmerFrameLayout
         android:id="@+id/shimmerLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/toolbarApps"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbarApps"
         android:orientation="vertical"
         android:visibility="gone"
         app:shimmer_direction="left_to_right">
@@ -42,7 +49,10 @@
         android:id="@+id/swipeRefreshLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/toolbarApps"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbarApps"
+        android:layout_marginTop="?attr/actionBarSize"
         android:visibility="gone">
 
         <androidx.recyclerview.widget.RecyclerView
@@ -56,11 +66,12 @@
         android:id="@+id/updateReportsFAB"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_margin="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
         android:contentDescription="@string/refresh"
         android:src="@drawable/ic_update"
         app:backgroundTint="@color/chipColor" />
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_tracker_detail.xml b/app/src/main/res/layout/fragment_tracker_detail.xml
index d2fc6136..776f0f3b 100644
--- a/app/src/main/res/layout/fragment_tracker_detail.xml
+++ b/app/src/main/res/layout/fragment_tracker_detail.xml
@@ -9,7 +9,7 @@
     tools:context=".fragments.trackerdetail.TrackerDetailFragment"
     tools:theme="@style/Theme.Exodus">
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -17,15 +17,19 @@
             android:id="@+id/toolbarTD"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             android:minHeight="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_back" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/trackerTitleTV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/toolbarTD"
-            android:layout_centerHorizontal="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbarTD"
             android:layout_marginTop="10dp"
             android:ellipsize="end"
             android:maxLines="2"
@@ -39,17 +43,19 @@
             android:id="@+id/chipGroup"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/trackerTitleTV"
-            android:layout_centerHorizontal="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/trackerTitleTV"
             android:layout_marginTop="20dp"
             android:orientation="horizontal" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/trackerPresenceTV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/chipGroup"
-            android:layout_centerHorizontal="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/chipGroup"
             android:layout_marginTop="10dp"
             android:ellipsize="end"
             android:maxLines="2"
@@ -60,23 +66,25 @@
             android:visibility="gone"
             tools:text="Present in 56% (50 apps) of your applications" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/trackerDescTV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/trackerPresenceTV"
-            android:layout_centerHorizontal="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/trackerPresenceTV"
             android:layout_marginTop="30dp"
             android:paddingHorizontal="40dp"
             android:textColor="?android:textColorPrimary"
             android:textSize="15sp" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/trackerWebURLTV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/trackerDescTV"
-            android:layout_centerHorizontal="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/trackerDescTV"
             android:layout_marginTop="10dp"
             android:ellipsize="end"
             android:maxLines="2"
@@ -85,12 +93,13 @@
             android:textSize="15sp"
             tools:text="https://www.huaweicentral.com/hms-core/" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/trackerDetectTV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/trackerWebURLTV"
-            android:layout_centerHorizontal="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/trackerWebURLTV"
             android:layout_marginTop="30dp"
             android:ellipsize="end"
             android:maxLines="2"
@@ -99,12 +108,13 @@
             android:textColor="?android:textColorPrimary"
             android:textSize="20sp" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/codeDetectTV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/trackerDetectTV"
-            android:layout_centerHorizontal="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/trackerDetectTV"
             android:layout_marginTop="20dp"
             android:ellipsize="end"
             android:maxLines="2"
@@ -113,23 +123,25 @@
             android:textColor="?android:textColorPrimary"
             android:textSize="16sp" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/codeSignTV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/codeDetectTV"
-            android:layout_centerHorizontal="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/codeDetectTV"
             android:layout_marginTop="5dp"
             android:paddingHorizontal="45dp"
             android:textColor="?android:textColorPrimary"
             android:textSize="15sp" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/networkDetectTV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/codeSignTV"
-            android:layout_centerHorizontal="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/codeSignTV"
             android:layout_marginTop="20dp"
             android:ellipsize="end"
             android:maxLines="2"
@@ -138,23 +150,25 @@
             android:textColor="?android:textColorPrimary"
             android:textSize="16sp" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/networkSignTV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/networkDetectTV"
-            android:layout_centerHorizontal="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/networkDetectTV"
             android:layout_marginTop="5dp"
             android:paddingHorizontal="45dp"
             android:textColor="?android:textColorPrimary"
             android:textSize="15sp" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/appsListTV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/networkSignTV"
-            android:layout_centerHorizontal="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/networkSignTV"
             android:layout_marginTop="30dp"
             android:ellipsize="end"
             android:maxLines="2"
@@ -168,11 +182,12 @@
             android:id="@+id/appsListRV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/appsListTV"
-            android:layout_centerHorizontal="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/appsListTV"
             android:layout_marginHorizontal="20dp"
             android:layout_marginTop="20dp"
             android:visibility="gone" />
-    </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_trackers.xml b/app/src/main/res/layout/fragment_trackers.xml
index 083f02e6..75058a55 100644
--- a/app/src/main/res/layout/fragment_trackers.xml
+++ b/app/src/main/res/layout/fragment_trackers.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_marginBottom="80dp"
     tools:context=".fragments.trackers.TrackersFragment"
     tools:theme="@style/Theme.Exodus">
 
@@ -11,13 +13,18 @@
         android:id="@+id/toolbarTrackers"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:title="@string/title_trackers" />
 
     <com.facebook.shimmer.ShimmerFrameLayout
         android:id="@+id/shimmerLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/toolbarTrackers"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbarTrackers"
         android:orientation="vertical"
         android:visibility="gone"
         app:shimmer_direction="left_to_right">
@@ -43,7 +50,10 @@
         android:id="@+id/swipeRefreshLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/toolbarTrackers"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbarTrackers"
+        android:layout_marginTop="?attr/actionBarSize"
         android:visibility="gone">
 
         <androidx.recyclerview.widget.RecyclerView
@@ -55,4 +65,4 @@
             android:scrollbars="vertical" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/recycler_view_app_item.xml b/app/src/main/res/layout/recycler_view_app_item.xml
index 810fa02c..00bdbb61 100644
--- a/app/src/main/res/layout/recycler_view_app_item.xml
+++ b/app/src/main/res/layout/recycler_view_app_item.xml
@@ -1,108 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="10dp"
-    android:layout_marginBottom="5dp"
+    android:layout_marginTop="4dp"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?android:attr/selectableItemBackground"
     android:padding="10dp"
     tools:theme="@style/Theme.Exodus">
 
-    <RelativeLayout
-        android:id="@+id/appInfoLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/appIconCV"
-            style="@style/Widget.Material3.CardView.Outlined"
-            android:layout_width="54dp"
-            android:layout_height="54dp"
-            app:cardCornerRadius="10dp">
-
-            <ImageView
-                android:id="@+id/appIconIV"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:contentDescription="@string/app_logo"
-                android:scaleType="fitXY"
-                tools:src="@drawable/ic_logo" />
-        </androidx.cardview.widget.CardView>
-
-        <LinearLayout
-            android:id="@+id/nameInfoLayout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="10dp"
-            android:layout_toEndOf="@+id/appIconCV"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/appNameTV"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:maxLines="2"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="18sp"
-                tools:text="@string/app_name" />
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/appIconIV"
+        android:layout_width="54dp"
+        android:layout_height="54dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:contentDescription="@string/app_logo"
+        tools:src="@drawable/ic_logo" />
 
-            <TextView
-                android:id="@+id/appVersionTV"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:maxLines="2"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="14sp"
-                tools:text="3.0.0" />
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/appNameTV"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        app:layout_constraintStart_toEndOf="@id/appIconIV"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginStart="12dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="18sp"
+        tools:text="@string/app_name" />
 
-        </LinearLayout>
-    </RelativeLayout>
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/appVersionTV"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        app:layout_constraintStart_toEndOf="@id/appIconIV"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/appNameTV"
+        android:layout_marginTop="4dp"
+        android:layout_marginStart="12dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="15sp"
+        tools:text="3.0.0" />
 
-    <LinearLayout
-        android:id="@+id/chipLayout"
+    <com.google.android.material.chip.Chip
+        android:id="@+id/trackersChip"
+        style="@style/Theme.Exodus.Chip"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/appInfoLayout"
-        android:layout_marginStart="60dp"
-        tools:ignore="RtlSymmetry">
+        app:layout_constraintStart_toEndOf="@id/appIconIV"
+        app:layout_constraintTop_toBottomOf="@id/appVersionTV"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="10dp"
+        app:chipIcon="@drawable/ic_tracker"
+        tools:text="0" />
 
-        <com.google.android.material.chip.Chip
-            android:id="@+id/trackersChip"
-            style="@style/Theme.Exodus.Chip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:chipIcon="@drawable/ic_tracker"
-            tools:text="0" />
-
-        <com.google.android.material.chip.Chip
-            android:id="@+id/permsChip"
-            style="@style/Theme.Exodus.Chip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="5dp"
-            android:textColor="@color/textColorDark"
-            app:chipIcon="@drawable/ic_permission"
-            app:chipIconTint="@color/textColorDark"
-            tools:chipBackgroundColor="@color/colorYellow"
-            tools:text="3" />
+    <com.google.android.material.chip.Chip
+        android:id="@+id/permsChip"
+        style="@style/Theme.Exodus.Chip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@id/trackersChip"
+        app:layout_constraintTop_toBottomOf="@id/appVersionTV"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="10dp"
+        android:textColor="@color/textColorDark"
+        app:chipIcon="@drawable/ic_permission"
+        app:chipIconTint="@color/textColorDark"
+        tools:chipBackgroundColor="@color/colorYellow"
+        tools:text="3" />
 
-        <com.google.android.material.chip.Chip
-            android:id="@+id/versionChip"
-            style="@style/Theme.Exodus.Chip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:chipIcon="@drawable/ic_match"
-            app:textEndPadding="0dp"
-            app:textStartPadding="0dp" />
-    </LinearLayout>
+    <com.google.android.material.chip.Chip
+        android:id="@+id/versionChip"
+        style="@style/Theme.Exodus.Chip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@id/permsChip"
+        app:layout_constraintTop_toBottomOf="@id/appVersionTV"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="5dp"
+        app:chipIcon="@drawable/ic_match"
+        app:textEndPadding="0dp"
+        app:textStartPadding="0dp" />
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/recycler_view_permission_item.xml b/app/src/main/res/layout/recycler_view_permission_item.xml
index 1bc4670d..202a2850 100644
--- a/app/src/main/res/layout/recycler_view_permission_item.xml
+++ b/app/src/main/res/layout/recycler_view_permission_item.xml
@@ -1,53 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginVertical="5dp"
+    android:layout_marginTop="5dp"
+    android:paddingVertical="4dp"
     android:clickable="true"
     android:focusable="true"
-    android:orientation="vertical"
     tools:theme="@style/Theme.Exodus">
 
-    <LinearLayout
-        android:id="@+id/permInfoLayout"
-        android:layout_width="match_parent"
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/permissionTitleTV"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_toStartOf="@+id/expandBT"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/permissionTitleTV"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="17sp"
-            tools:text="CAMERA" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/expandBT"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginEnd="5dp"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="17sp"
+        tools:text="CAMERA" />
 
-        <TextView
-            android:id="@+id/permissionSubTitleTV"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="15sp"
-            tools:text="Take pictures and videos" />
-    </LinearLayout>
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/permissionSubTitleTV"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/expandBT"
+        app:layout_constraintTop_toBottomOf="@id/permissionTitleTV"
+        android:layout_marginEnd="5dp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="15sp"
+        tools:text="Take pictures and videos" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/expandBT"
         style="@style/Widget.Material3.Button.IconButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/permissionTitleTV"
+        app:layout_constraintBottom_toBottomOf="@id/permissionSubTitleTV"
         app:icon="@drawable/ic_down"
         app:iconTint="?android:textColorPrimary" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/permissionDescTV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/permInfoLayout"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/permissionSubTitleTV"
         android:layout_marginVertical="5dp"
         android:paddingHorizontal="10dp"
         android:textColor="?android:textColorSecondary"
@@ -55,4 +59,4 @@
         android:visibility="gone"
         tools:text="Take pictures and videos" />
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/shimmer_layout_app_item.xml b/app/src/main/res/layout/shimmer_layout_app_item.xml
index 80d776e6..28e32402 100644
--- a/app/src/main/res/layout/shimmer_layout_app_item.xml
+++ b/app/src/main/res/layout/shimmer_layout_app_item.xml
@@ -1,110 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="10dp"
-    android:layout_marginBottom="5dp"
+    android:layout_marginTop="5dp"
     android:clickable="true"
     android:focusable="true"
     android:padding="10dp"
     tools:theme="@style/Theme.Exodus">
 
-    <RelativeLayout
-        android:id="@+id/appInfoLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/appIconCV"
-            style="@style/Widget.Material3.CardView.Outlined"
-            android:layout_width="54dp"
-            android:layout_height="54dp"
-            app:cardCornerRadius="10dp">
-
-            <ImageView
-                android:id="@+id/appIconIV"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:background="@color/colorGrey"
-                android:contentDescription="@string/app_logo"
-                android:scaleType="fitXY" />
-        </androidx.cardview.widget.CardView>
-
-        <LinearLayout
-            android:id="@+id/nameInfoLayout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="10dp"
-            android:layout_toEndOf="@+id/appIconCV"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/appNameTV"
-                android:layout_width="200dp"
-                android:layout_height="match_parent"
-                android:background="@color/colorGrey"
-                android:ellipsize="end"
-                android:maxLines="2"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="18sp" />
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/appIconIV"
+        android:layout_width="54dp"
+        android:layout_height="54dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:background="@color/colorGrey"
+        android:contentDescription="@string/app_logo"
+        android:scaleType="fitXY"
+        app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Medium"/>
 
-            <TextView
-                android:id="@+id/appVersionTV"
-                android:layout_width="100dp"
-                android:layout_height="match_parent"
-                android:background="@color/colorGrey"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="14sp" />
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/appNameTV"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        app:layout_constraintStart_toEndOf="@id/appIconIV"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginStart="12dp"
+        android:background="@color/colorGrey"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textColor="?android:textColorPrimary"/>
 
-        </LinearLayout>
-    </RelativeLayout>
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/appVersionTV"
+        android:layout_width="100dp"
+        android:layout_height="match_parent"
+        app:layout_constraintStart_toEndOf="@id/appIconIV"
+        app:layout_constraintTop_toBottomOf="@id/appNameTV"
+        android:layout_marginTop="4dp"
+        android:background="@color/colorGrey"
+        android:layout_marginStart="12dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textColor="?android:textColorSecondary"/>
 
-    <LinearLayout
-        android:id="@+id/chipLayout"
+    <com.google.android.material.chip.Chip
+        android:id="@+id/trackersChip"
+        style="@style/Theme.Exodus.Chip"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/appInfoLayout"
-        android:layout_marginStart="60dp"
-        tools:ignore="RtlSymmetry">
+        app:layout_constraintStart_toEndOf="@id/appIconIV"
+        app:layout_constraintTop_toBottomOf="@id/appVersionTV"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="10dp"
+        app:chipBackgroundColor="@color/colorGrey"
+        app:chipIcon="@drawable/ic_tracker"
+        app:chipIconTint="@color/colorGrey"/>
 
-        <com.google.android.material.chip.Chip
-            android:id="@+id/trackersChip"
-            style="@style/Theme.Exodus.Chip"
-            android:layout_width="50dp"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorPrimary"
-            app:chipBackgroundColor="@color/colorGrey"
-            app:chipIcon="@drawable/ic_tracker"
-            app:chipIconTint="@color/colorGrey" />
-
-        <com.google.android.material.chip.Chip
-            android:id="@+id/permsChip"
-            style="@style/Theme.Exodus.Chip"
-            android:layout_width="50dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="5dp"
-            android:textColor="@color/colorPrimary"
-            app:chipBackgroundColor="@color/colorGrey"
-            app:chipIcon="@drawable/ic_permission"
-            app:chipIconTint="@color/colorGrey" />
+    <com.google.android.material.chip.Chip
+        android:id="@+id/permsChip"
+        style="@style/Theme.Exodus.Chip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@id/trackersChip"
+        app:layout_constraintTop_toBottomOf="@id/appVersionTV"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="10dp"
+        app:chipBackgroundColor="@color/colorGrey"
+        app:chipIcon="@drawable/ic_permission"
+        app:chipIconTint="@color/colorGrey" />
 
-        <com.google.android.material.chip.Chip
-            android:id="@+id/versionChip"
-            style="@style/Theme.Exodus.Chip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:chipBackgroundColor="@color/colorGrey"
-            app:chipIcon="@drawable/ic_match"
-            app:chipIconTint="@color/colorGrey"
-            app:textEndPadding="0dp"
-            app:textStartPadding="0dp" />
-    </LinearLayout>
+    <com.google.android.material.chip.Chip
+        android:id="@+id/versionChip"
+        style="@style/Theme.Exodus.Chip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@id/permsChip"
+        app:layout_constraintTop_toBottomOf="@id/appVersionTV"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="5dp"
+        app:chipBackgroundColor="@color/colorGrey"
+        app:chipIcon="@drawable/ic_match"
+        app:chipIconTint="@color/colorGrey" />
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/shimmer_layout_tracker_item.xml b/app/src/main/res/layout/shimmer_layout_tracker_item.xml
index 73baa276..8c7d54c3 100644
--- a/app/src/main/res/layout/shimmer_layout_tracker_item.xml
+++ b/app/src/main/res/layout/shimmer_layout_tracker_item.xml
@@ -1,50 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
-    android:layout_marginHorizontal="20dp"
-    android:layout_marginVertical="10dp"
+    android:layout_marginTop="5dp"
+    android:orientation="vertical"
     android:clickable="true"
     android:focusable="true"
+    android:foreground="?android:attr/selectableItemBackground"
     tools:theme="@style/Theme.Exodus">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/trackerTitleTV"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/colorGrey"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="18sp"
-        app:drawableEndCompat="@drawable/ic_forward"
-        app:drawableTint="@color/colorGrey" />
+        android:layout_marginHorizontal="16dp"
+        android:background="@color/colorGrey"/>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/trackersPB"
         android:layout_width="200dp"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/trackerTitleTV"
         android:max="100"
-        android:paddingStart="10dp"
-        android:paddingTop="5dp"
-        android:paddingEnd="20dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginHorizontal="16dp"
         android:progress="100"
         app:indicatorColor="@color/colorGrey"
         app:trackCornerRadius="50dp"
-        app:trackThickness="25dp" />
+        app:trackThickness="30dp" />
 
-    <TextView
-        android:id="@+id/trackersStatusTV"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@+id/trackersPB"
-        android:layout_alignTop="@+id/trackersPB"
-        android:layout_alignEnd="@+id/trackersPB"
-        android:layout_alignBottom="@+id/trackersPB"
-        android:paddingStart="20dp"
-        android:paddingTop="5dp"
-        android:paddingEnd="20dp"
-        android:textColor="?android:textColorPrimary" />
-
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 66f8ef59..f4d77a5e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -40,4 +40,13 @@
 
     <style name="Theme.Exodus" parent="Theme.Exodus.Light" />
 
+    <style name="Theme.Exodus.BottomNavTextActive" parent="TextAppearance.Material3.ActionBar.Title">
+        <item name="android:textSize">15sp</item>
+    </style>
+
+    <style name="Theme.Exodus.BottomNavTextInactive" parent="TextAppearance.Material3.ActionBar.Title">
+        <item name="android:textSize">14sp</item>
+    </style>
+
+
 </resources>