diff --git a/android/app/src/main/res/layout/activity_app_details.xml b/android/app/src/main/res/layout/activity_app_details.xml
index dd652bea2..5374da8c6 100755
--- a/android/app/src/main/res/layout/activity_app_details.xml
+++ b/android/app/src/main/res/layout/activity_app_details.xml
@@ -17,7 +17,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
diff --git a/android/app/src/main/res/layout/activity_running_services_details.xml b/android/app/src/main/res/layout/activity_running_services_details.xml
index 5f8a90e0f..31d04d6d8 100755
--- a/android/app/src/main/res/layout/activity_running_services_details.xml
+++ b/android/app/src/main/res/layout/activity_running_services_details.xml
@@ -4,7 +4,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
diff --git a/android/app/src/main/res/layout/activity_standby_rules.xml b/android/app/src/main/res/layout/activity_standby_rules.xml
index 33c42fdcd..2b73b5f98 100644
--- a/android/app/src/main/res/layout/activity_standby_rules.xml
+++ b/android/app/src/main/res/layout/activity_standby_rules.xml
@@ -15,7 +15,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
diff --git a/android/app/src/main/res/layout/activity_start_chart.xml b/android/app/src/main/res/layout/activity_start_chart.xml
index 8679a2a62..440c5be51 100755
--- a/android/app/src/main/res/layout/activity_start_chart.xml
+++ b/android/app/src/main/res/layout/activity_start_chart.xml
@@ -15,15 +15,15 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        >
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:theme="?appbarTheme"
             android:background="?android:attr/windowBackground"
+            android:theme="?appbarTheme"
             app:elevation="@dimen/common_toolbar_elevation">
 
             <androidx.appcompat.widget.Toolbar
diff --git a/android/app/src/main/res/layout/activity_start_rules.xml b/android/app/src/main/res/layout/activity_start_rules.xml
index a4a217fcf..37f2a1f3e 100644
--- a/android/app/src/main/res/layout/activity_start_rules.xml
+++ b/android/app/src/main/res/layout/activity_start_rules.xml
@@ -15,15 +15,16 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:theme="?appbarTheme"
             android:background="?android:attr/windowBackground"
+            android:theme="?appbarTheme"
             app:elevation="@dimen/common_toolbar_elevation">
 
             <androidx.appcompat.widget.Toolbar
diff --git a/android/modules/module_component_manager/src/main/res/layout/module_component_manager_component_list_activity.xml b/android/modules/module_component_manager/src/main/res/layout/module_component_manager_component_list_activity.xml
index 4bead1698..87204615e 100755
--- a/android/modules/module_component_manager/src/main/res/layout/module_component_manager_component_list_activity.xml
+++ b/android/modules/module_component_manager/src/main/res/layout/module_component_manager_component_list_activity.xml
@@ -19,15 +19,16 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:theme="?appbarTheme"
             android:background="?android:attr/windowBackground"
+            android:theme="?appbarTheme"
             app:elevation="@dimen/common_toolbar_elevation">
 
             <FrameLayout
@@ -50,9 +51,9 @@
 
                 <com.miguelcatalan.materialsearchview.MaterialSearchView
                     android:id="@+id/search_view"
-                    android:layout_marginEnd="48dp"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="48dp" />
             </FrameLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/android/modules/module_locker/src/main/res/layout/module_locker_settings_activity.xml b/android/modules/module_locker/src/main/res/layout/module_locker_settings_activity.xml
index 3e4247f60..a7cf8ef00 100644
--- a/android/modules/module_locker/src/main/res/layout/module_locker_settings_activity.xml
+++ b/android/modules/module_locker/src/main/res/layout/module_locker_settings_activity.xml
@@ -4,15 +4,16 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:theme="?appbarTheme"
             android:background="?android:attr/windowBackground"
+            android:theme="?appbarTheme"
             app:elevation="@dimen/common_toolbar_elevation">
 
             <androidx.appcompat.widget.Toolbar
diff --git a/android/modules/module_notification_recorder/src/main/res/layout/module_notification_recorder_activity_settings.xml b/android/modules/module_notification_recorder/src/main/res/layout/module_notification_recorder_activity_settings.xml
index 861f0bfa8..8d919537a 100755
--- a/android/modules/module_notification_recorder/src/main/res/layout/module_notification_recorder_activity_settings.xml
+++ b/android/modules/module_notification_recorder/src/main/res/layout/module_notification_recorder_activity_settings.xml
@@ -4,15 +4,16 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:theme="?appbarTheme"
             android:background="?android:attr/windowBackground"
+            android:theme="?appbarTheme"
             app:elevation="@dimen/common_toolbar_elevation">
 
             <androidx.appcompat.widget.Toolbar
@@ -32,7 +33,6 @@
             android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@+id/appbar"
-             />
+            android:layout_below="@+id/appbar" />
     </RelativeLayout>
 </layout>
\ No newline at end of file
diff --git a/android/modules/module_profile/src/main/res/layout/module_profile_activity_engine_settings.xml b/android/modules/module_profile/src/main/res/layout/module_profile_activity_engine_settings.xml
index cf9304c6d..14ae5bb2a 100755
--- a/android/modules/module_profile/src/main/res/layout/module_profile_activity_engine_settings.xml
+++ b/android/modules/module_profile/src/main/res/layout/module_profile_activity_engine_settings.xml
@@ -4,15 +4,16 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:theme="?appbarTheme"
             android:background="?android:attr/windowBackground"
+            android:theme="?appbarTheme"
             app:elevation="@dimen/common_toolbar_elevation">
 
             <androidx.appcompat.widget.Toolbar
diff --git a/android/modules/module_profile/src/main/res/layout/module_profile_global_var_list_activity.xml b/android/modules/module_profile/src/main/res/layout/module_profile_global_var_list_activity.xml
index e2b3ec8e9..73dff2006 100644
--- a/android/modules/module_profile/src/main/res/layout/module_profile_global_var_list_activity.xml
+++ b/android/modules/module_profile/src/main/res/layout/module_profile_global_var_list_activity.xml
@@ -15,15 +15,16 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:theme="?appbarTheme"
             android:background="?android:attr/windowBackground"
+            android:theme="?appbarTheme"
             app:elevation="@dimen/common_toolbar_elevation">
 
             <androidx.appcompat.widget.Toolbar