diff --git a/packages/main/src/Option.ts b/packages/main/src/Option.ts
index f04f665ce045..cf02d34e5ca9 100644
--- a/packages/main/src/Option.ts
+++ b/packages/main/src/Option.ts
@@ -4,6 +4,7 @@ import property from "@ui5/webcomponents-base/dist/decorators/property.js";
 import { isDesktop } from "@ui5/webcomponents-base/dist/Device.js";
 import { IOption } from "./Select.js";
 import ListItemBase from "./ListItemBase.js";
+import Icon from "./Icon.js";
 
 // Template
 import OptionTemplate from "./generated/templates/OptionTemplate.lit.js";
@@ -37,6 +38,9 @@ import listItemAdditionalTextCss from "./generated/themes/ListItemAdditionalText
 		listItemIconCss,
 		optionBaseCss,
 	],
+	dependencies: [
+		Icon,
+	],
 })
 class Option extends ListItemBase implements IOption {
 	/**
diff --git a/packages/main/src/OptionCustom.ts b/packages/main/src/OptionCustom.ts
index 01810c0fa16d..c4ec1bd06e69 100644
--- a/packages/main/src/OptionCustom.ts
+++ b/packages/main/src/OptionCustom.ts
@@ -1,7 +1,7 @@
 import customElement from "@ui5/webcomponents-base/dist/decorators/customElement.js";
 import slot from "@ui5/webcomponents-base/dist/decorators/slot.js";
 import property from "@ui5/webcomponents-base/dist/decorators/property.js";
-
+import { isDesktop } from "@ui5/webcomponents-base/dist/Device.js";
 import { IOption } from "./Select.js";
 import ListItemBase from "./ListItemBase.js";
 
@@ -73,6 +73,12 @@ class OptionCustom extends ListItemBase implements IOption {
 	@property({ type: String })
 	tooltip!: string;
 
+	onEnterDOM() {
+		if (isDesktop()) {
+			this.setAttribute("desktop", "");
+		}
+	}
+
 	get effectiveDisplayText() {
 		return this.displayText || this.textContent || "";
 	}