diff --git a/app/src/main/res/layout/fragment_replayer.xml b/app/src/main/res/layout/fragment_replayer.xml
index 9c6a6943..5802b48d 100644
--- a/app/src/main/res/layout/fragment_replayer.xml
+++ b/app/src/main/res/layout/fragment_replayer.xml
@@ -10,7 +10,7 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:theme="@style/PokerAnalyticsTheme.Toolbar.Session"
-        app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toTopOf="parent">
 
@@ -18,7 +18,7 @@
 			android:id="@+id/toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="?attr/actionBarSize"
-            app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
 			app:title="@string/hand_history" />
@@ -30,16 +30,14 @@
 		android:layout_width="wrap_content"
 		android:layout_height="0dp"
 		app:layout_constraintBottom_toTopOf="@+id/bottomBar"
-        app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/appBar" />
 
 	<androidx.appcompat.widget.Toolbar
 		android:id="@+id/bottomBar"
 		android:layout_width="match_parent"
-		android:layout_height="?attr/actionBarSize"
-		android:layout_alignParentBottom="true"
-		android:layout_gravity="center"
+		android:layout_height="wrap_content"
 		android:background="?attr/colorPrimary"
 		app:layout_scrollFlags="scroll|enterAlways"
 		app:layout_constraintBottom_toBottomOf="parent"
@@ -49,8 +47,8 @@
 		<LinearLayout
 			android:id="@+id/controls"
 			android:layout_width="match_parent"
-			android:layout_height="50dp"
-			android:gravity="center"
+			android:layout_height="wrap_content"
+			android:fitsSystemWindows="true"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent">