diff --git a/packages/panel/src/components/Panel.svelte b/packages/panel/src/components/Panel.svelte
index 9b85807ef6..a46b10068f 100644
--- a/packages/panel/src/components/Panel.svelte
+++ b/packages/panel/src/components/Panel.svelte
@@ -28,13 +28,14 @@
   export let object: Doc
   export let panelWidth: number = 0
   export let innerWidth: number = 0
+  export let isTitle: boolean = true
   export let isHeader: boolean = true
   export let isSub: boolean = true
   export let isAside: boolean = true
   export let isCustomAttr: boolean = true
 </script>
 
-<Panel bind:isAside isHeader={$$slots.header || isHeader} bind:panelWidth bind:innerWidth on:close>
+<Panel bind:isAside {isTitle} isHeader={$$slots.header || isHeader} bind:panelWidth bind:innerWidth on:close>
   <svelte:fragment slot="title">
     <div class="popupPanel-title__content-container antiTitle">
       {#if $$slots.navigator}
@@ -97,7 +98,9 @@
   </svelte:fragment>
 
   {#if withoutActivity}
-    <slot />
+    <div class="popupPanel-body__main-content py-10 clear-mins">
+      <slot />
+    </div>
   {:else}
     <Scroller>
       <div class="popupPanel-body__main-content py-10 clear-mins">
diff --git a/packages/ui/src/components/Panel.svelte b/packages/ui/src/components/Panel.svelte
index 3388034c32..41cab5cfcb 100644
--- a/packages/ui/src/components/Panel.svelte
+++ b/packages/ui/src/components/Panel.svelte
@@ -18,6 +18,7 @@
 
   export let innerWidth: number = 0
   export let panelWidth: number = 0
+  export let isTitle: boolean = true
   export let isHeader: boolean = true
   export let isAside: boolean = true
 
@@ -33,32 +34,34 @@
 </script>
 
 <div class="popupPanel" bind:clientWidth={panelWidth}>
-  <div class="popupPanel-title">
-    <Button
-      icon={IconClose}
-      kind={'transparent'}
-      size={'medium'}
-      on:click={() => {
-        dispatch('close')
-      }}
-    />
-    <div class="popupPanel-title__content"><slot name="title" /></div>
-    <div class="buttons-group xsmall-gap">
-      <slot name="utils" />
-      {#if asideFloat && $$slots.aside && isAside}
-        {#if $$slots.utils}<div class="buttons-divider" />{/if}
-        <Button
-          icon={IconDetails}
-          kind={'transparent'}
-          size={'medium'}
-          selected={asideShown}
-          on:click={() => {
-            asideShown = !asideShown
-          }}
-        />
-      {/if}
+  {#if isTitle}
+    <div class="popupPanel-title">
+      <Button
+        icon={IconClose}
+        kind={'transparent'}
+        size={'medium'}
+        on:click={() => {
+          dispatch('close')
+        }}
+      />
+      <div class="popupPanel-title__content"><slot name="title" /></div>
+      <div class="buttons-group xsmall-gap">
+        <slot name="utils" />
+        {#if asideFloat && $$slots.aside && isAside}
+          {#if $$slots.utils}<div class="buttons-divider" />{/if}
+          <Button
+            icon={IconDetails}
+            kind={'transparent'}
+            size={'medium'}
+            selected={asideShown}
+            on:click={() => {
+              asideShown = !asideShown
+            }}
+          />
+        {/if}
+      </div>
     </div>
-  </div>
+  {/if}
   <div class="popupPanel-body" class:asideShown>
     <div class="popupPanel-body__main" bind:clientWidth={innerWidth}>
       {#if $$slots.header && isHeader}
diff --git a/plugins/tracker-assets/lang/en.json b/plugins/tracker-assets/lang/en.json
index 972eb0e4dc..5885a67438 100644
--- a/plugins/tracker-assets/lang/en.json
+++ b/plugins/tracker-assets/lang/en.json
@@ -96,6 +96,7 @@
     "PastMonth": "Past month",
     "CopyIssueUrl": "Copy Issue URL to clipboard",
     "CopyIssueId": "Copy Issue ID to clipboard",
+    "CopyIssueBranch": "Copy Git branch name to clipboard",
 
     "GotoIssues": "Go to issues",
     "GotoActive": "Go to active issues",
@@ -109,7 +110,9 @@
     "FilterIs": "is",
     "FilterIsNot": "is not",
     "FilterIsEither": "is either of",
-    "FilterStatesCount": "{value, plural, =1 {1 state} other {# states}}"
+    "FilterStatesCount": "{value, plural, =1 {1 state} other {# states}}",
+
+    "EditIssue": "Edit {title}"
   },
   "status": {}
 }
\ No newline at end of file
diff --git a/plugins/tracker-assets/lang/ru.json b/plugins/tracker-assets/lang/ru.json
index a8d9273d25..72f507d607 100644
--- a/plugins/tracker-assets/lang/ru.json
+++ b/plugins/tracker-assets/lang/ru.json
@@ -73,7 +73,9 @@
     "GotoBacklog": "Перейти к пулу задач",
     "GotoBoard": "Перейти к канбану",
     "GotoProjects": "Перейти к проекту",
-    "GotoTrackerApplication": "Перейти к приложению Трекер"
+    "GotoTrackerApplication": "Перейти к приложению Трекер",
+
+    "EditIssue": "Редактирование {title}"
   },
   "status": {}
 }
diff --git a/plugins/tracker-resources/package.json b/plugins/tracker-resources/package.json
index 02281014ed..7d5e64a932 100644
--- a/plugins/tracker-resources/package.json
+++ b/plugins/tracker-resources/package.json
@@ -49,6 +49,7 @@
     "@anticrm/view-resources": "~0.6.0",
     "@anticrm/text-editor": "~0.6.0",
     "@anticrm/panel": "~0.6.0",
-    "@anticrm/kanban": "~0.6.0"
+    "@anticrm/kanban": "~0.6.0",
+    "@anticrm/attachment-resources": "~0.6.0"
   }
 }
diff --git a/plugins/tracker-resources/src/components/issues/EditIssue.svelte b/plugins/tracker-resources/src/components/issues/EditIssue.svelte
deleted file mode 100644
index b7920de460..0000000000
--- a/plugins/tracker-resources/src/components/issues/EditIssue.svelte
+++ /dev/null
@@ -1,275 +0,0 @@
-<!--
-// Copyright © 2022 Hardcore Engineering Inc.
-// 
-// Licensed under the Eclipse Public License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License. You may
-// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// 
-// See the License for the specific language governing permissions and
-// limitations under the License.
--->
-<script lang="ts">
-  import contact from '@anticrm/contact'
-  import { Class, Ref, SortingOrder, WithLookup } from '@anticrm/core'
-  // import Card from '../Card.svelte'
-  import { Panel } from '@anticrm/panel'
-  import { createQuery, getClient, UserBox } from '@anticrm/presentation'
-  import { StyledTextBox } from '@anticrm/text-editor'
-  import type { Issue, IssueStatus, Team } from '@anticrm/tracker'
-  import {
-    Button,
-    DatePresenter,
-    EditBox,
-    IconDownOutline,
-    IconEdit,
-    IconMoreH,
-    IconUpOutline,
-    Label
-  } from '@anticrm/ui'
-  import { createEventDispatcher, onMount } from 'svelte'
-  import tracker from '../../plugin'
-  import IssuePresenter from './IssuePresenter.svelte'
-  import PriorityEditor from './PriorityEditor.svelte'
-  import StatusEditor from './StatusEditor.svelte'
-
-  export let _id: Ref<Issue>
-  export let _class: Ref<Class<Issue>>
-
-  const query = createQuery()
-  const statusesQuery = createQuery()
-  const dispatch = createEventDispatcher()
-  const client = getClient()
-
-  let issue: Issue | undefined
-  let currentTeam: Team | undefined
-  let issueStatuses: WithLookup<IssueStatus>[] | undefined
-  let innerWidth: number
-
-  $: _id &&
-    _class &&
-    query.query(_class, { _id }, async (result) => {
-      issue = result[0]
-    })
-
-  $: if (issue !== undefined) {
-    client.findOne(tracker.class.Team, { _id: issue.space }).then((r) => {
-      currentTeam = r
-    })
-  }
-
-  $: currentTeam &&
-    statusesQuery.query(
-      tracker.class.IssueStatus,
-      { attachedTo: currentTeam._id },
-      (statuses) => {
-        issueStatuses = statuses
-      },
-      {
-        lookup: { category: tracker.class.IssueStatusCategory },
-        sort: { rank: SortingOrder.Ascending }
-      }
-    )
-
-  $: issueLabel = currentTeam && issue && `${currentTeam.identifier}-${issue.number}`
-
-  function change (field: string, value: any) {
-    if (issue !== undefined) {
-      client.update(issue, { [field]: value })
-    }
-  }
-
-  function copy (text: string): void {
-    navigator.clipboard.writeText(text)
-  }
-
-  onMount(() => {
-    dispatch('open', { ignoreKeys: ['comments', 'name', 'description', 'number'] })
-  })
-</script>
-
-{#if issue !== undefined}
-  <Panel
-    object={issue}
-    isHeader
-    isAside={true}
-    isSub={false}
-    bind:innerWidth
-    on:close={() => {
-      dispatch('close')
-    }}
-  >
-    <svelte:fragment slot="custom-title">Custom Title</svelte:fragment>
-    <svelte:fragment slot="subtitle">
-      <div class="flex-between flex-grow">
-        {#if currentTeam}
-          <IssuePresenter value={issue} {currentTeam} />
-        {/if}
-        <div class="buttons-group xsmall-gap">
-          <Button icon={IconEdit} kind={'transparent'} size={'medium'} />
-          {#if innerWidth < 900}
-            <Button icon={IconMoreH} kind={'transparent'} size={'medium'} />
-          {/if}
-        </div>
-      </div>
-    </svelte:fragment>
-    <svelte:fragment slot="navigator">
-      <Button icon={IconDownOutline} kind={'secondary'} size={'medium'} />
-      <Button icon={IconUpOutline} kind={'secondary'} size={'medium'} />
-    </svelte:fragment>
-    <svelte:fragment slot="header">
-      <span class="fs-title">{issueLabel}</span>
-    </svelte:fragment>
-    <svelte:fragment slot="tools">
-      <Button icon={IconEdit} kind={'transparent'} size={'medium'} />
-      <Button icon={IconMoreH} kind={'transparent'} size={'medium'} />
-    </svelte:fragment>
-
-    <div class="mt-6">
-      <EditBox
-        label={tracker.string.Title}
-        bind:value={issue.title}
-        placeholder={tracker.string.IssueTitlePlaceholder}
-        maxWidth={'16rem'}
-        focus
-        on:change={() => change('title', issue?.title)}
-      />
-    </div>
-    <div class="mt-6 mb-6">
-      <StyledTextBox
-        alwaysEdit
-        bind:content={issue.description}
-        placeholder={tracker.string.IssueDescriptionPlaceholder}
-        on:value={(evt) => evt.detail !== issue?.description && change('description', evt.detail)}
-      />
-    </div>
-
-    <span slot="actions-label">{issueLabel}</span>
-    <svelte:fragment slot="actions">
-      <Button
-        icon={tracker.icon.Issue}
-        title={tracker.string.CopyIssueUrl}
-        width="min-content"
-        size="small"
-        kind="transparent"
-        on:click={() => copy(window.location.href)}
-      />
-      <Button
-        icon={tracker.icon.Views}
-        title={tracker.string.CopyIssueId}
-        width="min-content"
-        size="small"
-        kind="transparent"
-        on:click={() => issueLabel && copy(issueLabel)}
-      />
-    </svelte:fragment>
-
-    <svelte:fragment slot="custom-attributes" let:direction>
-      {#if issue && currentTeam && issueStatuses && direction === 'column'}
-        <div class="content">
-          <span class="label">
-            <Label label={tracker.string.Status} />
-          </span>
-          <StatusEditor value={issue} statuses={issueStatuses} currentSpace={currentTeam._id} shouldShowLabel />
-
-          <span class="label">
-            <Label label={tracker.string.Priority} />
-          </span>
-          <PriorityEditor value={issue} currentSpace={currentTeam._id} shouldShowLabel />
-
-          <span class="label">
-            <Label label={tracker.string.Assignee} />
-          </span>
-          <UserBox
-            _class={contact.class.Employee}
-            label={tracker.string.Assignee}
-            placeholder={tracker.string.Assignee}
-            bind:value={issue.assignee}
-            allowDeselect
-            titleDeselect={tracker.string.Unassigned}
-            size={'large'}
-            kind={'link'}
-            width={'100%'}
-            justify={'left'}
-            on:change={() => change('assignee', issue?.assignee)}
-          />
-
-          <span class="label">
-            <Label label={tracker.string.Labels} />
-          </span>
-          <Button
-            label={tracker.string.Labels}
-            icon={tracker.icon.Labels}
-            size={'large'}
-            kind={'link'}
-            width={'100%'}
-            justify={'left'}
-          />
-
-          <div class="divider" />
-
-          <span class="label">
-            <Label label={tracker.string.Project} />
-          </span>
-          <Button
-            label={tracker.string.Project}
-            icon={tracker.icon.Projects}
-            size={'large'}
-            kind={'link'}
-            width={'100%'}
-            justify={'left'}
-          />
-
-          {#if issue.dueDate !== null}
-            <div class="divider" />
-
-            <span class="label">
-              <Label label={tracker.string.DueDate} />
-            </span>
-            <DatePresenter bind:value={issue.dueDate} editable on:change={({ detail }) => change('dueDate', detail)} />
-          {/if}
-        </div>
-      {:else}
-        <div class="buttons-group small-gap">
-          <Button
-            label={tracker.string.Labels}
-            icon={tracker.icon.Labels}
-            width="min-content"
-            size="small"
-            kind="no-border"
-          />
-          <Button
-            label={tracker.string.Project}
-            icon={tracker.icon.Projects}
-            width="min-content"
-            size="small"
-            kind="no-border"
-          />
-        </div>
-      {/if}
-    </svelte:fragment>
-  </Panel>
-{/if}
-
-<style lang="scss">
-  .content {
-    display: grid;
-    grid-template-columns: 1fr 1.5fr;
-    grid-auto-flow: row;
-    justify-content: start;
-    align-items: center;
-    gap: 1rem;
-    margin-top: 1rem;
-    width: 100%;
-    height: min-content;
-  }
-
-  .divider {
-    grid-column: 1 / 3;
-    height: 1px;
-    background-color: var(--divider-color);
-  }
-</style>
diff --git a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte
index 1d1f8da544..b441851924 100644
--- a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte
@@ -27,13 +27,13 @@
 
   $: issueName = `${currentTeam.identifier}-${value.number}`
 
-  const handleIssueEditorOpened = () => {
-    showPanel(tracker.component.EditIssue, value._id, value._class, 'content')
+  const handleIssuePreviewOpened = () => {
+    showPanel(tracker.component.PreviewIssue, value._id, value._class, 'content')
   }
 </script>
 
 {#if value && shortLabel}
-  <div class="flex-presenter issuePresenterRoot" class:inline-presenter={inline} on:click={handleIssueEditorOpened}>
+  <div class="flex-presenter issuePresenterRoot" class:inline-presenter={inline} on:click={handleIssuePreviewOpened}>
     <div class="icon">
       <Icon icon={tracker.icon.Issue} size={'small'} />
     </div>
diff --git a/plugins/tracker-resources/src/components/issues/PriorityEditor.svelte b/plugins/tracker-resources/src/components/issues/PriorityEditor.svelte
index 19adf94ae3..6a1c3e979a 100644
--- a/plugins/tracker-resources/src/components/issues/PriorityEditor.svelte
+++ b/plugins/tracker-resources/src/components/issues/PriorityEditor.svelte
@@ -20,11 +20,13 @@
   import type { ButtonKind, ButtonSize } from '@anticrm/ui'
   import tracker from '../../plugin'
   import PrioritySelector from '../PrioritySelector.svelte'
+  import { createEventDispatcher } from 'svelte'
 
   export let value: Issue
   export let currentSpace: Ref<Team> | undefined = undefined
   export let isEditable: boolean = true
   export let shouldShowLabel: boolean = false
+  export let shouldSaveOnChange = true
 
   export let kind: ButtonKind = 'link'
   export let size: ButtonSize = 'large'
@@ -32,9 +34,14 @@
   export let width: string | undefined = '100%'
 
   const client = getClient()
+  const dispatch = createEventDispatcher()
 
   const handlePriorityChanged = async (newPriority: IssuePriority | undefined) => {
-    if (!isEditable || newPriority === undefined) {
+    if (isEditable) {
+      dispatch('change', newPriority)
+    }
+
+    if (!shouldSaveOnChange || !isEditable || newPriority === undefined) {
       return
     }
 
diff --git a/plugins/tracker-resources/src/components/issues/StatusEditor.svelte b/plugins/tracker-resources/src/components/issues/StatusEditor.svelte
index bff4410fc3..d0e4b2fce9 100644
--- a/plugins/tracker-resources/src/components/issues/StatusEditor.svelte
+++ b/plugins/tracker-resources/src/components/issues/StatusEditor.svelte
@@ -20,12 +20,14 @@
   import type { ButtonKind, ButtonSize } from '@anticrm/ui'
   import tracker from '../../plugin'
   import StatusSelector from '../StatusSelector.svelte'
+  import { createEventDispatcher } from 'svelte'
 
   export let value: Issue
   export let statuses: WithLookup<IssueStatus>[]
   export let currentSpace: Ref<Team> | undefined = undefined
   export let isEditable: boolean = true
   export let shouldShowLabel: boolean = false
+  export let shouldSaveOnChange = true
 
   export let kind: ButtonKind = 'link'
   export let size: ButtonSize = 'large'
@@ -33,9 +35,14 @@
   export let width: string | undefined = '100%'
 
   const client = getClient()
+  const dispatch = createEventDispatcher()
 
   const handleStatusChanged = async (newStatus: Ref<IssueStatus> | undefined) => {
-    if (!isEditable || newStatus === undefined) {
+    if (isEditable) {
+      dispatch('change', newStatus)
+    }
+
+    if (!isEditable || !shouldSaveOnChange || newStatus === undefined) {
       return
     }
 
diff --git a/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte b/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
new file mode 100644
index 0000000000..569e78c96c
--- /dev/null
+++ b/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
@@ -0,0 +1,153 @@
+<!--
+// Copyright © 2022 Hardcore Engineering Inc.
+// 
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+<script lang="ts">
+  import { createEventDispatcher } from 'svelte'
+  import { Ref, WithLookup } from '@anticrm/core'
+  import { UserBox } from '@anticrm/presentation'
+  import contact from '@anticrm/contact'
+  import type { Issue, IssueStatus, Team } from '@anticrm/tracker'
+  import { Button, Label } from '@anticrm/ui'
+  import tracker from '../../../plugin'
+  import PriorityEditor from '../PriorityEditor.svelte'
+  import StatusEditor from '../StatusEditor.svelte'
+  import DatePresenter from '@anticrm/ui/src/components/calendar/DatePresenter.svelte'
+
+  export let teamId: Ref<Team>
+  export let issue: Issue
+  export let issueStatuses: WithLookup<IssueStatus>[]
+  export let direction: string
+
+  const dispatch = createEventDispatcher()
+
+  function change<K extends keyof Issue> (field: K, value: Issue[K]) {
+    dispatch('issueChange', { field, value })
+  }
+</script>
+
+{#if direction === 'column'}
+  <div class="content">
+    <span class="label">
+      <Label label={tracker.string.Status} />
+    </span>
+    <StatusEditor
+      value={issue}
+      statuses={issueStatuses}
+      currentSpace={teamId}
+      shouldSaveOnChange={false}
+      shouldShowLabel
+      on:change={({ detail }) => detail && change('status', detail)}
+    />
+
+    <span class="label">
+      <Label label={tracker.string.Priority} />
+    </span>
+    <PriorityEditor
+      value={issue}
+      currentSpace={teamId}
+      shouldSaveOnChange={false}
+      shouldShowLabel
+      on:change={({ detail }) => detail !== undefined && change('priority', detail)}
+    />
+
+    <span class="label">
+      <Label label={tracker.string.Assignee} />
+    </span>
+    <UserBox
+      _class={contact.class.Employee}
+      label={tracker.string.Assignee}
+      placeholder={tracker.string.Assignee}
+      value={issue.assignee}
+      allowDeselect
+      titleDeselect={tracker.string.Unassigned}
+      size={'large'}
+      kind={'link'}
+      width={'100%'}
+      justify={'left'}
+      on:change={({ detail }) => change('assignee', detail)}
+    />
+
+    <span class="label">
+      <Label label={tracker.string.Labels} />
+    </span>
+    <Button
+      label={tracker.string.Labels}
+      icon={tracker.icon.Labels}
+      size={'large'}
+      kind={'link'}
+      width={'100%'}
+      justify={'left'}
+    />
+
+    <div class="divider" />
+
+    <span class="label">
+      <Label label={tracker.string.Project} />
+    </span>
+    <Button
+      label={tracker.string.Project}
+      icon={tracker.icon.Projects}
+      size={'large'}
+      kind={'link'}
+      width={'100%'}
+      justify={'left'}
+    />
+
+    {#if issue.dueDate !== null}
+      <div class="divider" />
+
+      <span class="label">
+        <Label label={tracker.string.DueDate} />
+      </span>
+      <DatePresenter bind:value={issue.dueDate} editable on:change={({ detail }) => change('dueDate', detail)} />
+    {/if}
+  </div>
+{:else}
+  <div class="buttons-group small-gap">
+    <Button
+      label={tracker.string.Labels}
+      icon={tracker.icon.Labels}
+      width="min-content"
+      size="small"
+      kind="no-border"
+    />
+    <Button
+      label={tracker.string.Project}
+      icon={tracker.icon.Projects}
+      width="min-content"
+      size="small"
+      kind="no-border"
+    />
+  </div>
+{/if}
+
+<style lang="scss">
+  .content {
+    display: grid;
+    grid-template-columns: 1fr 1.5fr;
+    grid-auto-flow: row;
+    justify-content: start;
+    align-items: center;
+    gap: 1rem;
+    margin-top: 1rem;
+    width: 100%;
+    height: min-content;
+  }
+
+  .divider {
+    grid-column: 1 / 3;
+    height: 1px;
+    background-color: var(--divider-color);
+  }
+</style>
diff --git a/plugins/tracker-resources/src/components/issues/edit/CopyToClipboard.svelte b/plugins/tracker-resources/src/components/issues/edit/CopyToClipboard.svelte
new file mode 100644
index 0000000000..924771de66
--- /dev/null
+++ b/plugins/tracker-resources/src/components/issues/edit/CopyToClipboard.svelte
@@ -0,0 +1,61 @@
+<!--
+// Copyright © 2022 Hardcore Engineering Inc.
+// 
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+<script lang="ts">
+  import { Button } from '@anticrm/ui'
+  import tracker from '../../../plugin'
+
+  export let issueUrl: string | undefined = undefined
+  export let issueId: string | undefined = undefined
+  export let issueBranch: string | undefined = undefined
+
+  function copy (text?: string): void {
+    if (text) {
+      navigator.clipboard.writeText(text)
+    }
+  }
+</script>
+
+{#if issueUrl}
+  <Button
+    icon={tracker.icon.Issue}
+    title={tracker.string.CopyIssueUrl}
+    width="min-content"
+    size="small"
+    kind="transparent"
+    on:click={() => copy(issueUrl)}
+  />
+{/if}
+
+{#if issueId}
+  <Button
+    icon={tracker.icon.Views}
+    title={tracker.string.CopyIssueId}
+    width="min-content"
+    size="small"
+    kind="transparent"
+    on:click={() => copy(issueId)}
+  />
+{/if}
+
+{#if issueBranch}
+  <Button
+    icon={tracker.icon.TrackerApplication}
+    title={tracker.string.CopyIssueBranch}
+    width="min-content"
+    size="small"
+    kind="transparent"
+    on:click={() => issueBranch}
+  />
+{/if}
diff --git a/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte b/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
new file mode 100644
index 0000000000..95c0431b45
--- /dev/null
+++ b/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
@@ -0,0 +1,163 @@
+<!--
+// Copyright © 2022 Hardcore Engineering Inc.
+// 
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+<script lang="ts">
+  import { Class, Data, Ref, SortingOrder, WithLookup } from '@anticrm/core'
+  import presentation, { createQuery, getClient } from '@anticrm/presentation'
+  import { Panel } from '@anticrm/panel'
+  import { StyledTextBox } from '@anticrm/text-editor'
+  import type { Issue, IssueStatus, Team } from '@anticrm/tracker'
+  import { Button, EditBox, Label, showPanel } from '@anticrm/ui'
+  import { createEventDispatcher, onMount } from 'svelte'
+  import tracker from '../../../plugin'
+  import ControlPanel from './ControlPanel.svelte'
+  import CopyToClipboard from './CopyToClipboard.svelte'
+
+  export let _id: Ref<Issue>
+  export let _class: Ref<Class<Issue>>
+
+  const query = createQuery()
+  const statusesQuery = createQuery()
+  const dispatch = createEventDispatcher()
+  const client = getClient()
+
+  let issue: Issue | undefined
+  let currentTeam: Team | undefined
+  let issueStatuses: WithLookup<IssueStatus>[] | undefined
+  let innerWidth: number
+  let issueUpdates: Partial<Data<Issue>> = {}
+
+  $: _id &&
+    _class &&
+    query.query(_class, { _id }, async (result) => {
+      issue = result[0]
+    })
+
+  $: if (issue) {
+    client.findOne(tracker.class.Team, { _id: issue.space }).then((r) => {
+      currentTeam = r
+    })
+  }
+
+  $: currentTeam &&
+    statusesQuery.query(
+      tracker.class.IssueStatus,
+      { attachedTo: currentTeam._id },
+      (statuses) => {
+        issueStatuses = statuses
+      },
+      {
+        lookup: { category: tracker.class.IssueStatusCategory },
+        sort: { rank: SortingOrder.Ascending }
+      }
+    )
+
+  $: issueTitle = currentTeam && issue && `${currentTeam.identifier}-${issue.number}`
+  $: updatedIssue = issue && { ...issue, ...issueUpdates }
+  $: canSave = updatedIssue && updatedIssue.title.trim().length > 0
+
+  function updateTitle (event: Event) {
+    update('title', (event.target as HTMLInputElement).value)
+  }
+
+  function update<K extends keyof Data<Issue>> (field: K, value: Issue[K]) {
+    issueUpdates = { ...issueUpdates, [field]: value }
+  }
+
+  function cancel () {
+    if (issue) {
+      showPanel(tracker.component.PreviewIssue, issue._id, issue._class, 'content')
+    }
+  }
+
+  async function save () {
+    if (issue && canSave) {
+      for (const [key, value] of Object.entries(issueUpdates)) {
+        if (issue[key as keyof Issue] === value) {
+          delete issueUpdates[key as keyof Data<Issue>]
+        } else if (key === 'title') {
+          issueUpdates[key] = issueUpdates[key]?.trim()
+        }
+      }
+
+      if (Object.keys(issueUpdates).length > 0) {
+        await client.update(issue, issueUpdates)
+      }
+
+      showPanel(tracker.component.PreviewIssue, issue._id, issue._class, 'content')
+    }
+  }
+
+  onMount(() => {
+    dispatch('open', { ignoreKeys: ['comments', 'name', 'description', 'number'] })
+  })
+</script>
+
+{#if updatedIssue}
+  <Panel
+    object={updatedIssue}
+    isHeader
+    withoutActivity
+    isTitle={false}
+    isAside={true}
+    isSub={false}
+    bind:innerWidth
+    on:close={() => {
+      dispatch('close')
+    }}
+  >
+    <svelte:fragment slot="header">
+      <Label label={tracker.string.EditIssue} params={{ title: issueTitle }} />
+    </svelte:fragment>
+    <svelte:fragment slot="tools">
+      <Button kind="transparent" label={presentation.string.Cancel} on:click={cancel} />
+      <Button disabled={!canSave} label={presentation.string.Save} on:click={save} />
+    </svelte:fragment>
+
+    <div class="mt-6">
+      <EditBox
+        value={updatedIssue.title}
+        placeholder={tracker.string.IssueTitlePlaceholder}
+        kind="large-style"
+        focus
+        on:change={updateTitle}
+      />
+    </div>
+    <div class="mt-6 mb-6">
+      <StyledTextBox
+        alwaysEdit
+        bind:content={updatedIssue.description}
+        placeholder={tracker.string.IssueDescriptionPlaceholder}
+        on:value={({ detail }) => update('description', detail)}
+      />
+    </div>
+
+    <span slot="actions-label">{issueTitle}</span>
+    <svelte:fragment slot="actions">
+      <CopyToClipboard issueUrl={window.location.href} issueId={issueTitle} />
+    </svelte:fragment>
+
+    <svelte:fragment slot="custom-attributes" let:direction>
+      {#if currentTeam && issueStatuses}
+        <ControlPanel
+          {issueStatuses}
+          {direction}
+          issue={updatedIssue}
+          teamId={currentTeam._id}
+          on:issueChange={({ detail }) => update(detail.field, detail.value)}
+        />
+      {/if}
+    </svelte:fragment>
+  </Panel>
+{/if}
diff --git a/plugins/tracker-resources/src/components/issues/edit/PreviewIssue.svelte b/plugins/tracker-resources/src/components/issues/edit/PreviewIssue.svelte
new file mode 100644
index 0000000000..f0ddaa4ee1
--- /dev/null
+++ b/plugins/tracker-resources/src/components/issues/edit/PreviewIssue.svelte
@@ -0,0 +1,162 @@
+<!--
+// Copyright © 2022 Hardcore Engineering Inc.
+// 
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+<script lang="ts">
+  import { Class, Ref, SortingOrder, WithLookup } from '@anticrm/core'
+  import { AttachmentDocList } from '@anticrm/attachment-resources'
+  import { Panel } from '@anticrm/panel'
+  import { createQuery, getClient, MessageViewer } from '@anticrm/presentation'
+  import type { Issue, IssueStatus, Team } from '@anticrm/tracker'
+  import { Button, IconDownOutline, IconEdit, IconMoreH, IconUpOutline, Label, showPanel } from '@anticrm/ui'
+  import { createEventDispatcher, onMount } from 'svelte'
+  import tracker from '../../../plugin'
+  import ControlPanel from './ControlPanel.svelte'
+  import CopyToClipboard from './CopyToClipboard.svelte'
+
+  export let _id: Ref<Issue>
+  export let _class: Ref<Class<Issue>>
+
+  const query = createQuery()
+  const statusesQuery = createQuery()
+  const dispatch = createEventDispatcher()
+  const client = getClient()
+
+  let issue: Issue | undefined
+  let currentTeam: Team | undefined
+  let issueStatuses: WithLookup<IssueStatus>[] | undefined
+  let innerWidth: number
+
+  $: _id &&
+    _class &&
+    query.query(_class, { _id }, async (result) => {
+      issue = result[0]
+    })
+
+  $: if (issue !== undefined) {
+    client.findOne(tracker.class.Team, { _id: issue.space }).then((r) => {
+      currentTeam = r
+    })
+  }
+
+  $: currentTeam &&
+    statusesQuery.query(
+      tracker.class.IssueStatus,
+      { attachedTo: currentTeam._id },
+      (statuses) => {
+        issueStatuses = statuses
+      },
+      {
+        lookup: { category: tracker.class.IssueStatusCategory },
+        sort: { rank: SortingOrder.Ascending }
+      }
+    )
+
+  $: issueTitle = currentTeam && issue && `${currentTeam.identifier}-${issue.number}`
+
+  function change (field: string, value: any) {
+    if (issue !== undefined) {
+      client.update(issue, { [field]: value })
+    }
+  }
+
+  function handleIssueEditorOpened () {
+    if (issue !== undefined) {
+      showPanel(tracker.component.EditIssue, issue._id, issue._class, 'content')
+    }
+  }
+
+  onMount(() => {
+    dispatch('open', { ignoreKeys: ['comments', 'name', 'description', 'number'] })
+  })
+</script>
+
+{#if issue !== undefined}
+  <Panel
+    object={issue}
+    isHeader
+    isAside={true}
+    isSub={false}
+    bind:innerWidth
+    on:close={() => {
+      dispatch('close')
+    }}
+  >
+    <svelte:fragment slot="subtitle">
+      <div class="flex-between flex-grow">
+        <div class="buttons-group xsmall-gap">
+          <Button icon={IconEdit} kind={'transparent'} size="medium" on:click={handleIssueEditorOpened} />
+          {#if innerWidth < 900}
+            <Button icon={IconMoreH} kind={'transparent'} size="medium" />
+          {/if}
+        </div>
+      </div>
+    </svelte:fragment>
+    <svelte:fragment slot="navigator">
+      <Button icon={IconDownOutline} kind="secondary" size="medium" />
+      <Button icon={IconUpOutline} kind="secondary" size="medium" />
+    </svelte:fragment>
+    <svelte:fragment slot="header">
+      <span class="fs-title">
+        {#if issueTitle !== undefined}
+          {issueTitle}
+        {/if}
+      </span>
+    </svelte:fragment>
+    <svelte:fragment slot="tools">
+      <Button icon={IconEdit} kind="transparent" size="medium" on:click={handleIssueEditorOpened} />
+      <Button icon={IconMoreH} kind="transparent" size="medium" />
+    </svelte:fragment>
+
+    <span class="mt-6 title">{issue.title}</span>
+    <div class="mt-6 mb-6">
+      {#if issue.description}
+        <MessageViewer message={issue.description} />
+      {:else}
+        <div on:click={handleIssueEditorOpened}>
+          <Label label={tracker.string.IssueDescriptionPlaceholder} />
+        </div>
+      {/if}
+      <AttachmentDocList value={issue} />
+    </div>
+
+    <span slot="actions-label">
+      {#if issueTitle !== undefined}
+        {issueTitle}
+      {/if}
+    </span>
+    <svelte:fragment slot="actions">
+      <CopyToClipboard issueUrl={window.location.href} issueId={issueTitle} />
+    </svelte:fragment>
+
+    <svelte:fragment slot="custom-attributes" let:direction>
+      {#if issue && currentTeam && issueStatuses}
+        <ControlPanel
+          {issue}
+          {issueStatuses}
+          {direction}
+          teamId={currentTeam._id}
+          on:issueChange={({ detail }) => change(detail.field, detail.value)}
+        />
+      {/if}
+    </svelte:fragment>
+  </Panel>
+{/if}
+
+<style lang="scss">
+  .title {
+    font-weight: 500;
+    font-size: 1.25rem;
+    color: var(--theme-caption-color);
+  }
+</style>
diff --git a/plugins/tracker-resources/src/index.ts b/plugins/tracker-resources/src/index.ts
index b547a40cbb..0c8fb04653 100644
--- a/plugins/tracker-resources/src/index.ts
+++ b/plugins/tracker-resources/src/index.ts
@@ -37,7 +37,8 @@ import AssigneePresenter from './components/issues/AssigneePresenter.svelte'
 import ViewOptionsPopup from './components/issues/ViewOptionsPopup.svelte'
 
 import ModificationDatePresenter from './components/issues/ModificationDatePresenter.svelte'
-import EditIssue from './components/issues/EditIssue.svelte'
+import PreviewIssue from './components/issues/edit/PreviewIssue.svelte'
+import EditIssue from './components/issues/edit/EditIssue.svelte'
 import NewIssueHeader from './components/NewIssueHeader.svelte'
 
 export default async (): Promise<Resources> => ({
@@ -61,6 +62,7 @@ export default async (): Promise<Resources> => ({
     StatusEditor,
     AssigneePresenter,
     DueDatePresenter,
+    PreviewIssue,
     EditIssue,
     NewIssueHeader,
     ViewOptionsPopup
diff --git a/plugins/tracker-resources/src/plugin.ts b/plugins/tracker-resources/src/plugin.ts
index 29d3e311b8..f2167c42b9 100644
--- a/plugins/tracker-resources/src/plugin.ts
+++ b/plugins/tracker-resources/src/plugin.ts
@@ -123,11 +123,14 @@ export default mergeIds(trackerId, tracker, {
 
     CopyIssueUrl: '' as IntlString,
     CopyIssueId: '' as IntlString,
+    CopyIssueBranch: '' as IntlString,
 
     FilterIs: '' as IntlString,
     FilterIsNot: '' as IntlString,
     FilterIsEither: '' as IntlString,
-    FilterStatesCount: '' as IntlString
+    FilterStatesCount: '' as IntlString,
+
+    EditIssue: '' as IntlString
   },
   component: {
     NopeComponent: '' as AnyComponent,
@@ -149,6 +152,7 @@ export default mergeIds(trackerId, tracker, {
     StatusEditor: '' as AnyComponent,
     AssigneePresenter: '' as AnyComponent,
     DueDatePresenter: '' as AnyComponent,
+    PreviewIssue: '' as AnyComponent,
     EditIssue: '' as AnyComponent,
     CreateTeam: '' as AnyComponent,
     NewIssueHeader: '' as AnyComponent