diff --git a/media/pwsh.svg b/media/pwsh.svg
deleted file mode 100644
index 681704b769..0000000000
--- a/media/pwsh.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="32px" height="32px">
-    <path style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;block-progression:tb;isolation:auto;mix-blend-mode:normal" d="M 8.0683594 5 C 7.5985478 5 7.0740085 5.0706042 6.6347656 5.4277344 C 6.1955227 5.7848645 6.0182993 6.2800756 5.9160156 6.7441406 C 4.6319924 12.607247 3.3484294 18.470878 2.0664062 24.333984 L 2.0664062 24.335938 C 1.9318566 24.956936 1.9940452 25.635268 2.3847656 26.175781 C 2.7754858 26.716249 3.4591241 27 4.125 27 L 24 27 C 24.514455 27 25.07303 26.820004 25.447266 26.451172 C 25.821502 26.08234 25.979845 25.634726 26.072266 25.212891 L 26.072266 25.210938 C 27.361317 19.31975 28.647572 13.427473 29.931641 7.5351562 C 30.063187 6.9314661 30.019975 6.2444204 29.595703 5.7167969 C 29.171432 5.1891733 28.509634 5 27.896484 5 L 8.0683594 5 z M 8.0683594 7 L 27.896484 7 C 27.959617 7 27.96256 7.0043131 27.992188 7.0078125 C 27.989342 7.0385555 27.99271 7.0442762 27.978516 7.109375 C 26.694585 13.001058 25.406136 18.89439 24.117188 24.785156 L 24.119141 24.783203 C 24.076503 24.977811 24.040539 25.0106 24.050781 25.001953 C 24.038906 25.001318 24.043479 25 24 25 L 4.125 25 C 3.9368759 25 3.9881392 24.979396 4.0058594 25.003906 C 4.0234384 25.028226 3.9740033 24.976286 4.0195312 24.761719 L 4.0195312 24.759766 C 5.3013723 18.897546 6.5852999 13.036101 7.8691406 7.1738281 C 7.8913694 7.0729753 7.905601 7.0435266 7.9179688 7.0097656 C 7.9510846 7.0057327 7.9748357 7 8.0683594 7 z M 11.533203 7.984375 A 1.50015 1.50015 0 0 0 10.40625 10.525391 L 15.25 15.695312 L 7.6132812 21.291016 A 1.50015 1.50015 0 1 0 9.3867188 23.708984 L 18.386719 17.115234 A 1.50015 1.50015 0 0 0 18.59375 14.878906 L 12.59375 8.4746094 A 1.50015 1.50015 0 0 0 11.533203 7.984375 z M 15.5 21 A 1.50015 1.50015 0 1 0 15.5 24 L 19.5 24 A 1.50015 1.50015 0 1 0 19.5 21 L 15.5 21 z" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
-</svg>
diff --git a/media/resources/dark/pencil.svg b/media/resources/dark/pencil.svg
deleted file mode 100644
index e4ba2d45a8..0000000000
--- a/media/resources/dark/pencil.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="14"
-   height="16"
-   viewBox="0 0 14 16"
-   version="1.1"
-   id="svg3715"
-   sodipodi:docname="pencil.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata3721">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3719" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     id="namedview3717"
-     showgrid="false"
-     inkscape:zoom="60.5"
-     inkscape:cx="4.3140496"
-     inkscape:cy="8"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3715" />
-  <path
-     d="M0 12v3h3l8-8-3-3-8 8zm3 2H1v-2h1v1h1v1zm10.3-9.3L12 6 9 3l1.3-1.3a.996.996 0 0 1 1.41 0l1.59 1.59c.39.39.39 1.02 0 1.41z"
-     id="path3713"
-     fill-rule="evenodd"
-     style="opacity:1;stroke:none;stroke-opacity:1;fill:#fffffa;fill-opacity:1" />
-</svg>
diff --git a/media/resources/dark/play.svg b/media/resources/dark/play.svg
deleted file mode 100644
index 464ef5147e..0000000000
--- a/media/resources/dark/play.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="19" viewBox="0 0 16 19" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 6V18.4805L15.9146 12.2402L7 6ZM14.1809 12.2402L7.995 16.5684V7.91209L14.1809 12.2402Z" fill="#C5C5C5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 1L1 0H7L7.70711 0.292893L10.7071 3.29289L11 4V8.80841V10L8 7.5V14H1L0 13L0 1ZM1 1V13H8V7.5L10 9.30203V8.10005V4L7 1H1Z" fill="#C5C5C5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6 1H7V4H10.5V5H6V1Z" fill="#C5C5C5"/>
-</svg>
diff --git a/media/resources/dark/question.svg b/media/resources/dark/question.svg
deleted file mode 100644
index b803dbf391..0000000000
--- a/media/resources/dark/question.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="14"
-   height="16"
-   viewBox="0 0 14 16"
-   version="1.1"
-   id="svg5984"
-   sodipodi:docname="question.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata5990">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs5988" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     id="namedview5986"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-4.0169492"
-     inkscape:cy="8"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5984" />
-  <path
-     fill-rule="evenodd"
-     d="M6 10h2v2H6v-2zm4-3.5C10 8.64 8 9 8 9H6c0-.55.45-1 1-1h.5c.28 0 .5-.22.5-.5v-1c0-.28-.22-.5-.5-.5h-1c-.28 0-.5.22-.5.5V7H4c0-1.5 1.5-3 3-3s3 1 3 2.5zM7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7z"
-     id="path5982"
-     style="stroke:none;stroke-opacity:1;fill:#ffffff;fill-opacity:1" />
-</svg>
diff --git a/media/resources/dark/run.svg b/media/resources/dark/run.svg
deleted file mode 100644
index 8b0a58eca9..0000000000
--- a/media/resources/dark/run.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2V14.4805L12.9146 8.24024L4 2ZM11.1809 8.24024L4.995 12.5684V3.91209L11.1809 8.24024Z" fill="#C5C5C5"/>
-</svg>
diff --git a/media/resources/dark/sync.svg b/media/resources/dark/sync.svg
deleted file mode 100644
index f3d5a1bc00..0000000000
--- a/media/resources/dark/sync.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="12"
-   height="16"
-   viewBox="0 0 12 16"
-   version="1.1"
-   id="svg6547"
-   sodipodi:docname="sync.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata6553">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6551" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     id="namedview6549"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-5.0169492"
-     inkscape:cy="8"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg6547" />
-  <path
-     fill-rule="evenodd"
-     d="M10.24 7.4a4.15 4.15 0 0 1-1.2 3.6 4.346 4.346 0 0 1-5.41.54L4.8 10.4.5 9.8l.6 4.2 1.31-1.26c2.36 1.74 5.7 1.57 7.84-.54a5.876 5.876 0 0 0 1.74-4.46l-1.75-.34zM2.96 5a4.346 4.346 0 0 1 5.41-.54L7.2 5.6l4.3.6-.6-4.2-1.31 1.26c-2.36-1.74-5.7-1.57-7.85.54C.5 5.03-.06 6.65.01 8.26l1.75.35A4.17 4.17 0 0 1 2.96 5z"
-     id="path6545"
-     style="fill:#ffffff;fill-opacity:1" />
-</svg>
diff --git a/media/resources/light/pencil.svg b/media/resources/light/pencil.svg
deleted file mode 100644
index 8702f4dcec..0000000000
--- a/media/resources/light/pencil.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M0 12v3h3l8-8-3-3-8 8zm3 2H1v-2h1v1h1v1zm10.3-9.3L12 6 9 3l1.3-1.3a.996.996 0 0 1 1.41 0l1.59 1.59c.39.39.39 1.02 0 1.41z"/></svg>
\ No newline at end of file
diff --git a/media/resources/light/play.svg b/media/resources/light/play.svg
deleted file mode 100644
index 6f479653b5..0000000000
--- a/media/resources/light/play.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="19" viewBox="0 0 16 19" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 6V18.4805L15.9146 12.2402L7 6ZM14.1809 12.2402L7.995 16.5684V7.91209L14.1809 12.2402Z" fill="#424242"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 1L1 0H7L7.70711 0.292893L10.7071 3.29289L11 4V8.80841V10L8 7.5V14H1L0 13L0 1ZM1 1V13H8V7.5L10 9.30203V8.10005V4L7 1H1Z" fill="#424242"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6 1H7V4H10.5V5H6V1Z" fill="#424242"/>
-</svg>
diff --git a/media/resources/light/question.svg b/media/resources/light/question.svg
deleted file mode 100644
index a6fc75310c..0000000000
--- a/media/resources/light/question.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M6 10h2v2H6v-2zm4-3.5C10 8.64 8 9 8 9H6c0-.55.45-1 1-1h.5c.28 0 .5-.22.5-.5v-1c0-.28-.22-.5-.5-.5h-1c-.28 0-.5.22-.5.5V7H4c0-1.5 1.5-3 3-3s3 1 3 2.5zM7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7z"/></svg>
\ No newline at end of file
diff --git a/media/resources/light/run.svg b/media/resources/light/run.svg
deleted file mode 100644
index 2563bfa114..0000000000
--- a/media/resources/light/run.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2V14.4805L12.9146 8.24024L4 2ZM11.1809 8.24024L4.995 12.5684V3.91209L11.1809 8.24024Z" fill="#424242"/>
-</svg>
diff --git a/media/resources/light/sync.svg b/media/resources/light/sync.svg
deleted file mode 100644
index 411f549b58..0000000000
--- a/media/resources/light/sync.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="12"
-   height="16"
-   viewBox="0 0 12 16"
-   version="1.1"
-   id="svg6547"
-   sodipodi:docname="sync.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata6553">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6551" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     id="namedview6549"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-5.0169492"
-     inkscape:cy="8"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg6547" />
-  <path
-     fill-rule="evenodd"
-     d="M10.24 7.4a4.15 4.15 0 0 1-1.2 3.6 4.346 4.346 0 0 1-5.41.54L4.8 10.4.5 9.8l.6 4.2 1.31-1.26c2.36 1.74 5.7 1.57 7.84-.54a5.876 5.876 0 0 0 1.74-4.46l-1.75-.34zM2.96 5a4.346 4.346 0 0 1 5.41-.54L7.2 5.6l4.3.6-.6-4.2-1.31 1.26c-2.36-1.74-5.7-1.57-7.85.54C.5 5.03-.06 6.65.01 8.26l1.75.35A4.17 4.17 0 0 1 2.96 5z"
-     id="path6545"
-     style="fill:#000000;fill-opacity:1" />
-</svg>
diff --git a/package.json b/package.json
index c8cfc7dab7..226ac43433 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
         {
           "id": "PowerShellCommandExplorer",
           "title": "(Preview) PowerShell Command Explorer",
-          "icon": "media/pwsh.svg"
+          "icon": "$(terminal-powershell)"
         }
       ]
     },
@@ -155,19 +155,13 @@
       {
         "command": "PowerShell.RefreshCommandsExplorer",
         "title": "Refresh Command Explorer",
-        "icon": {
-          "light": "media/resources/light/sync.svg",
-          "dark": "media/resources/dark/sync.svg"
-        },
+        "icon": "$(sync)",
         "category": "PowerShell"
       },
       {
         "command": "PowerShell.InsertCommand",
         "title": "Insert Command",
-        "icon": {
-          "light": "media/resources/light/pencil.svg",
-          "dark": "media/resources/dark/pencil.svg"
-        },
+        "icon": "$(pencil)",
         "category": "PowerShell"
       },
       {
@@ -178,29 +172,20 @@
       {
         "command": "PowerShell.ShowHelp",
         "title": "Get Help for Command",
-        "icon": {
-          "light": "media/resources/light/question.svg",
-          "dark": "media/resources/dark/question.svg"
-        },
+        "icon": "$(question)",
         "category": "PowerShell"
       },
       {
         "command": "PowerShell.Debug.Start",
         "title": "Run",
         "category": "PowerShell",
-        "icon": {
-          "light": "media/resources/light/run.svg",
-          "dark": "media/resources/dark/run.svg"
-        }
+        "icon": "$(run)"
       },
       {
         "command": "PowerShell.RunSelection",
         "title": "Run Selection",
         "category": "PowerShell",
-        "icon": {
-          "light": "media/resources/light/play.svg",
-          "dark": "media/resources/dark/play.svg"
-        }
+        "icon": "$(debug-line-by-line)"
       },
       {
         "command": "PowerShell.RestartSession",