diff --git a/Platform/OpenCanopy/Views/BootPicker.c b/Platform/OpenCanopy/Views/BootPicker.c
index 5fccff9e9716e25da17aec55a56ac24023e1b6fe..a9a42d32e10bb5f44f16be76c2f8483ba7b8887f 100644
--- a/Platform/OpenCanopy/Views/BootPicker.c
+++ b/Platform/OpenCanopy/Views/BootPicker.c
@@ -1511,13 +1511,10 @@ BootPickerEntriesSet (
     {
       SuggestedIcon = NULL;
 
-      switch (Entry->Type) {
-        case OC_BOOT_EXTERNAL_OS:
+      if (Entry->Type == OC_BOOT_EXTERNAL_OS) {
           SuggestedIcon = &GuiContext->Icons[ICON_OTHER][IconTypeIndex];
-          break;
-        case OC_BOOT_EXTERNAL_TOOL:
+      } else if (Entry->Type == OC_BOOT_EXTERNAL_TOOL || (Entry->Type & OC_BOOT_SYSTEM) != 0) {
           SuggestedIcon = &GuiContext->Icons[ICON_TOOL][IconTypeIndex];
-          break;
       }
 
       if (SuggestedIcon == NULL || SuggestedIcon->Buffer == NULL) {