diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
index 49144a9b..2fcb471c 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
@@ -56,6 +56,10 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 
 	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
 		when (item!!.itemId) {
+			R.id.stop -> {
+				currentSession.stopSession()
+				updateSessionUI()
+			}
 			R.id.restart -> toast("Restart is clicked!")
 			R.id.delete -> {
 				currentSession.delete()
@@ -126,19 +130,6 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 			layoutManager = viewManager
 		}
 
-		bottomAppBar.inflateMenu(R.menu.session_bottom_app_bar)
-		bottomAppBar.menu.findItem(R.id.stop).isVisible = false
-
-		bottomAppBar.setOnMenuItemClickListener { item ->
-			when (item.itemId) {
-				R.id.stop -> {
-					currentSession.stopSession()
-					updateSessionUI()
-				}
-			}
-			false
-		}
-
 		floatingActionButton.setOnClickListener {
 			manageSessionState()
 		}
@@ -156,7 +147,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 				state.setTextColor(ContextCompat.getColor(requireContext(), R.color.white))
 				sessionMenu?.findItem(R.id.restart)?.isVisible = false
 				floatingActionButton.setImageResource(R.drawable.ic_outline_play)
-				bottomAppBar.menu.findItem(R.id.stop).isVisible = false
+				sessionMenu?.findItem(R.id.stop)?.isVisible = false
 
 				floatingActionButton.animate().scaleX(1f).scaleY(1f).alpha(1f)
 					.setInterpolator(OvershootInterpolator()).start()
@@ -170,7 +161,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 				state.setTextColor(ContextCompat.getColor(requireContext(), R.color.green))
 				sessionMenu?.findItem(R.id.restart)?.isVisible = true
 				floatingActionButton.setImageResource(R.drawable.ic_outline_pause)
-				bottomAppBar.menu.findItem(R.id.stop).isVisible = true
+				sessionMenu?.findItem(R.id.stop)?.isVisible = true
 
 				floatingActionButton.animate().scaleX(1f).scaleY(1f).alpha(1f)
 					.setInterpolator(OvershootInterpolator()).start()
@@ -184,7 +175,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 				state.setTextColor(ContextCompat.getColor(requireContext(), R.color.blue))
 				sessionMenu?.findItem(R.id.restart)?.isVisible = true
 				floatingActionButton.setImageResource(R.drawable.ic_outline_play)
-				bottomAppBar.menu.findItem(R.id.stop).isVisible = true
+				sessionMenu?.findItem(R.id.stop)?.isVisible = true
 
 				floatingActionButton.animate().scaleX(1f).scaleY(1f).alpha(1f)
 					.setInterpolator(OvershootInterpolator()).start()
@@ -197,7 +188,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 				state.text = "FINISHED"
 				state.setTextColor(ContextCompat.getColor(requireContext(), R.color.white))
 				sessionMenu?.findItem(R.id.restart)?.isVisible = true
-				bottomAppBar.menu.findItem(R.id.stop).isVisible = false
+				sessionMenu?.findItem(R.id.stop)?.isVisible = false
 
 				floatingActionButton.animate().scaleX(0f).scaleY(0f).alpha(0f)
 					.setInterpolator(FastOutSlowInInterpolator()).start()
diff --git a/app/src/main/res/layout/fragment_session.xml b/app/src/main/res/layout/fragment_session.xml
index ac2b1e00..1f978b8f 100644
--- a/app/src/main/res/layout/fragment_session.xml
+++ b/app/src/main/res/layout/fragment_session.xml
@@ -117,7 +117,7 @@
 		android:id="@+id/appBar"
 		android:layout_width="match_parent"
 		android:layout_height="128dp"
-		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+		android:theme="@style/PokerAnalyticsTheme.Toolbar.Session">
 
 		<com.google.android.material.appbar.CollapsingToolbarLayout
 			android:id="@+id/collapsingToolbar"
@@ -143,14 +143,6 @@
 
 	</com.google.android.material.appbar.AppBarLayout>
 
-	<com.google.android.material.bottomappbar.BottomAppBar
-		android:id="@+id/bottomAppBar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
-		android:background="@color/red"
-		android:theme="@style/PokerAnalyticsTheme.BottomAppBar"
-		app:fabAlignmentMode="center" />
 
 	<com.google.android.material.floatingactionbutton.FloatingActionButton
 		android:id="@+id/floatingActionButton"
diff --git a/app/src/main/res/menu/session_bottom_app_bar.xml b/app/src/main/res/menu/session_bottom_app_bar.xml
deleted file mode 100644
index cab573d5..00000000
--- a/app/src/main/res/menu/session_bottom_app_bar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-
-	<item
-		android:id="@+id/stop"
-		android:title="@string/stop"
-		app:showAsAction="always" />
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/session_toolbar.xml b/app/src/main/res/menu/session_toolbar.xml
index 9f9c815e..836a654e 100644
--- a/app/src/main/res/menu/session_toolbar.xml
+++ b/app/src/main/res/menu/session_toolbar.xml
@@ -2,16 +2,21 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
+	<item
+		android:id="@+id/stop"
+		android:title="@string/stop"
+		app:showAsAction="always" />
+
 	<item
 		android:id="@+id/restart"
 		android:title="@string/restart_timer"
 		android:icon="@drawable/ic_outline_restart"
-		app:showAsAction="withText" />
+		app:showAsAction="never" />
 
 	<item
 		android:id="@+id/delete"
 		android:icon="@drawable/ic_outline_delete"
 		android:title="@string/delete"
-		app:showAsAction="withText" />
+		app:showAsAction="never" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 973f7ff7..97a13d55 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -31,11 +31,9 @@
 
 	<!-- Toolbar -->
 	<style name="PokerAnalyticsTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar">
-		<item name="android:background">@color/gray_darker</item>
 		<item name="titleTextColor">@color/white</item>
 		<item name="titleTextAppearance">@style/PokerAnalyticsTheme.Toolbar.TitleAppearance</item>
 	</style>
-	+
 
 	<style name="PokerAnalyticsTheme.Toolbar.TitleAppearance">
 		<item name="android:textSize">20sp</item>
@@ -52,6 +50,10 @@
 		<item name="android:textColor">@color/white</item>
 	</style>
 
+	<style name="PokerAnalyticsTheme.Toolbar.Session" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+		<item name="android:actionMenuTextColor">@color/green</item>
+	</style>
+
 	<!-- Bottom App Bar -->
 	<style name="PokerAnalyticsTheme.BottomAppBar" parent="Widget.MaterialComponents.BottomAppBar">
 		<item name="backgroundTint">@color/gray_darker</item>