diff --git a/packages/presentation/src/components/Card.svelte b/packages/presentation/src/components/Card.svelte
index 43ab3f8034..f965e8707a 100644
--- a/packages/presentation/src/components/Card.svelte
+++ b/packages/presentation/src/components/Card.svelte
@@ -64,6 +64,9 @@
   {/if}
   <div class="antiCard-footer reverse">
     <div class="buttons-group text-sm flex-no-shrink">
+      {#if $$slots.buttons}
+        <slot name="buttons" />
+      {/if}
       {#if createMore !== undefined}
         <MiniToggle label={presentation.string.CreateMore} bind:on={createMore} />
       {/if}
diff --git a/plugins/board-resources/src/components/KanbanCard.svelte b/plugins/board-resources/src/components/KanbanCard.svelte
index 7a975694ed..39df2ef77c 100644
--- a/plugins/board-resources/src/components/KanbanCard.svelte
+++ b/plugins/board-resources/src/components/KanbanCard.svelte
@@ -29,7 +29,7 @@
     EditBox,
     getPopupPositionElement,
     Icon,
-    IconEdit,
+    IconMoreV,
     Label,
     numberToHexColor,
     showPopup
@@ -96,7 +96,7 @@
       {/if}
       {#if !isEditMode}
         <div class="absolute mr-1 mt-1" style:top="0" style:right="0">
-          <Button icon={IconEdit} kind="transparent" on:click={enterEditMode} />
+          <Button icon={IconMoreV} kind="transparent" on:click={enterEditMode} />
         </div>
       {/if}
       <div
@@ -129,7 +129,7 @@
     {#if object.cover}
       <div class="relative h-9 border-radius-top-1" style={coverBackground}>
         <div class="absolute mr-1 mt-1" style:top="0" style:right="0">
-          <Button icon={IconEdit} kind="transparent" on:click={enterEditMode} />
+          <Button icon={IconMoreV} kind="transparent" on:click={enterEditMode} />
         </div>
       </div>
     {/if}
@@ -146,7 +146,7 @@
       {/if}
       {#if !isEditMode && !object.cover}
         <div class="absolute mr-1 mt-1" style:top="0" style:right="0">
-          <Button icon={IconEdit} kind="transparent" on:click={enterEditMode} />
+          <Button icon={IconMoreV} kind="transparent" on:click={enterEditMode} />
         </div>
       {/if}
       <div
diff --git a/plugins/board-resources/src/components/popups/AddChecklist.svelte b/plugins/board-resources/src/components/popups/AddChecklist.svelte
index ae9d377dac..5baaf497cf 100644
--- a/plugins/board-resources/src/components/popups/AddChecklist.svelte
+++ b/plugins/board-resources/src/components/popups/AddChecklist.svelte
@@ -5,8 +5,8 @@
   import { WithLookup } from '@anticrm/core'
   import task, { calcRank, TodoItem } from '@anticrm/task'
   import { translate } from '@anticrm/platform'
-  import presentation, { createQuery, getClient } from '@anticrm/presentation'
-  import { Label, Button, Dropdown, EditBox, IconClose } from '@anticrm/ui'
+  import presentation, { Card as Popup, createQuery, getClient } from '@anticrm/presentation'
+  import { Label, Dropdown, EditBox } from '@anticrm/ui'
   import type { ListItem } from '@anticrm/ui'
 
   import board from '../../plugin'
@@ -31,10 +31,6 @@
     noneListItem.label = result
   })
 
-  function close () {
-    dispatch('close')
-  }
-
   async function addChecklist () {
     if (!name || name.trim().length <= 0) {
       return
@@ -110,32 +106,24 @@
   )
 </script>
 
-<div class="antiPopup w-85">
-  <div class="relative flex-row-center w-full ">
-    <div class="flex-center flex-grow fs-title mt-1 mb-1">
-      <Label label={board.string.Checklists} />
-    </div>
-
-    <div class="absolute mr-1 mt-1 mb-1" style:top="0" style:right="0">
-      <Button icon={IconClose} kind="transparent" size="small" on:click={close} />
-    </div>
-  </div>
-  <div class="ap-space bottom-divider" />
-  <div class="flex-col ml-4 mt-4 mr-4 flex-gap-1">
-    <div class="text-md font-medium">
-      <Label label={board.string.Title} />
-    </div>
-
+<Popup
+  label={board.string.Checklists}
+  okAction={addChecklist}
+  okLabel={presentation.string.Add}
+  canSave={(name?.length ?? 0) > 0}
+  on:close={() => {
+    dispatch('close')
+  }}
+>
+  <div class="flex-col flex-gap-1">
+    <Label label={board.string.Title} />
     <div class="p-2 mt-1 mb-1 border-bg-accent border-radius-1">
       <EditBox bind:value={name} maxWidth="100%" focus={true} />
     </div>
   </div>
 
-  <div class="flex-col ml-4 mt-4 mr-4 flex-gap-1">
-    <div class="text-md font-medium">
-      <Label label={board.string.CopyChecklistFrom} />
-    </div>
-
+  <div class="flex-col flex-gap-1">
+    <Label label={board.string.CopyChecklistFrom} />
     <div class="mt-1 mb-1 w-full">
       <Dropdown
         bind:selected={selectedTemplate}
@@ -146,14 +134,4 @@
       />
     </div>
   </div>
-
-  <div class="ap-footer">
-    <Button
-      label={presentation.string.Add}
-      size="small"
-      kind="primary"
-      disabled={(name?.length ?? 0) <= 0}
-      on:click={addChecklist}
-    />
-  </div>
-</div>
+</Popup>
diff --git a/plugins/board-resources/src/components/popups/AttachmentPicker.svelte b/plugins/board-resources/src/components/popups/AttachmentPicker.svelte
deleted file mode 100644
index 3b65890095..0000000000
--- a/plugins/board-resources/src/components/popups/AttachmentPicker.svelte
+++ /dev/null
@@ -1,59 +0,0 @@
-<script lang="ts">
-  import { AddAttachment } from '@anticrm/attachment-resources'
-  import { Card } from '@anticrm/board'
-  import { Button, IconClose, Label } from '@anticrm/ui'
-  import { createEventDispatcher } from 'svelte'
-
-  import board from '../../plugin'
-
-  export let value: Card
-
-  let inputFile: HTMLInputElement
-  let loading: number = 0
-
-  const dispatch = createEventDispatcher()
-  function close () {
-    dispatch('close')
-  }
-  function onAttached () {
-    if (loading === 0) {
-      close()
-    }
-  }
-</script>
-
-<div class="antiPopup w-60 pb-2">
-  <div class="relative flex-row-center w-full">
-    <div class="flex-center flex-grow fs-title mt-1 mb-1">
-      <Label label={board.string.AttachFrom} />
-    </div>
-    <div class="absolute mr-1 mt-1 mb-1" style:top="0" style:right="0">
-      <Button icon={IconClose} kind="transparent" size="small" on:click={close} />
-    </div>
-  </div>
-  <div class="ap-space bottom-divider" />
-  <div class="flex-col mt-2 w-full">
-    <AddAttachment
-      bind:inputFile
-      bind:loading
-      objectClass={value._class}
-      objectId={value._id}
-      space={value.space}
-      on:attached={onAttached}
-    >
-      <svelte:fragment slot="control" let:click>
-        <Button
-          label={board.string.Computer}
-          kind="transparent"
-          width="100%"
-          justify="left"
-          on:click={() => {
-            click()
-          }}
-        />
-      </svelte:fragment>
-    </AddAttachment>
-  </div>
-  <div class="ap-space bottom-divider mt-3" />
-  <div class="mt-1 ml-2 mr-2 text-md"><Label label={board.string.AttachmentTip} /></div>
-</div>
diff --git a/plugins/board-resources/src/components/popups/CardCoverPicker.svelte b/plugins/board-resources/src/components/popups/CardCoverPicker.svelte
index 7e6213badb..cc78ab8dca 100644
--- a/plugins/board-resources/src/components/popups/CardCoverPicker.svelte
+++ b/plugins/board-resources/src/components/popups/CardCoverPicker.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { CardCover, Card } from '@anticrm/board'
-  import { getClient } from '@anticrm/presentation'
-  import { Button, hexColorToNumber, Icon, Label, IconCheck, IconClose } from '@anticrm/ui'
+  import presentation, { Card as Popup, getClient } from '@anticrm/presentation'
+  import { Button, hexColorToNumber, Icon, Label, IconCheck } from '@anticrm/ui'
   import { createEventDispatcher } from 'svelte'
   import board from '../../plugin'
   import { getBoardAvailableColors } from '../../utils/BoardUtils'
@@ -10,7 +10,9 @@
   export let object: Card | undefined
   export let onChange: (e: any) => void | undefined
 
-  $: cover = object ? object.cover : value
+  let cover = object ? object.cover : value
+  let coverColor = cover?.color
+  let coverSize = cover?.size ?? 'small'
 
   const client = getClient()
   const dispatch = createEventDispatcher()
@@ -19,30 +21,32 @@
     return colors.length ? [colors.slice(0, 5), ...chunk(colors.slice(5))] : []
   })(getBoardAvailableColors().map(hexColorToNumber))
 
-  function updateCover (newCover?: Partial<CardCover>) {
-    cover = newCover ? { size: 'small', color: colorGroups[0][0], ...cover, ...newCover } : null
+  function close () {
+    dispatch('close')
+  }
+  function updateCover () {
+    if (!coverColor) {
+      return
+    }
+    const newCover = { color: coverColor, size: coverSize }
+    if (onChange) onChange(newCover)
+    if (object) client.update(object, { cover: newCover })
+  }
+
+  function removeCover () {
+    cover = null
     if (onChange) onChange(cover)
     else if (object) client.update(object, { cover })
   }
 </script>
 
-<div class="antiPopup w-85">
-  <div class="ap-space" />
-  <div class="flex-center flex-grow fs-title mt-1 mb-1">
-    <Label label={board.string.Cover} />
-  </div>
-  <div class="absolute mr-1 mt-1 mb-1" style:top="0" style:right="0">
-    <Button
-      icon={IconClose}
-      kind="transparent"
-      size="small"
-      on:click={() => {
-        dispatch('close')
-      }}
-    />
-  </div>
-  <div class="ap-space bottom-divider" />
-  <div class="flex" />
+<Popup
+  label={board.string.Cover}
+  canSave={cover ? coverColor !== cover.color || coverSize !== cover.size : !!coverColor}
+  okAction={updateCover}
+  okLabel={presentation.string.Save}
+  on:close={close}
+>
   <div class="flex-col ml-4 mt-4 mb-4 mr-4 flex-gap-1">
     <div class="text-md font-medium">
       <Label label={board.string.Size} />
@@ -54,7 +58,7 @@
         width="40%"
         disabled={!cover || cover.size === 'small'}
         on:click={() => {
-          updateCover({ size: 'small' })
+          coverSize = 'small'
         }}
       />
       <Button
@@ -62,16 +66,7 @@
         width="40%"
         disabled={!cover || cover.size === 'large'}
         on:click={() => {
-          updateCover({ size: 'large' })
-        }}
-      />
-    </div>
-    <div class="flex-center">
-      <Button
-        label={board.string.RemoveCover}
-        width="80%"
-        on:click={() => {
-          updateCover()
+          coverSize = 'large'
         }}
       />
     </div>
@@ -89,10 +84,10 @@
                 value={color}
                 size="large"
                 on:click={() => {
-                  updateCover({ color })
+                  coverColor = color
                 }}
               >
-                {#if cover && cover.color === color}
+                {#if coverColor === color}
                   <div class="flex-center flex-grow fs-title h-full">
                     <Icon icon={IconCheck} size="small" />
                   </div>
@@ -104,4 +99,7 @@
       {/each}
     </div>
   </div>
-</div>
+  <svelte:fragment slot="buttons">
+    <Button label={board.string.RemoveCover} kind="transparent" on:click={removeCover} />
+  </svelte:fragment>
+</Popup>
diff --git a/plugins/board-resources/src/components/popups/CopyCard.svelte b/plugins/board-resources/src/components/popups/CopyCard.svelte
index c1e3226c81..98271093a4 100644
--- a/plugins/board-resources/src/components/popups/CopyCard.svelte
+++ b/plugins/board-resources/src/components/popups/CopyCard.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { createEventDispatcher, onMount } from 'svelte'
-  import { Label, Button, Status as StatusControl, TextArea } from '@anticrm/ui'
+  import { Label, Status as StatusControl, TextArea } from '@anticrm/ui'
   import { Class, Client, Doc, Ref } from '@anticrm/core'
   import { getResource, OK, Resource, Status } from '@anticrm/platform'
-  import { getClient } from '@anticrm/presentation'
+  import { Card as Popup, getClient } from '@anticrm/presentation'
   import { Card } from '@anticrm/board'
   import view from '@anticrm/view'
   import board from '../../plugin'
@@ -89,59 +89,51 @@
   onMount(() => inputRef.focus())
 </script>
 
-<div class="antiPopup antiPopup-withHeader antiPopup-withTitle antiPopup-withCategory w-85">
-  <div class="ap-space" />
-  <div class="fs-title ap-header flex-row-center">
-    <Label label={board.string.CopyCard} />
-  </div>
-  <div class="ap-space bottom-divider" />
+<Popup
+  label={board.string.CopyCard}
+  canSave={status === OK}
+  okAction={copyCard}
+  okLabel={board.string.CreateCard}
+  on:close={() => {
+    dispatch('close')
+  }}
+>
   <StatusControl {status} />
   <div class="ap-title">
     <Label label={board.string.Title} />
   </div>
-  <div class="mr-4 ml-4 mt-2">
+  <div class="mt-2">
     <TextArea bind:this={inputRef} bind:value={title} />
   </div>
   <div class="ap-title">
     <Label label={board.string.CopyTo} />
   </div>
-  <div class="ap-category">
-    <div class="categoryItem w-full border-radius-2 p-2 background-button-bg-enabled">
-      <SpaceSelect label={board.string.Board} object={value} bind:selected={selected.space} />
+  <div class="w-full flex ml-2">
+    <div style:flex-basis="10%" class="text-md">
+      <Label label={board.string.Board} />
     </div>
+    <SpaceSelect label={board.string.Board} object={value} bind:selected={selected.space} />
   </div>
-  <div class="ap-category flex-gap-3">
-    <div class="categoryItem w-full border-radius-2 p-2 background-button-bg-enabled">
-      {#key selected.space}
-        <StateSelect label={board.string.List} object={value} space={selected.space} bind:selected={selected.state} />
-      {/key}
+  <div class="w-full flex ml-2">
+    <div style:flex-basis="10%" class="text-md">
+      <Label label={board.string.List} />
     </div>
-    <div class="categoryItem w-full border-radius-2 p-2 background-button-bg-enabled">
-      {#key selected.state}
-        <RankSelect
-          label={board.string.Position}
-          object={value}
-          state={selected.state}
-          bind:selected={selected.rank}
-          isCopying={true}
-        />
-      {/key}
+    {#key selected.space}
+      <StateSelect label={board.string.List} object={value} space={selected.space} bind:selected={selected.state} />
+    {/key}
+  </div>
+  <div class="w-full flex ml-2">
+    <div style:flex-basis="10%" class="text-md">
+      <Label label={board.string.Position} />
     </div>
+    {#key selected.state}
+      <RankSelect
+        label={board.string.Position}
+        object={value}
+        state={selected.state}
+        bind:selected={selected.rank}
+        isCopying={true}
+      />
+    {/key}
   </div>
-  <div class="ap-footer">
-    <Button
-      size={'small'}
-      label={board.string.Cancel}
-      on:click={() => {
-        dispatch('close')
-      }}
-    />
-    <Button
-      label={board.string.CreateCard}
-      size={'small'}
-      disabled={status !== OK}
-      kind={'primary'}
-      on:click={copyCard}
-    />
-  </div>
-</div>
+</Popup>
diff --git a/plugins/board-resources/src/components/popups/MoveCard.svelte b/plugins/board-resources/src/components/popups/MoveCard.svelte
index 24f541cf95..41f682e609 100644
--- a/plugins/board-resources/src/components/popups/MoveCard.svelte
+++ b/plugins/board-resources/src/components/popups/MoveCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte'
-  import { Label, Button, Status as StatusControl } from '@anticrm/ui'
-  import { getClient } from '@anticrm/presentation'
+  import { Label, Status as StatusControl } from '@anticrm/ui'
+  import { Card as Popup, getClient } from '@anticrm/presentation'
   import { Class, Client, Doc, DocumentUpdate, Ref } from '@anticrm/core'
   import { getResource, OK, Resource, Status } from '@anticrm/platform'
   import { Card } from '@anticrm/board'
@@ -58,47 +58,39 @@
   $: validate({ ...value, ...selected }, value._class)
 </script>
 
-<div class="antiPopup antiPopup-withHeader antiPopup-withTitle antiPopup-withCategory w-85">
-  <div class="ap-space" />
-  <div class="fs-title ap-header flex-row-center">
-    <Label label={board.string.MoveCard} />
-  </div>
-  <div class="ap-space bottom-divider" />
+<Popup
+  label={board.string.MoveCard}
+  canSave={status === OK && (value.state !== selected.state || value.rank !== selected.rank)}
+  okAction={move}
+  okLabel={board.string.Move}
+  on:close={() => {
+    dispatch('close')
+  }}
+>
   <StatusControl {status} />
   <div class="ap-title">
     <Label label={board.string.SelectDestination} />
   </div>
-  <div class="ap-category">
-    <div class="categoryItem w-full border-radius-2 p-2 background-button-bg-enabled">
-      <SpaceSelect label={board.string.Board} object={value} bind:selected={selected.space} />
+  <div class="w-full flex ml-2">
+    <div style:flex-basis="10%" class="text-md">
+      <Label label={board.string.Board} />
     </div>
+    <SpaceSelect label={board.string.Board} object={value} bind:selected={selected.space} />
   </div>
-  <div class="ap-category flex-gap-3">
-    <div class="categoryItem w-full border-radius-2 p-2 background-button-bg-enabled">
-      {#key selected.space}
-        <StateSelect label={board.string.List} object={value} space={selected.space} bind:selected={selected.state} />
-      {/key}
+  <div class="w-full flex ml-2">
+    <div style:flex-basis="10%" class="text-md">
+      <Label label={board.string.List} />
     </div>
-    <div class="categoryItem w-full border-radius-2 p-2 background-button-bg-enabled">
-      {#key selected.state}
-        <RankSelect label={board.string.Position} object={value} state={selected.state} bind:selected={selected.rank} />
-      {/key}
+    {#key selected.space}
+      <StateSelect label={board.string.List} object={value} space={selected.space} bind:selected={selected.state} />
+    {/key}
+  </div>
+  <div class="w-full flex ml-2">
+    <div style:flex-basis="10%" class="text-md">
+      <Label label={board.string.Position} />
     </div>
+    {#key selected.state}
+      <RankSelect label={board.string.Position} object={value} state={selected.state} bind:selected={selected.rank} />
+    {/key}
   </div>
-  <div class="ap-footer">
-    <Button
-      size={'small'}
-      label={board.string.Cancel}
-      on:click={() => {
-        dispatch('close')
-      }}
-    />
-    <Button
-      label={board.string.Move}
-      size={'small'}
-      disabled={status !== OK || (value.state === selected.state && value.rank === selected.rank)}
-      kind={'primary'}
-      on:click={move}
-    />
-  </div>
-</div>
+</Popup>