diff --git a/src/main/res/layout/bottomappbar.xml b/src/main/res/layout/bottomappbar.xml
index 35cf2cada..a2ae9ba77 100644
--- a/src/main/res/layout/bottomappbar.xml
+++ b/src/main/res/layout/bottomappbar.xml
@@ -8,7 +8,7 @@
     <com.google.android.material.bottomappbar.BottomAppBar
         android:id="@+id/bottom_app_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="?attr/actionBarSize"
         android:layout_gravity="bottom"
         app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
 
diff --git a/src/main/res/layout/track_list.xml b/src/main/res/layout/track_list.xml
index 8d1c32a5c..48d7eba8d 100644
--- a/src/main/res/layout/track_list.xml
+++ b/src/main/res/layout/track_list.xml
@@ -27,9 +27,9 @@ limitations under the License.
             android:id="@+id/track_list_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_logo_color_24dp"
             app:layout_behavior="@string/searchbar_scrolling_view_behavior"
-            app:menu="@menu/track_list" />
+            app:menu="@menu/track_list"
+            app:navigationIcon="@drawable/ic_logo_color_24dp" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <com.google.android.material.search.SearchView
@@ -50,9 +50,10 @@ limitations under the License.
     <com.google.android.material.bottomappbar.BottomAppBar
         android:id="@+id/bottom_app_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="?attr/actionBarSize"
         android:layout_gravity="bottom"
-        app:fabAlignmentMode="end">
+        app:fabAlignmentMode="end"
+        app:fabAnchorMode="cradle">
 
         <com.google.android.material.button.MaterialButton
             style="@style/Widget.Material3.Button.IconButton"
diff --git a/src/main/res/layout/track_recording.xml b/src/main/res/layout/track_recording.xml
index ad503ae98..21a1e2945 100644
--- a/src/main/res/layout/track_recording.xml
+++ b/src/main/res/layout/track_recording.xml
@@ -35,9 +35,10 @@
     <com.google.android.material.bottomappbar.BottomAppBar
         android:id="@+id/bottom_app_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="?attr/actionBarSize"
         android:layout_gravity="bottom"
         app:fabAlignmentMode="end"
+        app:fabAnchorMode="cradle"
         app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
         app:menu="@menu/track_record" />