diff --git a/src/MagSend/app/build.gradle b/src/MagSend/app/build.gradle
index 3d615d2..acfdf25 100644
--- a/src/MagSend/app/build.gradle
+++ b/src/MagSend/app/build.gradle
@@ -35,7 +35,7 @@ android {
 dependencies {
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.material:material:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
     testImplementation 'junit:junit:4.13.2'
diff --git a/src/MagSend/app/src/main/AndroidManifest.xml b/src/MagSend/app/src/main/AndroidManifest.xml
index a0e7876..4a013db 100644
--- a/src/MagSend/app/src/main/AndroidManifest.xml
+++ b/src/MagSend/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
   xmlns:tools="http://schemas.android.com/tools">
 
   <application
+    android:name=".MagSendApplication"
     android:allowBackup="true"
     android:dataExtractionRules="@xml/data_extraction_rules"
     android:fullBackupContent="@xml/backup_rules"
diff --git a/src/MagSend/app/src/main/java/dev/kaderli/magsend/MagSendApplication.kt b/src/MagSend/app/src/main/java/dev/kaderli/magsend/MagSendApplication.kt
new file mode 100644
index 0000000..03d5c18
--- /dev/null
+++ b/src/MagSend/app/src/main/java/dev/kaderli/magsend/MagSendApplication.kt
@@ -0,0 +1,11 @@
+package dev.kaderli.magsend
+
+import android.app.Application
+import com.google.android.material.color.DynamicColors
+
+class MagSendApplication: Application() {
+  override fun onCreate() {
+    super.onCreate()
+    DynamicColors.applyToActivitiesIfAvailable(this)
+  }
+}
diff --git a/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/BaseActivity.kt b/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/BaseActivity.kt
index 4ba0ac3..badc323 100644
--- a/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/BaseActivity.kt
+++ b/src/MagSend/app/src/main/java/dev/kaderli/magsend/activity/BaseActivity.kt
@@ -2,8 +2,7 @@ package dev.kaderli.magsend.activity
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
-import dev.kaderli.magsend.R
+import com.google.android.material.elevation.SurfaceColors
 
 
 abstract class BaseActivity : AppCompatActivity() {
@@ -14,15 +13,10 @@ abstract class BaseActivity : AppCompatActivity() {
     super.onCreate(savedInstanceState)
     setContentView(getLayoutId())
 
-    val toolbar: Toolbar = findViewById(R.id.toolbar)
-    setSupportActionBar(toolbar)
-    if (getLayoutId() != R.layout.activity_main) {
-      supportActionBar?.setDisplayHomeAsUpEnabled(true)
-    }
-
-    supportActionBar?.title = title
+    val color = SurfaceColors.SURFACE_2.getColor(this)
+    window.statusBarColor = color
+    window.navigationBarColor = color
   }
 
   protected abstract fun getLayoutId(): Int
-
 }
diff --git a/src/MagSend/app/src/main/res/layout/activity_calibration.xml b/src/MagSend/app/src/main/res/layout/activity_calibration.xml
index 3a94f56..716ffba 100644
--- a/src/MagSend/app/src/main/res/layout/activity_calibration.xml
+++ b/src/MagSend/app/src/main/res/layout/activity_calibration.xml
@@ -6,22 +6,23 @@
   android:layout_height="match_parent"
   tools:context=".activity.CalibrationActivity">
 
-  <include layout="@layout/toolbar" />
-
   <TextView
     android:id="@+id/calibrationDescription"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/layout_margins"
+    android:paddingHorizontal="@dimen/layout_margins"
     android:text="@string/calibration_description"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@+id/toolbar" />
+    app:layout_constraintTop_toTopOf="parent" />
 
   <TextView
     android:id="@+id/calibrationValue"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/component_spacing"
+    android:paddingHorizontal="@dimen/layout_margins"
     android:textSize="48sp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
diff --git a/src/MagSend/app/src/main/res/layout/activity_main.xml b/src/MagSend/app/src/main/res/layout/activity_main.xml
index c01e9dd..f1bbf5e 100644
--- a/src/MagSend/app/src/main/res/layout/activity_main.xml
+++ b/src/MagSend/app/src/main/res/layout/activity_main.xml
@@ -7,20 +7,40 @@
   android:layout_height="match_parent"
   tools:context=".activity.MainActivity">
 
-  <include layout="@layout/toolbar" />
+  <TextView
+    android:id="@+id/homeReceiveDescription"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/layout_margins"
+    android:paddingHorizontal="@dimen/layout_margins"
+    android:text="@string/home_receive_description"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent" />
 
   <Button
     android:id="@+id/receiveButton"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
+    android:layout_marginTop="@dimen/component_spacing_small"
     android:onClick="startReceiveActivity"
     android:text="@string/receive_button_label"
     app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintHorizontal_bias="0.498"
+    app:layout_constraintHorizontal_bias="0.488"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/homeReceiveDescription" />
 
+  <TextView
+    android:id="@+id/homeCalibrationDescription"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/component_spacing"
+    android:paddingHorizontal="@dimen/layout_margins"
+    android:text="@string/home_calibration_description"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/receiveButton" />
+
   <Button
     android:id="@+id/calibrateButton"
     android:layout_width="wrap_content"
@@ -32,22 +52,4 @@
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/homeCalibrationDescription" />
 
-  <TextView
-    android:id="@+id/homeReceiveDescription"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:text="@string/home_receive_description"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@+id/toolbar" />
-
-  <TextView
-    android:id="@+id/homeCalibrationDescription"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/component_spacing"
-    android:text="@string/home_calibration_description"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@+id/receiveButton" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/src/MagSend/app/src/main/res/layout/activity_receive.xml b/src/MagSend/app/src/main/res/layout/activity_receive.xml
index 12cd56b..0a9eb9e 100644
--- a/src/MagSend/app/src/main/res/layout/activity_receive.xml
+++ b/src/MagSend/app/src/main/res/layout/activity_receive.xml
@@ -6,17 +6,16 @@
   android:layout_height="match_parent"
   tools:context=".activity.ReceiveActivity">
 
-  <include layout="@layout/toolbar" />
-
   <TextView
     android:id="@+id/receiveDescription"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/layout_margins"
     android:paddingHorizontal="@dimen/layout_margins"
     android:text="@string/receive_description"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@+id/toolbar" />
+    app:layout_constraintTop_toTopOf="parent" />
 
   <TextView
     android:id="@+id/preambleStatus"
diff --git a/src/MagSend/app/src/main/res/layout/toolbar.xml b/src/MagSend/app/src/main/res/layout/toolbar.xml
deleted file mode 100644
index 6fefc94..0000000
--- a/src/MagSend/app/src/main/res/layout/toolbar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:id="@+id/toolbar"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:background="?attr/colorPrimary"
-  android:minHeight="?attr/actionBarSize"
-  android:theme="?attr/actionBarTheme"
-  app:layout_constraintEnd_toEndOf="parent"
-  app:layout_constraintStart_toStartOf="parent" />
diff --git a/src/MagSend/app/src/main/res/values-night/themes.xml b/src/MagSend/app/src/main/res/values-night/themes.xml
index 608a4ce..2946070 100644
--- a/src/MagSend/app/src/main/res/values-night/themes.xml
+++ b/src/MagSend/app/src/main/res/values-night/themes.xml
@@ -1,16 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.MagSend" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
+<resources>
+
+  <style name="Theme.MagSend" parent="Theme.Material3.Dark" />
 </resources>
diff --git a/src/MagSend/app/src/main/res/values/colors.xml b/src/MagSend/app/src/main/res/values/colors.xml
index b299a61..e009841 100644
--- a/src/MagSend/app/src/main/res/values/colors.xml
+++ b/src/MagSend/app/src/main/res/values/colors.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
     <color name="error">#FFFF0000</color>
     <color name="success">#FF00FF00</color>
 </resources>
diff --git a/src/MagSend/app/src/main/res/values/dimens.xml b/src/MagSend/app/src/main/res/values/dimens.xml
index 3cbe198..3064a82 100644
--- a/src/MagSend/app/src/main/res/values/dimens.xml
+++ b/src/MagSend/app/src/main/res/values/dimens.xml
@@ -3,5 +3,5 @@
   <dimen name="layout_margins">16dp</dimen>
   <dimen name="component_spacing">24dp</dimen>
   <dimen name="title_text_size">48sp</dimen>
-    <dimen name="component_spacing_small">8dp</dimen>
+  <dimen name="component_spacing_small">8dp</dimen>
 </resources>
diff --git a/src/MagSend/app/src/main/res/values/themes.xml b/src/MagSend/app/src/main/res/values/themes.xml
index 4ba81b1..4596092 100644
--- a/src/MagSend/app/src/main/res/values/themes.xml
+++ b/src/MagSend/app/src/main/res/values/themes.xml
@@ -1,16 +1,8 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.MagSend" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
+<resources>
+
+  <style name="Theme.MagSend" parent="Theme.Material3.Light" >
+    <item name="android:windowLightStatusBar">true</item>
+    <item name="android:windowLightNavigationBar">true</item>
+  </style>
+
 </resources>