diff --git a/packages/presentation/src/components/DocPopup.svelte b/packages/presentation/src/components/DocPopup.svelte
index 63a1fe2ba3..b99e17d6fe 100644
--- a/packages/presentation/src/components/DocPopup.svelte
+++ b/packages/presentation/src/components/DocPopup.svelte
@@ -206,7 +206,7 @@
       icon={IconSearch}
       size={'large'}
       width={'100%'}
-      focus={!$deviceOptionsStore.isMobile}
+      autoFocus={!$deviceOptionsStore.isMobile}
       bind:value={search}
       on:change={() => dispatch('search', search)}
       on:input={() => dispatch('search', search)}
diff --git a/packages/presentation/src/components/IndexedDocumentCompare.svelte b/packages/presentation/src/components/IndexedDocumentCompare.svelte
index 89d0e12fd6..e999d35816 100644
--- a/packages/presentation/src/components/IndexedDocumentCompare.svelte
+++ b/packages/presentation/src/components/IndexedDocumentCompare.svelte
@@ -11,7 +11,7 @@
 </script>
 
 <Panel on:changeContent on:close>
-  <EditBox focus bind:value={search} kind="search-style" />
+  <EditBox autoFocus bind:value={search} kind="search-style" />
   <div class="indexed-background">
     <div class="indexed-doc text-base max-h-125">
       <div class="flex">
diff --git a/packages/presentation/src/components/IndexedDocumentPreview.svelte b/packages/presentation/src/components/IndexedDocumentPreview.svelte
index aed7e0c5ab..ec74fbcc40 100644
--- a/packages/presentation/src/components/IndexedDocumentPreview.svelte
+++ b/packages/presentation/src/components/IndexedDocumentPreview.svelte
@@ -25,7 +25,7 @@
 {#if noPanel}
   <div class="p-1 flex-col">
     <Label label={presentation.string.DocumentPreview} />
-    <EditBox focus bind:value={search} kind="search-style" />
+    <EditBox autoFocus bind:value={search} kind="search-style" />
   </div>
   <div class="indexed-background">
     <div class="indexed-doc text-base max-h-125">
@@ -36,7 +36,7 @@
   </div>
 {:else}
   <Panel on:changeContent on:close>
-    <EditBox focus bind:value={search} kind="search-style" />
+    <EditBox autoFocus bind:value={search} kind="search-style" />
     <div class="indexed-background">
       <div class="indexed-doc text-base max-h-125">
         {#if indexDoc}
diff --git a/packages/presentation/src/components/ObjectSearchPopup.svelte b/packages/presentation/src/components/ObjectSearchPopup.svelte
index e251bbd37e..b6d84e566f 100644
--- a/packages/presentation/src/components/ObjectSearchPopup.svelte
+++ b/packages/presentation/src/components/ObjectSearchPopup.svelte
@@ -178,7 +178,7 @@
       {/each}
     </div>
     <EditBox
-      focus={!$deviceOptionsStore.isMobile}
+      autoFocus={!$deviceOptionsStore.isMobile}
       icon={IconSearch}
       kind={'search-style'}
       focusIndex={0}
diff --git a/packages/presentation/src/components/SpacesMultiPopup.svelte b/packages/presentation/src/components/SpacesMultiPopup.svelte
index 6ebde7f3ad..1ebed249d9 100644
--- a/packages/presentation/src/components/SpacesMultiPopup.svelte
+++ b/packages/presentation/src/components/SpacesMultiPopup.svelte
@@ -78,7 +78,7 @@
       icon={IconSearch}
       size={'large'}
       width={'100%'}
-      focus={!$deviceOptionsStore.isMobile}
+      autoFocus={!$deviceOptionsStore.isMobile}
       bind:value={searchQuery}
       {placeholder}
       {placeholderParam}
diff --git a/packages/text-editor/src/components/LinkPopup.svelte b/packages/text-editor/src/components/LinkPopup.svelte
index e3cfd46b1b..c4802f4fbd 100644
--- a/packages/text-editor/src/components/LinkPopup.svelte
+++ b/packages/text-editor/src/components/LinkPopup.svelte
@@ -41,5 +41,5 @@
   }}
   on:changeContent
 >
-  <EditBox placeholder={linkPlaceholder} bind:value={link} focus />
+  <EditBox placeholder={linkPlaceholder} bind:value={link} autoFocus />
 </Card>
diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss
index 9479b4c802..36720588a7 100644
--- a/packages/theme/styles/_layouts.scss
+++ b/packages/theme/styles/_layouts.scss
@@ -197,6 +197,12 @@ input.search {
   display: flex;
   align-items: stretch;
 }
+.flex-row-baseline {
+  display: flex;
+  align-items: baseline;
+  flex-wrap: nowrap;
+  min-width: 0;
+}
 .flex-row-center {
   display: flex;
   align-items: center;
@@ -659,6 +665,7 @@ input.search {
 .max-w-40 { max-width: 10rem; }
 .max-w-60 { max-width: 15rem; }
 .max-w-80 { max-width: 20rem; }
+.max-w-120 { max-width: 30rem; }
 .max-w-240 { max-width: 60rem; }
 .max-h-0 { max-height: 0; }
 .max-h-2 { max-height: .5rem; }
diff --git a/packages/theme/styles/common.scss b/packages/theme/styles/common.scss
index 66b1db77a7..33e6d5f3f1 100644
--- a/packages/theme/styles/common.scss
+++ b/packages/theme/styles/common.scss
@@ -355,6 +355,18 @@
   &.noMargin { margin: 0; }
 }
 
+.antiHSpacer {
+  flex-shrink: 0;
+  width: .25rem;
+
+  &:not(.withMargins) { margin: 0 !important; }
+
+  &.x1-5 { width: .375rem; }
+  &.x2 { width: .5rem; }
+  &.x3 { width: .75rem; }
+  &.x4 { width: 1rem; }
+}
+
 .antiSection {
   display: flex;
   flex-direction: column;
diff --git a/packages/ui/src/components/ColorPopup.svelte b/packages/ui/src/components/ColorPopup.svelte
index 4883265f33..04bb300c00 100644
--- a/packages/ui/src/components/ColorPopup.svelte
+++ b/packages/ui/src/components/ColorPopup.svelte
@@ -75,7 +75,7 @@
         icon={IconSearch}
         size={'large'}
         width={'100%'}
-        focus={!$deviceOptionsStore.isMobile}
+        autoFocus={!$deviceOptionsStore.isMobile}
         bind:value={search}
         {placeholder}
         {placeholderParam}
diff --git a/packages/ui/src/components/Component.svelte b/packages/ui/src/components/Component.svelte
index 5981abeb37..f21361d4f0 100644
--- a/packages/ui/src/components/Component.svelte
+++ b/packages/ui/src/components/Component.svelte
@@ -28,6 +28,7 @@
   export let shrink: boolean = false
   export let showLoading = true
   export let inline: boolean = false
+  export let disabled: boolean = false
 
   $: component = is != null ? getResource(is) : Promise.reject(new Error('is not defined'))
 </script>
@@ -40,11 +41,33 @@
   {:then Ctor}
     <ErrorBoundary>
       {#if $$slots.default !== undefined}
-        <Ctor bind:this={innerRef} {...props} {inline} on:change on:close on:open on:click on:delete on:action>
+        <Ctor
+          bind:this={innerRef}
+          {...props}
+          {inline}
+          {disabled}
+          on:change
+          on:close
+          on:open
+          on:click
+          on:delete
+          on:action
+        >
           <slot />
         </Ctor>
       {:else}
-        <Ctor bind:this={innerRef} {...props} {inline} on:change on:close on:open on:click on:delete on:action />
+        <Ctor
+          bind:this={innerRef}
+          {...props}
+          {inline}
+          {disabled}
+          on:change
+          on:close
+          on:open
+          on:click
+          on:delete
+          on:action
+        />
       {/if}
     </ErrorBoundary>
   {:catch err}
diff --git a/packages/ui/src/components/DropdownLabelsPopup.svelte b/packages/ui/src/components/DropdownLabelsPopup.svelte
index be8b57e3d2..0796762970 100644
--- a/packages/ui/src/components/DropdownLabelsPopup.svelte
+++ b/packages/ui/src/components/DropdownLabelsPopup.svelte
@@ -98,7 +98,7 @@
         icon={IconSearch}
         size={'large'}
         width={'100%'}
-        focus={!$deviceOptionsStore.isMobile}
+        autoFocus={!$deviceOptionsStore.isMobile}
         bind:value={search}
         {placeholder}
         {placeholderParam}
diff --git a/packages/ui/src/components/EditBox.svelte b/packages/ui/src/components/EditBox.svelte
index c4c1ecc1b1..9b14126905 100644
--- a/packages/ui/src/components/EditBox.svelte
+++ b/packages/ui/src/components/EditBox.svelte
@@ -33,7 +33,7 @@
   export let format: 'text' | 'password' | 'number' = 'text'
   export let maxDigitsAfterPoint: number | undefined = undefined
   export let kind: EditStyle = 'editbox'
-  export let focus: boolean = false
+  export let autoFocus: boolean = false
   export let select: boolean = false
   export let focusable: boolean = false
   export let disabled: boolean = false
@@ -87,9 +87,9 @@
   }
 
   onMount(() => {
-    if (focus) {
+    if (autoFocus) {
       input.focus()
-      focus = false
+      autoFocus = false
     }
     if (select) {
       input.select()
@@ -125,7 +125,7 @@
     input.addEventListener('focus', updateFocus, { once: true })
   }
 
-  export function focused (): void {
+  export function focus (): void {
     input.focus()
   }
 </script>
diff --git a/packages/ui/src/components/EditWithIcon.svelte b/packages/ui/src/components/EditWithIcon.svelte
index 9d29633514..ed8b61d582 100644
--- a/packages/ui/src/components/EditWithIcon.svelte
+++ b/packages/ui/src/components/EditWithIcon.svelte
@@ -27,21 +27,23 @@
   export let value: string | undefined = undefined
   export let placeholder: IntlString = plugin.string.EditBoxPlaceholder
   export let placeholderParam: any | undefined = undefined
-  export let focus: boolean = false
+  export let autoFocus: boolean = false
   export let size: 'small' | 'medium' | 'large' = 'medium'
 
   const dispatch = createEventDispatcher()
   let textHTML: HTMLInputElement
   let phTraslate: string = ''
 
+  export function focus () {
+    textHTML.focus()
+    autoFocus = false
+  }
+
   $: translate(placeholder, placeholderParam ?? {}).then((res) => {
     phTraslate = res
   })
   $: if (textHTML !== undefined) {
-    if (focus) {
-      textHTML.focus()
-      focus = false
-    }
+    if (autoFocus) focus()
   }
 </script>
 
diff --git a/packages/ui/src/components/SelectPopup.svelte b/packages/ui/src/components/SelectPopup.svelte
index 41eb1dbebc..ed7b83477d 100644
--- a/packages/ui/src/components/SelectPopup.svelte
+++ b/packages/ui/src/components/SelectPopup.svelte
@@ -130,7 +130,7 @@
         icon={IconSearch}
         size={'large'}
         width={'100%'}
-        focus={!$deviceOptionsStore.isMobile}
+        autoFocus={!$deviceOptionsStore.isMobile}
         bind:value={search}
         {placeholder}
         {placeholderParam}
diff --git a/packages/ui/src/components/TooltipInstance.svelte b/packages/ui/src/components/TooltipInstance.svelte
index 31dcb7df64..be12b16396 100644
--- a/packages/ui/src/components/TooltipInstance.svelte
+++ b/packages/ui/src/components/TooltipInstance.svelte
@@ -191,6 +191,8 @@
     class:doublePadding={$tooltip.label}
     use:resizeObserver={(element) => {
       clWidth = element.clientWidth
+      if (kind === 'submenu') fitSubmenu()
+      else fitTooltip(tooltipHTML)
     }}
     bind:this={tooltipHTML}
   >
diff --git a/plugins/activity-resources/src/components/TxViewTx.svelte b/plugins/activity-resources/src/components/TxViewTx.svelte
index 070bf2ebc2..61cdcde672 100644
--- a/plugins/activity-resources/src/components/TxViewTx.svelte
+++ b/plugins/activity-resources/src/components/TxViewTx.svelte
@@ -27,18 +27,20 @@
     <IconAdd size={'x-small'} fill={'var(--theme-trans-color)'} />
   {/if}
   {#if typeof viewlet?.component === 'string'}
-    <Component is={viewlet?.component} props={getProps(ctx, edit)} inline on:close={onCancelEdit} />
+    <Component is={viewlet?.component} props={getProps(ctx, edit)} disabled inline on:close={onCancelEdit} />
   {:else}
-    <svelte:component this={viewlet?.component} {...getProps(ctx, edit)} inline on:close={onCancelEdit} />
+    <svelte:component this={viewlet?.component} {...getProps(ctx, edit)} disabled inline on:close={onCancelEdit} />
   {/if}
+  <div class="antiHSpacer" />
 {/each}
 {#each filterTx([...tx.txes, tx], core.class.TxRemoveDoc) as ctx, i}
   {#if i === 0 && !presentersOnly}
     <IconDelete size={'x-small'} fill={'var(--theme-trans-color)'} />
   {/if}
   {#if typeof viewlet?.component === 'string'}
-    <Component is={viewlet?.component} props={getProps(ctx, edit)} inline on:close={onCancelEdit} />
+    <Component is={viewlet?.component} props={getProps(ctx, edit)} disabled inline on:close={onCancelEdit} />
   {:else}
-    <svelte:component this={viewlet?.component} {...getProps(ctx, edit)} inline on:close={onCancelEdit} />
+    <svelte:component this={viewlet?.component} {...getProps(ctx, edit)} disabled inline on:close={onCancelEdit} />
   {/if}
+  <div class="antiHSpacer" />
 {/each}
diff --git a/plugins/automation-resources/src/components/actions/ContentActionCreate.svelte b/plugins/automation-resources/src/components/actions/ContentActionCreate.svelte
index 869c4e9bdd..76886eae12 100644
--- a/plugins/automation-resources/src/components/actions/ContentActionCreate.svelte
+++ b/plugins/automation-resources/src/components/actions/ContentActionCreate.svelte
@@ -46,7 +46,7 @@
         {#if typeClass === core.class.TypeString || typeClass === core.class.TypeMarkup}
           <EditBox bind:value />
         {:else if typeClass === core.class.TypeNumber}
-          <NumberEditor value={Number(value)} {onChange} focus={true} placeholder={ui.string.EditBoxPlaceholder} />
+          <NumberEditor value={Number(value)} {onChange} autoFocus placeholder={ui.string.EditBoxPlaceholder} />
         {:else if typeClass === core.class.TypeBoolean}
           <BooleanEditor {value} {onChange} />
         {/if}
diff --git a/plugins/bitrix-resources/src/components/FieldMappingSynchronizer.svelte b/plugins/bitrix-resources/src/components/FieldMappingSynchronizer.svelte
index a41dd7ac64..96ac04833c 100644
--- a/plugins/bitrix-resources/src/components/FieldMappingSynchronizer.svelte
+++ b/plugins/bitrix-resources/src/components/FieldMappingSynchronizer.svelte
@@ -153,7 +153,7 @@
     <NumberEditor
       kind={'button'}
       value={syncPeriod}
-      focus={false}
+      autoFocus={false}
       placeholder={getEmbeddedLabel('Period')}
       onChange={(val) => {
         if (val) {
@@ -165,7 +165,7 @@
       <NumberEditor
         kind={'button'}
         value={limit}
-        focus={false}
+        autoFocus={false}
         placeholder={getEmbeddedLabel('Limit')}
         onChange={(val) => {
           if (val) {
diff --git a/plugins/board-resources/src/components/CreateBoard.svelte b/plugins/board-resources/src/components/CreateBoard.svelte
index ad49a62427..3c2c0b6e31 100644
--- a/plugins/board-resources/src/components/CreateBoard.svelte
+++ b/plugins/board-resources/src/components/CreateBoard.svelte
@@ -60,7 +60,7 @@
       icon={IconFolder}
       bind:value={name}
       placeholder={board.string.Board}
-      focus
+      autoFocus
     />
     <!-- <ToggleWithLabel label={board.string.MakePrivate} description={board.string.MakePrivateDescription} /> -->
 
diff --git a/plugins/board-resources/src/components/CreateCard.svelte b/plugins/board-resources/src/components/CreateCard.svelte
index a6f985596f..c8fabe44a8 100644
--- a/plugins/board-resources/src/components/CreateCard.svelte
+++ b/plugins/board-resources/src/components/CreateCard.svelte
@@ -89,7 +89,7 @@
       bind:value={title}
       icon={board.icon.Card}
       placeholder={board.string.CardPlaceholder}
-      focus
+      autoFocus
     />
   </Grid>
 </Card>
diff --git a/plugins/board-resources/src/components/EditCard.svelte b/plugins/board-resources/src/components/EditCard.svelte
index 97980b3957..91a8fae1cd 100644
--- a/plugins/board-resources/src/components/EditCard.svelte
+++ b/plugins/board-resources/src/components/EditCard.svelte
@@ -146,7 +146,12 @@
         }}
       />
     </svelte:fragment>
-    <EditBox bind:value={object.title} kind={'large-style'} focus on:change={() => change('title', object?.title)} />
+    <EditBox
+      bind:value={object.title}
+      kind={'large-style'}
+      autoFocus
+      on:change={() => change('title', object?.title)}
+    />
     <div class="background-accent-bg-color border-divider-color border-radius-3 p-4 mt-4 w-full">
       <StyledTextBox
         alwaysEdit={true}
diff --git a/plugins/board-resources/src/components/KanbanCard.svelte b/plugins/board-resources/src/components/KanbanCard.svelte
index 347637e687..57ebd1be79 100644
--- a/plugins/board-resources/src/components/KanbanCard.svelte
+++ b/plugins/board-resources/src/components/KanbanCard.svelte
@@ -110,7 +110,7 @@
             <div class="fs-title text-lg">
               <EditBox
                 bind:value={object.title}
-                focus
+                autoFocus
                 on:change={() => updateCard(client, object, 'title', object?.title)}
               />
             </div>
@@ -158,7 +158,7 @@
           <div class="fs-title text-lg">
             <EditBox
               bind:value={object.title}
-              focus
+              autoFocus
               on:change={() => updateCard(client, object, 'title', object?.title)}
             />
           </div>
diff --git a/plugins/board-resources/src/components/popups/AddChecklist.svelte b/plugins/board-resources/src/components/popups/AddChecklist.svelte
index 192e59c895..2ed185571b 100644
--- a/plugins/board-resources/src/components/popups/AddChecklist.svelte
+++ b/plugins/board-resources/src/components/popups/AddChecklist.svelte
@@ -118,7 +118,7 @@
   <div class="flex-col flex-gap-1">
     <Label label={board.string.Title} />
     <div class="p-2 mt-1 mb-1 border-divider-color border-radius-1">
-      <EditBox bind:value={name} focus={true} />
+      <EditBox bind:value={name} autoFocus />
     </div>
   </div>
 
diff --git a/plugins/calendar-resources/src/components/CreateEvent.svelte b/plugins/calendar-resources/src/components/CreateEvent.svelte
index 53e2ab8801..a8ee3572cd 100644
--- a/plugins/calendar-resources/src/components/CreateEvent.svelte
+++ b/plugins/calendar-resources/src/components/CreateEvent.svelte
@@ -97,7 +97,7 @@
   }}
   on:changeContent
 >
-  <EditBox bind:value={title} placeholder={calendar.string.Title} kind={'large-style'} focus />
+  <EditBox bind:value={title} placeholder={calendar.string.Title} kind={'large-style'} autoFocus />
   <svelte:fragment slot="pool">
     <DateRangePresenter
       value={startDate}
diff --git a/plugins/calendar-resources/src/components/CreateReminder.svelte b/plugins/calendar-resources/src/components/CreateReminder.svelte
index 6f17d56e12..379bb76fbf 100644
--- a/plugins/calendar-resources/src/components/CreateReminder.svelte
+++ b/plugins/calendar-resources/src/components/CreateReminder.svelte
@@ -69,7 +69,7 @@
   }}
   on:changeContent
 >
-  <EditBox bind:value={title} placeholder={calendar.string.Title} kind={'large-style'} focus />
+  <EditBox bind:value={title} placeholder={calendar.string.Title} kind={'large-style'} autoFocus />
   <svelte:fragment slot="pool">
     <!-- <TimeShiftPicker title={calendar.string.Date} bind:value direction="after" /> -->
     <DateRangePresenter
diff --git a/plugins/chunter-resources/src/components/CommentPopup.svelte b/plugins/chunter-resources/src/components/CommentPopup.svelte
index 5d7afd195c..c6bd16c083 100644
--- a/plugins/chunter-resources/src/components/CommentPopup.svelte
+++ b/plugins/chunter-resources/src/components/CommentPopup.svelte
@@ -71,7 +71,7 @@
   {/if}
 </div>
 {#if withInput}
-  <div class="mt-2">
+  <div class="mt-2 max-w-120">
     <CommentInput {object} />
   </div>
 {/if}
diff --git a/plugins/chunter-resources/src/components/ConvertDmToPrivateChannel.svelte b/plugins/chunter-resources/src/components/ConvertDmToPrivateChannel.svelte
index 32037d3597..e8f072530a 100644
--- a/plugins/chunter-resources/src/components/ConvertDmToPrivateChannel.svelte
+++ b/plugins/chunter-resources/src/components/ConvertDmToPrivateChannel.svelte
@@ -66,6 +66,6 @@
     icon={IconFolder}
     bind:value={name}
     placeholder={chunter.string.ChannelNamePlaceholder}
-    focus
+    autoFocus
   />
 </Card>
diff --git a/plugins/chunter-resources/src/components/CreateChannel.svelte b/plugins/chunter-resources/src/components/CreateChannel.svelte
index 4cd6ee8731..1ac8beb25f 100644
--- a/plugins/chunter-resources/src/components/CreateChannel.svelte
+++ b/plugins/chunter-resources/src/components/CreateChannel.svelte
@@ -62,7 +62,7 @@
       icon={IconFolder}
       bind:value={name}
       placeholder={chunter.string.ChannelNamePlaceholder}
-      focus
+      autoFocus
     />
     <ToggleWithLabel
       label={presentation.string.MakePrivate}
diff --git a/plugins/chunter-resources/src/components/EditChannelDescriptionTab.svelte b/plugins/chunter-resources/src/components/EditChannelDescriptionTab.svelte
index e50a934f20..fc27fa25b7 100644
--- a/plugins/chunter-resources/src/components/EditChannelDescriptionTab.svelte
+++ b/plugins/chunter-resources/src/components/EditChannelDescriptionTab.svelte
@@ -59,14 +59,13 @@
         label={chunter.string.Topic}
         bind:value={channel.topic}
         placeholder={chunter.string.Topic}
-        focus
+        autoFocus
         on:change={onTopicChange}
       />
       <EditBox
         label={chunter.string.ChannelDescription}
         bind:value={channel.description}
         placeholder={chunter.string.ChannelDescription}
-        focus
         on:change={onDescriptionChange}
       />
       <Button
diff --git a/plugins/contact-resources/src/components/AssigneePopup.svelte b/plugins/contact-resources/src/components/AssigneePopup.svelte
index e5eedee938..5ec4c78967 100644
--- a/plugins/contact-resources/src/components/AssigneePopup.svelte
+++ b/plugins/contact-resources/src/components/AssigneePopup.svelte
@@ -197,7 +197,7 @@
       icon={IconSearch}
       size={'large'}
       width={'100%'}
-      focus={!$deviceOptionsStore.isMobile}
+      autoFocus={!$deviceOptionsStore.isMobile}
       bind:value={search}
       {placeholder}
       {placeholderParam}
diff --git a/plugins/contact-resources/src/components/CreateEmployee.svelte b/plugins/contact-resources/src/components/CreateEmployee.svelte
index 8bcf4ac11b..101ae9eeac 100644
--- a/plugins/contact-resources/src/components/CreateEmployee.svelte
+++ b/plugins/contact-resources/src/components/CreateEmployee.svelte
@@ -140,7 +140,7 @@
         placeholder={contact.string.PersonFirstNamePlaceholder}
         bind:value={firstName}
         kind={'large-style'}
-        focus
+        autoFocus
         focusIndex={1}
       />
       <EditBox
diff --git a/plugins/contact-resources/src/components/CreateOrganization.svelte b/plugins/contact-resources/src/components/CreateOrganization.svelte
index 85a2a356ab..0f21ef20fc 100644
--- a/plugins/contact-resources/src/components/CreateOrganization.svelte
+++ b/plugins/contact-resources/src/components/CreateOrganization.svelte
@@ -94,7 +94,7 @@
       placeholder={contact.string.OrganizationNamePlaceholder}
       bind:value={object.name}
       kind={'large-style'}
-      focus
+      autoFocus
       focusIndex={1}
     />
   </div>
diff --git a/plugins/contact-resources/src/components/CreatePerson.svelte b/plugins/contact-resources/src/components/CreatePerson.svelte
index 7bab3a9977..f4f913ec50 100644
--- a/plugins/contact-resources/src/components/CreatePerson.svelte
+++ b/plugins/contact-resources/src/components/CreatePerson.svelte
@@ -96,7 +96,7 @@
         placeholder={contact.string.PersonFirstNamePlaceholder}
         bind:value={firstName}
         kind={'large-style'}
-        focus
+        autoFocus
         focusIndex={1}
       />
       <EditBox
diff --git a/plugins/contact-resources/src/components/EmployeeAccountPresenter.svelte b/plugins/contact-resources/src/components/EmployeeAccountPresenter.svelte
index 48e38ca9cb..e7e158a07e 100644
--- a/plugins/contact-resources/src/components/EmployeeAccountPresenter.svelte
+++ b/plugins/contact-resources/src/components/EmployeeAccountPresenter.svelte
@@ -17,12 +17,13 @@
   import { EmployeeAccount } from '@hcengineering/contact'
   import core, { Account, systemAccountEmail } from '@hcengineering/core'
   import { getEmbeddedLabel } from '@hcengineering/platform'
-  import { Label, tooltip } from '@hcengineering/ui'
+  import { Label, tooltip, IconSize } from '@hcengineering/ui'
   import { employeeByIdStore } from '../utils'
   import Avatar from './Avatar.svelte'
   import EmployeePresenter from './EmployeePresenter.svelte'
 
   export let value: Account
+  export let avatarSize: IconSize = 'x-small'
   export let disabled = false
   export let inline = false
 
@@ -34,10 +35,10 @@
 {#if value}
   <!-- svelte-ignore a11y-click-events-have-key-events -->
   {#if employee}
-    <EmployeePresenter value={employee} {disabled} {inline} />
+    <EmployeePresenter value={employee} {disabled} {inline} {avatarSize} />
   {:else}
     <div class="flex-row-center">
-      <Avatar size="x-small" />
+      <Avatar size={avatarSize} />
       <span class="overflow-label user" use:tooltip={{ label: valueLabel }}><Label label={valueLabel} /></span>
     </div>
   {/if}
diff --git a/plugins/contact-resources/src/components/EmployeeAccountRefPresenter.svelte b/plugins/contact-resources/src/components/EmployeeAccountRefPresenter.svelte
index 5e7e4308a9..db9c3f20a8 100644
--- a/plugins/contact-resources/src/components/EmployeeAccountRefPresenter.svelte
+++ b/plugins/contact-resources/src/components/EmployeeAccountRefPresenter.svelte
@@ -16,15 +16,18 @@
 <script lang="ts">
   import { EmployeeAccount } from '@hcengineering/contact'
   import { Ref } from '@hcengineering/core'
+  import { IconSize } from '@hcengineering/ui'
   import { employeeAccountByIdStore } from '../utils'
   import EmployeeAccountPresenter from './EmployeeAccountPresenter.svelte'
 
   export let value: Ref<EmployeeAccount>
+  export let avatarSize: IconSize = 'x-small'
   export let disabled = false
+  export let inline = false
 
   $: account = $employeeAccountByIdStore.get(value)
 </script>
 
 {#if account}
-  <EmployeeAccountPresenter value={account} {disabled} />
+  <EmployeeAccountPresenter value={account} {disabled} {inline} {avatarSize} />
 {/if}
diff --git a/plugins/contact-resources/src/components/EmployeeFilter.svelte b/plugins/contact-resources/src/components/EmployeeFilter.svelte
index ae1af5b121..6fcc3e473f 100644
--- a/plugins/contact-resources/src/components/EmployeeFilter.svelte
+++ b/plugins/contact-resources/src/components/EmployeeFilter.svelte
@@ -133,7 +133,7 @@
       icon={IconSearch}
       size={'large'}
       width={'100%'}
-      focus={!$deviceOptionsStore.isMobile}
+      autoFocus={!$deviceOptionsStore.isMobile}
       bind:value={search}
       placeholder={presentation.string.Search}
       on:change={() => {
diff --git a/plugins/contact-resources/src/components/MemberPresenter.svelte b/plugins/contact-resources/src/components/MemberPresenter.svelte
index 775d7450c3..76ba035f64 100644
--- a/plugins/contact-resources/src/components/MemberPresenter.svelte
+++ b/plugins/contact-resources/src/components/MemberPresenter.svelte
@@ -20,12 +20,13 @@
   import { ContactPresenter } from '..'
 
   export let value: Member
+  export let disabled: boolean = false
   export let inline: boolean = false
 
   const contactRef = getClient().findOne(contact.class.Contact, { _id: value.contact })
 </script>
 
-<DocNavLink object={value} {inline}>
+<DocNavLink object={value} {inline} {disabled} noUnderline={disabled}>
   {#await contactRef then ct}
     {#if ct}
       <ContactPresenter disabled={true} value={ct} {inline} />
diff --git a/plugins/document-resources/src/components/CreateDocument.svelte b/plugins/document-resources/src/components/CreateDocument.svelte
index 46f31506e4..de368dba26 100644
--- a/plugins/document-resources/src/components/CreateDocument.svelte
+++ b/plugins/document-resources/src/components/CreateDocument.svelte
@@ -114,7 +114,7 @@
       placeholder={document.string.DocumentNamePlaceholder}
       bind:value={object.name}
       kind={'large-style'}
-      focus
+      autoFocus
       focusIndex={1}
     />
   </div>
diff --git a/plugins/hr-resources/src/components/CreateDepartment.svelte b/plugins/hr-resources/src/components/CreateDepartment.svelte
index 9832260750..9d792ccace 100644
--- a/plugins/hr-resources/src/components/CreateDepartment.svelte
+++ b/plugins/hr-resources/src/components/CreateDepartment.svelte
@@ -70,7 +70,7 @@
         bind:value={name}
         placeholder={hr.string.DepartmentPlaceholder}
         kind={'large-style'}
-        focus
+        autoFocus
       />
     </div>
   </div>
diff --git a/plugins/hr-resources/src/components/schedule/CreatePublicHoliday.svelte b/plugins/hr-resources/src/components/schedule/CreatePublicHoliday.svelte
index d27e8bb6a7..11d1de92bf 100644
--- a/plugins/hr-resources/src/components/schedule/CreatePublicHoliday.svelte
+++ b/plugins/hr-resources/src/components/schedule/CreatePublicHoliday.svelte
@@ -70,7 +70,7 @@
   on:changeContent
 >
   <div class="flex-grow mt-4">
-    <EditBox placeholder={hr.string.Title} bind:value={title} kind={'large-style'} focus focusIndex={1} />
+    <EditBox placeholder={hr.string.Title} bind:value={title} kind={'large-style'} autoFocus focusIndex={1} />
   </div>
   <div class="flex-grow mt-4">
     <EditBox placeholder={hr.string.Description} bind:value={description} kind={'large-style'} />
diff --git a/plugins/inventory-resources/src/components/CreateCategory.svelte b/plugins/inventory-resources/src/components/CreateCategory.svelte
index d9679c5d7f..f27bae41a5 100644
--- a/plugins/inventory-resources/src/components/CreateCategory.svelte
+++ b/plugins/inventory-resources/src/components/CreateCategory.svelte
@@ -69,6 +69,6 @@
     <div class="mr-3">
       <Button focusIndex={1} icon={inventory.icon.Categories} size={'medium'} kind={'link-bordered'} disabled />
     </div>
-    <EditBox bind:value={name} placeholder={inventory.string.Category} kind={'large-style'} focus />
+    <EditBox bind:value={name} placeholder={inventory.string.Category} kind={'large-style'} autoFocus />
   </div>
 </Card>
diff --git a/plugins/inventory-resources/src/components/CreateProduct.svelte b/plugins/inventory-resources/src/components/CreateProduct.svelte
index 6632242aa4..859a067ca7 100644
--- a/plugins/inventory-resources/src/components/CreateProduct.svelte
+++ b/plugins/inventory-resources/src/components/CreateProduct.svelte
@@ -80,7 +80,7 @@
     <div class="mr-3">
       <Button focusIndex={1} icon={inventory.icon.Products} size={'medium'} kind={'link-bordered'} disabled />
     </div>
-    <EditBox bind:value={doc.name} placeholder={inventory.string.Product} kind={'large-style'} focus />
+    <EditBox bind:value={doc.name} placeholder={inventory.string.Product} kind={'large-style'} autoFocus />
   </div>
   <svelte:fragment slot="pool">
     <DropdownLabels
diff --git a/plugins/inventory-resources/src/components/CreateVariant.svelte b/plugins/inventory-resources/src/components/CreateVariant.svelte
index a75171e7d7..a8824a8297 100644
--- a/plugins/inventory-resources/src/components/CreateVariant.svelte
+++ b/plugins/inventory-resources/src/components/CreateVariant.svelte
@@ -66,7 +66,7 @@
   on:changeContent
 >
   <Grid column={1} rowGap={1.75}>
-    <EditBox label={inventory.string.Variant} bind:value={doc.name} placeholder={inventory.string.Variant} focus />
+    <EditBox label={inventory.string.Variant} bind:value={doc.name} placeholder={inventory.string.Variant} autoFocus />
     <EditBox label={inventory.string.SKU} bind:value={doc.sku} placeholder={inventory.string.SKU} />
   </Grid>
 </Card>
diff --git a/plugins/lead-resources/src/components/CreateCustomer.svelte b/plugins/lead-resources/src/components/CreateCustomer.svelte
index e4019f2897..0c3c53056e 100644
--- a/plugins/lead-resources/src/components/CreateCustomer.svelte
+++ b/plugins/lead-resources/src/components/CreateCustomer.svelte
@@ -162,7 +162,7 @@
           placeholder={contact.string.PersonFirstNamePlaceholder}
           bind:value={firstName}
           kind={'large-style'}
-          focus
+          autoFocus
           focusIndex={1}
         />
         <EditBox
@@ -205,7 +205,7 @@
         placeholder={contact.string.OrganizationNamePlaceholder}
         bind:value={object.name}
         kind={'large-style'}
-        focus
+        autoFocus
         focusIndex={1}
       />
     </div>
diff --git a/plugins/lead-resources/src/components/CreateFunnel.svelte b/plugins/lead-resources/src/components/CreateFunnel.svelte
index f4a76ede17..8ce69d3ad6 100644
--- a/plugins/lead-resources/src/components/CreateFunnel.svelte
+++ b/plugins/lead-resources/src/components/CreateFunnel.svelte
@@ -68,7 +68,7 @@
       icon={IconFolder}
       bind:value={name}
       placeholder={lead.string.FunnelName}
-      focus
+      autoFocus
     />
     <ToggleWithLabel
       label={presentation.string.MakePrivate}
diff --git a/plugins/lead-resources/src/components/CreateLead.svelte b/plugins/lead-resources/src/components/CreateLead.svelte
index c9d779b140..9a21b43567 100644
--- a/plugins/lead-resources/src/components/CreateLead.svelte
+++ b/plugins/lead-resources/src/components/CreateLead.svelte
@@ -147,7 +147,13 @@
     <div class="mr-3">
       <Button focusIndex={1} icon={lead.icon.Lead} size={'medium'} kind={'link-bordered'} disabled />
     </div>
-    <EditBox focusIndex={1} bind:value={title} placeholder={lead.string.LeadPlaceholder} kind={'large-style'} focus />
+    <EditBox
+      focusIndex={1}
+      bind:value={title}
+      placeholder={lead.string.LeadPlaceholder}
+      kind={'large-style'}
+      autoFocus
+    />
   </div>
 
   <svelte:fragment slot="pool">
diff --git a/plugins/lead-resources/src/components/EditFunnel.svelte b/plugins/lead-resources/src/components/EditFunnel.svelte
index 3fd7a237cf..ce0ed75862 100644
--- a/plugins/lead-resources/src/components/EditFunnel.svelte
+++ b/plugins/lead-resources/src/components/EditFunnel.svelte
@@ -86,7 +86,7 @@
         bind:value={object.name}
         placeholder={lead.string.FunnelPlaceholder}
         kind={'large-style'}
-        focus
+        autoFocus
         focusable
         on:blur={() => {
           if (rawName !== object.name) onChange('name', object.name)
diff --git a/plugins/notification-resources/src/components/activity/TxCollaboratorsChange.svelte b/plugins/notification-resources/src/components/activity/TxCollaboratorsChange.svelte
index bb750af904..7049d72190 100644
--- a/plugins/notification-resources/src/components/activity/TxCollaboratorsChange.svelte
+++ b/plugins/notification-resources/src/components/activity/TxCollaboratorsChange.svelte
@@ -59,21 +59,23 @@
 </script>
 
 {#if diff}
-  <div class="flex-presenter">
-    <Label label={notification.string.ChangeCollaborators} />
-    {#if diff.added.length > 0}
-      <IconAdd size={'x-small'} fill={'var(--theme-trans-color)'} />
-      {#each diff.added as add}
-        <EmployeeAccountRefPresenter value={add} disabled />
-      {/each}
-    {/if}
-    {#if diff.removed.length > 0}
-      <IconDelete size={'x-small'} fill={'var(--theme-trans-color)'} />
-      {#each diff.removed as removed}
-        <EmployeeAccountRefPresenter value={removed} disabled />
-      {/each}
-    {/if}
-  </div>
+  <Label label={notification.string.ChangeCollaborators} />
+  {#if diff.added.length > 0}
+    <div class="antiHSpacer" />
+    <IconAdd size={'x-small'} fill={'var(--theme-trans-color)'} />
+    {#each diff.added as add}
+      <EmployeeAccountRefPresenter value={add} disabled inline />
+      <div class="antiHSpacer" />
+    {/each}
+  {/if}
+  {#if diff.removed.length > 0}
+    <div class="antiHSpacer" />
+    <IconDelete size={'x-small'} fill={'var(--theme-trans-color)'} />
+    {#each diff.removed as removed}
+      <EmployeeAccountRefPresenter value={removed} disabled inline />
+      <div class="antiHSpacer" />
+    {/each}
+  {/if}
 {:else}
   <Label label={notification.string.YouAddedCollaborators} />
 {/if}
diff --git a/plugins/recruit-resources/src/components/CreateCandidate.svelte b/plugins/recruit-resources/src/components/CreateCandidate.svelte
index 80e9c75738..ccff4a7506 100644
--- a/plugins/recruit-resources/src/components/CreateCandidate.svelte
+++ b/plugins/recruit-resources/src/components/CreateCandidate.svelte
@@ -525,7 +525,7 @@
         placeholder={recruit.string.PersonFirstNamePlaceholder}
         bind:value={object.firstName}
         kind={'large-style'}
-        focus
+        autoFocus
         maxWidth={'30rem'}
         focusIndex={1}
       />
diff --git a/plugins/recruit-resources/src/components/CreateVacancy.svelte b/plugins/recruit-resources/src/components/CreateVacancy.svelte
index 0cb93f2cfa..c0a22c13a5 100644
--- a/plugins/recruit-resources/src/components/CreateVacancy.svelte
+++ b/plugins/recruit-resources/src/components/CreateVacancy.svelte
@@ -252,7 +252,7 @@
         bind:value={name}
         placeholder={recruit.string.VacancyPlaceholder}
         kind={'large-style'}
-        focus
+        autoFocus
       />
     </div>
   </div>
diff --git a/plugins/recruit-resources/src/components/EditVacancy.svelte b/plugins/recruit-resources/src/components/EditVacancy.svelte
index c440156307..dbb8fad45b 100644
--- a/plugins/recruit-resources/src/components/EditVacancy.svelte
+++ b/plugins/recruit-resources/src/components/EditVacancy.svelte
@@ -158,7 +158,7 @@
         placeholder={recruit.string.VacancyPlaceholder}
         kind={'large-style'}
         focusable
-        focus={!embedded}
+        autoFocus={!embedded}
         on:blur={save}
       />
     </span>
diff --git a/plugins/recruit-resources/src/components/review/CreateOpinion.svelte b/plugins/recruit-resources/src/components/review/CreateOpinion.svelte
index 836a30eee8..9b69ebe6e3 100644
--- a/plugins/recruit-resources/src/components/review/CreateOpinion.svelte
+++ b/plugins/recruit-resources/src/components/review/CreateOpinion.svelte
@@ -94,7 +94,7 @@
     bind:value={doc.value}
     label={recruit.string.OpinionValue}
     placeholder={recruit.string.OpinionValuePlaceholder}
-    focus
+    autoFocus
   />
   <StyledTextArea placeholder={recruit.string.Description} bind:content={doc.description} kind={'emphasized'} />
 </Card>
diff --git a/plugins/recruit-resources/src/components/review/CreateReview.svelte b/plugins/recruit-resources/src/components/review/CreateReview.svelte
index 184ab86fa2..f919420e24 100644
--- a/plugins/recruit-resources/src/components/review/CreateReview.svelte
+++ b/plugins/recruit-resources/src/components/review/CreateReview.svelte
@@ -157,7 +157,7 @@
   on:changeContent
 >
   <StatusControl slot="error" {status} />
-  <EditBox placeholder={recruit.string.Title} bind:value={title} kind={'large-style'} focus />
+  <EditBox placeholder={recruit.string.Title} bind:value={title} kind={'large-style'} autoFocus />
   <EditBox placeholder={recruit.string.Location} bind:value={location} kind={'small-style'} />
   <StyledTextArea bind:content={description} placeholder={recruit.string.AddDescription} kind={'emphasized'} />
   <svelte:fragment slot="pool">
diff --git a/plugins/recruit-resources/src/components/review/EditOpinion.svelte b/plugins/recruit-resources/src/components/review/EditOpinion.svelte
index fc51db5949..5572ff1ae5 100644
--- a/plugins/recruit-resources/src/components/review/EditOpinion.svelte
+++ b/plugins/recruit-resources/src/components/review/EditOpinion.svelte
@@ -74,7 +74,7 @@
     bind:value
     icon={recruit.icon.Application}
     placeholder={recruit.string.OpinionValue}
-    focus
+    autoFocus
   />
   <StyledTextArea placeholder={recruit.string.Description} bind:content={description} kind={'emphasized'} />
 </Card>
diff --git a/plugins/setting-resources/src/components/CreateMixin.svelte b/plugins/setting-resources/src/components/CreateMixin.svelte
index bc8f148434..b5190dbc83 100644
--- a/plugins/setting-resources/src/components/CreateMixin.svelte
+++ b/plugins/setting-resources/src/components/CreateMixin.svelte
@@ -62,5 +62,5 @@
     </div>
   </svelte:fragment>
 
-  <div class="mb-2"><EditBox focus bind:value={name} placeholder={core.string.Name} /></div>
+  <div class="mb-2"><EditBox autoFocus bind:value={name} placeholder={core.string.Name} /></div>
 </Card>
diff --git a/plugins/setting-resources/src/components/Profile.svelte b/plugins/setting-resources/src/components/Profile.svelte
index a2f8a452cf..76f3c1f3c2 100644
--- a/plugins/setting-resources/src/components/Profile.svelte
+++ b/plugins/setting-resources/src/components/Profile.svelte
@@ -108,7 +108,7 @@
             placeholder={contact.string.PersonFirstNamePlaceholder}
             bind:value={firstName}
             kind={'large-style'}
-            focus
+            autoFocus
             focusIndex={1}
             on:change={async () => {
               const changeName = await getResource(login.function.ChangeName)
diff --git a/plugins/tags-resources/src/components/CreateTagElement.svelte b/plugins/tags-resources/src/components/CreateTagElement.svelte
index e7e18066f8..ed6a4ea3eb 100644
--- a/plugins/tags-resources/src/components/CreateTagElement.svelte
+++ b/plugins/tags-resources/src/components/CreateTagElement.svelte
@@ -129,7 +129,7 @@
         placeholder={tags.string.TagName}
         placeholderParam={{ word: keyTitle }}
         kind={'large-style'}
-        focus
+        autoFocus
       />
       <div class="mt-2">
         <EditBox bind:value={description} placeholder={tags.string.TagDescriptionPlaceholder} kind={'small-style'} />
diff --git a/plugins/tags-resources/src/components/TagsFilter.svelte b/plugins/tags-resources/src/components/TagsFilter.svelte
index 5b003dc416..3510b11be6 100644
--- a/plugins/tags-resources/src/components/TagsFilter.svelte
+++ b/plugins/tags-resources/src/components/TagsFilter.svelte
@@ -134,7 +134,7 @@
       icon={IconSearch}
       size={'large'}
       width={'100%'}
-      focus={!$deviceOptionsStore.isMobile}
+      autoFocus={!$deviceOptionsStore.isMobile}
       bind:value={search}
       placeholder={presentation.string.Search}
       on:input={() => getValues(search)}
diff --git a/plugins/tags-resources/src/components/TagsPopup.svelte b/plugins/tags-resources/src/components/TagsPopup.svelte
index 60a13ba15f..e414bc7714 100644
--- a/plugins/tags-resources/src/components/TagsPopup.svelte
+++ b/plugins/tags-resources/src/components/TagsPopup.svelte
@@ -107,7 +107,7 @@
       icon={IconSearch}
       size={'large'}
       width={'100%'}
-      focus={!$deviceOptionsStore.isMobile}
+      autoFocus={!$deviceOptionsStore.isMobile}
       bind:value={search}
       {placeholder}
       {placeholderParam}
diff --git a/plugins/task-resources/src/components/todos/CreateTodo.svelte b/plugins/task-resources/src/components/todos/CreateTodo.svelte
index 7a76645873..be9d4b89d3 100644
--- a/plugins/task-resources/src/components/todos/CreateTodo.svelte
+++ b/plugins/task-resources/src/components/todos/CreateTodo.svelte
@@ -81,7 +81,7 @@
       bind:value={name}
       icon={task.icon.Task}
       placeholder={plugin.string.TodoDescriptionPlaceholder}
-      focus
+      autoFocus
     />
     <DatePicker title={plugin.string.TodoDueDate} bind:value={dueTo} />
   </Grid>
diff --git a/plugins/task-resources/src/components/todos/EditTodo.svelte b/plugins/task-resources/src/components/todos/EditTodo.svelte
index 5930decd40..e135aed230 100644
--- a/plugins/task-resources/src/components/todos/EditTodo.svelte
+++ b/plugins/task-resources/src/components/todos/EditTodo.svelte
@@ -78,7 +78,7 @@
       bind:value={name}
       icon={task.icon.Task}
       placeholder={plugin.string.TodoDescriptionPlaceholder}
-      focus
+      autoFocus
     />
     <DatePicker title={plugin.string.TodoDueDate} bind:value={dueTo} />
   </Grid>
diff --git a/plugins/templates-resources/src/components/CreateTemplateCategory.svelte b/plugins/templates-resources/src/components/CreateTemplateCategory.svelte
index 6ef990563b..876e8da1cd 100644
--- a/plugins/templates-resources/src/components/CreateTemplateCategory.svelte
+++ b/plugins/templates-resources/src/components/CreateTemplateCategory.svelte
@@ -57,7 +57,7 @@
       icon={IconFolder}
       bind:value={name}
       placeholder={templates.string.TemplateCategory}
-      focus
+      autoFocus
     />
     <ToggleWithLabel
       label={presentation.string.MakePrivate}
diff --git a/plugins/templates-resources/src/components/TemplatePopup.svelte b/plugins/templates-resources/src/components/TemplatePopup.svelte
index f3298ca60c..c355e966a5 100644
--- a/plugins/templates-resources/src/components/TemplatePopup.svelte
+++ b/plugins/templates-resources/src/components/TemplatePopup.svelte
@@ -95,7 +95,7 @@
       icon={IconSearch}
       bind:value={query}
       placeholder={templates.string.SearchTemplate}
-      focus={!$deviceOptionsStore.isMobile}
+      autoFocus={!$deviceOptionsStore.isMobile}
     />
   </div>
   <div class="scroll mt-2">
diff --git a/plugins/tracker-resources/src/components/CreateIssue.svelte b/plugins/tracker-resources/src/components/CreateIssue.svelte
index fa51f7acab..356e988c14 100644
--- a/plugins/tracker-resources/src/components/CreateIssue.svelte
+++ b/plugins/tracker-resources/src/components/CreateIssue.svelte
@@ -580,7 +580,7 @@
       bind:value={object.title}
       placeholder={tracker.string.IssueTitlePlaceholder}
       kind={'large-style'}
-      focus
+      autoFocus
       fullSize
     />
   </div>
diff --git a/plugins/tracker-resources/src/components/SpacesPopup.svelte b/plugins/tracker-resources/src/components/SpacesPopup.svelte
index 0bcd3a57c2..01988c491d 100644
--- a/plugins/tracker-resources/src/components/SpacesPopup.svelte
+++ b/plugins/tracker-resources/src/components/SpacesPopup.svelte
@@ -44,7 +44,7 @@
       icon={IconSearch}
       bind:value={search}
       placeholder={ui.string.SearchDots}
-      focus={!$deviceOptionsStore.isMobile}
+      autoFocus={!$deviceOptionsStore.isMobile}
     />
     <div class="ap-caption"><Label label={ui.string.Suggested} /></div>
   </div>
diff --git a/plugins/tracker-resources/src/components/components/NewComponent.svelte b/plugins/tracker-resources/src/components/components/NewComponent.svelte
index 5086deb7bf..d26c5fa7c7 100644
--- a/plugins/tracker-resources/src/components/components/NewComponent.svelte
+++ b/plugins/tracker-resources/src/components/components/NewComponent.svelte
@@ -58,7 +58,12 @@
       size={'large'}
     />
   </svelte:fragment>
-  <EditBox bind:value={object.label} placeholder={tracker.string.ComponentNamePlaceholder} kind={'large-style'} focus />
+  <EditBox
+    bind:value={object.label}
+    placeholder={tracker.string.ComponentNamePlaceholder}
+    kind={'large-style'}
+    autoFocus
+  />
   <StyledTextArea
     bind:content={object.description}
     placeholder={tracker.string.ComponentDescriptionPlaceholder}
diff --git a/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte b/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
index b093af3b17..14f48714fa 100644
--- a/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
@@ -190,7 +190,7 @@
       placeholder={tracker.string.IssueTitlePlaceholder}
       kind="large-style"
       on:blur={save}
-      focus={!embedded}
+      autoFocus={!embedded}
     />
     <div class="w-full mt-6">
       <AttachmentStyleBoxEditor
diff --git a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
index fa4ccaca71..6c00fb2162 100644
--- a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
+++ b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
@@ -101,7 +101,7 @@
   </svelte:fragment>
   <div class="flex-row-center gap-2">
     <EditBox
-      focus
+      autoFocus
       bind:value={data.value}
       {placeholder}
       maxWidth={'9rem'}
diff --git a/plugins/tracker-resources/src/components/milestones/MilestoneFilter.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneFilter.svelte
index 76e5c2c254..ab4d7bd325 100644
--- a/plugins/tracker-resources/src/components/milestones/MilestoneFilter.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneFilter.svelte
@@ -122,7 +122,7 @@
       icon={IconSearch}
       size={'large'}
       width={'100%'}
-      focus={!$deviceOptionsStore.isMobile}
+      autoFocus={!$deviceOptionsStore.isMobile}
       bind:value={search}
       placeholder={presentation.string.Search}
       on:change={() => {
diff --git a/plugins/tracker-resources/src/components/milestones/NewMilestone.svelte b/plugins/tracker-resources/src/components/milestones/NewMilestone.svelte
index ff151498dc..d38db587b6 100644
--- a/plugins/tracker-resources/src/components/milestones/NewMilestone.svelte
+++ b/plugins/tracker-resources/src/components/milestones/NewMilestone.svelte
@@ -70,7 +70,12 @@
       bind:space
     />
   </svelte:fragment>
-  <EditBox bind:value={object.label} placeholder={tracker.string.MilestoneNamePlaceholder} kind={'large-style'} focus />
+  <EditBox
+    bind:value={object.label}
+    placeholder={tracker.string.MilestoneNamePlaceholder}
+    kind={'large-style'}
+    autoFocus
+  />
   <StyledTextArea
     bind:content={object.description}
     placeholder={tracker.string.ComponentDescriptionPlaceholder}
diff --git a/plugins/tracker-resources/src/components/projects/CreateProject.svelte b/plugins/tracker-resources/src/components/projects/CreateProject.svelte
index b192e95558..50a96217ee 100644
--- a/plugins/tracker-resources/src/components/projects/CreateProject.svelte
+++ b/plugins/tracker-resources/src/components/projects/CreateProject.svelte
@@ -259,7 +259,7 @@
           bind:value={name}
           placeholder={tracker.string.ProjectTitlePlaceholder}
           kind={'large-style'}
-          focus
+          autoFocus
           on:input={() => {
             if (isNew) {
               identifier = name.toLocaleUpperCase().replaceAll(' ', '_').substring(0, 5)
diff --git a/plugins/tracker-resources/src/components/scrums/NewScrum.svelte b/plugins/tracker-resources/src/components/scrums/NewScrum.svelte
index b3970101b1..a5f8ddd837 100644
--- a/plugins/tracker-resources/src/components/scrums/NewScrum.svelte
+++ b/plugins/tracker-resources/src/components/scrums/NewScrum.svelte
@@ -71,7 +71,12 @@
   <svelte:fragment slot="header">
     <SpaceSelector _class={tracker.class.Project} label={tracker.string.Project} bind:space />
   </svelte:fragment>
-  <EditBox bind:value={object.title} placeholder={tracker.string.ScrumTitlePlaceholder} kind={'large-style'} focus />
+  <EditBox
+    bind:value={object.title}
+    placeholder={tracker.string.ScrumTitlePlaceholder}
+    kind={'large-style'}
+    autoFocus
+  />
   <StyledTextArea
     bind:content={object.description}
     placeholder={tracker.string.ScrumDescriptionPlaceholder}
diff --git a/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte b/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
index 57ab9c6ebf..e3dcce42c8 100644
--- a/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
+++ b/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
@@ -144,7 +144,12 @@
     <Label {label} />
   </svelte:fragment>
 
-  <EditBox bind:value={object.title} placeholder={tracker.string.IssueTitlePlaceholder} kind={'large-style'} focus />
+  <EditBox
+    bind:value={object.title}
+    placeholder={tracker.string.IssueTitlePlaceholder}
+    kind={'large-style'}
+    autoFocus
+  />
   <StyledTextBox
     alwaysEdit
     showButtons={false}
diff --git a/plugins/tracker-resources/src/components/templates/DraftIssueChildEditor.svelte b/plugins/tracker-resources/src/components/templates/DraftIssueChildEditor.svelte
index 123f763bed..a9d432ed96 100644
--- a/plugins/tracker-resources/src/components/templates/DraftIssueChildEditor.svelte
+++ b/plugins/tracker-resources/src/components/templates/DraftIssueChildEditor.svelte
@@ -163,7 +163,7 @@
         bind:focusInput={focusIssueTitle}
         kind={'large-style'}
         placeholder={tracker.string.SubIssueTitlePlaceholder}
-        focus
+        autoFocus
         fullSize
       />
     </div>
diff --git a/plugins/tracker-resources/src/components/templates/IssueTemplateChildEditor.svelte b/plugins/tracker-resources/src/components/templates/IssueTemplateChildEditor.svelte
index de890fd209..a205aa7910 100644
--- a/plugins/tracker-resources/src/components/templates/IssueTemplateChildEditor.svelte
+++ b/plugins/tracker-resources/src/components/templates/IssueTemplateChildEditor.svelte
@@ -114,7 +114,7 @@
       bind:focusInput={focusIssueTitle}
       kind={'large-style'}
       placeholder={tracker.string.SubIssueTitlePlaceholder}
-      focus
+      autoFocus
     />
     <div class="mt-4 clear-mins">
       {#key newIssue.description}
diff --git a/plugins/view-resources/src/components/ActionsPopup.svelte b/plugins/view-resources/src/components/ActionsPopup.svelte
index 44b851c336..0ff1fc9ccf 100644
--- a/plugins/view-resources/src/components/ActionsPopup.svelte
+++ b/plugins/view-resources/src/components/ActionsPopup.svelte
@@ -16,9 +16,18 @@
   import { WithLookup, Doc } from '@hcengineering/core'
   import { getResource, translate } from '@hcengineering/platform'
   import { createQuery, getClient, ActionContext } from '@hcengineering/presentation'
-  import ui, { Button, closePopup, Component, Icon, IconArrowLeft, Label } from '@hcengineering/ui'
+  import ui, {
+    Button,
+    closePopup,
+    Component,
+    Icon,
+    IconArrowLeft,
+    Label,
+    EditWithIcon,
+    IconSearch,
+    deviceOptionsStore
+  } from '@hcengineering/ui'
   import { Action, ViewContext } from '@hcengineering/view'
-  import { onMount } from 'svelte'
   import { filterActions, getSelection } from '../actions'
   import view from '../plugin'
   import { focusStore, selectionStore } from '../selection'
@@ -31,7 +40,7 @@
 
   let search: string = ''
   let actions: WithLookup<Action>[] = []
-  let input: HTMLInputElement | undefined
+  let input: EditWithIcon
 
   const query = createQuery()
 
@@ -112,15 +121,6 @@
   }
   $: filterSearchActions(supportedActions, search)
 
-  let phTraslate: string = ''
-  $: translate(view.string.ActionPlaceholder, {}).then((res) => {
-    phTraslate = res
-  })
-
-  onMount(() => {
-    if (input) input.focus()
-  })
-
   let selection = 0
   let list: ListView
   /* eslint-disable no-undef */
@@ -202,34 +202,36 @@
   on:keydown={onKeydown}
   use:resizeObserver={() => dispatch('changeContent')}
 >
-  <div class="mt-2 ml-2 flex-between">
-    {#if $selectionStore.length > 0}
-      <div class="item-box">
-        {$selectionStore.length} items
-      </div>
-    {:else if $focusStore.focus !== undefined}
-      <div class="item-box">
-        <ObjectPresenter
-          objectId={$focusStore.focus._id}
-          _class={$focusStore.focus._class}
-          value={$focusStore.focus}
-          props={{ inline: true }}
-        />
-      </div>
-    {/if}
-    {#if activeAction && activeAction?.actionPopup !== undefined}
-      <div class="mt-2 mb-2 mr-2">
-        <Button
-          icon={IconArrowLeft}
-          label={ui.string.Back}
-          on:click={() => {
-            activeAction = undefined
-          }}
-          width={'fit-content'}
-        />
-      </div>
-    {/if}
-  </div>
+  {#if $selectionStore.length > 0 || $focusStore.focus !== undefined || (activeAction && activeAction?.actionPopup !== undefined)}
+    <div class="mt-2 ml-2 flex-between">
+      {#if $selectionStore.length > 0}
+        <div class="item-box">
+          {$selectionStore.length} items
+        </div>
+      {:else if $focusStore.focus !== undefined}
+        <div class="item-box">
+          <ObjectPresenter
+            objectId={$focusStore.focus._id}
+            _class={$focusStore.focus._class}
+            value={$focusStore.focus}
+            props={{ inline: true }}
+          />
+        </div>
+      {/if}
+      {#if activeAction && activeAction?.actionPopup !== undefined}
+        <div class="mt-2 mb-2 mr-2">
+          <Button
+            icon={IconArrowLeft}
+            label={ui.string.Back}
+            on:click={() => {
+              activeAction = undefined
+            }}
+            width={'fit-content'}
+          />
+        </div>
+      {/if}
+    </div>
+  {/if}
   {#if activeAction && activeAction?.actionPopup !== undefined}
     <Component
       is={activeAction?.actionPopup}
@@ -247,7 +249,15 @@
     />
   {:else}
     <div class="header">
-      <input bind:this={input} type="text" bind:value={search} placeholder={phTraslate} />
+      <EditWithIcon
+        bind:this={input}
+        icon={IconSearch}
+        size={'large'}
+        width={'100%'}
+        autoFocus={!$deviceOptionsStore.isMobile}
+        bind:value={search}
+        placeholder={view.string.ActionPlaceholder}
+      />
     </div>
     <div class="scroll">
       <div class="box">
@@ -312,7 +322,7 @@
     min-width: 1.5rem;
     color: var(--theme-caption-color);
     background-color: var(--theme-button-enabled);
-    border: 1px solid var(--theme-divider-color);
+    border: 1px solid var(--theme-button-border);
     border-radius: 0.25rem;
   }
   .key-box + .key-box {
@@ -326,9 +336,13 @@
     border-radius: 0.25rem;
   }
   .category-box {
-    display: inline-block;
+    display: flex;
+    align-items: center;
+    padding: 0.5rem 1rem;
+    min-height: 2rem;
+    text-transform: uppercase;
+    font-weight: 500;
+    font-size: 0.625rem;
     color: var(--theme-caption-color);
-    background-color: var(--theme-comp-header-color);
-    padding: 0.5rem;
   }
 </style>
diff --git a/plugins/view-resources/src/components/NumberEditor.svelte b/plugins/view-resources/src/components/NumberEditor.svelte
index 8514ac32be..b50387c627 100644
--- a/plugins/view-resources/src/components/NumberEditor.svelte
+++ b/plugins/view-resources/src/components/NumberEditor.svelte
@@ -22,7 +22,7 @@
   // export let label: IntlString
   export let placeholder: IntlString
   export let value: number | undefined
-  export let focus: boolean = false
+  export let autoFocus: boolean = false
   // export let maxWidth: string = '10rem'
   export let onChange: (value: number | undefined) => void
   export let kind: 'no-border' | 'link' | 'button' = 'no-border'
@@ -74,5 +74,5 @@
     <span class="content-dark-color"><Label label={placeholder} /></span>
   {/if}
 {:else}
-  <EditBox {placeholder} bind:value format={'number'} {focus} on:change={_onchange} />
+  <EditBox {placeholder} bind:value format={'number'} {autoFocus} on:change={_onchange} />
 {/if}
diff --git a/plugins/view-resources/src/components/StringEditor.svelte b/plugins/view-resources/src/components/StringEditor.svelte
index 0b07cac9ea..289b307080 100644
--- a/plugins/view-resources/src/components/StringEditor.svelte
+++ b/plugins/view-resources/src/components/StringEditor.svelte
@@ -22,7 +22,7 @@
   // export let label: IntlString
   export let placeholder: IntlString
   export let value: string
-  export let focus: boolean = false
+  export let autoFocus: boolean = false
   export let select: boolean = false
   export let onChange: (value: string) => void = () => {}
   export let kind: ButtonKind | undefined = undefined
@@ -71,5 +71,5 @@
     <span class="content-dark-color"><Label label={placeholder} /></span>
   {/if}
 {:else}
-  <EditBox {placeholder} bind:value {focus} {select} on:change={_onchange} />
+  <EditBox {placeholder} bind:value {autoFocus} {select} on:change={_onchange} />
 {/if}
diff --git a/plugins/view-resources/src/components/filter/FilterSave.svelte b/plugins/view-resources/src/components/filter/FilterSave.svelte
index 9f2134897d..2cbf1569fe 100644
--- a/plugins/view-resources/src/components/filter/FilterSave.svelte
+++ b/plugins/view-resources/src/components/filter/FilterSave.svelte
@@ -57,7 +57,7 @@
         placeholder={view.string.FilteredViewName}
         bind:value={filterName}
         kind={'large-style'}
-        focus
+        autoFocus
         focusIndex={1}
       />
     </div>
diff --git a/plugins/view-resources/src/components/filter/ObjectFilter.svelte b/plugins/view-resources/src/components/filter/ObjectFilter.svelte
index 2ba9d2d1f2..21206e8169 100644
--- a/plugins/view-resources/src/components/filter/ObjectFilter.svelte
+++ b/plugins/view-resources/src/components/filter/ObjectFilter.svelte
@@ -173,7 +173,7 @@
         icon={IconSearch}
         size={'large'}
         width={'100%'}
-        focus={!$deviceOptionsStore.isMobile}
+        autoFocus={!$deviceOptionsStore.isMobile}
         bind:value={search}
         placeholder={presentation.string.Search}
         on:change={() => {
diff --git a/plugins/view-resources/src/components/filter/StringFilter.svelte b/plugins/view-resources/src/components/filter/StringFilter.svelte
index 3943b7f4f4..7c078c2b19 100644
--- a/plugins/view-resources/src/components/filter/StringFilter.svelte
+++ b/plugins/view-resources/src/components/filter/StringFilter.svelte
@@ -54,7 +54,7 @@
       icon={IconSearch}
       size={'large'}
       width={'100%'}
-      focus={!$deviceOptionsStore.isMobile}
+      autoFocus={!$deviceOptionsStore.isMobile}
       bind:value={search}
       placeholder={filter.key.label}
       on:change
diff --git a/plugins/view-resources/src/components/filter/ValueFilter.svelte b/plugins/view-resources/src/components/filter/ValueFilter.svelte
index 28e14d5a22..242baa98ca 100644
--- a/plugins/view-resources/src/components/filter/ValueFilter.svelte
+++ b/plugins/view-resources/src/components/filter/ValueFilter.svelte
@@ -148,7 +148,7 @@
         icon={IconSearch}
         size={'large'}
         width={'100%'}
-        focus={!$deviceOptionsStore.isMobile}
+        autoFocus={!$deviceOptionsStore.isMobile}
         bind:value={search}
         placeholder={presentation.string.Search}
         on:change={() => {
diff --git a/plugins/view-resources/src/components/list/ListHeader.svelte b/plugins/view-resources/src/components/list/ListHeader.svelte
index 680c843261..81b31dc2da 100644
--- a/plugins/view-resources/src/components/list/ListHeader.svelte
+++ b/plugins/view-resources/src/components/list/ListHeader.svelte
@@ -61,8 +61,9 @@
 
   let accentColor: ColorDefinition | undefined = undefined
 
+  $: showColors = (viewOptions as any).shouldShowColors !== false
   $: headerBGColor =
-    level === 0 && (viewOptions as any).shouldShowColors !== false
+    level === 0 && showColors
       ? accentColor?.background ?? defaultBackground($themeStore.dark)
       : defaultBackground($themeStore.dark)
 
@@ -84,6 +85,7 @@
     style:--header-bg-color={headerBGColor}
     class="flex-between categoryHeader row"
     class:flat
+    class:noDivide={showColors}
     class:collapsed
     class:subLevel={level !== 0}
     class:lastCat
@@ -225,6 +227,8 @@
     }
     &::after {
       border: 1px solid var(--theme-list-border-color);
+    }
+    &.noDivide::after {
       border-bottom-color: transparent;
     }
     &::before {
diff --git a/plugins/workbench-resources/src/components/navigator/SpacePanel.svelte b/plugins/workbench-resources/src/components/navigator/SpacePanel.svelte
index 996916ac9e..07eb7fe181 100644
--- a/plugins/workbench-resources/src/components/navigator/SpacePanel.svelte
+++ b/plugins/workbench-resources/src/components/navigator/SpacePanel.svelte
@@ -79,7 +79,7 @@
           icon={clazz.icon}
           bind:value={space.name}
           placeholder={clazz.label}
-          focus
+          autoFocus
           on:change={onNameChange}
         />
         <!-- <AttributeBarEditor maxWidth="39rem" object={space} key="name"/> -->