diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts
index 3256493456..35f9bff4bb 100644
--- a/models/tracker/src/index.ts
+++ b/models/tracker/src/index.ts
@@ -365,9 +365,6 @@ export class TComponent extends TDoc implements Component {
   @Prop(TypeMarkup(), tracker.string.Description)
     description?: Markup
 
-  @Prop(TypeString(), tracker.string.AssetLabel)
-    icon!: Asset
-
   @Prop(TypeComponentStatus(), tracker.string.Status)
     status!: ComponentStatus
 
diff --git a/models/tracker/src/migration.ts b/models/tracker/src/migration.ts
index dac14faf94..3e775af4df 100644
--- a/models/tracker/src/migration.ts
+++ b/models/tracker/src/migration.ts
@@ -310,24 +310,6 @@ async function migrateIssueComponents (client: MigrationClient): Promise<void> {
   }
 }
 
-async function upgradeComponentIcons (tx: TxOperations): Promise<void> {
-  const components = await tx.findAll(tracker.class.Component, {})
-
-  if (components.length === 0) {
-    return
-  }
-
-  for (const component of components) {
-    const icon = component.icon as unknown
-
-    if (icon !== undefined) {
-      continue
-    }
-
-    await tx.update(component, { icon: tracker.icon.Components })
-  }
-}
-
 async function createDefaults (tx: TxOperations): Promise<void> {
   await createDefaultProject(tx)
   await createOrUpdate(
@@ -415,10 +397,6 @@ async function upgradeIssues (tx: TxOperations): Promise<void> {
   }
 }
 
-async function upgradeComponents (tx: TxOperations): Promise<void> {
-  await upgradeComponentIcons(tx)
-}
-
 async function renameProject (client: MigrationClient): Promise<void> {
   await client.update(
     DOMAIN_TRACKER,
@@ -786,6 +764,5 @@ export const trackerOperation: MigrateOperation = {
     await createDefaults(tx)
     await upgradeProjects(tx)
     await upgradeIssues(tx)
-    await upgradeComponents(tx)
   }
 }
diff --git a/plugins/tracker-resources/src/components/ComponentSelector.svelte b/plugins/tracker-resources/src/components/ComponentSelector.svelte
index c831b584aa..e01cd8de67 100644
--- a/plugins/tracker-resources/src/components/ComponentSelector.svelte
+++ b/plugins/tracker-resources/src/components/ComponentSelector.svelte
@@ -55,7 +55,6 @@
   $: handleSelectedComponentIdUpdated(value, rawComponents)
 
   $: translate(tracker.string.Component, {}).then((result) => (defaultComponentLabel = result))
-  $: componentIcon = selectedComponent?.icon ?? tracker.icon.Components
   $: componentText = shouldShowLabel ? selectedComponent?.label ?? defaultComponentLabel : undefined
 
   const handleSelectedComponentIdUpdated = async (
@@ -81,7 +80,7 @@
       { id: null, icon: tracker.icon.Components, label: tracker.string.NoComponent, isSelected: !selectedComponent },
       ...rawComponents.map((p) => ({
         id: p._id,
-        icon: p.icon,
+        icon: tracker.icon.Components,
         text: p.label,
         isSelected: selectedComponent ? p._id === selectedComponent._id : false
       }))
@@ -103,7 +102,7 @@
     {shape}
     {width}
     {justify}
-    icon={componentIcon}
+    icon={tracker.icon.Components}
     disabled={!isEditable}
     {loading}
     on:click={handleComponentEditorOpened}
@@ -115,7 +114,7 @@
     {shape}
     {width}
     {justify}
-    icon={componentIcon}
+    icon={tracker.icon.Components}
     disabled={!isEditable}
     {loading}
     on:click={handleComponentEditorOpened}
diff --git a/plugins/tracker-resources/src/components/components/ComponentTimeline.svelte b/plugins/tracker-resources/src/components/components/ComponentTimeline.svelte
index 928f13ebb8..79b305dbe7 100644
--- a/plugins/tracker-resources/src/components/components/ComponentTimeline.svelte
+++ b/plugins/tracker-resources/src/components/components/ComponentTimeline.svelte
@@ -95,7 +95,6 @@
     const tR: TimelineRow = { items: [] }
     tR.items = [
       {
-        icon: proj.icon,
         presenter: ComponentPresenter,
         props: { value: proj },
         startDate: proj.startDate as Timestamp,
diff --git a/plugins/tracker-resources/src/components/components/ComponentTitlePresenter.svelte b/plugins/tracker-resources/src/components/components/ComponentTitlePresenter.svelte
index c18f60be32..463edc363e 100644
--- a/plugins/tracker-resources/src/components/components/ComponentTitlePresenter.svelte
+++ b/plugins/tracker-resources/src/components/components/ComponentTitlePresenter.svelte
@@ -22,7 +22,7 @@
 
 {#if value}
   <span class="overflow-label flex">
-    <Icon icon={value.icon ?? tracker.icon.Component} size={'small'} />
+    <Icon icon={tracker.icon.Component} size={'small'} />
     <div class="ml-2 mr-2">
       {value.label}
     </div></span
diff --git a/plugins/tracker-resources/src/components/components/IconComponent.svelte b/plugins/tracker-resources/src/components/components/IconComponent.svelte
index 8c73e1d553..f3efbcff12 100644
--- a/plugins/tracker-resources/src/components/components/IconComponent.svelte
+++ b/plugins/tracker-resources/src/components/components/IconComponent.svelte
@@ -13,11 +13,8 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { WithLookup } from '@hcengineering/core'
-  import { Component } from '@hcengineering/tracker'
   import { Button } from '@hcengineering/ui'
-
-  export let value: WithLookup<Component>
+  import tracker from '../../plugin'
 </script>
 
-<Button size="small" kind="link" icon={value.icon} />
+<Button size="small" kind="link" icon={tracker.icon.Components} />
diff --git a/plugins/tracker-resources/src/components/components/NewComponent.svelte b/plugins/tracker-resources/src/components/components/NewComponent.svelte
index 68fc853fee..fc9c6e0499 100644
--- a/plugins/tracker-resources/src/components/components/NewComponent.svelte
+++ b/plugins/tracker-resources/src/components/components/NewComponent.svelte
@@ -30,7 +30,6 @@
   const object: Data<Component> = {
     label: '' as IntlString,
     description: '',
-    icon: tracker.icon.Components,
     status: ComponentStatus.Backlog,
     lead: null,
     members: [],
diff --git a/plugins/tracker-resources/src/components/sprints/SprintComponentEditor.svelte b/plugins/tracker-resources/src/components/sprints/SprintComponentEditor.svelte
index c775f3e822..913ce9d50d 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintComponentEditor.svelte
+++ b/plugins/tracker-resources/src/components/sprints/SprintComponentEditor.svelte
@@ -68,4 +68,3 @@
     />
   </div>
 {/if}
-AddToComponent
diff --git a/plugins/tracker/src/index.ts b/plugins/tracker/src/index.ts
index fe38bfb5e5..5ef4dd3386 100644
--- a/plugins/tracker/src/index.ts
+++ b/plugins/tracker/src/index.ts
@@ -345,7 +345,6 @@ export enum ComponentStatus {
 export interface Component extends Doc {
   label: string
   description?: Markup
-  icon: Asset
 
   status: ComponentStatus
 
diff --git a/plugins/view-resources/src/components/filter/FilterSave.svelte b/plugins/view-resources/src/components/filter/FilterSave.svelte
index 2585956739..5949f693e7 100644
--- a/plugins/view-resources/src/components/filter/FilterSave.svelte
+++ b/plugins/view-resources/src/components/filter/FilterSave.svelte
@@ -23,6 +23,7 @@
     await client.createDoc(view.class.FilteredView, preference.space.Preference, {
       name: filterName,
       location: loc,
+      filterClass: _class,
       filters,
       attachedTo: loc.path[2] as Ref<Doc>,
       viewOptions,