diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss
index 5b2ca5bb87..519e6627a4 100644
--- a/packages/theme/styles/_layouts.scss
+++ b/packages/theme/styles/_layouts.scss
@@ -532,6 +532,7 @@ input.search {
 .m-1 { margin: .25rem; }
 .m-3 { margin: .75rem; }
 
+.pl-0-5 { padding-left: .125rem; }
 .pl-1 { padding-left: .25rem; }
 .pl-2 { padding-left: .5rem; }
 .pl-3 { padding-left: .75rem; }
diff --git a/plugins/tracker-resources/src/components/milestones/MilestoneStatusEditor.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneStatusEditor.svelte
index 23cbb53824..a9b35906f5 100644
--- a/plugins/tracker-resources/src/components/milestones/MilestoneStatusEditor.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneStatusEditor.svelte
@@ -17,7 +17,16 @@
   import { Data } from '@hcengineering/core'
   import { Milestone } from '@hcengineering/tracker'
   import { getClient } from '@hcengineering/presentation'
-  import { Button, ButtonKind, ButtonSize, Icon, SelectPopup, eventToHTMLElement, showPopup } from '@hcengineering/ui'
+  import {
+    Button,
+    ButtonKind,
+    ButtonSize,
+    Icon,
+    SelectPopup,
+    eventToHTMLElement,
+    showPopup,
+    Label
+  } from '@hcengineering/ui'
   import { defaultMilestoneStatuses, milestoneStatusAssets } from '../../utils'
   import tracker from '../../plugin'
 
@@ -72,6 +81,11 @@
   >
     <Icon {icon} {size} />
   </button>
+{:else if kind === 'list-header'}
+  <div class="flex-row-center pl-0-5">
+    <Icon {icon} {size} />
+    <span class="overflow-label ml-1-5"><Label {label} /></span>
+  </div>
 {:else}
   <Button
     {label}
diff --git a/plugins/tracker-resources/src/components/milestones/MoveAndDeleteMilestonePopup.svelte b/plugins/tracker-resources/src/components/milestones/MoveAndDeleteMilestonePopup.svelte
index 9608233804..d269daf3f3 100644
--- a/plugins/tracker-resources/src/components/milestones/MoveAndDeleteMilestonePopup.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MoveAndDeleteMilestonePopup.svelte
@@ -35,7 +35,7 @@
 <Card
   canSave
   label={tracker.string.MoveAndDeleteMilestone}
-  labelProps={{ newMilestone: selectedMilestoneLabel, deleteMilestone: milestones.map((p) => p.label) }}
+  labelProps={{ newMilestone: selectedMilestoneLabel, deleteMilestone: milestones.map((p) => p.label).join(', ') }}
   okLabel={tracker.string.Delete}
   okAction={() => moveAndDeleteMilestone(selectedMilestone)}
   on:close