diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 87d2978..618526c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,7 +40,7 @@
         <activity
             android:name=".activities.MainActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/Theme.Bitsy.NoActionBar"
+            android:theme="@style/Theme.Bitsy"
             android:windowSoftInputMode="adjustPan"/>
         <!-- Used to share Images like the QR code and the eReceipt -->
         <provider
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt
index 69d5656..26e2bc6 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt
@@ -32,7 +32,7 @@ class MainActivity : ConnectedActivity() {
         // Sets the theme to night mode if it has been selected by the user
         if (PreferenceManager.getDefaultSharedPreferences(this)
                 .getBoolean(Constants.KEY_NIGHT_MODE_ACTIVATED, false)) {
-            setTheme(R.style.Theme_Bitsy_Dark_NoActionBar)
+            setTheme(R.style.Theme_Bitsy_Dark)
         }
         setContentView(R.layout.activity_main)
 
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/HomeFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/HomeFragment.kt
index e87a3f3..28d8189 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/HomeFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/HomeFragment.kt
@@ -54,7 +54,7 @@ class HomeFragment : Fragment() {
         // Sets the status and navigation bars background color to a dark blue or just dark
         context?.let { context ->
             val statusBarColor = ContextCompat.getColor(context,
-                    if (!nightMode) R.color.colorPrimaryDark else R.color.colorStatusBarDark)
+                    if (!nightMode) R.color.colorPrimaryVariant else R.color.colorStatusBarDark)
             window?.statusBarColor = statusBarColor
             window?.navigationBarColor = statusBarColor
         }
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
index 94b3966..6c26d43 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
@@ -354,8 +354,8 @@ class SendTransactionFragment : ConnectedFragment(), ZXingScannerView.ResultHand
         cameraPreview.setFormats(listOf(BarcodeFormat.QR_CODE))
         cameraPreview.setAspectTolerance(0.5f)
         cameraPreview.setAutoFocus(true)
-        cameraPreview.setLaserColor(R.color.colorAccent)
-        cameraPreview.setMaskColor(R.color.colorAccent)
+        cameraPreview.setLaserColor(R.color.colorSecondary)
+        cameraPreview.setMaskColor(R.color.colorSecondary)
         cameraPreview.setResultHandler(this)
         cameraPreview.startCamera()
 
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/views/DatePickerFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/views/DatePickerFragment.kt
index 312d3af..3fbb266 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/views/DatePickerFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/views/DatePickerFragment.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.os.Message
 import android.widget.DatePicker
 import androidx.fragment.app.DialogFragment
+import com.google.android.material.picker.MaterialDatePickerDialog
 import cy.agorise.bitsybitshareswallet.fragments.FilterOptionsDialog
 import java.util.*
 
@@ -58,7 +59,7 @@ class DatePickerFragment : DialogFragment(), DatePickerDialog.OnDateSetListener
         val day = calendar.get(Calendar.DAY_OF_MONTH)
 
         // Create a new instance of DatePickerDialog and return it
-        val datePicker = DatePickerDialog(activity!!, this, year, month, day)
+        val datePicker = MaterialDatePickerDialog(activity!!, this, year, month, day)
 
         // Set maximum date allowed to today
         datePicker.datePicker.maxDate = maxTime
diff --git a/app/src/main/res/drawable/outline_rounded_corners.xml b/app/src/main/res/drawable/outline_rounded_corners.xml
index 38a5c24..2cb2af2 100644
--- a/app/src/main/res/drawable/outline_rounded_corners.xml
+++ b/app/src/main/res/drawable/outline_rounded_corners.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@android:color/transparent"/>
     <corners android:radius="4dp"/>
-    <stroke android:color="@color/colorAccent" android:width="1dp"/>
+    <stroke android:color="@color/colorSecondary" android:width="1dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_pin_security_lock.xml b/app/src/main/res/layout/dialog_pin_security_lock.xml
index eeb50eb..060c8c6 100644
--- a/app/src/main/res/layout/dialog_pin_security_lock.xml
+++ b/app/src/main/res/layout/dialog_pin_security_lock.xml
@@ -48,6 +48,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_different_section"
         android:layout_marginEnd="@dimen/spacing_different_section"
+        app:boxBackgroundColor="?android:colorBackground"
         app:layout_constraintTop_toBottomOf="@id/tvSubTitle"
         app:layout_constraintBottom_toBottomOf="parent">
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4aa9f6a..a709b74 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -31,6 +31,7 @@
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/fabReceiveTransaction"
+                style="@style/Widget.MaterialComponents.FloatingActionButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:fabSize="auto"
@@ -79,7 +80,6 @@
                 app:layout_constraintBottom_toTopOf="@+id/tvSendTransaction"
                 app:layout_constraintVertical_chainStyle="packed"/>
 
-
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/fabSendTransactionCamera"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 189e9dd..9805fec 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">#0099d6</color>
-    <color name="colorPrimaryDark">#006ba4</color>
-    <color name="colorAccent">#0099d6</color>
+    <color name="colorPrimaryVariant">#006ba4</color>
+    <color name="colorSecondary">#0099d6</color>
 
     <!-- Dark theme -->
     <color name="colorBackgroundFloating">#424242</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 192e9f1..c3edbca 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,43 +1,36 @@
 <resources>
 
     <!-- Base application light theme. -->
-    <style name="Theme.Bitsy" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
+    <style name="Theme.Bitsy" 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="colorPrimaryVariant">@color/colorPrimaryVariant</item>
+        <item name="colorSecondary">@color/colorSecondary</item>
+        <item name="colorOnSecondary">#fff</item>
         <!--Custom attributes -->
         <item name="android:fontFamily">@font/p_f_beau_sans_pro</item>
         <item name="themedColorBackgroundFloating">@android:color/white</item>
-        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
-        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
-    </style>
-    <style name="Theme.Bitsy.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
+        <item name="android:statusBarColor">@color/colorPrimaryVariant</item>
+        <item name="android:navigationBarColor">@color/colorPrimaryVariant</item>
     </style>
     <style name="Theme.Bitsy.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar"/>
 
     <!-- Base application dark theme. -->
-    <!-- Bridge is still used cause there is an issue with the Transactions' FilterOptionsDialog Calendar -->
-    <style name="Theme.Bitsy.Dark" parent="Theme.MaterialComponents.Bridge">
+    <style name="Theme.Bitsy.Dark" parent="Theme.MaterialComponents.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="colorPrimaryVariant">@color/colorPrimaryVariant</item>
+        <item name="colorSecondary">@color/colorSecondary</item>
+        <item name="colorOnSecondary">#fff</item>
         <!--Custom attributes -->
         <item name="android:fontFamily">@font/p_f_beau_sans_pro</item>
         <item name="themedColorBackgroundFloating">@color/colorBackgroundFloating</item>
         <item name="android:statusBarColor">@color/colorStatusBarDark</item>
         <item name="android:navigationBarColor">@color/colorStatusBarDark</item>
     </style>
-    <style name="Theme.Bitsy.Dark.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
 
     <!-- Custom widget styles -->
-    <style name="SplashTheme" parent="Theme.Bitsy.NoActionBar">
+    <style name="SplashTheme" parent="Theme.Bitsy">
         <item name="android:windowBackground">@drawable/splash_screen</item>
     </style>