diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt
index 0dfdbd22..6a5b6769 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt
@@ -20,8 +20,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import no.nordicsemi.android.nrftoolbox.R
 import no.nordicsemi.android.material.you.ScreenSection
+import no.nordicsemi.android.nrftoolbox.R
 
 @Composable
 fun FeatureButton(
@@ -43,17 +43,39 @@ fun FeatureButton(
                 MaterialTheme.colorScheme.secondary
             }
 
-            Image(
-                painter = painterResource(iconId),
-                contentDescription = stringResource(id = name),
-                contentScale = ContentScale.Crop,
-                colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSecondary),
-                modifier = Modifier
-                    .size(64.dp)
-                    .clip(CircleShape)
-                    .background(color)
-                    .padding(16.dp)
-            )
+            Box {
+                if (isRunning == true) {
+                    Image(
+                        painter = painterResource(iconId),
+                        contentDescription = stringResource(id = name),
+                        contentScale = ContentScale.Crop,
+                        colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSecondary),
+                        modifier = Modifier
+                            .size(64.dp)
+                            .clip(CircleShape)
+                            .background(color)
+                            .padding(16.dp)
+                    )
+                } else {
+                    Image(
+                        painter = painterResource(R.drawable.ic_ukraine_flag),
+                        contentDescription = stringResource(id = name),
+                        contentScale = ContentScale.Crop,
+                        modifier = Modifier
+                            .size(64.dp)
+                            .clip(CircleShape)
+                    )
+                    Image(
+                        painter = painterResource(iconId),
+                        contentDescription = stringResource(id = name),
+                        contentScale = ContentScale.Crop,
+                        colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSecondary),
+                        modifier = Modifier
+                            .size(64.dp)
+                            .padding(16.dp)
+                    )
+                }
+            }
 
             Spacer(modifier = Modifier.size(16.dp))
 
diff --git a/lib_service/src/main/java/no/nordicsemi/android/service/BleManagerStatus.kt b/lib_service/src/main/java/no/nordicsemi/android/service/BleManagerStatus.kt
index 53fc7003..97dca30c 100644
--- a/lib_service/src/main/java/no/nordicsemi/android/service/BleManagerStatus.kt
+++ b/lib_service/src/main/java/no/nordicsemi/android/service/BleManagerStatus.kt
@@ -1,9 +1,5 @@
 package no.nordicsemi.android.service
 
-enum class BleManagerStatus {
-    CONNECTING, OK, LINK_LOSS, DISCONNECTED, MISSING_SERVICE
-}
-
 sealed class BleManagerResult <T> {
 
     fun isRunning(): Boolean {
diff --git a/profile_uart/build.gradle b/profile_uart/build.gradle
index b4d95a07..0f8532fe 100644
--- a/profile_uart/build.gradle
+++ b/profile_uart/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.google.protobuf'
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.14.0'
+        artifact = 'com.google.protobuf:protoc:3.14.0:osx-x86_64'
     }
 
     // Generates the java Protobuf-lite code for the Protobufs in this project. See