diff --git a/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/service/ExerciseService.kt b/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/service/ExerciseService.kt
index c2036851..5e34a67b 100644
--- a/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/service/ExerciseService.kt
+++ b/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/service/ExerciseService.kt
@@ -55,7 +55,7 @@ class ExerciseService : LifecycleService() {
     private val localBinder = LocalBinder()
 
     private val serviceRunningInForeground: Boolean
-        get() = this.foregroundServiceType != ServiceInfo.FOREGROUND_SERVICE_TYPE_NONE
+        get() = this.foregroundServiceType != 0
 
     private suspend fun isExerciseInProgress() =
         exerciseClientManager.exerciseClient.isExerciseInProgress()
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/drawable/ic_launcher_background.xml b/health-services/ExerciseSampleCompose/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 00000000..ca3826a4
--- /dev/null
+++ b/health-services/ExerciseSampleCompose/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/drawable/ic_launcher_foreground.xml b/health-services/ExerciseSampleCompose/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 00000000..da1dcd94
--- /dev/null
+++ b/health-services/ExerciseSampleCompose/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startY="49.59793"
+                android:startX="42.9492"
+                android:endY="92.4963"
+                android:endX="85.84757"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000"/>
+</vector>
\ No newline at end of file
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000..bbd3e021
--- /dev/null
+++ b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..bbd3e021
--- /dev/null
+++ b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-hdpi/ic_launcher.webp
index c209e78e..7f907b61 100644
Binary files a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..1f14ac03
Binary files /dev/null and b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-mdpi/ic_launcher.webp
index 4f0f1d64..4792018b 100644
Binary files a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..e59c7c0d
Binary files /dev/null and b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
index 948a3070..1a6546e6 100644
Binary files a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..6180aadc
Binary files /dev/null and b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
index 28d4b77f..1ec18077 100644
Binary files a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..935c9a90
Binary files /dev/null and b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
index aa7d6427..8d4bf8ec 100644
Binary files a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..ea1f7693
Binary files /dev/null and b/health-services/ExerciseSampleCompose/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/health-services/ExerciseSampleCompose/app/src/main/res/values/strings.xml b/health-services/ExerciseSampleCompose/app/src/main/res/values/strings.xml
index 34ad1b0c..73737d34 100644
--- a/health-services/ExerciseSampleCompose/app/src/main/res/values/strings.xml
+++ b/health-services/ExerciseSampleCompose/app/src/main/res/values/strings.xml
@@ -67,6 +67,6 @@
 
     <!-- Exercise Goal Met Dialog -->
     <string name="goal_achieved">Goal achieved!</string>
-    <string name="yes">positive</string>
-    <string name="no">negative</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
 </resources>
diff --git a/health-services/ExerciseSampleCompose/screenshots/ongoing_notification.png b/health-services/ExerciseSampleCompose/screenshots/ongoing_notification.png
index 99f7d360..5dd2aeea 100644
Binary files a/health-services/ExerciseSampleCompose/screenshots/ongoing_notification.png and b/health-services/ExerciseSampleCompose/screenshots/ongoing_notification.png differ