diff --git a/src/main/res/layout/track_list.xml b/src/main/res/layout/track_list.xml
index 4c9a1afda..e78d0cd35 100644
--- a/src/main/res/layout/track_list.xml
+++ b/src/main/res/layout/track_list.xml
@@ -54,12 +54,12 @@ limitations under the License.
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:layout_gravity="bottom"
-        app:fabAlignmentMode="end"
+        app:fabAlignmentMode="center"
         app:fabAnchorMode="cradle">
 
         <com.google.android.material.button.MaterialButton
-            style="@style/Widget.Material3.Button.IconButton"
             android:id="@+id/aggregated_stats_button"
+            style="@style/Widget.Material3.Button.IconButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:icon="@drawable/ic_statistics_24dp"
@@ -77,11 +77,11 @@ limitations under the License.
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/track_list_fab_action"
-        android:tint="@android:color/white"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/image_record"
         android:src="@drawable/ic_baseline_record_24"
+        android:tint="@android:color/white"
         app:layout_anchor="@id/bottom_app_bar" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_recording.xml b/src/main/res/layout/track_recording.xml
index 14afb475a..e63e79ad6 100644
--- a/src/main/res/layout/track_recording.xml
+++ b/src/main/res/layout/track_recording.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        android:orientation="vertical">
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/track_detail_activity_tablayout"
@@ -19,9 +19,9 @@
         <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:id="@+id/track_recording_coordinator_layout"
             android:layout_width="match_parent"
-            android:paddingBottom="?attr/actionBarSize"
             android:layout_height="0dp"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:paddingBottom="?attr/actionBarSize">
 
             <androidx.viewpager2.widget.ViewPager2
                 android:id="@+id/track_detail_activity_view_pager"
@@ -37,17 +37,17 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:layout_gravity="bottom"
-        app:fabAlignmentMode="end"
+        app:fabAlignmentMode="center"
         app:fabAnchorMode="cradle"
-        app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
-        app:menu="@menu/track_record" />
+        app:menu="@menu/track_record"
+        app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/track_recording_fab_action"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_baseline_record_24"
         android:contentDescription="@string/image_stop"
+        android:src="@drawable/ic_baseline_record_24"
         app:layout_anchor="@id/bottom_app_bar" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file