diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
index 968d04ca..2b9e910a 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import io.realm.Realm
 import kotlinx.android.synthetic.main.activity_home.*
+import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.ui.fragment.HistoryFragment
 import net.pokeranalytics.android.ui.fragment.SettingsFragment
@@ -85,6 +86,13 @@ class HomeActivity : PokerAnalyticsActivity() {
 	 */
 	private fun displayFragment(index: Int) {
 
+		toolbar.title = when (index) {
+			0 -> getString(R.string.title_history)
+			1 -> getString(R.string.title_stats)
+			2 -> getString(R.string.title_settings)
+			else -> ""
+		}
+
 		val fragment = when(index) {
 			0 -> HistoryFragment()
 			1 -> StatsFragment()
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
index 845b1835..9cf088a5 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
@@ -15,6 +15,7 @@ import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface
 import net.pokeranalytics.android.ui.adapter.components.EditableDataDelegate
 import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
 import net.pokeranalytics.android.ui.fragment.components.BottomSheetType
+import net.pokeranalytics.android.util.PokerAnalyticsActivity
 import net.pokeranalytics.android.util.PokerAnalyticsFragment
 
 class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, EditableDataDelegate {
@@ -56,6 +57,10 @@ class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, Editabl
 	 */
 	private fun initUI() {
 
+		val activity = activity as PokerAnalyticsActivity
+		activity.setSupportActionBar(toolbar)
+		activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
 		val viewManager = LinearLayoutManager(requireContext())
 		val newSessionAdapter = DynamicListAdapter(newSession, this)
 
@@ -71,7 +76,7 @@ class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, Editabl
 	 * Set fragment data
 	 */
 	fun setData(isTournament: Boolean) {
-		title.text = if (isTournament) "New tournament" else "New cash game"
+		toolbar.title = if (isTournament) "Tournament" else "Cash game"
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt b/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt
index f9bdfe8f..49dee4a6 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt
@@ -2,6 +2,7 @@ package net.pokeranalytics.android.util
 
 import android.os.Bundle
 import android.os.PersistableBundle
+import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import io.realm.Realm
 
@@ -13,6 +14,15 @@ open class PokerAnalyticsActivity : AppCompatActivity() {
 		super.onCreate(savedInstanceState, persistentState)
 	}
 
+	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+		item?.let {
+			if (it.itemId == android.R.id.home) {
+				finish()
+			}
+		}
+		return super.onOptionsItemSelected(item)
+	}
+
 	override fun onDestroy() {
 		super.onDestroy()
 		realm.close()
diff --git a/app/src/main/res/color/bottom_navigation_item.xml b/app/src/main/res/color/bottom_navigation_item.xml
new file mode 100644
index 00000000..c4ff8e09
--- /dev/null
+++ b/app/src/main/res/color/bottom_navigation_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item android:color="@color/green" android:state_checked="true" android:state_enabled="true" />
+	<item android:color="@color/gray_light" android:state_checked="false" android:state_enabled="true" />
+	<item android:color="@color/gray_light" android:state_checked="false" android:state_enabled="false" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_outline_chart_bar.xml b/app/src/main/res/drawable/ic_outline_chart_bar.xml
new file mode 100644
index 00000000..bfc0c1e8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_chart_bar.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M5,9.2h3L8,19L5,19L5,9.2zM10.6,5h2.8v14h-2.8L10.6,5zM16.2,13L19,13v6h-2.8v-6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_chart_show.xml b/app/src/main/res/drawable/ic_outline_chart_show.xml
new file mode 100644
index 00000000..9a7f2079
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_chart_show.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M3.5,18.49l6,-6.01 4,4L22,6.92l-1.41,-1.41 -7.09,7.97 -4,-4L2,16.99l1.5,1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_filter_list.xml b/app/src/main/res/drawable/ic_outline_filter_list.xml
new file mode 100644
index 00000000..5959f25e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_filter_list.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_history.xml b/app/src/main/res/drawable/ic_outline_history.xml
new file mode 100644
index 00000000..c1caa0b0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_history.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.25,2.52 0.77,-1.28 -3.52,-2.09L13.5,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_settings.xml b/app/src/main/res/drawable/ic_outline_settings.xml
new file mode 100644
index 00000000..e1fb6a23
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_settings.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98 0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_sort.xml b/app/src/main/res/drawable/ic_outline_sort.xml
new file mode 100644
index 00000000..26453725
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_sort.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 9c60a84a..121f90c3 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -6,6 +6,16 @@
 	android:layout_height="match_parent"
 	tools:context=".ui.activity.HomeActivity">
 
+	<androidx.appcompat.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?attr/actionBarSize"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:title="@string/app_name"
+		app:titleTextColor="@color/white" />
+
 	<FrameLayout
 		android:id="@+id/container"
 		android:layout_width="0dp"
@@ -13,7 +23,7 @@
 		app:layout_constraintBottom_toTopOf="@+id/navigation"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
+		app:layout_constraintTop_toBottomOf="@+id/toolbar" />
 
 	<com.google.android.material.bottomnavigation.BottomNavigationView
 		android:id="@+id/navigation"
@@ -21,7 +31,6 @@
 		android:layout_height="wrap_content"
 		android:layout_marginStart="0dp"
 		android:layout_marginEnd="0dp"
-		android:background="?android:attr/windowBackground"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintLeft_toLeftOf="parent"
 		app:layout_constraintRight_toRightOf="parent"
diff --git a/app/src/main/res/layout/bottom_sheet_blinds.xml b/app/src/main/res/layout/bottom_sheet_blinds.xml
index c0d86a55..08fb4cb2 100644
--- a/app/src/main/res/layout/bottom_sheet_blinds.xml
+++ b/app/src/main/res/layout/bottom_sheet_blinds.xml
@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical"
-	tools:background="@color/gray_dark_1">
+	tools:background="@color/gray_darker">
 
 	<androidx.appcompat.widget.AppCompatTextView
 		android:id="@+id/appCompatTextView"
diff --git a/app/src/main/res/layout/fragment_bottom_sheet.xml b/app/src/main/res/layout/fragment_bottom_sheet.xml
index 76eabc63..5db274df 100644
--- a/app/src/main/res/layout/fragment_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_bottom_sheet.xml
@@ -8,7 +8,6 @@
 
 	<androidx.appcompat.widget.Toolbar
 		android:id="@+id/bottomSheetToolbar"
-		style="@style/BottomSheetToolbar"
 		android:layout_width="0dp"
 		android:layout_height="?actionBarSize"
 		app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_editable_data.xml b/app/src/main/res/layout/fragment_editable_data.xml
index 7d50fb8c..76e12a6b 100644
--- a/app/src/main/res/layout/fragment_editable_data.xml
+++ b/app/src/main/res/layout/fragment_editable_data.xml
@@ -17,7 +17,7 @@
 
 			<androidx.appcompat.widget.AppCompatTextView
 				android:id="@+id/title"
-				style="@style/Title"
+				style="@style/PokerAnalyticsTheme.TextView.Title"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
index 79607455..3408c3e6 100644
--- a/app/src/main/res/layout/fragment_history.xml
+++ b/app/src/main/res/layout/fragment_history.xml
@@ -11,8 +11,8 @@
 		android:id="@+id/newSession"
 		android:layout_width="48dp"
 		android:layout_height="48dp"
-		android:layout_marginStart="8dp"
-		android:layout_marginTop="8dp"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="16dp"
 		android:background="@drawable/rectangle_rounded_green_ripple"
 		android:elevation="4dp"
 		android:scaleType="fitCenter"
@@ -26,8 +26,7 @@
 		android:id="@+id/newTournament"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="8dp"
-		android:layout_marginTop="8dp"
+		android:layout_marginStart="16dp"
 		android:background="@drawable/rectangle_rounded_green_ripple"
 		android:elevation="4dp"
 		android:scaleType="fitCenter"
@@ -35,14 +34,13 @@
 		app:layout_constraintEnd_toStartOf="@+id/newHand"
 		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintStart_toEndOf="@+id/newSession"
-		app:layout_constraintTop_toTopOf="parent" />
+		app:layout_constraintTop_toTopOf="@+id/newSession" />
 
 	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/newHand"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="8dp"
-		android:layout_marginTop="8dp"
+		android:layout_marginStart="16dp"
 		android:background="@drawable/rectangle_rounded_green_ripple"
 		android:elevation="4dp"
 		android:scaleType="fitCenter"
@@ -50,15 +48,14 @@
 		app:layout_constraintEnd_toStartOf="@+id/newTransaction"
 		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintStart_toEndOf="@+id/newTournament"
-		app:layout_constraintTop_toTopOf="parent" />
+		app:layout_constraintTop_toTopOf="@+id/newSession" />
 
 	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/newTransaction"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="8dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginEnd="8dp"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="16dp"
 		android:background="@drawable/rectangle_rounded_green_ripple"
 		android:elevation="4dp"
 		android:scaleType="fitCenter"
@@ -66,13 +63,13 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintStart_toEndOf="@+id/newHand"
-		app:layout_constraintTop_toTopOf="parent" />
+		app:layout_constraintTop_toTopOf="@+id/newSession" />
 
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
-		android:layout_marginTop="8dp"
+		android:layout_marginTop="16dp"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_new_session.xml b/app/src/main/res/layout/fragment_new_session.xml
index 987c681f..cb1e83b2 100644
--- a/app/src/main/res/layout/fragment_new_session.xml
+++ b/app/src/main/res/layout/fragment_new_session.xml
@@ -13,30 +13,16 @@
 
 		<androidx.constraintlayout.widget.ConstraintLayout
 			android:layout_width="match_parent"
-			android:layout_height="400dp">
-
-			<androidx.appcompat.widget.AppCompatTextView
-				android:id="@+id/title"
-				style="@style/Title"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="8dp"
-				android:layout_marginTop="8dp"
-				android:layout_marginEnd="8dp"
-				android:text="New session"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="parent" />
+			android:layout_height="wrap_content">
 
 			<androidx.recyclerview.widget.RecyclerView
 				android:id="@+id/recyclerView"
 				android:layout_width="0dp"
 				android:layout_height="0dp"
-				android:layout_marginTop="8dp"
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/title" />
+				app:layout_constraintTop_toTopOf="parent" />
 
 		</androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -61,6 +47,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="?attr/actionBarSize"
 				app:title="Poker Analytics"
+				app:titleMargins="0dp"
 				app:titleTextColor="@color/white"
 				app:layout_collapseMode="pin" />
 
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 6202c2e5..0d9b6d37 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,31 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 
-    <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Settings"
-            android:layout_marginTop="8dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginEnd="8dp"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginStart="8dp"/>
-
-    <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintTop_toBottomOf="@+id/title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginTop="8dp"/>
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/recyclerView"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_stats.xml b/app/src/main/res/layout/fragment_stats.xml
index 05c56d34..76da5548 100644
--- a/app/src/main/res/layout/fragment_stats.xml
+++ b/app/src/main/res/layout/fragment_stats.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:background="#999999"
-        android:layout_height="match_parent"
-        tools:context=".ui.activity.HomeActivity">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/container"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	tools:context=".ui.activity.HomeActivity">
 
-    <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/activity_horizontal_margin"
-            android:layout_marginLeft="@dimen/activity_horizontal_margin"
-            android:layout_marginTop="@dimen/activity_vertical_margin"
-            android:text="fragment"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+	<androidx.appcompat.widget.AppCompatTextView
+		android:id="@+id/title"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="8dp"
+		android:layout_marginEnd="8dp"
+		android:text="Stats"
+		android:textSize="48sp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml
index 2b0f820c..c279292d 100644
--- a/app/src/main/res/menu/navigation.xml
+++ b/app/src/main/res/menu/navigation.xml
@@ -3,17 +3,17 @@
 
     <item
             android:id="@+id/navigation_history"
-            android:icon="@drawable/ic_home_black_24dp"
+            android:icon="@drawable/ic_outline_history"
             android:title="@string/title_history"/>
 
     <item
             android:id="@+id/navigation_stats"
-            android:icon="@drawable/ic_dashboard_black_24dp"
+            android:icon="@drawable/ic_outline_chart_bar"
             android:title="@string/title_stats"/>
 
     <item
             android:id="@+id/navigation_settings"
-            android:icon="@drawable/ic_notifications_black_24dp"
+            android:icon="@drawable/ic_outline_settings"
             android:title="@string/title_settings"/>
 
 </menu>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 438fd332..81e23bbd 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,13 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<color name="colorPrimary">#008577</color>
-	<color name="colorPrimaryDark">#00574B</color>
-	<color name="colorAccent">#D81B60</color>
+	<color name="colorPrimary">#141414</color>
+	<color name="colorPrimaryDark">#0A0A0A</color>
+	<color name="colorAccent">#58C473</color>
 
 	<color name="black">#000000</color>
 	<color name="white">#FFFFFF</color>
+
+	<color name="gray_light">#6AFFFFFF</color>
+	<color name="gray_darker">#141414</color>
+	<color name="gray_dark">#1B1F1B</color>
+
+	<color name="white_dark">#e0e0e0</color>
+	<color name="dark_clear">#40000000</color>
+
 	<color name="green">#58C473</color>
-	<color name="gray_dark_1">#141414</color>
-	<color name="gray_dark_2">#1B1F1B</color>
+	<color name="green_light">#65FF82</color>
+	<color name="green_lighter_gradient">#282e29</color>
+	<color name="green_diamond_dark">#2E8148</color>
+	<color name="green_darker">#212d21</color>
+	<color name="green_darkest">#101911</color>
+	<color name="green_darkest_soft">#151c15</color>
+	<color name="green_darkest_softer">#1b1f1b</color>
+
+	<color name="kaki">#3b4a39</color>
+	<color name="kaki_medium">#57815a</color>
+
+	<color name="kaki_light">#657d60</color>
+	<color name="kaki_lighter">#9bae8d</color>
+
+	<color name="red">#FF5F57</color>
+
+	<color name="blue">#1b8ec8</color>
+
+	<color name="purple">#8e35c8</color>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f6d293ed..cf708458 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,38 +1,60 @@
 <resources>
 
 	<!-- PokerAnalytics application theme -->
-	<style name="PokerAnalyticsTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
+	<style name="PokerAnalyticsTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
 		<!-- Customize your theme here. -->
 		<item name="colorPrimary">@color/colorPrimary</item>
 		<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
 		<item name="colorAccent">@color/colorAccent</item>
+		<item name="android:windowBackground">@color/gray_dark</item>
+		<item name="android:navigationBarColor">@color/colorPrimary</item>
+
+		<item name="bottomNavigationStyle">@style/PokerAnalyticsTheme.BottomNavigationView</item>
+		<item name="toolbarStyle">@style/PokerAnalyticsTheme.Toolbar</item>
+		<item name="android:textViewStyle">@style/PokerAnalyticsTheme.TextView</item>
+
+	</style>
+
+	<!-- Defaults -->
+
+	<!-- Bottom Bar -->
+	<style name="PokerAnalyticsTheme.BottomNavigationView">
+		<item name="itemIconTint">@color/bottom_navigation_item</item>
+		<item name="itemTextColor">@color/bottom_navigation_item</item>
+		<item name="android:background">@color/gray_darker</item>
 	</style>
 
 	<!-- Toolbar -->
-	<style name="BottomSheetToolbar" parent="PokerAnalyticsTheme">
-		<item name="android:background">@color/gray_dark_1</item>
+	<style name="PokerAnalyticsTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar">
+		<item name="android:background">@color/gray_darker</item>
 		<item name="titleTextColor">@color/white</item>
+		<item name="android:fontFamily">@font/roboto_bold</item>
+	</style>
+
+	<style name="PokerAnalyticsTheme.TextView">
+		<item name="android:textColor">@color/white</item>
+		<item name="android:fontFamily">@font/roboto</item>
 	</style>
 
 
 	<!-- TextView -->
-	<style name="Title" parent="PokerAnalyticsTheme">
+	<style name="PokerAnalyticsTheme.TextView.Title" parent="PokerAnalyticsTheme">
 		<item name="android:textSize">22sp</item>
-		<item name="android:textColor">@color/gray_dark_1</item>
+		<item name="android:textColor">@color/white</item>
 		<item name="android:fontFamily">@font/roboto_bold</item>
 		<item name="android:paddingTop">8dp</item>
 	</style>
 
-	<style name="Header" parent="PokerAnalyticsTheme">
+	<style name="PokerAnalyticsTheme.TextView.Header" parent="PokerAnalyticsTheme">
 		<item name="android:textSize">22sp</item>
-		<item name="android:textColor">@color/gray_dark_1</item>
+		<item name="android:textColor">@color/gray_darker</item>
 		<item name="android:fontFamily">@font/roboto_bold</item>
 		<item name="android:paddingTop">8dp</item>
 	</style>
 
-	<style name="RowTitle" parent="PokerAnalyticsTheme">
+	<style name="PokerAnalyticsTheme.TextView.TitleRow" parent="PokerAnalyticsTheme">
 		<item name="android:textSize">16sp</item>
-		<item name="android:textColor">@color/gray_dark_1</item>
+		<item name="android:textColor">@color/gray_darker</item>
 		<item name="android:fontFamily">@font/roboto</item>
 		<item name="android:paddingTop">8dp</item>
 	</style>