diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetAnalogueConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetAnalogueConfigureActivity.kt
index 332ae133..f58abe54 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetAnalogueConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetAnalogueConfigureActivity.kt
@@ -3,6 +3,7 @@ package com.simplemobiletools.clock.activities
 import android.app.Activity
 import android.appwidget.AppWidgetManager
 import android.content.Intent
+import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
 import android.widget.SeekBar
@@ -37,6 +38,7 @@ class WidgetAnalogueConfigureActivity : SimpleActivity() {
         }
 
         config_analogue_save.setOnClickListener { saveConfig() }
+        config_analogue_save.setTextColor(getProperPrimaryColor().getContrastColor())
         config_analogue_bg_color.setOnClickListener { pickBackgroundColor() }
 
         val primaryColor = getProperPrimaryColor()
@@ -53,8 +55,7 @@ class WidgetAnalogueConfigureActivity : SimpleActivity() {
 
     override fun onResume() {
         super.onResume()
-        window.decorView.setBackgroundColor(0)
-
+        setupToolbar(config_toolbar)
         if (mFeatureLockedDialog != null && isOrWasThankYouInstalled()) {
             mFeatureLockedDialog?.dismissDialog()
         }
@@ -107,6 +108,7 @@ class WidgetAnalogueConfigureActivity : SimpleActivity() {
         mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
         config_analogue_bg_color.setFillWithStroke(mBgColor, mBgColor)
         config_analogue_background.applyColorFilter(mBgColor)
+        config_analogue_save.backgroundTintList = ColorStateList.valueOf(getProperPrimaryColor())
     }
 
     private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDigitalConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDigitalConfigureActivity.kt
index 2b491a81..ea8f494c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDigitalConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDigitalConfigureActivity.kt
@@ -3,6 +3,7 @@ package com.simplemobiletools.clock.activities
 import android.app.Activity
 import android.appwidget.AppWidgetManager
 import android.content.Intent
+import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
 import android.widget.SeekBar
@@ -55,8 +56,7 @@ class WidgetDigitalConfigureActivity : SimpleActivity() {
 
     override fun onResume() {
         super.onResume()
-        window.decorView.setBackgroundColor(0)
-
+        setupToolbar(config_toolbar)
         if (mFeatureLockedDialog != null && isOrWasThankYouInstalled()) {
             mFeatureLockedDialog?.dismissDialog()
         }
@@ -122,12 +122,14 @@ class WidgetDigitalConfigureActivity : SimpleActivity() {
         config_digital_text_color.setFillWithStroke(mTextColor, mTextColor)
         config_digital_time.setTextColor(mTextColor)
         config_digital_date.setTextColor(mTextColor)
+        config_digital_save.setTextColor(getProperPrimaryColor().getContrastColor())
     }
 
     private fun updateBackgroundColor() {
         mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
         config_digital_bg_color.setFillWithStroke(mBgColor, mBgColor)
         config_digital_background.applyColorFilter(mBgColor)
+        config_digital_save.backgroundTintList = ColorStateList.valueOf(getProperPrimaryColor())
     }
 
     private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener {
diff --git a/app/src/main/res/layout/widget_config_analogue.xml b/app/src/main/res/layout/widget_config_analogue.xml
index 83d2c70f..1c520030 100644
--- a/app/src/main/res/layout/widget_config_analogue.xml
+++ b/app/src/main/res/layout/widget_config_analogue.xml
@@ -1,79 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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/config_analogue_holder"
+    android:id="@+id/config_coordinator"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_centerHorizontal="true"
-    android:layout_margin="@dimen/activity_margin">
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/config_app_bar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/config_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:title="@string/app_launcher_name"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <RelativeLayout
-        android:id="@+id/config_analogue_wrapper"
+        android:id="@+id/config_analogue_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/small_margin">
+        android:layout_centerHorizontal="true"
+        android:layout_margin="@dimen/activity_margin"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <RelativeLayout
+            android:id="@+id/config_analogue_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/small_margin">
+
+            <ImageView
+                android:id="@+id/config_analogue_background"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@+id/config_analogue_time"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true"
+                android:src="@drawable/widget_round_background" />
+
+            <AnalogClock
+                android:id="@+id/config_analogue_time"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/widget_analogue_time_height"
+                android:gravity="center_horizontal"
+                android:includeFontPadding="false"
+                android:textSize="@dimen/widget_time_text_size_small"
+                tools:text="00:00" />
+
+        </RelativeLayout>
 
         <ImageView
-            android:id="@+id/config_analogue_background"
+            android:id="@+id/config_analogue_bg_color"
+            android:layout_width="@dimen/widget_colorpicker_size"
+            android:layout_height="@dimen/widget_colorpicker_size"
+            android:layout_above="@+id/config_analogue_save"
+            android:layout_margin="@dimen/tiny_margin" />
+
+        <RelativeLayout
+            android:id="@+id/config_analogue_seekbar_holder"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignTop="@+id/config_analogue_bg_color"
+            android:layout_alignBottom="@+id/config_analogue_bg_color"
+            android:layout_marginStart="@dimen/medium_margin"
+            android:layout_toEndOf="@+id/config_analogue_bg_color"
+            android:background="@drawable/widget_config_seekbar_background">
+
+            <com.simplemobiletools.commons.views.MySeekBar
+                android:id="@+id/config_analogue_bg_seekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingEnd="@dimen/activity_margin" />
+        </RelativeLayout>
+
+        <Button
+            android:id="@+id/config_analogue_save"
+            style="@style/MyWidgetConfigSaveStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/config_analogue_time"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
             android:layout_alignParentEnd="true"
-            android:src="@drawable/widget_round_background" />
-
-        <AnalogClock
-            android:id="@+id/config_analogue_time"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/widget_analogue_time_height"
-            android:gravity="center_horizontal"
-            android:includeFontPadding="false"
-            android:textSize="@dimen/widget_time_text_size_small"
-            tools:text="00:00" />
+            android:layout_alignParentBottom="true"
+            android:layout_marginTop="@dimen/small_margin"
+            android:text="@string/ok" />
 
     </RelativeLayout>
-
-    <ImageView
-        android:id="@+id/config_analogue_bg_color"
-        android:layout_width="@dimen/widget_colorpicker_size"
-        android:layout_height="@dimen/widget_colorpicker_size"
-        android:layout_above="@+id/config_analogue_save"
-        android:layout_margin="@dimen/tiny_margin" />
-
-    <RelativeLayout
-        android:id="@+id/config_analogue_seekbar_holder"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignTop="@+id/config_analogue_bg_color"
-        android:layout_alignBottom="@+id/config_analogue_bg_color"
-        android:layout_marginStart="@dimen/medium_margin"
-        android:layout_toEndOf="@+id/config_analogue_bg_color"
-        android:background="@drawable/widget_config_seekbar_background">
-
-        <com.simplemobiletools.commons.views.MySeekBar
-            android:id="@+id/config_analogue_bg_seekbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:paddingStart="@dimen/activity_margin"
-            android:paddingEnd="@dimen/activity_margin" />
-    </RelativeLayout>
-
-    <Button
-        android:id="@+id/config_analogue_save"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginTop="@dimen/small_margin"
-        android:background="@drawable/widget_config_seekbar_background"
-        android:fontFamily="sans-serif-light"
-        android:paddingStart="@dimen/activity_margin"
-        android:paddingEnd="@dimen/activity_margin"
-        android:text="@string/ok"
-        android:textColor="@color/dark_grey"
-        android:textFontWeight="400"
-        android:textSize="@dimen/big_text_size" />
-
-</RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_config_digital.xml b/app/src/main/res/layout/widget_config_digital.xml
index a3fa887d..555b448e 100644
--- a/app/src/main/res/layout/widget_config_digital.xml
+++ b/app/src/main/res/layout/widget_config_digital.xml
@@ -1,107 +1,124 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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/config_digital_holder"
+    android:id="@+id/config_coordinator"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_centerHorizontal="true"
-    android:layout_margin="@dimen/activity_margin">
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/config_app_bar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/config_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:title="@string/app_launcher_name"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <RelativeLayout
-        android:id="@+id/config_digital_wrapper"
+        android:id="@+id/config_digital_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/small_margin">
+        android:layout_centerHorizontal="true"
+        android:layout_margin="@dimen/activity_margin"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <RelativeLayout
+            android:id="@+id/config_digital_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/small_margin">
+
+            <ImageView
+                android:id="@+id/config_digital_background"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@+id/config_digital_date"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true"
+                android:src="@drawable/widget_round_background" />
+
+            <TextClock
+                android:id="@+id/config_digital_time"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/widget_digital_time_height"
+                android:format12Hour="h:mm"
+                android:format24Hour="k:mm"
+                android:gravity="center_horizontal"
+                android:includeFontPadding="false"
+                android:shadowColor="@android:color/black"
+                android:shadowDy="1"
+                android:shadowRadius="1"
+                android:textSize="@dimen/widget_time_text_size_small"
+                tools:text="00:00" />
+
+            <TextClock
+                android:id="@+id/config_digital_date"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/config_digital_time"
+                android:format12Hour="EEE, d MMM"
+                android:format24Hour="EEE, d MMM"
+                android:gravity="center_horizontal"
+                android:includeFontPadding="false"
+                android:paddingBottom="@dimen/small_margin"
+                android:shadowColor="@android:color/black"
+                android:shadowDy="1"
+                android:shadowRadius="1"
+                android:textSize="@dimen/normal_text_size"
+                tools:text="Mon, 1 January" />
+
+        </RelativeLayout>
 
         <ImageView
-            android:id="@+id/config_digital_background"
+            android:id="@+id/config_digital_bg_color"
+            android:layout_width="@dimen/widget_colorpicker_size"
+            android:layout_height="@dimen/widget_colorpicker_size"
+            android:layout_above="@+id/config_digital_text_color"
+            android:layout_margin="@dimen/tiny_margin" />
+
+        <RelativeLayout
+            android:id="@+id/config_digital_seekbar_holder"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignTop="@+id/config_digital_bg_color"
+            android:layout_alignBottom="@+id/config_digital_bg_color"
+            android:layout_marginStart="@dimen/medium_margin"
+            android:layout_toEndOf="@+id/config_digital_bg_color"
+            android:background="@drawable/widget_config_seekbar_background">
+
+            <com.simplemobiletools.commons.views.MySeekBar
+                android:id="@+id/config_digital_bg_seekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingEnd="@dimen/activity_margin" />
+
+        </RelativeLayout>
+
+        <ImageView
+            android:id="@+id/config_digital_text_color"
+            android:layout_width="@dimen/widget_colorpicker_size"
+            android:layout_height="@dimen/widget_colorpicker_size"
+            android:layout_alignParentBottom="true"
+            android:layout_margin="@dimen/tiny_margin" />
+
+        <Button
+            android:id="@+id/config_digital_save"
+            style="@style/MyWidgetConfigSaveStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/config_digital_date"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
             android:layout_alignParentEnd="true"
-            android:src="@drawable/widget_round_background" />
-
-        <TextClock
-            android:id="@+id/config_digital_time"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/widget_digital_time_height"
-            android:format12Hour="h:mm"
-            android:format24Hour="k:mm"
-            android:gravity="center_horizontal"
-            android:includeFontPadding="false"
-            android:shadowColor="@android:color/black"
-            android:shadowDy="1"
-            android:shadowRadius="1"
-            android:textSize="@dimen/widget_time_text_size_small"
-            tools:text="00:00" />
-
-        <TextClock
-            android:id="@+id/config_digital_date"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/config_digital_time"
-            android:format12Hour="EEE, d MMM"
-            android:format24Hour="EEE, d MMM"
-            android:gravity="center_horizontal"
-            android:includeFontPadding="false"
-            android:paddingBottom="@dimen/small_margin"
-            android:shadowColor="@android:color/black"
-            android:shadowDy="1"
-            android:shadowRadius="1"
-            android:textSize="@dimen/normal_text_size"
-            tools:text="Mon, 1 January" />
+            android:layout_alignParentBottom="true"
+            android:text="@string/ok" />
 
     </RelativeLayout>
-
-    <ImageView
-        android:id="@+id/config_digital_bg_color"
-        android:layout_width="@dimen/widget_colorpicker_size"
-        android:layout_height="@dimen/widget_colorpicker_size"
-        android:layout_above="@+id/config_digital_text_color"
-        android:layout_margin="@dimen/tiny_margin" />
-
-    <RelativeLayout
-        android:id="@+id/config_digital_seekbar_holder"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignTop="@+id/config_digital_bg_color"
-        android:layout_alignBottom="@+id/config_digital_bg_color"
-        android:layout_marginStart="@dimen/medium_margin"
-        android:layout_toEndOf="@+id/config_digital_bg_color"
-        android:background="@drawable/widget_config_seekbar_background">
-
-        <com.simplemobiletools.commons.views.MySeekBar
-            android:id="@+id/config_digital_bg_seekbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:paddingStart="@dimen/activity_margin"
-            android:paddingEnd="@dimen/activity_margin" />
-
-    </RelativeLayout>
-
-    <ImageView
-        android:id="@+id/config_digital_text_color"
-        android:layout_width="@dimen/widget_colorpicker_size"
-        android:layout_height="@dimen/widget_colorpicker_size"
-        android:layout_alignParentBottom="true"
-        android:layout_margin="@dimen/tiny_margin" />
-
-    <Button
-        android:id="@+id/config_digital_save"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:background="@drawable/widget_config_seekbar_background"
-        android:fontFamily="sans-serif-light"
-        android:paddingStart="@dimen/activity_margin"
-        android:paddingEnd="@dimen/activity_margin"
-        android:text="@string/ok"
-        android:textColor="@color/dark_grey"
-        android:textFontWeight="400"
-        android:textSize="@dimen/big_text_size" />
-
-</RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>