diff --git a/img/icons/erd-editor.svg b/img/icons/erd-editor.svg
new file mode 100644
index 00000000..10914455
--- /dev/null
+++ b/img/icons/erd-editor.svg
@@ -0,0 +1,9 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M56 16C49.3726 16 44 21.3726 44 28V228C44 234.627 49.3726 240 56 240H200C206.627 240 212 234.627 212 228V73L182.5 43.5L155 16H56Z" fill="#272727"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M155 28V16L182.5 43.5L212 73H200H197H167C160.373 73 155 67.6274 155 61V31V28Z" fill="#8B8B8B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M192 140H144V200H192V140ZM186 146H150V194H186V146Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112 98H64V158H112V98ZM106 104H70V152H106V104Z" fill="white"/>
+<rect x="126" y="127" width="4" height="44" fill="white"/>
+<rect x="126" y="168" width="22" height="4" fill="white"/>
+<rect x="108" y="126" width="22" height="4" fill="white"/>
+</svg>
diff --git a/img/icons/erd-editor_128x128.png b/img/icons/erd-editor_128x128.png
new file mode 100644
index 00000000..9b44decc
Binary files /dev/null and b/img/icons/erd-editor_128x128.png differ
diff --git a/img/icons/erd-editor_192x192.png b/img/icons/erd-editor_192x192.png
new file mode 100644
index 00000000..c5418ffd
Binary files /dev/null and b/img/icons/erd-editor_192x192.png differ
diff --git a/img/icons/erd-editor_256x256.png b/img/icons/erd-editor_256x256.png
new file mode 100644
index 00000000..61b5cce4
Binary files /dev/null and b/img/icons/erd-editor_256x256.png differ
diff --git a/img/icons/erd-editor_512x512.png b/img/icons/erd-editor_512x512.png
new file mode 100644
index 00000000..a22bdea4
Binary files /dev/null and b/img/icons/erd-editor_512x512.png differ
diff --git a/img/icons/erd-editor_64x64.png b/img/icons/erd-editor_64x64.png
new file mode 100644
index 00000000..9fa3162d
Binary files /dev/null and b/img/icons/erd-editor_64x64.png differ
diff --git a/img/icons/erd-editor_icon.svg b/img/icons/erd-editor_icon.svg
new file mode 100644
index 00000000..522011ad
--- /dev/null
+++ b/img/icons/erd-editor_icon.svg
@@ -0,0 +1,9 @@
+<svg width="168" height="224" viewBox="0 0 168 224" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 0C5.37258 0 0 5.37258 0 12V212C0 218.627 5.37259 224 12 224H156C162.627 224 168 218.627 168 212V57L138.5 27.5L111 0H12Z" fill="#272727"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M111 12V0L138.5 27.5L168 57H156H153H123C116.373 57 111 51.6274 111 45V15V12Z" fill="#8B8B8B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M148 124H100V184H148V124ZM142 130H106V178H142V130Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68 82H20V142H68V82ZM62 88H26V136H62V88Z" fill="white"/>
+<rect x="82" y="111" width="4" height="44" fill="white"/>
+<rect x="82" y="152" width="22" height="4" fill="white"/>
+<rect x="64" y="110" width="22" height="4" fill="white"/>
+</svg>
diff --git a/packages/erd-editor-app/public/apple-touch-icon-180x180.png b/packages/erd-editor-app/public/apple-touch-icon-180x180.png
new file mode 100644
index 00000000..e62d3e5e
Binary files /dev/null and b/packages/erd-editor-app/public/apple-touch-icon-180x180.png differ
diff --git a/packages/erd-editor-app/public/apple-touch-icon.png b/packages/erd-editor-app/public/apple-touch-icon.png
deleted file mode 100644
index ac9fe4d6..00000000
Binary files a/packages/erd-editor-app/public/apple-touch-icon.png and /dev/null differ
diff --git a/packages/erd-editor-app/public/browserconfig.xml b/packages/erd-editor-app/public/browserconfig.xml
deleted file mode 100644
index 0cc1e1e2..00000000
--- a/packages/erd-editor-app/public/browserconfig.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
-            <TileColor>#282c34</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>
diff --git a/packages/erd-editor-app/public/erd-editor.svg b/packages/erd-editor-app/public/erd-editor.svg
new file mode 100644
index 00000000..10914455
--- /dev/null
+++ b/packages/erd-editor-app/public/erd-editor.svg
@@ -0,0 +1,9 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M56 16C49.3726 16 44 21.3726 44 28V228C44 234.627 49.3726 240 56 240H200C206.627 240 212 234.627 212 228V73L182.5 43.5L155 16H56Z" fill="#272727"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M155 28V16L182.5 43.5L212 73H200H197H167C160.373 73 155 67.6274 155 61V31V28Z" fill="#8B8B8B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M192 140H144V200H192V140ZM186 146H150V194H186V146Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112 98H64V158H112V98ZM106 104H70V152H106V104Z" fill="white"/>
+<rect x="126" y="127" width="4" height="44" fill="white"/>
+<rect x="126" y="168" width="22" height="4" fill="white"/>
+<rect x="108" y="126" width="22" height="4" fill="white"/>
+</svg>
diff --git a/packages/erd-editor-app/public/erd-editor_icon.svg b/packages/erd-editor-app/public/erd-editor_icon.svg
new file mode 100644
index 00000000..522011ad
--- /dev/null
+++ b/packages/erd-editor-app/public/erd-editor_icon.svg
@@ -0,0 +1,9 @@
+<svg width="168" height="224" viewBox="0 0 168 224" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 0C5.37258 0 0 5.37258 0 12V212C0 218.627 5.37259 224 12 224H156C162.627 224 168 218.627 168 212V57L138.5 27.5L111 0H12Z" fill="#272727"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M111 12V0L138.5 27.5L168 57H156H153H123C116.373 57 111 51.6274 111 45V15V12Z" fill="#8B8B8B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M148 124H100V184H148V124ZM142 130H106V178H142V130Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68 82H20V142H68V82ZM62 88H26V136H62V88Z" fill="white"/>
+<rect x="82" y="111" width="4" height="44" fill="white"/>
+<rect x="82" y="152" width="22" height="4" fill="white"/>
+<rect x="64" y="110" width="22" height="4" fill="white"/>
+</svg>
diff --git a/packages/erd-editor-app/public/favicon-16x16.png b/packages/erd-editor-app/public/favicon-16x16.png
deleted file mode 100644
index 12c0dd91..00000000
Binary files a/packages/erd-editor-app/public/favicon-16x16.png and /dev/null differ
diff --git a/packages/erd-editor-app/public/favicon-32x32.png b/packages/erd-editor-app/public/favicon-32x32.png
deleted file mode 100644
index c39f6859..00000000
Binary files a/packages/erd-editor-app/public/favicon-32x32.png and /dev/null differ
diff --git a/packages/erd-editor-app/public/favicon.ico b/packages/erd-editor-app/public/favicon.ico
index bbb58c95..781ba7f7 100644
Binary files a/packages/erd-editor-app/public/favicon.ico and b/packages/erd-editor-app/public/favicon.ico differ
diff --git a/packages/erd-editor-app/public/index.html b/packages/erd-editor-app/public/index.html
index 99191e22..725071a0 100644
--- a/packages/erd-editor-app/public/index.html
+++ b/packages/erd-editor-app/public/index.html
@@ -6,13 +6,14 @@
     <base href="/" />
     <title>erd-editor-app</title>
     <meta name="description" content="Entity-Relationship Diagram Editor App" />
-    <link rel="icon" href="/favicon.ico" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
-    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#000" />
-    <meta name="msapplication-TileColor" content="#000" />
-    <meta name="theme-color" content="#000" />
+    <link rel="icon" href="/favicon.ico" sizes="48x48" />
+    <link
+      rel="icon"
+      href="/erd-editor_icon.svg"
+      sizes="any"
+      type="image/svg+xml"
+    />
+    <link rel="apple-touch-icon" href="/apple-touch-icon-180x180.png" />
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link
diff --git a/packages/erd-editor-app/public/maskable-icon-512x512.png b/packages/erd-editor-app/public/maskable-icon-512x512.png
new file mode 100644
index 00000000..80bff1ae
Binary files /dev/null and b/packages/erd-editor-app/public/maskable-icon-512x512.png differ
diff --git a/packages/erd-editor-app/public/mstile-150x150.png b/packages/erd-editor-app/public/mstile-150x150.png
deleted file mode 100644
index 748e166b..00000000
Binary files a/packages/erd-editor-app/public/mstile-150x150.png and /dev/null differ
diff --git a/packages/erd-editor-app/public/pwa-192x192.png b/packages/erd-editor-app/public/pwa-192x192.png
new file mode 100644
index 00000000..58fc28dc
Binary files /dev/null and b/packages/erd-editor-app/public/pwa-192x192.png differ
diff --git a/packages/erd-editor-app/public/pwa-512x512.png b/packages/erd-editor-app/public/pwa-512x512.png
new file mode 100644
index 00000000..79846399
Binary files /dev/null and b/packages/erd-editor-app/public/pwa-512x512.png differ
diff --git a/packages/erd-editor-app/public/pwa-64x64.png b/packages/erd-editor-app/public/pwa-64x64.png
new file mode 100644
index 00000000..f81a3941
Binary files /dev/null and b/packages/erd-editor-app/public/pwa-64x64.png differ
diff --git a/packages/erd-editor-app/public/robots.txt b/packages/erd-editor-app/public/robots.txt
deleted file mode 100644
index 14267e90..00000000
--- a/packages/erd-editor-app/public/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Allow: /
\ No newline at end of file
diff --git a/packages/erd-editor-app/public/safari-pinned-tab.svg b/packages/erd-editor-app/public/safari-pinned-tab.svg
deleted file mode 100644
index bc1dd13d..00000000
--- a/packages/erd-editor-app/public/safari-pinned-tab.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="512.000000pt" height="512.000000pt" viewBox="0 0 512.000000 512.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.14, written by Peter Selinger 2001-2017
-</metadata>
-<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M1043 4786 c-13 -6 -23 -14 -23 -18 0 -5 -6 -8 -12 -8 -19 0 -61 -41
--78 -75 -8 -16 -22 -42 -32 -57 -17 -25 -18 -125 -18 -2087 0 -1367 3 -2061
-10 -2061 6 0 10 -7 10 -15 0 -31 94 -125 125 -125 8 0 15 -4 15 -10 0 -7 510
--10 1510 -10 831 0 1510 3 1510 8 0 4 17 15 38 24 46 20 102 70 102 92 0 9 3
-16 8 16 31 0 32 45 32 1640 l0 1585 -558 558 -558 557 -1029 -1 c-735 -1
--1036 -5 -1052 -13z m1237 -1906 l0 -320 180 0 180 0 0 -400 0 -400 120 0 120
-0 0 260 0 260 460 0 460 0 0 -600 0 -600 -460 0 -460 0 0 300 0 300 -160 0
--160 0 0 400 0 400 -140 0 -140 0 0 -240 0 -240 -480 0 -480 0 0 600 0 600
-480 0 480 0 0 -320z"/>
-<path d="M1440 2600 l0 -480 360 0 360 0 0 480 0 480 -360 0 -360 0 0 -480z"/>
-<path d="M3000 1680 l0 -480 340 0 340 0 0 480 0 480 -340 0 -340 0 0 -480z"/>
-</g>
-</svg>
diff --git a/packages/erd-editor-app/src/assets/erd-editor-192x192.png b/packages/erd-editor-app/src/assets/erd-editor-192x192.png
deleted file mode 100644
index 1df38405..00000000
Binary files a/packages/erd-editor-app/src/assets/erd-editor-192x192.png and /dev/null differ
diff --git a/packages/erd-editor-app/src/assets/erd-editor-512x512.png b/packages/erd-editor-app/src/assets/erd-editor-512x512.png
deleted file mode 100644
index 57f2bc16..00000000
Binary files a/packages/erd-editor-app/src/assets/erd-editor-512x512.png and /dev/null differ
diff --git a/packages/erd-editor-app/webpack.config.js b/packages/erd-editor-app/webpack.config.js
index 6f2bb438..c0f78fde 100644
--- a/packages/erd-editor-app/webpack.config.js
+++ b/packages/erd-editor-app/webpack.config.js
@@ -126,18 +126,25 @@ module.exports = (env, argv) => {
         theme_color: '#000',
         icons: [
           {
-            src: resolvePath('src/assets/erd-editor-192x192.png'),
-            size: '192x192',
+            src: resolvePath('public/pwa-64x64.png'),
+            sizes: '64x64',
+            type: 'image/png',
           },
           {
-            src: resolvePath('src/assets/erd-editor-512x512.png'),
-            size: '512x512',
-            purpose: 'any',
+            src: resolvePath('public/pwa-192x192.png'),
+            sizes: '192x192',
+            type: 'image/png',
           },
           {
-            src: resolvePath('src/assets/erd-editor-512x512.png'),
-            size: '512x512',
-            purpose: 'any maskable',
+            src: resolvePath('public/pwa-512x512.png'),
+            sizes: '512x512',
+            type: 'image/png',
+          },
+          {
+            src: resolvePath('public/maskable-icon-512x512.png'),
+            sizes: '512x512',
+            type: 'image/png',
+            purpose: 'maskable',
           },
         ],
       }),
diff --git a/packages/erd-editor-vscode/assets/erd-editor.png b/packages/erd-editor-vscode/assets/erd-editor.png
index 42405056..61b5cce4 100644
Binary files a/packages/erd-editor-vscode/assets/erd-editor.png and b/packages/erd-editor-vscode/assets/erd-editor.png differ
diff --git a/packages/erd-editor-vscode/assets/erd-editor.svg b/packages/erd-editor-vscode/assets/erd-editor.svg
new file mode 100644
index 00000000..10914455
--- /dev/null
+++ b/packages/erd-editor-vscode/assets/erd-editor.svg
@@ -0,0 +1,9 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M56 16C49.3726 16 44 21.3726 44 28V228C44 234.627 49.3726 240 56 240H200C206.627 240 212 234.627 212 228V73L182.5 43.5L155 16H56Z" fill="#272727"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M155 28V16L182.5 43.5L212 73H200H197H167C160.373 73 155 67.6274 155 61V31V28Z" fill="#8B8B8B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M192 140H144V200H192V140ZM186 146H150V194H186V146Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112 98H64V158H112V98ZM106 104H70V152H106V104Z" fill="white"/>
+<rect x="126" y="127" width="4" height="44" fill="white"/>
+<rect x="126" y="168" width="22" height="4" fill="white"/>
+<rect x="108" y="126" width="22" height="4" fill="white"/>
+</svg>
diff --git a/packages/erd-editor-vscode/assets/menu-icon.svg b/packages/erd-editor-vscode/assets/menu-icon.svg
new file mode 100644
index 00000000..522011ad
--- /dev/null
+++ b/packages/erd-editor-vscode/assets/menu-icon.svg
@@ -0,0 +1,9 @@
+<svg width="168" height="224" viewBox="0 0 168 224" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 0C5.37258 0 0 5.37258 0 12V212C0 218.627 5.37259 224 12 224H156C162.627 224 168 218.627 168 212V57L138.5 27.5L111 0H12Z" fill="#272727"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M111 12V0L138.5 27.5L168 57H156H153H123C116.373 57 111 51.6274 111 45V15V12Z" fill="#8B8B8B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M148 124H100V184H148V124ZM142 130H106V178H142V130Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68 82H20V142H68V82ZM62 88H26V136H62V88Z" fill="white"/>
+<rect x="82" y="111" width="4" height="44" fill="white"/>
+<rect x="82" y="152" width="22" height="4" fill="white"/>
+<rect x="64" y="110" width="22" height="4" fill="white"/>
+</svg>
diff --git a/packages/erd-editor-vscode/package.json b/packages/erd-editor-vscode/package.json
index e28c0237..c1007998 100644
--- a/packages/erd-editor-vscode/package.json
+++ b/packages/erd-editor-vscode/package.json
@@ -83,8 +83,8 @@
         "category": "vuerd",
         "title": "Open ERD Editor",
         "icon": {
-          "dark": "./assets/erd-editor.png",
-          "light": "./assets/erd-editor.png"
+          "dark": "./assets/menu-icon.svg",
+          "light": "./assets/menu-icon.svg"
         }
       },
       {
@@ -98,8 +98,8 @@
         "category": "vuerd",
         "title": "Open ERD Editor to the Side",
         "icon": {
-          "dark": "./assets/erd-editor.png",
-          "light": "./assets/erd-editor.png"
+          "dark": "./assets/menu-icon.svg",
+          "light": "./assets/menu-icon.svg"
         }
       }
     ],