removing the extra commands on the side bar text

2023-03-10 08:08:18 -08:00 · 2023-03-10 08:08:18 -08:00 · dfab171a94
--- a/package.json
+++ b/package.json
@ -93,10 +93,7 @@
        "title": "%cmake-tools.command.cmake.selectConfigurePreset.title%",
        "when": "cmake:enableFullFeatureSet && useCMakePresets",
        "category": "CMake",
-        "icon": {
-          "dark": "res/dark/edit-icon.svg",
-          "light": "res/light/edit-icon.svg"
-        }
+        "icon": "$(edit)"
      },
      {
        "command": "cmake.selectBuildPreset",
@ -109,10 +106,7 @@
        "title": "%cmake-tools.command.cmake.selectBuildPreset.title%",
        "when": "cmake:enableFullFeatureSet && useCMakePresets",
        "category": "CMake",
-        "icon": {
-          "dark": "res/dark/edit-icon.svg",
-          "light": "res/light/edit-icon.svg"
-        }
+        "icon": "$(edit)"
      },
      {
        "command": "cmake.selectTestPreset",
@ -125,20 +119,14 @@
        "title": "%cmake-tools.command.cmake.selectTestPreset.title%",
        "when": "cmake:enableFullFeatureSet && useCMakePresets",
        "category": "CMake",
-        "icon": {
-          "dark": "res/dark/edit-icon.svg",
-          "light": "res/light/edit-icon.svg"
-        }
+        "icon": "$(edit)"
      },
      {
        "command": "cmake.projectStatus.setTestTarget",
        "title": "%cmake-tools.command.cmake.projectStatus.selectTestPreset.title%",
        "when": "cmake:enableFullFeatureSet && useCMakePresets",
        "category": "CMake",
-        "icon": {
-          "dark": "res/dark/edit-icon.svg",
-          "light": "res/light/edit-icon.svg"
-        }
+        "icon": "$(edit)"
      },
      {
        "command": "cmake.viewLog",
@ -163,10 +151,7 @@
        "title": "%cmake-tools.command.cmake.selectActiveFolder.title%",
        "when": "cmake:enableFullFeatureSet",
        "category": "CMake",
-        "icon": {
-          "dark": "res/dark/edit-icon.svg",
-          "light": "res/light/edit-icon.svg"
-        }
+        "icon": "$(edit)"
      },
      {
        "command": "cmake.outline.selectWorkspace",
@ -203,10 +188,7 @@
        "title": "%cmake-tools.command.cmake.selectKit.title%",
        "when": "cmake:enableFullFeatureSet",
        "category": "CMake",
-        "icon": {
-          "dark": "res/dark/edit-icon.svg",
-          "light": "res/light/edit-icon.svg"
-        }
+        "icon": "$(edit)"
      },
      {
        "command": "cmake.setVariant",
@ -219,10 +201,7 @@
        "title": "%cmake-tools.command.cmake.setVariant.title%",
        "when": "cmake:enableFullFeatureSet && !useCMakePresets",
        "category": "CMake",
-        "icon": {
-          "dark": "res/dark/edit-icon.svg",
-          "light": "res/light/edit-icon.svg"
-        }
+        "icon": "$(edit)"
      },
      {
        "command": "cmake.setVariantAll",
@ -383,10 +362,7 @@
        "title": "%cmake-tools.command.cmake.setDefaultTarget.title%",
        "when": "cmake:enableFullFeatureSet",
        "category": "CMake",
-        "icon": {
-          "dark": "res/dark/edit-icon.svg",
-          "light": "res/light/edit-icon.svg"
-        }
+        "icon": "$(edit)"
      },
      {
        "command": "cmake.cleanConfigure",
@ -471,10 +447,7 @@
        "command": "cmake.projectStatus.ctest",
        "title": "%cmake-tools.command.cmake.ctest.title%",
        "when": "cmake:enableFullFeatureSet",
-        "icon": {
-          "dark": "res/dark/beaker-icon.svg",
-          "light": "res/light/beaker-icon.svg"
-        },
+        "icon": "$(beaker)",
        "category": "CMake"
      },
      {
@ -510,10 +483,7 @@
        "when": "cmake:enableFullFeatureSet",
        "title": "%cmake-tools.command.cmake.debugTarget.title%",
        "category": "CMake",
-        "icon": {
-          "dark": "res/dark/debug-icon.svg",
-          "light": "res/light/debug-icon.svg"
-        }
+        "icon": "$(debug-alt)"
      },
      {
        "command": "cmake.debugTargetAll",
@ -531,10 +501,7 @@
        "command": "cmake.projectStatus.setDebugTarget",
        "when": "cmake:enableFullFeatureSet",
        "title": "%cmake-tools.command.cmake.selectLaunchTarget.title%",
-        "icon": {
-          "dark": "res/dark/edit-icon.svg",
-          "light": "res/light/edit-icon.svg"
-        }
+        "icon": "$(edit)"
      },
      {
        "command": "cmake.outline.launchTarget",
@ -569,10 +536,7 @@
        "command": "cmake.projectStatus.setLaunchTarget",
        "when": "cmake:enableFullFeatureSet",
        "title": "%cmake-tools.command.cmake.outline.setLaunchTarget.title%",
-        "icon": {
-          "dark": "res/dark/edit-icon.svg",
-          "light": "res/light/edit-icon.svg"
-        }
+        "icon": "$(edit)"
      },
      {
        "command": "cmake.stop",
@ -585,19 +549,13 @@
        "title": "%cmake-tools.command.cmake.stop.title%",
        "when": "cmake:enableFullFeatureSet",
        "category": "CMake",
-        "icon": {
-          "dark": "res/dark/stop-icon.svg",
-          "light": "res/light/stop-icon.svg"
-        }
+        "icon": "$(x)"
      },
      {
        "command": "cmake.outline.stop",
        "title": "%cmake-tools.command.cmake.stop.title%",
        "when": "cmake:enableFullFeatureSet",
-        "icon": {
-          "dark": "res/dark/stop-icon.svg",
-          "light": "res/light/stop-icon.svg"
-        }
+        "icon": "$(x)"
      },
      {
        "command": "cmake.stopAll",
@ -609,10 +567,7 @@
        "command": "cmake.outline.stopAll",
        "title": "%cmake-tools.command.cmake.stopAll.title%",
        "when": "cmake:enableFullFeatureSet",
-        "icon": {
-          "dark": "res/dark/stop-icon.svg",
-          "light": "res/light/stop-icon.svg"
-        }
+        "icon": "$(x)"
      },
      {
        "command": "cmake.resetState",
--- a/res/dark/beaker-icon.svg
+++ b/res/dark/beaker-icon.svg
@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.8929 13.558L9.99994 6.006V2.006H10.9999V1.006H9.99394V1L9.53794 1.005H4.99994V2H5.99994V5.952L2.10594 13.561C2.03023 13.7133 1.99465 13.8825 2.00254 14.0524C2.01044 14.2224 2.06156 14.3875 2.15106 14.5321C2.24057 14.6768 2.3655 14.7962 2.51404 14.8792C2.66258 14.9621 2.82982 15.0057 2.99994 15.006H12.9999C13.1704 15.0058 13.3379 14.9621 13.4867 14.8789C13.6355 14.7958 13.7606 14.676 13.8501 14.5309C13.9395 14.3858 13.9904 14.2203 13.9979 14.05C14.0054 13.8798 13.9693 13.7104 13.8929 13.558ZM6.89294 6.408L6.99994 6.193V2.036L8.99994 2.012V6.007V6.249L9.11094 6.464L10.9369 10.006H5.04894L6.89294 6.408ZM2.99994 14.017L4.54094 11.006H11.4559L13.0029 14.006L2.99994 14.017Z" fill="#C5C5C5"/>
-</svg>
--- a/res/dark/binary-icon.svg
+++ b/res/dark/binary-icon.svg
@ -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="M10.57 1.14L13.85 4.44L14 4.8V14.5L13.5 15H2.5L2 14.5V1.5L2.5 1H10.22L10.57 1.14ZM3 2V14H13V5L10 2H3ZM4.45947 6.05176C4.45947 7.33903 4.91781 7.98267 5.83447 7.98267C6.29102 7.98267 6.64103 7.809 6.88452 7.46167C7.1298 7.11434 7.25244 6.61483 7.25244 5.96313C7.25244 4.65438 6.80485 4 5.90967 4C5.4388 4 5.07894 4.17546 4.83008 4.52637C4.58301 4.87549 4.45947 5.38395 4.45947 6.05176ZM5.32153 6.03027C5.32153 5.10824 5.50505 4.64722 5.87207 4.64722C6.21582 4.64722 6.3877 5.09481 6.3877 5.98999C6.3877 6.88517 6.21224 7.33276 5.86133 7.33276C5.50146 7.33276 5.32153 6.8986 5.32153 6.03027ZM8.50854 7.91553H10.9443V7.24414H10.1521V4L8.48706 4.33569V5.02319L9.30615 4.84595V7.24414H8.50854V7.91553ZM7.17188 12.9155H4.73608V12.2441H5.53369V9.84595L4.7146 10.0232V9.33569L6.37964 9V12.2441H7.17188V12.9155ZM8.20703 10.9846C8.20703 12.2719 8.66536 12.9155 9.58203 12.9155C10.0386 12.9155 10.3886 12.7419 10.6321 12.3945C10.8774 12.0472 11 11.5477 11 10.896C11 9.58724 10.5524 8.93286 9.65723 8.93286C9.18636 8.93286 8.8265 9.10832 8.57764 9.45923C8.33057 9.80835 8.20703 10.3168 8.20703 10.9846ZM9.06909 10.9631C9.06909 10.0411 9.2526 9.58008 9.61963 9.58008C9.96338 9.58008 10.1353 10.0277 10.1353 10.9229C10.1353 11.818 9.9598 12.2656 9.60889 12.2656C9.24902 12.2656 9.06909 11.8315 9.06909 10.9631Z" fill="#C5C5C5"/>
-</svg>
--- a/res/dark/debug-icon.svg
+++ b/res/dark/debug-icon.svg
@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.46279 12.86L3.45815 12.79C3.45964 12.8134 3.46119 12.8367 3.46279 12.86Z" fill="#C5C5C5"/>
-<path d="M10.7275 13.5509L7.69304 10.501L8.70723 9.4868L11.9159 12.7117L15.0789 9.54875L16.0931 10.5629L13.0589 13.5972L16.0934 16.647L15.0792 17.6612L11.8705 14.4362L8.70748 17.5993L7.69329 16.5851L10.7275 13.5509Z" fill="#C5C5C5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.9329 5.00286V6H18.2784L21.1205 3.15788L22.1347 4.17207L19.4435 6.86321L19.476 6.94805C20.0424 8.42597 20.3614 10.094 20.3614 11.86C20.3614 12.1955 20.3499 12.5274 20.3274 12.8552L20.3222 12.93H23.8629V14.3643H20.142L20.1315 14.4217C19.8292 16.075 19.2409 17.5825 18.4398 18.851L18.3802 18.9454L21.8027 22.3852L20.7859 23.3968L17.512 20.1063L17.4131 20.2169C15.934 21.8712 14.0177 22.8629 11.93 22.8629C9.81001 22.8629 7.86653 21.8402 6.37842 20.1395L6.27988 20.0268L3.07125 23.2355L2.05706 22.2213L5.42258 18.8558L5.36431 18.7615C4.59172 17.5118 4.02373 16.0363 3.72847 14.4217L3.71797 14.3643H0V12.93H3.53777L3.53262 12.8552C3.51009 12.5274 3.49858 12.1955 3.49858 11.86C3.49858 10.117 3.80935 8.46951 4.36194 7.00599L4.39377 6.92168L1.63228 4.14621L2.64904 3.13457L5.50003 6H6.92715V5.00286C6.92715 2.23986 9.16701 0 11.93 0C14.693 0 16.9329 2.23986 16.9329 5.00286ZM8.36144 5.00286V6H15.4986V5.00286C15.4986 3.03199 13.9009 1.43429 11.93 1.43429C9.95914 1.43429 8.36144 3.03199 8.36144 5.00286ZM18.1609 7.52498L18.1267 7.43429H5.73328L5.69915 7.52498C5.21331 8.81605 4.93286 10.2859 4.93286 11.86C4.93286 14.6199 5.7951 17.061 7.11691 18.7793C8.43755 20.4962 10.1529 21.4286 11.93 21.4286C13.7072 21.4286 15.4225 20.4962 16.7431 18.7793C18.0649 17.061 18.9271 14.6199 18.9271 11.86C18.9271 10.2859 18.6467 8.81605 18.1609 7.52498Z" fill="#C5C5C5"/>
-</svg>
--- a/res/dark/edit-icon.svg
+++ b/res/dark/edit-icon.svg
@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.23 1H11.77L3.52002 9.25L3.35999 9.46997L1 13.59L2.41003 15L6.53003 12.64L6.75 12.48L15 4.22998V2.77002L13.23 1ZM2.41003 13.59L3.92004 10.59L5.37 12.04L2.41003 13.59ZM6.23999 11.53L4.46997 9.76001L12.47 1.76001L14.24 3.53003L6.23999 11.53Z" fill="#C5C5C5"/>
-</svg>
--- a/res/dark/library-icon.svg
+++ b/res/dark/library-icon.svg
@ -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="M14.5 2H9L8.65002 2.15002L8 2.79004L7.34998 2.15002L7 2H1.5L1 2.5V12.5L1.5 13H6.78998L7.65002 13.85H8.34998L9.21002 13H14.5L15 12.5V2.5L14.5 2ZM7.5 12.3199L7.32001 12.15L7 12H2V3H6.78998L7.53003 3.73999L7.5 12.3199ZM14 12H9L8.65002 12.15L8.51001 12.28V3.69995L9.21002 3H14V12ZM6 5H3V6H6V5ZM6 9H3V10H6V9ZM3 7H6V8H3V7ZM13 5H10V6H13V5ZM10 7H13V8H10V7ZM10 9H13V10H10V9Z" fill="#C5C5C5"/>
-</svg>
--- a/res/dark/stop-icon.svg
+++ b/res/dark/stop-icon.svg
@ -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="M8.00001 8.70708L11.6465 12.3535L12.3536 11.6464L8.70711 7.99998L12.3536 4.35353L11.6465 3.64642L8.00001 7.29287L4.35356 3.64642L3.64645 4.35353L7.2929 7.99998L3.64645 11.6464L4.35356 12.3535L8.00001 8.70708Z" fill="#C5C5C5"/>
-</svg>
--- a/res/dark/utility-icon.svg
+++ b/res/dark/utility-icon.svg
@ -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="M14.7725 3.48501L13.9937 3.30124L11.885 5.39688L10.6906 4.18062L12.7469 2.02372L12.5675 1.23187C12.1328 1.08662 11.6782 1.00986 11.22 1.00436C10.7203 0.996443 10.2243 1.09177 9.76314 1.28437C9.31788 1.48601 8.91537 1.77113 8.57748 2.12433C8.20131 2.48057 7.90333 2.91115 7.70248 3.38872C7.31581 4.33966 7.31581 5.40403 7.70248 6.35498C5.91311 8.10498 2.95999 11.0931 1.52936 12.5894C1.31962 12.8644 1.21845 13.207 1.24503 13.5518C1.25433 13.7356 1.30042 13.9156 1.38063 14.0812C1.46028 14.2472 1.57177 14.3958 1.70875 14.5187C1.83285 14.6544 1.98123 14.7657 2.14625 14.8469C2.31632 14.9218 2.49873 14.9648 2.68437 14.9737C3 14.9677 3.30292 14.8481 3.53753 14.6369C5.08628 13.18 8.05249 10.1875 9.73687 8.4331C10.1935 8.62691 10.6846 8.72663 11.1806 8.72625C11.68 8.72589 12.1742 8.62543 12.6341 8.43081C13.094 8.23618 13.5102 7.9513 13.8581 7.59308C14.5728 6.86438 14.972 5.88373 14.9694 4.86309C14.9807 4.39597 14.9141 3.93029 14.7725 3.48501ZM2.93377 13.9281C2.89509 13.9624 2.84845 13.9864 2.79812 13.9981C2.7489 14.0066 2.69861 14.0066 2.64939 13.9981C2.59757 13.9903 2.54817 13.9709 2.50498 13.9412C2.45894 13.9143 2.42 13.8768 2.39128 13.8318C2.25128 13.6875 2.12 13.4162 2.25125 13.2631C3.62062 11.8062 6.44249 8.95809 8.20562 7.21684C8.30665 7.3493 8.41626 7.47498 8.53374 7.59308C8.6522 7.71588 8.77941 7.82994 8.91436 7.93435C7.20811 9.68435 4.42565 12.4975 2.93377 13.9281ZM14.0506 4.86309C14.0531 5.62826 13.7546 6.36373 13.2194 6.91061C12.6845 7.4354 11.965 7.72938 11.2156 7.72938C10.4663 7.72938 9.74682 7.4354 9.21189 6.91061C8.82005 6.50142 8.55242 5.98941 8.44012 5.4341C8.32782 4.8788 8.37544 4.30301 8.57748 3.77372C8.712 3.41382 8.92053 3.08613 9.18956 2.81183C9.45859 2.53752 9.78217 2.32269 10.1394 2.18121C10.4787 2.03857 10.8432 1.96567 11.2112 1.96684H11.465L9.64939 3.83935V4.53496L11.5437 6.42061H12.2044L14.0506 4.60498V4.86309ZM3.23998 6.68751H4.77123L5.4756 7.40501L6.15375 6.73125L5.48874 6.05315V6.00936L5.54562 4.36003L5.32687 3.92253L2.4656 2.04126L1.87498 2.1069L1.04372 2.95562L0.978088 3.55499L2.81562 6.47314L3.23998 6.68751ZM2.29497 3.05624L4.60936 4.57878L4.57 5.70313H3.49371L2.00188 3.34062L2.29497 3.05624ZM9.39997 10.0169L10.0737 9.34314L13.18 12.5282C13.4416 12.8031 13.5875 13.1681 13.5875 13.5476C13.5875 13.9271 13.4416 14.292 13.18 14.5669C12.9833 14.7688 12.7304 14.9068 12.4541 14.963C12.1779 15.0192 11.8912 14.9909 11.6313 14.8819C11.4652 14.8083 11.3162 14.7011 11.1938 14.5669L8.05249 11.3644L8.73064 10.6863L11.8631 13.88C11.9053 13.9265 11.9577 13.9625 12.0163 13.9851C12.1313 14.0318 12.26 14.0318 12.375 13.9851C12.4335 13.9625 12.4859 13.9265 12.5281 13.88C12.5721 13.8366 12.6064 13.7845 12.6287 13.7269C12.6513 13.6682 12.6632 13.606 12.6638 13.5432C12.6627 13.4804 12.6509 13.4182 12.6287 13.3594C12.6064 13.3018 12.5721 13.2497 12.5281 13.2063L9.39997 10.0169Z" fill="#C5C5C5"/>
-</svg>
--- a/res/light/beaker-icon.svg
+++ b/res/light/beaker-icon.svg
@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.8932 13.558L10.0002 6.006V2.006H11.0002V1.006H9.99418V1L9.53818 1.005H5.00018V2H6.00018V5.952L2.10618 13.561C2.03048 13.7133 1.99489 13.8825 2.00279 14.0524C2.01068 14.2224 2.0618 14.3875 2.15131 14.5321C2.24081 14.6768 2.36574 14.7962 2.51428 14.8792C2.66282 14.9621 2.83006 15.0057 3.00018 15.006H13.0002C13.1706 15.0058 13.3382 14.9621 13.487 14.8789C13.6358 14.7958 13.7608 14.676 13.8503 14.5309C13.9398 14.3858 13.9907 14.2203 13.9982 14.05C14.0057 13.8798 13.9695 13.7104 13.8932 13.558ZM6.89318 6.408L7.00018 6.193V2.036L9.00018 2.012V6.007V6.249L9.11118 6.464L10.9372 10.006H5.04918L6.89318 6.408ZM3.00018 14.017L4.54118 11.006H11.4562L13.0032 14.006L3.00018 14.017Z" fill="#424242"/>
-</svg>
--- a/res/light/binary-icon.svg
+++ b/res/light/binary-icon.svg
@ -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="M10.57 1.14L13.85 4.44L14 4.8V14.5L13.5 15H2.5L2 14.5V1.5L2.5 1H10.22L10.57 1.14ZM3 2V14H13V5L10 2H3ZM4.45947 6.05176C4.45947 7.33903 4.91781 7.98267 5.83447 7.98267C6.29102 7.98267 6.64103 7.809 6.88452 7.46167C7.1298 7.11434 7.25244 6.61483 7.25244 5.96313C7.25244 4.65438 6.80485 4 5.90967 4C5.4388 4 5.07894 4.17546 4.83008 4.52637C4.58301 4.87549 4.45947 5.38395 4.45947 6.05176ZM5.32153 6.03027C5.32153 5.10824 5.50505 4.64722 5.87207 4.64722C6.21582 4.64722 6.3877 5.09481 6.3877 5.98999C6.3877 6.88517 6.21224 7.33276 5.86133 7.33276C5.50146 7.33276 5.32153 6.8986 5.32153 6.03027ZM8.50854 7.91553H10.9443V7.24414H10.1521V4L8.48706 4.33569V5.02319L9.30615 4.84595V7.24414H8.50854V7.91553ZM7.17188 12.9155H4.73608V12.2441H5.53369V9.84595L4.7146 10.0232V9.33569L6.37964 9V12.2441H7.17188V12.9155ZM8.20703 10.9846C8.20703 12.2719 8.66536 12.9155 9.58203 12.9155C10.0386 12.9155 10.3886 12.7419 10.6321 12.3945C10.8774 12.0472 11 11.5477 11 10.896C11 9.58724 10.5524 8.93286 9.65723 8.93286C9.18636 8.93286 8.8265 9.10832 8.57764 9.45923C8.33057 9.80835 8.20703 10.3168 8.20703 10.9846ZM9.06909 10.9631C9.06909 10.0411 9.2526 9.58008 9.61963 9.58008C9.96338 9.58008 10.1353 10.0277 10.1353 10.9229C10.1353 11.818 9.9598 12.2656 9.60889 12.2656C9.24902 12.2656 9.06909 11.8315 9.06909 10.9631Z" fill="#424242"/>
-</svg>
--- a/res/light/debug-icon.svg
+++ b/res/light/debug-icon.svg
@ -1,12 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path d="M3.46303 12.86L3.45839 12.79C3.45989 12.8134 3.46143 12.8367 3.46303 12.86Z" fill="#424242"/>
-<path d="M10.7277 13.5509L7.69328 10.501L8.70748 9.4868L11.9162 12.7117L15.0792 9.54875L16.0934 10.5629L13.0591 13.5972L16.0936 16.647L15.0794 17.6612L11.8707 14.4362L8.70773 17.5993L7.69353 16.5851L10.7277 13.5509Z" fill="#424242"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.9331 5.00286V6H18.2786L21.1207 3.15788L22.1349 4.17207L19.4438 6.86321L19.4763 6.94805C20.0426 8.42597 20.3617 10.094 20.3617 11.86C20.3617 12.1955 20.3502 12.5274 20.3276 12.8552L20.3225 12.93H23.8631V14.3643H20.1423L20.1318 14.4217C19.8294 16.075 19.2411 17.5825 18.44 18.851L18.3804 18.9454L21.8029 22.3852L20.7862 23.3968L17.5122 20.1063L17.4133 20.2169C15.9343 21.8712 14.0179 22.8629 11.9303 22.8629C9.81026 22.8629 7.86677 21.8402 6.37866 20.1395L6.28012 20.0268L3.0715 23.2355L2.05731 22.2213L5.42282 18.8558L5.36455 18.7615C4.59197 17.5118 4.02398 16.0363 3.72871 14.4217L3.71821 14.3643H0.000244141V12.93H3.53801L3.53287 12.8552C3.51034 12.5274 3.49882 12.1955 3.49882 11.86C3.49882 10.117 3.8096 8.46951 4.36218 7.00599L4.39402 6.92168L1.63253 4.14621L2.64928 3.13457L5.50028 6H6.9274V5.00286C6.9274 2.23986 9.16725 0 11.9303 0C14.6933 0 16.9331 2.23986 16.9331 5.00286ZM8.36168 5.00286V6H15.4988V5.00286C15.4988 3.03199 13.9011 1.43429 11.9303 1.43429C9.95938 1.43429 8.36168 3.03199 8.36168 5.00286ZM18.1611 7.52498L18.127 7.43429H5.73353L5.6994 7.52498C5.21355 8.81605 4.93311 10.2859 4.93311 11.86C4.93311 14.6199 5.79535 17.061 7.11715 18.7793C8.43779 20.4962 10.1531 21.4286 11.9303 21.4286C13.7074 21.4286 15.4227 20.4962 16.7433 18.7793C18.0652 17.061 18.9274 14.6199 18.9274 11.86C18.9274 10.2859 18.6469 8.81605 18.1611 7.52498Z" fill="#424242"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="24" height="24" fill="white" transform="translate(0.000244141)"/>
-</clipPath>
-</defs>
-</svg>
--- a/res/light/edit-icon.svg
+++ b/res/light/edit-icon.svg
@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.2302 1H11.7703L3.52026 9.25L3.36023 9.46997L1.00024 13.59L2.41028 15L6.53027 12.64L6.75024 12.48L15.0002 4.22998V2.77002L13.2302 1ZM2.41028 13.59L3.92029 10.59L5.37024 12.04L2.41028 13.59ZM6.24023 11.53L4.47021 9.76001L12.4702 1.76001L14.2402 3.53003L6.24023 11.53Z" fill="#424242"/>
-</svg>
--- a/res/light/library-icon.svg
+++ b/res/light/library-icon.svg
@ -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="M14.5 2H9L8.65002 2.15002L8 2.79004L7.34998 2.15002L7 2H1.5L1 2.5V12.5L1.5 13H6.78998L7.65002 13.85H8.34998L9.21002 13H14.5L15 12.5V2.5L14.5 2ZM7.5 12.3199L7.32001 12.15L7 12H2V3H6.78998L7.53003 3.73999L7.5 12.3199ZM14 12H9L8.65002 12.15L8.51001 12.28V3.69995L9.21002 3H14V12ZM6 5H3V6H6V5ZM6 9H3V10H6V9ZM3 7H6V8H3V7ZM13 5H10V6H13V5ZM10 7H13V8H10V7ZM10 9H13V10H10V9Z" fill="#424242"/>
-</svg>
--- a/res/light/stop-icon.svg
+++ b/res/light/stop-icon.svg
@ -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="M7.99998 8.70708L11.6464 12.3535L12.3535 11.6464L8.70708 7.99998L12.3535 4.35353L11.6464 3.64642L7.99998 7.29287L4.35353 3.64642L3.64642 4.35353L7.29287 7.99998L3.64642 11.6464L4.35353 12.3535L7.99998 8.70708Z" fill="#424242"/>
-</svg>
--- a/res/light/utility-icon.svg
+++ b/res/light/utility-icon.svg
@ -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="M14.7725 3.48501L13.9937 3.30124L11.885 5.39688L10.6906 4.18062L12.7469 2.02372L12.5675 1.23187C12.1328 1.08662 11.6782 1.00986 11.22 1.00436C10.7203 0.996443 10.2243 1.09177 9.76314 1.28437C9.31788 1.48601 8.91537 1.77113 8.57748 2.12433C8.20131 2.48057 7.90333 2.91115 7.70248 3.38872C7.31581 4.33966 7.31581 5.40403 7.70248 6.35498C5.91311 8.10498 2.95999 11.0931 1.52936 12.5894C1.31962 12.8644 1.21845 13.207 1.24503 13.5518C1.25433 13.7356 1.30042 13.9156 1.38063 14.0812C1.46028 14.2472 1.57177 14.3958 1.70875 14.5187C1.83285 14.6544 1.98123 14.7657 2.14625 14.8469C2.31632 14.9218 2.49873 14.9648 2.68437 14.9737C3 14.9677 3.30292 14.8481 3.53753 14.6369C5.08628 13.18 8.05249 10.1875 9.73687 8.4331C10.1935 8.62691 10.6846 8.72663 11.1806 8.72625C11.68 8.72589 12.1742 8.62543 12.6341 8.43081C13.094 8.23618 13.5102 7.9513 13.8581 7.59308C14.5728 6.86438 14.972 5.88373 14.9694 4.86309C14.9807 4.39597 14.9141 3.93029 14.7725 3.48501ZM2.93377 13.9281C2.89509 13.9624 2.84845 13.9864 2.79812 13.9981C2.7489 14.0066 2.69861 14.0066 2.64939 13.9981C2.59757 13.9903 2.54817 13.9709 2.50498 13.9412C2.45894 13.9143 2.42 13.8768 2.39128 13.8318C2.25128 13.6875 2.12 13.4162 2.25125 13.2631C3.62062 11.8062 6.44249 8.95809 8.20562 7.21684C8.30665 7.3493 8.41626 7.47498 8.53374 7.59308C8.6522 7.71588 8.77941 7.82994 8.91436 7.93435C7.20811 9.68435 4.42565 12.4975 2.93377 13.9281ZM14.0506 4.86309C14.0531 5.62826 13.7546 6.36373 13.2194 6.91061C12.6845 7.4354 11.965 7.72938 11.2156 7.72938C10.4663 7.72938 9.74682 7.4354 9.21189 6.91061C8.82005 6.50142 8.55242 5.98941 8.44012 5.4341C8.32782 4.8788 8.37544 4.30301 8.57748 3.77372C8.712 3.41382 8.92053 3.08613 9.18956 2.81183C9.45859 2.53752 9.78217 2.32269 10.1394 2.18121C10.4787 2.03857 10.8432 1.96567 11.2112 1.96684H11.465L9.64939 3.83935V4.53496L11.5437 6.42061H12.2044L14.0506 4.60498V4.86309ZM3.23998 6.68751H4.77123L5.4756 7.40501L6.15375 6.73125L5.48874 6.05315V6.00936L5.54562 4.36003L5.32687 3.92253L2.4656 2.04126L1.87498 2.1069L1.04372 2.95562L0.978088 3.55499L2.81562 6.47314L3.23998 6.68751ZM2.29497 3.05624L4.60936 4.57878L4.57 5.70313H3.49371L2.00188 3.34062L2.29497 3.05624ZM9.39997 10.0169L10.0737 9.34314L13.18 12.5282C13.4416 12.8031 13.5875 13.1681 13.5875 13.5476C13.5875 13.9271 13.4416 14.292 13.18 14.5669C12.9833 14.7688 12.7304 14.9068 12.4541 14.963C12.1779 15.0192 11.8912 14.9909 11.6313 14.8819C11.4652 14.8083 11.3162 14.7011 11.1938 14.5669L8.05249 11.3644L8.73064 10.6863L11.8631 13.88C11.9053 13.9265 11.9577 13.9625 12.0163 13.9851C12.1313 14.0318 12.26 14.0318 12.375 13.9851C12.4335 13.9625 12.4859 13.9265 12.5281 13.88C12.5721 13.8366 12.6064 13.7845 12.6287 13.7269C12.6513 13.6682 12.6632 13.606 12.6638 13.5432C12.6627 13.4804 12.6509 13.4182 12.6287 13.3594C12.6064 13.3018 12.5721 13.2497 12.5281 13.2063L9.39997 10.0169Z" fill="#424242"/>
-</svg>
--- a/src/projectOutlineProvider.ts
+++ b/src/projectOutlineProvider.ts
@ -3,7 +3,7 @@ import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import * as codeModel from '@cmt/drivers/codeModel';
 import rollbar from '@cmt/rollbar';
-import { lexicographicalCompare, splitPath, thisExtension } from '@cmt/util';
+import { lexicographicalCompare, splitPath } from '@cmt/util';

 nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
 const localize: nls.LocalizeFunc = nls.loadMessageBundle();
@ -103,15 +103,15 @@ function collapseTreeInplace<T>(tree: PathedTree<T>): void {
 function iconForTargetType(type: codeModel.TargetTypeString): string {
    switch (type) {
        case 'EXECUTABLE':
-            return 'binary-icon.svg';
+            return '$(file-binary)';
        case 'MODULE_LIBRARY':
        case 'SHARED_LIBRARY':
        case 'OBJECT_LIBRARY':
        case 'INTERFACE_LIBRARY':
        case 'STATIC_LIBRARY':
-            return 'library-icon.svg';
+            return '$(library)';
        case 'UTILITY':
-            return 'utility-icon.svg';
+            return '$(wrench)';
    }
 }

@ -302,11 +302,7 @@ export class TargetNode extends BaseNode {
            if (this._isDefault) {
                item.tooltip += ` [${localize('default.tooltip', 'default')}]`;
            }
-            const icon = iconForTargetType(this._type);
-            item.iconPath = {
-                light: path.join(thisExtension().extensionPath, "res/light", icon),
-                dark: path.join(thisExtension().extensionPath, "res/dark", icon)
-            };
+            item.iconPath = iconForTargetType(this._type);
            item.id = this.id;
            const canBuild = this._type !== 'INTERFACE_LIBRARY' && this._type !== 'UTILITY' && this._type !== 'OBJECT_LIBRARY';
            const canRun = this._type === 'UTILITY';
--- a/src/sideBar.ts
+++ b/src/sideBar.ts
@ -89,15 +89,15 @@ class TreeDataProvider implements vscode.TreeDataProvider<Node>, vscode.Disposab
                await runCommand('selectConfigurePreset', folder);
                await this.refresh(node);
            }),
-            vscode.commands.registerCommand('cmake.projectStatus.configure', async (folder: vscode.WorkspaceFolder) => {
-                void runCommand('configure', folder);
+            vscode.commands.registerCommand('cmake.projectStatus.configure', async (_node: Node) => {
+                void runCommand('configure', this.cmakeProject?.workspaceFolder);
            }),
            vscode.commands.registerCommand('cmake.projectStatus.setVariant', async (node: Node, folder: vscode.WorkspaceFolder, variant: Promise<string>) => {
                await runCommand('setVariant', folder, await variant);
                await this.refresh(node);
            }),
-            vscode.commands.registerCommand('cmake.projectStatus.build', async (folder: vscode.WorkspaceFolder, target: Promise<string>) => {
-                void runCommand('build', folder, await target);
+            vscode.commands.registerCommand('cmake.projectStatus.build', async (_node: Node) => {
+                void runCommand('build', this.cmakeProject?.workspaceFolder, await this.cmakeProject?.buildTargetName());
            }),
            vscode.commands.registerCommand('cmake.projectStatus.setDefaultTarget', async (node: Node, folder: vscode.WorkspaceFolder, target: Promise<string>) => {
                await runCommand('setDefaultTarget', folder, await target);
@ -318,11 +318,6 @@ class ConfigNode extends Node {
            return;
        }
        this.label = localize('Configure', 'Configure');
-        this.command = {
-            title: this.label,
-            command: 'cmake.projectStatus.configure',
-            arguments: [treeDataProvider.cmakeProject.workspaceFolder]
-        };
        this.tooltip = this.label;
        this.collapsibleState = vscode.TreeItemCollapsibleState.Expanded;
        this.contextValue = "configure";
@ -383,11 +378,6 @@ class BuildNode extends Node {
            return;
        }
        this.label = localize('Build', 'Build');
-        this.command = {
-            title: this.label,
-            command: 'cmake.projectStatus.build',
-            arguments: [treeDataProvider.cmakeProject.workspaceFolder, treeDataProvider.cmakeProject.buildTargetName()]
-        };
        this.tooltip = this.label;
        this.collapsibleState = vscode.TreeItemCollapsibleState.Expanded;
        this.contextValue = 'build';
@ -446,11 +436,6 @@ class TestNode extends Node {
            return;
        }
        this.label = localize('Test', 'Test');
-        this.command = {
-            title: this.label,
-            command: 'cmake.projectStatus.test',
-            arguments: [treeDataProvider.cmakeProject.workspaceFolder, treeDataProvider.cmakeProject.allTargetName]
-        };
        this.tooltip = this.label;
        this.collapsibleState = vscode.TreeItemCollapsibleState.Expanded;
        this.contextValue = 'test';
@ -492,11 +477,6 @@ class DebugNode extends Node {
            return;
        }
        this.label = localize('Debug', 'Debug');
-        this.command = {
-            title: this.label,
-            command: 'cmake.projectStatus.debugTarget',
-            arguments: [treeDataProvider.cmakeProject.workspaceFolder, treeDataProvider.cmakeProject.launchTargetName || await treeDataProvider.cmakeProject.allTargetName]
-        };
        this.tooltip = this.label;
        this.collapsibleState = vscode.TreeItemCollapsibleState.Expanded;
        this.contextValue = 'debug';
@ -529,11 +509,6 @@ class LaunchNode extends Node {
            return;
        }
        this.label = localize('Launch', 'Launch');
-        this.command = {
-            title: this.label,
-            command: 'cmake.projectStatus.launchTarget',
-            arguments: [treeDataProvider.cmakeProject.workspaceFolder, treeDataProvider.cmakeProject.launchTargetName || await treeDataProvider.cmakeProject.allTargetName]
-        };
        this.tooltip = this.label;
        this.collapsibleState = vscode.TreeItemCollapsibleState.Expanded;
        this.contextValue = 'launch';
@ -595,11 +570,6 @@ class ConfigPreset extends Node {
            return;
        }
        this.label = treeDataProvider.cmakeProject.configurePreset?.name || noConfigPresetSelected;
-        this.command = {
-            title: localize('change.preset', 'Change Preset'),
-            command: 'cmake.projectStatus.selectConfigurePreset',
-            arguments: [this]
-        };
        this.tooltip = 'Change Configure Preset';
        this.contextValue = 'configPreset';
        this.collapsibleState = vscode.TreeItemCollapsibleState.None;
@ -623,11 +593,6 @@ class BuildPreset extends Node {
        if (this.label === preset.defaultBuildPreset.name) {
            this.label = preset.defaultBuildPreset.displayName;
        }
-        this.command = {
-            title: localize('change.preset', 'Change Preset'),
-            command: 'cmake.projectStatus.selectBuildPreset',
-            arguments: [this]
-        };
        this.tooltip = 'Change Build Preset';
        this.contextValue = 'buildPreset';
        this.collapsibleState = vscode.TreeItemCollapsibleState.None;
@ -651,11 +616,6 @@ class TestPreset extends Node {
        if (this.label === preset.defaultTestPreset.name) {
            this.label = preset.defaultTestPreset.displayName;
        }
-        this.command = {
-            title: localize('change.preset', 'Change Preset'),
-            command: 'cmake.projectStatus.selectTestPreset',
-            arguments: [this]
-        };
        this.tooltip = 'Change Test Preset';
        this.contextValue = 'testPreset';
        this.collapsibleState = vscode.TreeItemCollapsibleState.None;
@ -676,11 +636,6 @@ class Kit extends Node {
            return;
        }
        this.label = treeDataProvider.cmakeProject.activeKit?.name || noKitSelected;
-        this.command = {
-            title: localize('change.kit', 'Change Kit'),
-            command: 'cmake.projectStatus.selectKit',
-            arguments: []
-        };
        this.tooltip = "Change Kit";
        this.collapsibleState = vscode.TreeItemCollapsibleState.None;
        this.contextValue = 'kit';
@ -703,11 +658,6 @@ class BuildTarget extends Node {
        }
        const title: string = localize('set.build.target', 'Set Build Target');
        this.label = await treeDataProvider.cmakeProject.buildTargetName() || await treeDataProvider.cmakeProject.allTargetName;
-        this.command = {
-            title: title,
-            command: 'cmake.projectStatus.setDefaultTarget',
-            arguments: [this, treeDataProvider.cmakeProject.workspaceFolder, treeDataProvider.cmakeProject.buildTargetName()]
-        };
        this.tooltip = title;
        this.collapsibleState = vscode.TreeItemCollapsibleState.None;
        this.contextValue = 'buildTarget';
@ -728,22 +678,15 @@ class TestTarget extends Node {
            return;
        }
        this.label = "[All tests]";
-        const title: string = localize('set.test.target', 'Set Test Target');
-        this.command = {
-            title: title,
-            command: 'cmake.projectStatus.setTestTarget',
-            arguments: [treeDataProvider.cmakeProject.workspaceFolder, "All tests"]
-        };
-        this.tooltip = title;
        this.collapsibleState = vscode.TreeItemCollapsibleState.None;
-        this.contextValue = 'testTarget';
+        // Set the contextValue to 'testTarget' when we implement setTestTarget to choose a target for a test.
    }

    async refresh() {
        if (!treeDataProvider.cmakeProject) {
            return;
        }
-        this.label = "All tests";
+        this.label = "[All tests]";
    }
 }

@ -755,11 +698,6 @@ class DebugTarget extends Node {
        }
        this.label = treeDataProvider.cmakeProject.launchTargetName || await treeDataProvider.cmakeProject.allTargetName;
        const title: string = localize('set.debug.target', 'Set debug target');
-        this.command = {
-            title: title,
-            command: 'cmake.projectStatus.setDebugTarget',
-            arguments: [this, treeDataProvider.cmakeProject.workspaceFolder, treeDataProvider.cmakeProject.launchTargetName]
-        };
        this.tooltip = title;
        this.collapsibleState = vscode.TreeItemCollapsibleState.None;
        this.contextValue = 'debugTarget';
@ -781,11 +719,6 @@ class LaunchTarget extends Node {
        }
        this.label = treeDataProvider.cmakeProject.launchTargetName || await treeDataProvider.cmakeProject.allTargetName;
        const title: string = localize('set.launch.target', 'Set Launch Target');
-        this.command = {
-            title: title,
-            command: 'cmake.projectStatus.setLaunchTarget',
-            arguments: [this, treeDataProvider.cmakeProject.workspaceFolder, treeDataProvider.cmakeProject.launchTargetName]
-        };
        this.tooltip = title;
        this.collapsibleState = vscode.TreeItemCollapsibleState.None;
        this.contextValue = 'launchTarget';
@ -807,11 +740,6 @@ class Project extends Node {
        }
        this.label = treeDataProvider.cmakeProject.folderName;
        const title: string = localize('select.active.project', 'Select active project');
-        this.command = {
-            title: title,
-            command: "cmake.projectStatus.selectActiveProject",
-            arguments: []
-        };
        this.tooltip = title;
        this.collapsibleState = vscode.TreeItemCollapsibleState.None;
        this.contextValue = 'activeProject';
@ -831,11 +759,6 @@ class Variant extends Node {
            return;
        }
        this.label = treeDataProvider.cmakeProject.activeVariantName || "Debug";
-        this.command = {
-            title: localize('set.variant', 'Set variant'),
-            command: 'cmake.setVariant',
-            arguments: [this, treeDataProvider.cmakeProject.workspaceFolder, treeDataProvider.cmakeProject.activeVariantName]
-        };
        this.tooltip = "Set variant";
        this.collapsibleState = vscode.TreeItemCollapsibleState.None;
        this.contextValue = 'variant';