diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt
index 3777287132..a45b5a4a78 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt
@@ -121,7 +121,7 @@ class EditNotificationProfileFragment : DSLSettingsFragment(layoutId = R.layout.
       .subscribeBy(
         onSuccess = { initial ->
           if (initial.createMode) {
-            saveButton.text = getString(R.string.EditNotificationProfileFragment__next)
+            saveButton.text = getString(R.string.EditNotificationProfileFragment__create)
             title.setText(R.string.EditNotificationProfileFragment__name_your_profile)
           } else {
             saveButton.text = getString(R.string.EditNotificationProfileFragment__save)
diff --git a/app/src/main/res/drawable/notification_profile_day_background.xml b/app/src/main/res/drawable/notification_profile_day_background.xml
new file mode 100644
index 0000000000..1bde2bd00f
--- /dev/null
+++ b/app/src/main/res/drawable/notification_profile_day_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="8dp" android:left="8dp" android:right="8dp" android:bottom="8dp">
+        <shape android:shape="oval">
+            <solid android:color="@color/notification_profile_schedule_background_tint" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/layout/fragment_edit_notification_profile_schedule.xml b/app/src/main/res/layout/fragment_edit_notification_profile_schedule.xml
index 6e0d82daf2..15f8604754 100644
--- a/app/src/main/res/layout/fragment_edit_notification_profile_schedule.xml
+++ b/app/src/main/res/layout/fragment_edit_notification_profile_schedule.xml
@@ -139,7 +139,7 @@
                 android:id="@+id/edit_notification_profile_schedule_day_1"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:background="@drawable/circle_tintable_padded"
+                android:background="@drawable/notification_profile_day_background"
                 android:enabled="false"
                 android:foreground="?selectableItemBackgroundBorderless"
                 android:gravity="center"
@@ -153,7 +153,7 @@
                 android:id="@+id/edit_notification_profile_schedule_day_2"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:background="@drawable/circle_tintable_padded"
+                android:background="@drawable/notification_profile_day_background"
                 android:enabled="false"
                 android:foreground="?selectableItemBackgroundBorderless"
                 android:gravity="center"
@@ -167,7 +167,7 @@
                 android:id="@+id/edit_notification_profile_schedule_day_3"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:background="@drawable/circle_tintable_padded"
+                android:background="@drawable/notification_profile_day_background"
                 android:enabled="false"
                 android:foreground="?selectableItemBackgroundBorderless"
                 android:gravity="center"
@@ -181,7 +181,7 @@
                 android:id="@+id/edit_notification_profile_schedule_day_4"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:background="@drawable/circle_tintable_padded"
+                android:background="@drawable/notification_profile_day_background"
                 android:enabled="false"
                 android:foreground="?selectableItemBackgroundBorderless"
                 android:gravity="center"
@@ -195,7 +195,7 @@
                 android:id="@+id/edit_notification_profile_schedule_day_5"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:background="@drawable/circle_tintable_padded"
+                android:background="@drawable/notification_profile_day_background"
                 android:enabled="false"
                 android:foreground="?selectableItemBackgroundBorderless"
                 android:gravity="center"
@@ -209,7 +209,7 @@
                 android:id="@+id/edit_notification_profile_schedule_day_6"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:background="@drawable/circle_tintable_padded"
+                android:background="@drawable/notification_profile_day_background"
                 android:enabled="false"
                 android:foreground="?selectableItemBackgroundBorderless"
                 android:gravity="center"
@@ -223,7 +223,7 @@
                 android:id="@+id/edit_notification_profile_schedule_day_7"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:background="@drawable/circle_tintable_padded"
+                android:background="@drawable/notification_profile_day_background"
                 android:enabled="false"
                 android:foreground="?selectableItemBackgroundBorderless"
                 android:gravity="center"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 28d3776595..b983e01644 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4076,8 +4076,10 @@
     <string name="EditNotificationProfileFragment__profile_name">Profile name</string>
     <!-- Name has a max length, this shows how many characters are used out of the max -->
     <string name="EditNotificationProfileFragment__count">%1$d/%2$d</string>
-    <!-- Call to action button once the profile is named to continue to the next create step -->
+    <!-- Call to action button to continue to the next step -->
     <string name="EditNotificationProfileFragment__next">Next</string>
+    <!-- Call to action button once the profile is named to create the profile and continue to the customization steps -->
+    <string name="EditNotificationProfileFragment__create">Create</string>
     <!-- Call to action button once the profile name is edited -->
     <string name="EditNotificationProfileFragment__save">Save</string>
     <!-- Title of edit notification profile screen -->