diff --git a/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt b/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt
index 681941d5..ef0863a3 100644
--- a/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt
+++ b/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt
@@ -74,7 +74,7 @@ abstract class NotificationService : LifecycleService() {
         return NotificationCompat.Builder(this, CHANNEL_ID)
             .setContentTitle(getString(R.string.app_name))
             .setContentText(getString(messageResId, "Device"))
-            .setSmallIcon(R.drawable.ic_notification_icon)
+            .setSmallIcon(R.drawable.ic_launcher_foreground)
             .setColor(ContextCompat.getColor(this, R.color.md_theme_primary))
             .setContentIntent(pendingIntent)
             .build()
diff --git a/lib_service/src/main/res/drawable/ic_notification_icon.xml b/lib_service/src/main/res/drawable/ic_notification_icon.xml
index 3a3f4904..70962226 100644
--- a/lib_service/src/main/res/drawable/ic_notification_icon.xml
+++ b/lib_service/src/main/res/drawable/ic_notification_icon.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="1024dp"
     android:height="1024dp"
+    android:tint="#ffffff"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
   <path
diff --git a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/dialog/StringListDialog.kt b/lib_theme/src/main/java/no/nordicsemi/android/theme/view/dialog/StringListDialog.kt
index 9bb16fed..29e31714 100644
--- a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/dialog/StringListDialog.kt
+++ b/lib_theme/src/main/java/no/nordicsemi/android/theme/view/dialog/StringListDialog.kt
@@ -13,6 +13,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -68,6 +69,7 @@ fun StringListView(config: StringListDialogConfig) {
                             Image(
                                 modifier = Modifier.padding(horizontal = 4.dp),
                                 painter = painterResource(it),
+                                colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurfaceVariant),
                                 contentDescription = "Content image",
                             )
                         }
diff --git a/lib_theme/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/lib_theme/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..6fc213de
Binary files /dev/null and b/lib_theme/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTAddMacroDialog.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTAddMacroDialog.kt
index e64c6236..8a50932d 100644
--- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTAddMacroDialog.kt
+++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTAddMacroDialog.kt
@@ -21,6 +21,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -83,7 +84,7 @@ internal fun UARTAddMacroDialog(macro: UARTMacro?, onEvent: (UARTViewEvent) -> U
                         val background = if (selectedIcon.value == icon) {
                             MaterialTheme.colorScheme.primaryContainer
                         } else {
-                            MaterialTheme.colorScheme.secondaryContainer
+                            Color.Transparent
                         }
 
                         Image(
@@ -97,7 +98,6 @@ internal fun UARTAddMacroDialog(macro: UARTMacro?, onEvent: (UARTViewEvent) -> U
                         )
                     }
 
-
                     item(span = { GridItemSpan(GRID_SIZE) }) {
                         Row(
                             modifier = Modifier.fillMaxWidth(),
diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt
index 47c55bcc..b3bd2704 100644
--- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt
+++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt
@@ -155,9 +155,18 @@ private fun OutputSection(records: List<UARTOutputRecord>, onEvent: (UARTViewEve
                 horizontalArrangement = Arrangement.SpaceBetween,
                 verticalAlignment = Alignment.CenterVertically
             ) {
-                SectionTitle(resId = R.drawable.ic_output, title = stringResource(R.string.uart_output), modifier = Modifier)
+                SectionTitle(
+                    resId = R.drawable.ic_output,
+                    title = stringResource(R.string.uart_output),
+                    modifier = Modifier
+                )
 
-                Icon(Icons.Default.Delete, contentDescription = "Clear items.", modifier = Modifier.clickable { onEvent(ClearOutputItems) })
+                IconButton(onClick = { onEvent(ClearOutputItems) }) {
+                    Icon(
+                        Icons.Default.Delete,
+                        contentDescription = "Clear items.",
+                    )
+                }
             }
 
             Spacer(modifier = Modifier.height(16.dp))