2 files changed, 7 insertions, 8 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt
index 796ce53baa..05fa19e28f 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt
@@ -33,7 +33,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.component.SpacedColumn
-import net.mullvad.mullvadvpn.compose.util.isBelowMaxSize
+import net.mullvad.mullvadvpn.compose.util.hasValidSize
+import net.mullvad.mullvadvpn.compose.util.isBelowMaxByteSize
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaDisabled
@@ -81,7 +82,7 @@ fun SplitTunnelingCell(
         launch(Dispatchers.IO) {
             val drawable = onResolveIcon(packageName ?: "")
             icon =
-                if (drawable != null && drawable.isBelowMaxSize()) {
+                if (drawable != null && drawable.isBelowMaxByteSize() && drawable.hasValidSize()) {
                     IconState.Icon(drawable = drawable)
                 } else {
                     IconState.NoIcon
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/Drawable.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/Drawable.kt
index 3985590879..7d7e2605eb 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/Drawable.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/Drawable.kt
@@ -5,9 +5,7 @@ import android.graphics.drawable.Drawable
 
 private const val MAX_BITMAP_SIZE_BYTES = 100 * 1024 * 1024 // 100MB
 
-fun Drawable.isBelowMaxSize(): Boolean =
-    if (this is BitmapDrawable) {
-        bitmap.byteCount < MAX_BITMAP_SIZE_BYTES
-    } else {
-        true
-    }
+fun Drawable.isBelowMaxByteSize(): Boolean =
+    if (this is BitmapDrawable) bitmap.byteCount < MAX_BITMAP_SIZE_BYTES else true
+
+fun Drawable.hasValidSize(): Boolean = intrinsicHeight > 0 && intrinsicWidth > 0