diff --git a/src/main/res/layout/activity_settings_custom_layout.xml b/src/main/res/layout/activity_settings_custom_layout.xml
index 1274706bc..85d79b021 100644
--- a/src/main/res/layout/activity_settings_custom_layout.xml
+++ b/src/main/res/layout/activity_settings_custom_layout.xml
@@ -40,6 +40,7 @@
                     android:id="@+id/recycler_view_visible"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:scrollbars="vertical"
                     app:layout_constraintBottom_toTopOf="@id/recycler_view_not_visible"
                     app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/src/main/res/layout/activity_settings_custom_layout_list.xml b/src/main/res/layout/activity_settings_custom_layout_list.xml
index c62d756b2..fc79056ec 100644
--- a/src/main/res/layout/activity_settings_custom_layout_list.xml
+++ b/src/main/res/layout/activity_settings_custom_layout_list.xml
@@ -18,11 +18,11 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout xmlns:tools="http://schemas.android.com/tools"
-        android:paddingTop="?attr/actionBarSize"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fitsSystemWindows="true"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingTop="?attr/actionBarSize">
 
         <LinearLayout
             android:id="@+id/custom_layout_list_add_linear_layout"
@@ -82,7 +82,8 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:scrollbars="vertical" />
 
     </LinearLayout>
 
diff --git a/src/main/res/layout/aggregated_stats.xml b/src/main/res/layout/aggregated_stats.xml
index e58ecbb25..48b435a97 100644
--- a/src/main/res/layout/aggregated_stats.xml
+++ b/src/main/res/layout/aggregated_stats.xml
@@ -28,6 +28,7 @@
             android:id="@+id/aggregated_stats_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:scrollbars="vertical"
             android:visibility="gone" />
 
         <TextView
@@ -35,8 +36,8 @@
             style="?attr/textAppearanceHeadline4"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:padding="16dp"
             android:gravity="center_horizontal|center_vertical"
+            android:padding="16dp"
             android:text="@string/aggregated_stats_empty_message" />
 
     </LinearLayout>
diff --git a/src/main/res/layout/interval_list_view.xml b/src/main/res/layout/interval_list_view.xml
index 7eb6b4a6a..5a5f80e75 100644
--- a/src/main/res/layout/interval_list_view.xml
+++ b/src/main/res/layout/interval_list_view.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="8dp"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:padding="8dp">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/intervals_input_layout"
@@ -29,26 +29,26 @@
 
         <TextView
             android:id="@+id/interval_distance"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
             style="@style/TextAppearance.OpenTracks.PrimaryHeader"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:text="@string/stats_distance" />
 
         <TextView
             android:id="@+id/interval_rate"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
             style="@style/TextAppearance.OpenTracks.PrimaryHeader"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
             tools:text="Speed" />
 
         <TextView
             android:id="@+id/interval_altitude"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
             style="@style/TextAppearance.OpenTracks.PrimaryHeader"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:text="@string/stats_gain_loss" />
 
     </LinearLayout>
@@ -64,13 +64,14 @@
         android:id="@+id/interval_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="8dp" />
+        android:layout_margin="8dp"
+        android:scrollbars="vertical" />
 
     <TextView
         android:id="@+id/interval_list_empty_view"
+        style="?attr/textAppearanceHeadline4"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        style="?attr/textAppearanceHeadline4"
         android:gravity="center_horizontal|center_vertical"
         android:text="@string/interval_list_empty_message" />
 
diff --git a/src/main/res/layout/marker_list.xml b/src/main/res/layout/marker_list.xml
index da4e9138b..7e1947fb3 100644
--- a/src/main/res/layout/marker_list.xml
+++ b/src/main/res/layout/marker_list.xml
@@ -27,9 +27,9 @@ limitations under the License.
             android:id="@+id/marker_list_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_marker_show_24dp"
             app:layout_behavior="@string/searchbar_scrolling_view_behavior"
-            app:menu="@menu/marker_list" />
+            app:menu="@menu/marker_list"
+            app:navigationIcon="@drawable/ic_marker_show_24dp" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <com.google.android.material.search.SearchView
@@ -51,7 +51,8 @@ limitations under the License.
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/marker_list"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:scrollbars="vertical" />
 
         <TextView
             android:id="@+id/marker_list_empty"
diff --git a/src/main/res/layout/track_list.xml b/src/main/res/layout/track_list.xml
index 575baaab0..4c9a1afda 100644
--- a/src/main/res/layout/track_list.xml
+++ b/src/main/res/layout/track_list.xml
@@ -46,6 +46,7 @@ limitations under the License.
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingBottom="?attr/actionBarSize"
+        android:scrollbars="vertical"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     <com.google.android.material.bottomappbar.BottomAppBar