diff --git a/src/main/res/layout/about.xml b/src/main/res/layout/about.xml
index 5e8fa7711..e0b09cb07 100644
--- a/src/main/res/layout/about.xml
+++ b/src/main/res/layout/about.xml
@@ -7,7 +7,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/track_list_toolbar"
diff --git a/src/main/res/layout/activity_settings_custom_layout.xml b/src/main/res/layout/activity_settings_custom_layout.xml
index 8f5e4205a..162967f19 100644
--- a/src/main/res/layout/activity_settings_custom_layout.xml
+++ b/src/main/res/layout/activity_settings_custom_layout.xml
@@ -7,7 +7,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/export_activity_toolbar"
diff --git a/src/main/res/layout/activity_show_error.xml b/src/main/res/layout/activity_show_error.xml
index 5e79ad8d6..5e02de72f 100644
--- a/src/main/res/layout/activity_show_error.xml
+++ b/src/main/res/layout/activity_show_error.xml
@@ -5,7 +5,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/show_error_toolbar"
diff --git a/src/main/res/layout/aggregated_stats.xml b/src/main/res/layout/aggregated_stats.xml
index 9cc6d24f3..e58ecbb25 100644
--- a/src/main/res/layout/aggregated_stats.xml
+++ b/src/main/res/layout/aggregated_stats.xml
@@ -7,7 +7,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:layout_width="match_parent"
diff --git a/src/main/res/layout/export_activity.xml b/src/main/res/layout/export_activity.xml
index 514b7492a..192ace387 100644
--- a/src/main/res/layout/export_activity.xml
+++ b/src/main/res/layout/export_activity.xml
@@ -7,7 +7,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/export_activity_toolbar"
diff --git a/src/main/res/layout/help.xml b/src/main/res/layout/help.xml
index f98306535..db2610d2b 100644
--- a/src/main/res/layout/help.xml
+++ b/src/main/res/layout/help.xml
@@ -7,7 +7,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:layout_width="match_parent"
diff --git a/src/main/res/layout/import_activity.xml b/src/main/res/layout/import_activity.xml
index 70e4aab60..1f36cee6a 100644
--- a/src/main/res/layout/import_activity.xml
+++ b/src/main/res/layout/import_activity.xml
@@ -7,7 +7,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/import_activity_toolbar"
diff --git a/src/main/res/layout/marker_detail_activity.xml b/src/main/res/layout/marker_detail_activity.xml
index d45c989dc..2494b556f 100644
--- a/src/main/res/layout/marker_detail_activity.xml
+++ b/src/main/res/layout/marker_detail_activity.xml
@@ -20,7 +20,8 @@ limitations under the License.
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/marker_detail_toolbar"
diff --git a/src/main/res/layout/marker_edit.xml b/src/main/res/layout/marker_edit.xml
index d0eef4257..e7a71b4ee 100644
--- a/src/main/res/layout/marker_edit.xml
+++ b/src/main/res/layout/marker_edit.xml
@@ -20,7 +20,8 @@ limitations under the License.
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/marker_edit_toolbar"
diff --git a/src/main/res/layout/marker_list.xml b/src/main/res/layout/marker_list.xml
index 58cce26ef..da4e9138b 100644
--- a/src/main/res/layout/marker_list.xml
+++ b/src/main/res/layout/marker_list.xml
@@ -20,7 +20,8 @@ limitations under the License.
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.search.SearchBar
             android:id="@+id/marker_list_toolbar"
diff --git a/src/main/res/layout/settings.xml b/src/main/res/layout/settings.xml
index d890936b7..899b72768 100644
--- a/src/main/res/layout/settings.xml
+++ b/src/main/res/layout/settings.xml
@@ -7,7 +7,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/top_app_bar"
diff --git a/src/main/res/layout/track_list.xml b/src/main/res/layout/track_list.xml
index 83d90b4bd..8d1c32a5c 100644
--- a/src/main/res/layout/track_list.xml
+++ b/src/main/res/layout/track_list.xml
@@ -20,7 +20,8 @@ limitations under the License.
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.search.SearchBar
             android:id="@+id/track_list_toolbar"