diff --git a/app/src/main/res/drawable/preview_add_bg.xml b/app/src/main/res/drawable/preview_circle.xml
similarity index 52%
rename from app/src/main/res/drawable/preview_add_bg.xml
rename to app/src/main/res/drawable/preview_circle.xml
index 7bd7cac..da2ecc2 100644
--- a/app/src/main/res/drawable/preview_add_bg.xml
+++ b/app/src/main/res/drawable/preview_circle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Round badge for the widget-picker preview. Tinted at the use site. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/widget_preview_primary_container" />
+    <solid android:color="@android:color/white" />
 </shape>
diff --git a/app/src/main/res/drawable/preview_pill.xml b/app/src/main/res/drawable/preview_pill.xml
new file mode 100644
index 0000000..8b5d6ed
--- /dev/null
+++ b/app/src/main/res/drawable/preview_pill.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Full-pill action button for the widget-picker preview. Tinted at the use site. -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/white" />
+    <corners android:radius="100dp" />
+</shape>
diff --git a/app/src/main/res/drawable/preview_ring.xml b/app/src/main/res/drawable/preview_ring.xml
index d1722ed..823026e 100644
--- a/app/src/main/res/drawable/preview_ring.xml
+++ b/app/src/main/res/drawable/preview_ring.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Static mock of WidgetProgressRing for the widget-picker preview. -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@android:color/transparent" />
-    <stroke android:width="7dp" android:color="@color/widget_preview_primary" />
-</shape>
+<!-- Static mock of WidgetProgressRing (4 of 6 done) for the widget-picker preview. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp" android:height="72dp"
+    android:viewportWidth="100" android:viewportHeight="100">
+    <path
+        android:pathData="M50,5 A45,45 0 1 1 50,95 A45,45 0 1 1 50,5"
+        android:strokeColor="@color/widget_preview_surface_variant"
+        android:strokeWidth="10" />
+    <path
+        android:pathData="M50,5 A45,45 0 1 1 11.03,72.5"
+        android:strokeColor="@color/widget_preview_primary"
+        android:strokeWidth="10"
+        android:strokeLineCap="round" />
+</vector>
diff --git a/app/src/main/res/drawable/preview_row.xml b/app/src/main/res/drawable/preview_row.xml
new file mode 100644
index 0000000..85af09e
--- /dev/null
+++ b/app/src/main/res/drawable/preview_row.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Static mock of WidgetGroupedRow (Position.Alone) for the widget-picker preview. Tinted at the use site. -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/white" />
+    <corners android:radius="22dp" />
+</shape>
diff --git a/app/src/main/res/drawable/preview_stripe.xml b/app/src/main/res/drawable/preview_stripe.xml
deleted file mode 100644
index 222a3f6..0000000
--- a/app/src/main/res/drawable/preview_stripe.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#B48A9C" />
-    <corners android:radius="2dp" />
-</shape>
diff --git a/app/src/main/res/drawable/preview_tile.xml b/app/src/main/res/drawable/preview_tile.xml
new file mode 100644
index 0000000..6fd86b9
--- /dev/null
+++ b/app/src/main/res/drawable/preview_tile.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Static mock of WidgetTile for the widget-picker preview. Tinted at the use site. -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/white" />
+    <corners android:radius="16dp" />
+</shape>
diff --git a/app/src/main/res/layout/widget_preview_lists.xml b/app/src/main/res/layout/widget_preview_lists.xml
index 59f8a7f..6bfce84 100644
--- a/app/src/main/res/layout/widget_preview_lists.xml
+++ b/app/src/main/res/layout/widget_preview_lists.xml
@@ -6,36 +6,208 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/preview_widget_bg"
-    android:padding="8dp"
+    android:padding="4dp"
     android:columnCount="2"
     android:rowCount="2"
-    tools:ignore="HardcodedText">
+    tools:ignore="HardcodedText,UseAppTint">
 
-    <TextView
+    <FrameLayout
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:layout_column="0"
+        android:layout_row="0"
         android:layout_columnWeight="1"
         android:layout_rowWeight="1"
-        android:layout_margin="4dp"
-        android:background="@drawable/preview_stripe"
-        android:backgroundTint="#B48A9C"
-        android:padding="8dp"
-        android:gravity="bottom"
-        android:text="Home\n3"
-        android:textColor="@android:color/white"
-        android:textSize="13sp" />
+        android:padding="4dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:background="@drawable/preview_tile"
+            android:backgroundTint="#B87898"
+            android:padding="8dp">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:maxLines="2"
+                android:text="Home"
+                android:fontFamily="sans-serif-medium"
+                android:textColor="@android:color/white"
+                android:textSize="13sp" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="3"
+                    android:fontFamily="sans-serif-medium"
+                    android:textColor="@android:color/white"
+                    android:textSize="18sp" />
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:padding="3dp"
+                    android:contentDescription="@null"
+                    android:background="@drawable/preview_circle"
+                    android:backgroundTint="@color/widget_preview_primary_container"
+                    android:src="@drawable/floret_ic_widget_add"
+                    android:tint="@color/widget_preview_on_primary_container" />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
 
-    <TextView
+    <FrameLayout
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:layout_column="1"
+        android:layout_row="0"
         android:layout_columnWeight="1"
         android:layout_rowWeight="1"
-        android:layout_margin="4dp"
-        android:background="@drawable/preview_stripe"
-        android:backgroundTint="#7FA3C9"
-        android:padding="8dp"
-        android:gravity="bottom"
-        android:text="Work\n5"
-        android:textColor="@android:color/white"
-        android:textSize="13sp" />
+        android:padding="4dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:background="@drawable/preview_tile"
+            android:backgroundTint="#6E93B8"
+            android:padding="8dp">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:maxLines="2"
+                android:text="Work"
+                android:fontFamily="sans-serif-medium"
+                android:textColor="@android:color/white"
+                android:textSize="13sp" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="5"
+                    android:fontFamily="sans-serif-medium"
+                    android:textColor="@android:color/white"
+                    android:textSize="18sp" />
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:padding="3dp"
+                    android:contentDescription="@null"
+                    android:background="@drawable/preview_circle"
+                    android:backgroundTint="@color/widget_preview_primary_container"
+                    android:src="@drawable/floret_ic_widget_add"
+                    android:tint="@color/widget_preview_on_primary_container" />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_column="0"
+        android:layout_row="1"
+        android:layout_columnWeight="1"
+        android:layout_rowWeight="1"
+        android:padding="4dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:background="@drawable/preview_tile"
+            android:backgroundTint="#8DB878"
+            android:padding="8dp">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:maxLines="2"
+                android:text="Groceries"
+                android:fontFamily="sans-serif-medium"
+                android:textColor="@android:color/white"
+                android:textSize="13sp" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="4"
+                    android:fontFamily="sans-serif-medium"
+                    android:textColor="@android:color/white"
+                    android:textSize="18sp" />
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:padding="3dp"
+                    android:contentDescription="@null"
+                    android:background="@drawable/preview_circle"
+                    android:backgroundTint="@color/widget_preview_primary_container"
+                    android:src="@drawable/floret_ic_widget_add"
+                    android:tint="@color/widget_preview_on_primary_container" />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_column="1"
+        android:layout_row="1"
+        android:layout_columnWeight="1"
+        android:layout_rowWeight="1"
+        android:padding="4dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:background="@drawable/preview_tile"
+            android:backgroundTint="#B89565"
+            android:padding="8dp">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:maxLines="2"
+                android:text="Ideas"
+                android:fontFamily="sans-serif-medium"
+                android:textColor="@android:color/white"
+                android:textSize="13sp" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="2"
+                    android:fontFamily="sans-serif-medium"
+                    android:textColor="@android:color/white"
+                    android:textSize="18sp" />
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:padding="3dp"
+                    android:contentDescription="@null"
+                    android:background="@drawable/preview_circle"
+                    android:backgroundTint="@color/widget_preview_primary_container"
+                    android:src="@drawable/floret_ic_widget_add"
+                    android:tint="@color/widget_preview_on_primary_container" />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
 </GridLayout>
diff --git a/app/src/main/res/layout/widget_preview_tasks.xml b/app/src/main/res/layout/widget_preview_tasks.xml
index 8836ce2..2eb60fc 100644
--- a/app/src/main/res/layout/widget_preview_tasks.xml
+++ b/app/src/main/res/layout/widget_preview_tasks.xml
@@ -7,69 +7,66 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@drawable/preview_widget_bg"
-    android:padding="12dp"
+    android:paddingHorizontal="8dp"
+    android:paddingVertical="4dp"
     tools:ignore="HardcodedText,UseCompoundDrawables,UseAppTint">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="36dp"
         android:orientation="horizontal"
         android:gravity="center_vertical">
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:layout_marginStart="8dp"
+            android:maxLines="1"
             android:text="@string/smart_today"
+            android:fontFamily="sans-serif-medium"
             android:textColor="@color/widget_preview_primary"
-            android:textSize="16sp"
-            android:textStyle="bold" />
+            android:textSize="16sp" />
         <ImageView
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:padding="9dp"
+            android:layout_width="36dp"
+            android:layout_height="28dp"
+            android:padding="5dp"
             android:contentDescription="@null"
-            android:background="@drawable/preview_add_bg"
+            android:background="@drawable/preview_pill"
+            android:backgroundTint="@color/widget_preview_primary"
             android:src="@drawable/floret_ic_widget_add"
-            android:tint="@color/widget_preview_on_primary_container" />
+            android:tint="@color/widget_preview_on_primary" />
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:minHeight="40dp"
         android:orientation="horizontal"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        android:background="@drawable/preview_row"
+        android:backgroundTint="@color/widget_preview_surface_variant"
+        android:paddingHorizontal="8dp"
+        android:paddingVertical="6dp">
         <ImageView
-            android:layout_width="4dp"
-            android:layout_height="32dp"
-            android:contentDescription="@null"
-            android:background="@drawable/preview_stripe"
-            android:backgroundTint="#B48A9C" />
-        <ImageView
-            android:layout_width="22dp"
-            android:layout_height="22dp"
-            android:layout_marginStart="9dp"
-            android:layout_marginEnd="9dp"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:padding="6dp"
             android:contentDescription="@null"
             android:src="@drawable/floret_ic_widget_check"
             android:tint="@color/widget_preview_variant" />
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
             android:orientation="vertical">
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:maxLines="1"
                 android:text="Water the plants"
+                android:fontFamily="sans-serif-medium"
                 android:textColor="@color/widget_preview_on_surface"
                 android:textSize="14sp" />
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Today"
-                android:textColor="@color/widget_preview_variant"
-                android:textSize="12sp" />
         </LinearLayout>
     </LinearLayout>
 
@@ -77,36 +74,38 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:minHeight="40dp"
         android:orientation="horizontal"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        android:background="@drawable/preview_row"
+        android:backgroundTint="@color/widget_preview_surface_variant"
+        android:paddingHorizontal="8dp"
+        android:paddingVertical="6dp">
         <ImageView
-            android:layout_width="4dp"
-            android:layout_height="32dp"
-            android:contentDescription="@null"
-            android:background="@drawable/preview_stripe"
-            android:backgroundTint="#7FA3C9" />
-        <ImageView
-            android:layout_width="22dp"
-            android:layout_height="22dp"
-            android:layout_marginStart="9dp"
-            android:layout_marginEnd="9dp"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:padding="6dp"
             android:contentDescription="@null"
             android:src="@drawable/floret_ic_widget_check"
             android:tint="@color/widget_preview_variant" />
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
             android:orientation="vertical">
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:maxLines="1"
                 android:text="Call the dentist"
+                android:fontFamily="sans-serif-medium"
                 android:textColor="@color/widget_preview_on_surface"
                 android:textSize="14sp" />
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Today · 10:30"
+                android:maxLines="1"
+                android:text="10:30"
                 android:textColor="@color/widget_preview_variant"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -116,36 +115,38 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:minHeight="40dp"
         android:orientation="horizontal"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        android:background="@drawable/preview_row"
+        android:backgroundTint="@color/widget_preview_surface_variant"
+        android:paddingHorizontal="8dp"
+        android:paddingVertical="6dp">
         <ImageView
-            android:layout_width="4dp"
-            android:layout_height="32dp"
-            android:contentDescription="@null"
-            android:background="@drawable/preview_stripe"
-            android:backgroundTint="#8FB58A" />
-        <ImageView
-            android:layout_width="22dp"
-            android:layout_height="22dp"
-            android:layout_marginStart="9dp"
-            android:layout_marginEnd="9dp"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:padding="6dp"
             android:contentDescription="@null"
             android:src="@drawable/floret_ic_widget_check"
             android:tint="@color/widget_preview_variant" />
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
             android:orientation="vertical">
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:maxLines="1"
                 android:text="Pick up groceries"
+                android:fontFamily="sans-serif-medium"
                 android:textColor="@color/widget_preview_on_surface"
                 android:textSize="14sp" />
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Today · 18:00"
+                android:maxLines="1"
+                android:text="18:00"
                 android:textColor="@color/widget_preview_variant"
                 android:textSize="12sp" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/widget_preview_today.xml b/app/src/main/res/layout/widget_preview_today.xml
index 51e74d8..1cdc2e4 100644
--- a/app/src/main/res/layout/widget_preview_today.xml
+++ b/app/src/main/res/layout/widget_preview_today.xml
@@ -7,16 +7,33 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@drawable/preview_widget_bg"
-    android:padding="10dp"
+    android:padding="8dp"
     tools:ignore="HardcodedText,UseAppTint">
 
-    <TextView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/smart_today"
-        android:textColor="@color/widget_preview_primary"
-        android:textSize="16sp"
-        android:textStyle="bold" />
+        android:layout_height="36dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:maxLines="1"
+            android:text="@string/smart_today"
+            android:fontFamily="sans-serif-medium"
+            android:textColor="@color/widget_preview_primary"
+            android:textSize="16sp" />
+        <ImageView
+            android:layout_width="36dp"
+            android:layout_height="28dp"
+            android:padding="5dp"
+            android:contentDescription="@null"
+            android:background="@drawable/preview_pill"
+            android:backgroundTint="@color/widget_preview_primary"
+            android:src="@drawable/floret_ic_widget_add"
+            android:tint="@color/widget_preview_on_primary" />
+    </LinearLayout>
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -24,18 +41,22 @@
         android:layout_weight="1"
         android:layout_marginTop="4dp">
         <ImageView
-            android:layout_width="72dp"
-            android:layout_height="72dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_gravity="center"
+            android:maxWidth="160dp"
+            android:maxHeight="160dp"
+            android:adjustViewBounds="true"
+            android:scaleType="fitCenter"
             android:contentDescription="@null"
-            android:background="@drawable/preview_ring" />
+            android:src="@drawable/preview_ring" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text="4/6"
+            android:fontFamily="sans-serif-medium"
             android:textColor="@color/widget_preview_on_surface"
-            android:textSize="16sp"
-            android:textStyle="bold" />
+            android:textSize="22sp" />
     </FrameLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_preview_up_next.xml b/app/src/main/res/layout/widget_preview_up_next.xml
index e299378..44ccd8b 100644
--- a/app/src/main/res/layout/widget_preview_up_next.xml
+++ b/app/src/main/res/layout/widget_preview_up_next.xml
@@ -8,34 +8,48 @@
     android:orientation="horizontal"
     android:gravity="center_vertical"
     android:background="@drawable/preview_widget_bg"
-    android:padding="10dp"
+    android:padding="8dp"
     tools:ignore="HardcodedText,UseAppTint">
 
-    <ImageView
-        android:layout_width="22dp"
-        android:layout_height="22dp"
-        android:layout_marginEnd="9dp"
-        android:contentDescription="@null"
-        android:src="@drawable/floret_ic_widget_check"
-        android:tint="@color/widget_preview_variant" />
+    <FrameLayout
+        android:layout_width="40dp"
+        android:layout_height="40dp">
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:contentDescription="@null"
+            android:src="@drawable/floret_widget_shape_cookie"
+            android:tint="@color/widget_preview_primary_container" />
+        <ImageView
+            android:layout_width="17dp"
+            android:layout_height="17dp"
+            android:layout_gravity="center"
+            android:contentDescription="@null"
+            android:src="@drawable/floret_ic_widget_check"
+            android:tint="@color/widget_preview_on_primary_container" />
+    </FrameLayout>
 
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:layout_marginStart="12dp"
         android:orientation="vertical">
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Call the dentist"
-            android:textColor="@color/widget_preview_on_surface"
-            android:textSize="14sp"
+            android:maxLines="1"
+            android:text="14:30"
+            android:textColor="@color/widget_preview_primary"
+            android:textSize="20sp"
             android:textStyle="bold" />
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="in 3 h"
-            android:textColor="@color/widget_preview_variant"
-            android:textSize="12sp" />
+            android:maxLines="1"
+            android:text="Call the dentist"
+            android:fontFamily="sans-serif-medium"
+            android:textColor="@color/widget_preview_on_surface"
+            android:textSize="15sp" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_preview_week.xml b/app/src/main/res/layout/widget_preview_week.xml
index cb30dd7..fc83894 100644
--- a/app/src/main/res/layout/widget_preview_week.xml
+++ b/app/src/main/res/layout/widget_preview_week.xml
@@ -7,50 +7,250 @@
     android:layout_height="match_parent"
     android:orientation="horizontal"
     android:background="@drawable/preview_widget_bg"
-    android:padding="6dp"
-    tools:ignore="HardcodedText">
+    android:padding="4dp"
+    tools:ignore="HardcodedText,UseAppTint">
 
-    <TextView
+    <FrameLayout
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:layout_margin="2dp"
-        android:background="@color/widget_preview_primary_container"
-        android:gravity="center"
-        android:text="M\n17\n2"
-        android:textColor="@color/widget_preview_on_primary_container"
-        android:textSize="11sp" />
+        android:paddingHorizontal="2dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:background="@drawable/preview_tile"
+            android:backgroundTint="@color/widget_preview_primary_container"
+            android:padding="8dp">
+            <LinearLayout
+                android:layout_width="38dp"
+                android:layout_height="38dp"
+                android:orientation="vertical"
+                android:gravity="center"
+                android:background="@drawable/preview_circle"
+                android:backgroundTint="@color/widget_preview_primary">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="Mon"
+                    android:fontFamily="sans-serif-medium"
+                    android:textColor="@color/widget_preview_on_primary"
+                    android:textSize="10sp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="17"
+                    android:textColor="@color/widget_preview_on_primary"
+                    android:textSize="13sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+                <ImageView
+                    android:layout_width="14dp"
+                    android:layout_height="14dp"
+                    android:layout_marginEnd="2dp"
+                    android:contentDescription="@null"
+                    android:src="@drawable/floret_ic_widget_checklist"
+                    android:tint="@color/widget_preview_on_primary_container" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="2"
+                    android:textColor="@color/widget_preview_on_primary_container"
+                    android:textSize="15sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
 
-    <TextView
+    <FrameLayout
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:layout_margin="2dp"
-        android:background="@color/widget_preview_surface"
-        android:gravity="center"
-        android:text="T\n18\n1"
-        android:textColor="@color/widget_preview_variant"
-        android:textSize="11sp" />
+        android:paddingHorizontal="2dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:background="@drawable/preview_tile"
+            android:backgroundTint="@color/widget_preview_surface_variant"
+            android:padding="8dp">
+            <LinearLayout
+                android:layout_width="38dp"
+                android:layout_height="38dp"
+                android:orientation="vertical"
+                android:gravity="center"
+                android:background="@drawable/preview_circle"
+                android:backgroundTint="@color/widget_preview_surface">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="Tue"
+                    android:fontFamily="sans-serif-medium"
+                    android:textColor="@color/widget_preview_variant"
+                    android:textSize="10sp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="18"
+                    android:textColor="@color/widget_preview_variant"
+                    android:textSize="13sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+                <ImageView
+                    android:layout_width="14dp"
+                    android:layout_height="14dp"
+                    android:layout_marginEnd="2dp"
+                    android:contentDescription="@null"
+                    android:src="@drawable/floret_ic_widget_checklist"
+                    android:tint="@color/widget_preview_variant" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="1"
+                    android:textColor="@color/widget_preview_variant"
+                    android:textSize="15sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
 
-    <TextView
+    <FrameLayout
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:layout_margin="2dp"
-        android:background="@color/widget_preview_surface"
-        android:gravity="center"
-        android:text="W\n19\n·"
-        android:textColor="@color/widget_preview_variant"
-        android:textSize="11sp" />
+        android:paddingHorizontal="2dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:background="@drawable/preview_tile"
+            android:backgroundTint="@color/widget_preview_surface_variant"
+            android:padding="8dp">
+            <LinearLayout
+                android:layout_width="38dp"
+                android:layout_height="38dp"
+                android:orientation="vertical"
+                android:gravity="center"
+                android:background="@drawable/preview_circle"
+                android:backgroundTint="@color/widget_preview_surface">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="Wed"
+                    android:fontFamily="sans-serif-medium"
+                    android:textColor="@color/widget_preview_variant"
+                    android:textSize="10sp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="19"
+                    android:textColor="@color/widget_preview_variant"
+                    android:textSize="13sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+                <ImageView
+                    android:layout_width="14dp"
+                    android:layout_height="14dp"
+                    android:layout_marginEnd="2dp"
+                    android:contentDescription="@null"
+                    android:src="@drawable/floret_ic_widget_checklist"
+                    android:tint="@color/widget_preview_variant" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="0"
+                    android:textColor="@color/widget_preview_variant"
+                    android:textSize="15sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
 
-    <TextView
+    <FrameLayout
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:layout_margin="2dp"
-        android:background="@color/widget_preview_surface"
-        android:gravity="center"
-        android:text="T\n20\n3"
-        android:textColor="@color/widget_preview_variant"
-        android:textSize="11sp" />
+        android:paddingHorizontal="2dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:background="@drawable/preview_tile"
+            android:backgroundTint="@color/widget_preview_surface_variant"
+            android:padding="8dp">
+            <LinearLayout
+                android:layout_width="38dp"
+                android:layout_height="38dp"
+                android:orientation="vertical"
+                android:gravity="center"
+                android:background="@drawable/preview_circle"
+                android:backgroundTint="@color/widget_preview_surface">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="Thu"
+                    android:fontFamily="sans-serif-medium"
+                    android:textColor="@color/widget_preview_variant"
+                    android:textSize="10sp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="20"
+                    android:textColor="@color/widget_preview_variant"
+                    android:textSize="13sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+                <ImageView
+                    android:layout_width="14dp"
+                    android:layout_height="14dp"
+                    android:layout_marginEnd="2dp"
+                    android:contentDescription="@null"
+                    android:src="@drawable/floret_ic_widget_checklist"
+                    android:tint="@color/widget_preview_variant" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="3"
+                    android:textColor="@color/widget_preview_variant"
+                    android:textSize="15sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
 </LinearLayout>
diff --git a/app/src/main/res/values-night-v31/widget_preview_colors.xml b/app/src/main/res/values-night-v31/widget_preview_colors.xml
index f5f5e1f..9e74283 100644
--- a/app/src/main/res/values-night-v31/widget_preview_colors.xml
+++ b/app/src/main/res/values-night-v31/widget_preview_colors.xml
@@ -6,4 +6,6 @@
     <color name="widget_preview_primary">@android:color/system_accent1_200</color>
     <color name="widget_preview_primary_container">@android:color/system_accent1_700</color>
     <color name="widget_preview_on_primary_container">@android:color/system_accent1_100</color>
+    <color name="widget_preview_surface_variant">@android:color/system_neutral2_700</color>
+    <color name="widget_preview_on_primary">@android:color/system_accent1_800</color>
 </resources>
diff --git a/app/src/main/res/values-night/widget_preview_colors.xml b/app/src/main/res/values-night/widget_preview_colors.xml
index eda3004..0c2a055 100644
--- a/app/src/main/res/values-night/widget_preview_colors.xml
+++ b/app/src/main/res/values-night/widget_preview_colors.xml
@@ -6,4 +6,6 @@
     <color name="widget_preview_primary">#E2BAC9</color>
     <color name="widget_preview_primary_container">#583B49</color>
     <color name="widget_preview_on_primary_container">#F6D9E5</color>
+    <color name="widget_preview_surface_variant">#49454F</color>
+    <color name="widget_preview_on_primary">#402533</color>
 </resources>
diff --git a/app/src/main/res/values-v31/widget_preview_colors.xml b/app/src/main/res/values-v31/widget_preview_colors.xml
index bba3eab..c6a8a21 100644
--- a/app/src/main/res/values-v31/widget_preview_colors.xml
+++ b/app/src/main/res/values-v31/widget_preview_colors.xml
@@ -6,4 +6,6 @@
     <color name="widget_preview_primary">@android:color/system_accent1_600</color>
     <color name="widget_preview_primary_container">@android:color/system_accent1_100</color>
     <color name="widget_preview_on_primary_container">@android:color/system_accent1_900</color>
+    <color name="widget_preview_surface_variant">@android:color/system_neutral2_100</color>
+    <color name="widget_preview_on_primary">@android:color/system_accent1_0</color>
 </resources>
diff --git a/app/src/main/res/values/widget_preview_colors.xml b/app/src/main/res/values/widget_preview_colors.xml
index 8999c11..09fbe2c 100644
--- a/app/src/main/res/values/widget_preview_colors.xml
+++ b/app/src/main/res/values/widget_preview_colors.xml
@@ -8,4 +8,6 @@
     <color name="widget_preview_primary">#6A4E5B</color>
     <color name="widget_preview_primary_container">#F6D9E5</color>
     <color name="widget_preview_on_primary_container">#2A101C</color>
+    <color name="widget_preview_surface_variant">#E7E0EC</color>
+    <color name="widget_preview_on_primary">#FFFFFF</color>
 </resources>