diff --git a/packages/theme/styles/dialogs.scss b/packages/theme/styles/dialogs.scss
index 15e9d3b89f..c18964c47a 100644
--- a/packages/theme/styles/dialogs.scss
+++ b/packages/theme/styles/dialogs.scss
@@ -322,10 +322,10 @@
     box-shadow: var(--theme-popup-shadow);
   }
   &.fullsize {
-    width: 100%;
-    height: 100%;
-    max-width: 100%;
-    max-height: 100%;
+    width: calc(100vw - 3rem);
+    height: calc(100vh - 4rem);
+    max-width: calc(100vw - 3rem);
+    max-height: calc(100vh - 4rem);
   }
 
   .header {
diff --git a/packages/ui/lang/en.json b/packages/ui/lang/en.json
index 6706aefcb7..780ff758bf 100644
--- a/packages/ui/lang/en.json
+++ b/packages/ui/lang/en.json
@@ -92,6 +92,7 @@
     "Submit": "Submit",
     "NextStep": "Next step",
     "TypeHere": "Type here...",
+    "NormalSize": "Normal size",
     "FullSize": "Full size",
     "UseMaxWidth": "Max width",
     "Sidebar": "Sidebar",
diff --git a/packages/ui/lang/es.json b/packages/ui/lang/es.json
index 7052c5c193..152fca1663 100644
--- a/packages/ui/lang/es.json
+++ b/packages/ui/lang/es.json
@@ -92,6 +92,7 @@
     "Submit": "Enviar",
     "NextStep": "Siguiente paso",
     "TypeHere": "Escribe aquí...",
+    "NormalSize": "Tamaño normal",
     "FullSize": "Tamaño completo",
     "UseMaxWidth": "Ancho máximo",
     "Sidebar": "Barra lateral",
diff --git a/packages/ui/lang/fr.json b/packages/ui/lang/fr.json
index 0b4daa13a8..a91e537305 100644
--- a/packages/ui/lang/fr.json
+++ b/packages/ui/lang/fr.json
@@ -92,6 +92,7 @@
     "Submit": "Soumettre",
     "NextStep": "Étape suivante",
     "TypeHere": "Tapez ici...",
+    "NormalSize": "Taille normale",
     "FullSize": "Taille réelle",
     "UseMaxWidth": "Largeur maximale",
     "Sidebar": "Barre latérale",
diff --git a/packages/ui/lang/it.json b/packages/ui/lang/it.json
index f424b56c29..868fbfe243 100644
--- a/packages/ui/lang/it.json
+++ b/packages/ui/lang/it.json
@@ -92,6 +92,7 @@
     "Submit": "Invia",
     "NextStep": "Prossimo passo",
     "TypeHere": "Scrivi qui...",
+    "NormalSize": "Dimensioni normali",
     "FullSize": "Dimensione intera",
     "UseMaxWidth": "Larghezza massima",
     "Sidebar": "Barra laterale",
diff --git a/packages/ui/lang/pt.json b/packages/ui/lang/pt.json
index b60d5a9794..6750502192 100644
--- a/packages/ui/lang/pt.json
+++ b/packages/ui/lang/pt.json
@@ -92,6 +92,7 @@
     "Submit": "Enviar",
     "NextStep": "Seguinte passo",
     "TypeHere": "Escreva aqui...",
+    "NormalSize": "Tamanho normal",
     "FullSize": "Tamanho completo",
     "UseMaxWidth": "Largura máxima",
     "Sidebar": "Barra lateral",
diff --git a/packages/ui/lang/ru.json b/packages/ui/lang/ru.json
index 9b2ae680e6..b7c1b4cb48 100644
--- a/packages/ui/lang/ru.json
+++ b/packages/ui/lang/ru.json
@@ -92,6 +92,7 @@
     "Submit": "Отправить",
     "NextStep": "Следующий шаг",
     "TypeHere": "Вводите здесь...",
+    "NormalSize": "Обычный размер",
     "FullSize": "Полный размер",
     "UseMaxWidth": "Максимальная ширина",
     "Sidebar": "Боковая панель",
diff --git a/packages/ui/lang/zh.json b/packages/ui/lang/zh.json
index 26320c8627..305c002319 100644
--- a/packages/ui/lang/zh.json
+++ b/packages/ui/lang/zh.json
@@ -92,6 +92,7 @@
     "Submit": "提交",
     "NextStep": "下一步",
     "TypeHere": "在此输入...",
+    "NormalSize": "正常尺寸",
     "FullSize": "全尺寸",
     "UseMaxWidth": "使用最大宽度",
     "Sidebar": "侧边栏",
diff --git a/packages/ui/src/components/Dialog.svelte b/packages/ui/src/components/Dialog.svelte
index 9cc185ad8f..ef8f85087d 100644
--- a/packages/ui/src/components/Dialog.svelte
+++ b/packages/ui/src/components/Dialog.svelte
@@ -20,13 +20,14 @@
     Button,
     Label,
     IconClose,
-    IconScale,
-    IconScaleFull,
+    IconMaximize,
+    IconMinimize,
     resizeObserver,
     tooltip,
     deviceOptionsStore as deviceInfo,
     checkAdaptiveMatching
   } from '..'
+  import ui from '../plugin'
 
   export let label: IntlString | undefined = undefined
   export let isFullSize: boolean = false
@@ -69,11 +70,12 @@
       {#if isFullSize && !needFullSize}
         <Button
           focusIndex={100010}
-          icon={fullSize ? IconScale : IconScaleFull}
+          icon={fullSize ? IconMinimize : IconMaximize}
           kind={'ghost'}
           size={'medium'}
           selected={fullSize}
           id={'btnDialogFullScreen'}
+          showTooltip={{ label: fullSize ? ui.string.NormalSize : ui.string.FullSize }}
           on:click={() => (toggleFullSize = !toggleFullSize)}
         />
       {/if}
diff --git a/packages/ui/src/components/icons/Maximize.svelte b/packages/ui/src/components/icons/Maximize.svelte
index 7f00317bd3..2c55a0c398 100644
--- a/packages/ui/src/components/icons/Maximize.svelte
+++ b/packages/ui/src/components/icons/Maximize.svelte
@@ -19,5 +19,7 @@
 </script>
 
 <svg class="svg-{size}" {fill} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <path d="M7 3V2H2V7H3V3.707L12.293 13H9V14H14V9H13V12.293L3.707 3H7Z" />
+  <g transform="translate(16 0) scale(-1 1)">
+    <path d="M7 3V2H2V7H3V3.707L12.293 13H9V14H14V9H13V12.293L3.707 3H7Z" />
+  </g>
 </svg>
diff --git a/packages/ui/src/plugin.ts b/packages/ui/src/plugin.ts
index c50a006d90..5a174d2b63 100644
--- a/packages/ui/src/plugin.ts
+++ b/packages/ui/src/plugin.ts
@@ -119,6 +119,7 @@ export const uis = plugin(uiId, {
     NextStep: '' as IntlString,
     TypeHere: '' as IntlString,
 
+    NormalSize: '' as IntlString,
     FullSize: '' as IntlString,
     UseMaxWidth: '' as IntlString,
     Sidebar: '' as IntlString,