diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
index 672985310d..be163e65a6 100644
--- a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
+++ b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
@@ -249,4 +249,4 @@
     {{{concat '<!-- ' (env 'CONSUL_GIT_SHA') '-->'}}}
   </:content-info>
 
-</App>
\ No newline at end of file
+</App>
diff --git a/ui/packages/consul-ui/app/components/popover-select/index.scss b/ui/packages/consul-ui/app/components/popover-select/index.scss
index dad07b2cdd..ac45555434 100644
--- a/ui/packages/consul-ui/app/components/popover-select/index.scss
+++ b/ui/packages/consul-ui/app/components/popover-select/index.scss
@@ -56,30 +56,10 @@
   @extend %with-user-team-mask, %as-pseudo;
   color: rgb(var(--tone-gray-500));
 }
-%popover-select .lambda button::before,
-%popover-select .aws button::before {
-  @extend %with-aws-300;
-}
-%popover-select .kubernetes button::before {
-  @extend %with-logo-kubernetes-color-icon, %as-pseudo;
-}
 %popover-select .jwt button::before {
   @extend %with-logo-jwt-color-icon, %as-pseudo;
 }
 %popover-select .oidc button::before {
   @extend %with-logo-oidc-color-icon, %as-pseudo;
 }
-%popover-select .consul button::before,
-%popover-select .consul-api-gateway button::before {
-  @extend %with-logo-consul-color-icon, %as-pseudo;
-}
-%popover-select .nomad button::before {
-  @extend %with-logo-nomad-color-icon, %as-pseudo;
-}
-%popover-select .vault button::before {
-  @extend %with-vault-300;
-}
-%popover-select .terraform button::before {
-  @extend %with-logo-terraform-color-icon, %as-pseudo;
-}
 /**/
diff --git a/ui/packages/consul-ui/app/helpers/icons-debug.js b/ui/packages/consul-ui/app/helpers/icons-debug.js
index 30b12c9e28..9cd51242b0 100644
--- a/ui/packages/consul-ui/app/helpers/icons-debug.js
+++ b/ui/packages/consul-ui/app/helpers/icons-debug.js
@@ -75,10 +75,6 @@ export default helper(function ([lib], hash) {
     'auto-apply-24.svg',
     'award-16.svg',
     'award-24.svg',
-    'aws-16.svg',
-    'aws-24.svg',
-    'aws-color-16.svg',
-    'aws-color-24.svg',
     'azure-16.svg',
     'azure-24.svg',
     'azure-color-16.svg',
@@ -549,8 +545,6 @@ export default helper(function ([lib], hash) {
     'logo-alicloud-color.svg',
     'logo-alicloud-monochrome.svg',
     'logo-auth0-color.svg',
-    'logo-aws-color.svg',
-    'logo-aws-monochrome.svg',
     'logo-azure-color.svg',
     'logo-azure-dev-ops-color.svg',
     'logo-azure-dev-ops-monochrome.svg',
@@ -573,15 +567,12 @@ export default helper(function ([lib], hash) {
     'logo-kubernetes-color.svg',
     'logo-kubernetes-monochrome.svg',
     'logo-microsoft-color.svg',
-    'logo-nomad-color.svg',
     'logo-oidc-color.svg',
     'logo-okta-color.svg',
     'logo-oracle-color.svg',
     'logo-oracle-monochrome.svg',
     'logo-slack-color.svg',
     'logo-slack-monochrome.svg',
-    'logo-terraform-color.svg',
-    'logo-vault-color.svg',
     'logo-vmware-color.svg',
     'logo-vmware-monochrome.svg',
     'mail-16.svg',
diff --git a/ui/packages/consul-ui/app/styles/base/icons/debug.scss b/ui/packages/consul-ui/app/styles/base/icons/debug.scss
index 16fe3c648d..3641a2a64e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/debug.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/debug.scss
@@ -2385,254 +2385,6 @@
   background-image: var(--award-24-svg);
 }
 
-.debug-with-aws-16-mask-before::before,
-.debug-with-aws-16-icon-before::before,
-.debug-with-aws-16-mask-after::after,
-.debug-with-aws-16-icon-after::after {
-  display: inline-block;
-  content: '';
-  visibility: visible;
-  background-size: contain;
-  width: 1.2em;
-  height: 1.2em;
-  vertical-align: text-top;
-}
-.debug-with-aws-16-mask-before::before,
-.debug-with-aws-16-mask-after::after {
-  -webkit-mask-repeat: no-repeat;
-  -webkit-mask-position: center;
-  mask-repeat: no-repeat;
-  mask-position: center;
-  background-color: currentColor;
-
-  -webkit-mask-image: var(--aws-16-svg);
-  mask-image: var(--aws-16-svg);
-}
-.debug-with-aws-16-icon-before::before,
-.debug-with-aws-16-icon-after::after {
-  background-repeat: no-repeat;
-  background-position: center;
-
-  background-image: var(--aws-16-svg);
-}
-
-.debug-with-aws-24-mask-before::before,
-.debug-with-aws-24-icon-before::before,
-.debug-with-aws-24-mask-after::after,
-.debug-with-aws-24-icon-after::after {
-  display: inline-block;
-  content: '';
-  visibility: visible;
-  background-size: contain;
-  width: 1.2em;
-  height: 1.2em;
-  vertical-align: text-top;
-}
-.debug-with-aws-24-mask-before::before,
-.debug-with-aws-24-mask-after::after {
-  -webkit-mask-repeat: no-repeat;
-  -webkit-mask-position: center;
-  mask-repeat: no-repeat;
-  mask-position: center;
-  background-color: currentColor;
-
-  -webkit-mask-image: var(--aws-24-svg);
-  mask-image: var(--aws-24-svg);
-}
-.debug-with-aws-24-icon-before::before,
-.debug-with-aws-24-icon-after::after {
-  background-repeat: no-repeat;
-  background-position: center;
-
-  background-image: var(--aws-24-svg);
-}
-
-.debug-with-aws-color-16-mask-before::before,
-.debug-with-aws-color-16-icon-before::before,
-.debug-with-aws-color-16-mask-after::after,
-.debug-with-aws-color-16-icon-after::after {
-  display: inline-block;
-  content: '';
-  visibility: visible;
-  background-size: contain;
-  width: 1.2em;
-  height: 1.2em;
-  vertical-align: text-top;
-}
-.debug-with-aws-color-16-mask-before::before,
-.debug-with-aws-color-16-mask-after::after {
-  -webkit-mask-repeat: no-repeat;
-  -webkit-mask-position: center;
-  mask-repeat: no-repeat;
-  mask-position: center;
-  background-color: currentColor;
-
-  -webkit-mask-image: var(--aws-color-16-svg);
-  mask-image: var(--aws-color-16-svg);
-}
-.debug-with-aws-color-16-icon-before::before,
-.debug-with-aws-color-16-icon-after::after {
-  background-repeat: no-repeat;
-  background-position: center;
-
-  background-image: var(--aws-color-16-svg);
-}
-
-.debug-with-aws-color-24-mask-before::before,
-.debug-with-aws-color-24-icon-before::before,
-.debug-with-aws-color-24-mask-after::after,
-.debug-with-aws-color-24-icon-after::after {
-  display: inline-block;
-  content: '';
-  visibility: visible;
-  background-size: contain;
-  width: 1.2em;
-  height: 1.2em;
-  vertical-align: text-top;
-}
-.debug-with-aws-color-24-mask-before::before,
-.debug-with-aws-color-24-mask-after::after {
-  -webkit-mask-repeat: no-repeat;
-  -webkit-mask-position: center;
-  mask-repeat: no-repeat;
-  mask-position: center;
-  background-color: currentColor;
-
-  -webkit-mask-image: var(--aws-color-24-svg);
-  mask-image: var(--aws-color-24-svg);
-}
-.debug-with-aws-color-24-icon-before::before,
-.debug-with-aws-color-24-icon-after::after {
-  background-repeat: no-repeat;
-  background-position: center;
-
-  background-image: var(--aws-color-24-svg);
-}
-
-.debug-with-aws-ec2-16-mask-before::before,
-.debug-with-aws-ec2-16-icon-before::before,
-.debug-with-aws-ec2-16-mask-after::after,
-.debug-with-aws-ec2-16-icon-after::after {
-  display: inline-block;
-  content: '';
-  visibility: visible;
-  background-size: contain;
-  width: 1.2em;
-  height: 1.2em;
-  vertical-align: text-top;
-}
-.debug-with-aws-ec2-16-mask-before::before,
-.debug-with-aws-ec2-16-mask-after::after {
-  -webkit-mask-repeat: no-repeat;
-  -webkit-mask-position: center;
-  mask-repeat: no-repeat;
-  mask-position: center;
-  background-color: currentColor;
-
-  -webkit-mask-image: var(--aws-ec2-16-svg);
-  mask-image: var(--aws-ec2-16-svg);
-}
-.debug-with-aws-ec2-16-icon-before::before,
-.debug-with-aws-ec2-16-icon-after::after {
-  background-repeat: no-repeat;
-  background-position: center;
-
-  background-image: var(--aws-ec2-16-svg);
-}
-
-.debug-with-aws-ec2-24-mask-before::before,
-.debug-with-aws-ec2-24-icon-before::before,
-.debug-with-aws-ec2-24-mask-after::after,
-.debug-with-aws-ec2-24-icon-after::after {
-  display: inline-block;
-  content: '';
-  visibility: visible;
-  background-size: contain;
-  width: 1.2em;
-  height: 1.2em;
-  vertical-align: text-top;
-}
-.debug-with-aws-ec2-24-mask-before::before,
-.debug-with-aws-ec2-24-mask-after::after {
-  -webkit-mask-repeat: no-repeat;
-  -webkit-mask-position: center;
-  mask-repeat: no-repeat;
-  mask-position: center;
-  background-color: currentColor;
-
-  -webkit-mask-image: var(--aws-ec2-24-svg);
-  mask-image: var(--aws-ec2-24-svg);
-}
-.debug-with-aws-ec2-24-icon-before::before,
-.debug-with-aws-ec2-24-icon-after::after {
-  background-repeat: no-repeat;
-  background-position: center;
-
-  background-image: var(--aws-ec2-24-svg);
-}
-
-.debug-with-aws-ec2-color-16-mask-before::before,
-.debug-with-aws-ec2-color-16-icon-before::before,
-.debug-with-aws-ec2-color-16-mask-after::after,
-.debug-with-aws-ec2-color-16-icon-after::after {
-  display: inline-block;
-  content: '';
-  visibility: visible;
-  background-size: contain;
-  width: 1.2em;
-  height: 1.2em;
-  vertical-align: text-top;
-}
-.debug-with-aws-ec2-color-16-mask-before::before,
-.debug-with-aws-ec2-color-16-mask-after::after {
-  -webkit-mask-repeat: no-repeat;
-  -webkit-mask-position: center;
-  mask-repeat: no-repeat;
-  mask-position: center;
-  background-color: currentColor;
-
-  -webkit-mask-image: var(--aws-ec2-color-16-svg);
-  mask-image: var(--aws-ec2-color-16-svg);
-}
-.debug-with-aws-ec2-color-16-icon-before::before,
-.debug-with-aws-ec2-color-16-icon-after::after {
-  background-repeat: no-repeat;
-  background-position: center;
-
-  background-image: var(--aws-ec2-color-16-svg);
-}
-
-.debug-with-aws-ec2-color-24-mask-before::before,
-.debug-with-aws-ec2-color-24-icon-before::before,
-.debug-with-aws-ec2-color-24-mask-after::after,
-.debug-with-aws-ec2-color-24-icon-after::after {
-  display: inline-block;
-  content: '';
-  visibility: visible;
-  background-size: contain;
-  width: 1.2em;
-  height: 1.2em;
-  vertical-align: text-top;
-}
-.debug-with-aws-ec2-color-24-mask-before::before,
-.debug-with-aws-ec2-color-24-mask-after::after {
-  -webkit-mask-repeat: no-repeat;
-  -webkit-mask-position: center;
-  mask-repeat: no-repeat;
-  mask-position: center;
-  background-color: currentColor;
-
-  -webkit-mask-image: var(--aws-ec2-color-24-svg);
-  mask-image: var(--aws-ec2-color-24-svg);
-}
-.debug-with-aws-ec2-color-24-icon-before::before,
-.debug-with-aws-ec2-color-24-icon-after::after {
-  background-repeat: no-repeat;
-  background-position: center;
-
-  background-image: var(--aws-ec2-color-24-svg);
-}
-
 .debug-with-azure-16-mask-before::before,
 .debug-with-azure-16-icon-before::before,
 .debug-with-azure-16-mask-after::after,
@@ -19063,37 +18815,6 @@
   background-image: var(--logo-microsoft-color-svg);
 }
 
-.debug-with-logo-nomad-color-mask-before::before,
-.debug-with-logo-nomad-color-icon-before::before,
-.debug-with-logo-nomad-color-mask-after::after,
-.debug-with-logo-nomad-color-icon-after::after {
-  display: inline-block;
-  content: '';
-  visibility: visible;
-  background-size: contain;
-  width: 1.2em;
-  height: 1.2em;
-  vertical-align: text-top;
-}
-.debug-with-logo-nomad-color-mask-before::before,
-.debug-with-logo-nomad-color-mask-after::after {
-  -webkit-mask-repeat: no-repeat;
-  -webkit-mask-position: center;
-  mask-repeat: no-repeat;
-  mask-position: center;
-  background-color: currentColor;
-
-  -webkit-mask-image: var(--logo-nomad-color-svg);
-  mask-image: var(--logo-nomad-color-svg);
-}
-.debug-with-logo-nomad-color-icon-before::before,
-.debug-with-logo-nomad-color-icon-after::after {
-  background-repeat: no-repeat;
-  background-position: center;
-
-  background-image: var(--logo-nomad-color-svg);
-}
-
 .debug-with-logo-oidc-color-mask-before::before,
 .debug-with-logo-oidc-color-icon-before::before,
 .debug-with-logo-oidc-color-mask-after::after,
@@ -19280,68 +19001,6 @@
   background-image: var(--logo-slack-monochrome-svg);
 }
 
-.debug-with-logo-terraform-color-mask-before::before,
-.debug-with-logo-terraform-color-icon-before::before,
-.debug-with-logo-terraform-color-mask-after::after,
-.debug-with-logo-terraform-color-icon-after::after {
-  display: inline-block;
-  content: '';
-  visibility: visible;
-  background-size: contain;
-  width: 1.2em;
-  height: 1.2em;
-  vertical-align: text-top;
-}
-.debug-with-logo-terraform-color-mask-before::before,
-.debug-with-logo-terraform-color-mask-after::after {
-  -webkit-mask-repeat: no-repeat;
-  -webkit-mask-position: center;
-  mask-repeat: no-repeat;
-  mask-position: center;
-  background-color: currentColor;
-
-  -webkit-mask-image: var(--logo-terraform-color-svg);
-  mask-image: var(--logo-terraform-color-svg);
-}
-.debug-with-logo-terraform-color-icon-before::before,
-.debug-with-logo-terraform-color-icon-after::after {
-  background-repeat: no-repeat;
-  background-position: center;
-
-  background-image: var(--logo-terraform-color-svg);
-}
-
-.debug-with-logo-vault-color-mask-before::before,
-.debug-with-logo-vault-color-icon-before::before,
-.debug-with-logo-vault-color-mask-after::after,
-.debug-with-logo-vault-color-icon-after::after {
-  display: inline-block;
-  content: '';
-  visibility: visible;
-  background-size: contain;
-  width: 1.2em;
-  height: 1.2em;
-  vertical-align: text-top;
-}
-.debug-with-logo-vault-color-mask-before::before,
-.debug-with-logo-vault-color-mask-after::after {
-  -webkit-mask-repeat: no-repeat;
-  -webkit-mask-position: center;
-  mask-repeat: no-repeat;
-  mask-position: center;
-  background-color: currentColor;
-
-  -webkit-mask-image: var(--logo-vault-color-svg);
-  mask-image: var(--logo-vault-color-svg);
-}
-.debug-with-logo-vault-color-icon-before::before,
-.debug-with-logo-vault-color-icon-after::after {
-  background-repeat: no-repeat;
-  background-position: center;
-
-  background-image: var(--logo-vault-color-svg);
-}
-
 .debug-with-logo-vmware-color-mask-before::before,
 .debug-with-logo-vmware-color-icon-before::before,
 .debug-with-logo-vmware-color-mask-after::after,
@@ -35692,10 +35351,6 @@
 
   --logo-oidc-color-svg: url('data:image/svg+xml;charset=UTF-8,<svg viewbox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M12.833 8.375l-.291-2.625-.846.554c-.788-.496-1.78-.846-2.888-1.02 0 0-.554-.117-1.283-.117-.73 0-1.4.087-1.4.087-2.83.35-4.958 1.954-4.958 3.88 0 1.983 2.187 3.616 5.541 3.908v-1.138c-2.304-.32-3.762-1.4-3.762-2.77 0-1.284 1.341-2.363 3.179-2.713 0 0 1.43-.321 2.683.058.613.146 1.167.35 1.634.642l-1.109.67 3.5.584z" fill="%239E9E9E"/><path d="M6.708 2.833v10.209l1.75-.875V1.958l-1.75.875z" fill="%23000"/><path d="M6.708 2.833v10.209l1.75-.875V1.958l-1.75.875z" fill="%23FF9800"/></svg>');
 
-  --logo-terraform-color-svg: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 16 18" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="%235C4EE5" d="M5.51 3.15l4.886 2.821v5.644L5.509 8.792z"/><path fill="%234040B2" d="M10.931 5.971v5.644l4.888-2.823V3.15z"/><path fill="%235C4EE5" d="M.086 0v5.642l4.887 2.823V2.82zM5.51 15.053l4.886 2.823v-5.644l-4.887-2.82z"/></g></svg>');
-
-  --logo-vault-color-svg: url('data:image/svg+xml;charset=UTF-8,<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M0 0L14.9453 30L30 0H0ZM16.724 6.02083H18.4635V7.76042H16.724V6.02083ZM11.5208 12.9766H13.2604V11.237H11.5208V12.9766ZM13.2604 10.3724H11.5208V8.6302H13.2604V10.3724ZM11.5208 7.76823H13.2604V6.02083H11.5208V7.76823ZM15.8646 15.5937H14.1302V13.8463H15.8698L15.8646 15.5937ZM14.1302 12.9896H15.8646L15.8698 11.237H14.1302V12.9896ZM15.8646 10.3854H14.1302V8.6302H15.8698L15.8646 10.3854ZM14.1302 7.78125H15.8646L15.8698 6.02083H14.1302V7.78125ZM16.7187 8.65105H18.4635V10.3906H16.7239L16.7187 8.65105ZM16.7344 11.237V13L18.4896 12.9766V11.237H16.7344Z" fill="%23000"/></svg>');
-
   --mail-16-svg: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h11.5A2.25 2.25 0 0116 3.25v9.5A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75v-9.5zm2.25-.75a.75.75 0 00-.748.69L8 8.297l6.498-5.105a.75.75 0 00-.748-.691H2.25zm-.75 9.885V5.097l3.865 3.037L1.5 12.385zM2.514 13.5h10.972L9.452 9.063l-.989.777a.75.75 0 01-.926 0l-.99-.777L2.515 13.5zm8.12-5.366l3.866 4.251V5.097l-3.865 3.037z" clip-rule="evenodd"/></svg>');
 
   --mail-24-svg: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M1 5.75A2.75 2.75 0 013.75 3h16.5A2.75 2.75 0 0123 5.75v12.5A2.75 2.75 0 0120.25 21H3.75A2.75 2.75 0 011 18.25V5.75zM3.75 4.5a1.25 1.25 0 00-1.057.582L12 12.062l9.307-6.98A1.25 1.25 0 0020.25 4.5H3.75zM2.5 16.44V6.812l5.501 4.125L2.5 16.44zm.031 2.09c.127.555.625.97 1.219.97h16.5a1.25 1.25 0 001.219-.97l-6.682-6.683L12.45 13.6a.75.75 0 01-.9 0l-2.337-1.752-6.682 6.681zM16 10.937L21.5 16.44V6.813l-5.501 4.125z" clip-rule="evenodd"/></svg>');
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/index.scss
deleted file mode 100644
index ba3c10a4ec..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/index.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-
-        @import './property-16';
-        @import './property-24';
-        @import './keyframes';
-        @import './placeholders';
-      
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/keyframes.scss
deleted file mode 100644
index d3dfe5bfc0..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/keyframes.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@keyframes icon-aws-color {
-  100% {
-    background-image: var(--icon-aws-color-16);
-  }
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/placeholders.scss
deleted file mode 100644
index 49812edc7a..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/placeholders.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-
-%with-aws-color-icon {
-  --icon-name: icon-aws-color;
-  content: '';
-}
-%with-aws-color-mask {
-  --icon-name: icon-aws-color;
-  content: '';
-}
-  
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/property-16.scss
deleted file mode 100644
index 49cbd83c17..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/property-16.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:root {
-  --icon-aws-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23252F3E" d="M4.51 7.687c0 .197.02.357.058.475.042.117.096.245.17.384a.233.233 0 01.037.123c0 .053-.032.107-.1.16l-.336.224a.255.255 0 01-.138.048c-.054 0-.107-.026-.16-.074a1.652 1.652 0 01-.192-.251 4.137 4.137 0 01-.165-.315c-.415.491-.936.737-1.564.737-.447 0-.804-.129-1.064-.385-.261-.256-.394-.598-.394-1.025 0-.454.16-.822.484-1.1.325-.278.756-.416 1.304-.416.18 0 .367.016.564.042.197.027.4.07.612.118v-.39c0-.406-.085-.689-.25-.854-.17-.166-.458-.246-.868-.246-.186 0-.377.022-.574.07a4.23 4.23 0 00-.575.181 1.525 1.525 0 01-.186.07.326.326 0 01-.085.016c-.075 0-.112-.054-.112-.166v-.262c0-.085.01-.15.037-.186a.399.399 0 01.15-.113c.185-.096.409-.176.67-.24.26-.07.537-.101.83-.101.633 0 1.096.144 1.394.432.293.288.442.726.442 1.314v1.73h.01zm-2.161.811c.175 0 .356-.032.548-.096.191-.064.362-.182.505-.342a.848.848 0 00.181-.341c.032-.129.054-.283.054-.465V7.03a4.43 4.43 0 00-.49-.09 3.996 3.996 0 00-.5-.033c-.357 0-.618.07-.793.214-.176.144-.26.347-.26.614 0 .25.063.437.196.566.128.133.314.197.559.197zm4.273.577c-.096 0-.16-.016-.202-.054-.043-.032-.08-.106-.112-.208l-1.25-4.127a.938.938 0 01-.049-.214c0-.085.043-.133.128-.133h.522c.1 0 .17.016.207.053.043.032.075.107.107.208l.894 3.535.83-3.535c.026-.106.058-.176.1-.208a.365.365 0 01.214-.053h.425c.102 0 .17.016.213.053.043.032.08.107.101.208l.841 3.578.92-3.578a.458.458 0 01.107-.208.346.346 0 01.208-.053h.495c.085 0 .133.043.133.133 0 .027-.006.054-.01.086a.76.76 0 01-.038.133l-1.283 4.127c-.032.107-.069.177-.111.209a.34.34 0 01-.203.053h-.457c-.101 0-.17-.016-.213-.053-.043-.038-.08-.107-.101-.214L8.213 5.37l-.82 3.439c-.026.107-.058.176-.1.213-.043.038-.118.054-.213.054h-.458zm6.838.144a3.51 3.51 0 01-.82-.096c-.266-.064-.473-.134-.612-.214-.085-.048-.143-.101-.165-.15a.378.378 0 01-.031-.149v-.272c0-.112.042-.166.122-.166a.3.3 0 01.096.016c.032.011.08.032.133.054.18.08.378.144.585.187.213.042.42.064.633.064.336 0 .596-.059.777-.176a.575.575 0 00.277-.508.52.52 0 00-.144-.373c-.095-.102-.276-.193-.537-.278l-.772-.24c-.388-.123-.676-.305-.851-.545a1.275 1.275 0 01-.266-.774c0-.224.048-.422.143-.593.096-.17.224-.32.384-.438.16-.122.34-.213.553-.277.213-.064.436-.091.67-.091.118 0 .24.005.357.021.122.016.234.038.346.06.106.026.208.052.303.085.096.032.17.064.224.096a.46.46 0 01.16.133.289.289 0 01.047.176v.251c0 .112-.042.171-.122.171a.552.552 0 01-.202-.064 2.427 2.427 0 00-1.022-.208c-.303 0-.543.048-.708.15-.165.1-.25.256-.25.475 0 .149.053.277.16.379.106.101.303.202.585.293l.756.24c.383.123.66.294.825.513.165.219.244.47.244.748 0 .23-.047.437-.138.619a1.436 1.436 0 01-.388.47c-.165.133-.362.23-.591.299-.24.075-.49.112-.761.112z"/><g fill="%23F90" fill-rule="evenodd" clip-rule="evenodd"><path d="M14.465 11.813c-1.75 1.297-4.294 1.986-6.481 1.986-3.065 0-5.827-1.137-7.913-3.027-.165-.15-.016-.353.18-.235 2.257 1.313 5.04 2.109 7.92 2.109 1.941 0 4.075-.406 6.039-1.239.293-.133.543.192.255.406z"/><path d="M15.194 10.98c-.223-.287-1.479-.138-2.048-.069-.17.022-.197-.128-.043-.24 1-.705 2.645-.502 2.836-.267.192.24-.053 1.89-.99 2.68-.143.123-.281.06-.218-.1.213-.53.687-1.72.463-2.003z"/></g></svg>');
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/property-24.scss
deleted file mode 100644
index 50edae1674..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-color/property-24.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:root {
-  --icon-aws-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23252F3E" d="M6.895 10.085c0 .288.031.521.085.692.063.172.14.359.25.561a.338.338 0 01.054.18c0 .077-.047.155-.148.233l-.49.327a.373.373 0 01-.203.07c-.077 0-.155-.039-.233-.11a2.408 2.408 0 01-.28-.365 6.031 6.031 0 01-.241-.46c-.607.717-1.37 1.075-2.288 1.075-.654 0-1.176-.187-1.557-.56-.381-.374-.576-.873-.576-1.495 0-.662.234-1.2.708-1.605.475-.404 1.105-.607 1.907-.607.265 0 .537.023.825.062.288.04.584.102.895.172v-.569c0-.591-.125-1.004-.366-1.246-.249-.24-.67-.358-1.268-.358a3.54 3.54 0 00-.84.102 6.2 6.2 0 00-.841.264 2.234 2.234 0 01-.273.101.477.477 0 01-.124.024c-.11 0-.164-.078-.164-.242V5.95c0-.125.016-.218.055-.273A.583.583 0 012 5.514c.272-.14.599-.257.98-.35a4.716 4.716 0 011.214-.148c.926 0 1.604.21 2.04.63.427.42.645 1.06.645 1.916v2.522h.016zm-3.16 1.183c.257 0 .522-.047.802-.14.28-.094.529-.265.74-.498.124-.148.217-.312.264-.499.046-.187.078-.412.078-.677v-.327a6.494 6.494 0 00-.716-.133 5.86 5.86 0 00-.732-.046c-.521 0-.903.1-1.16.311-.256.21-.381.506-.381.896 0 .366.093.638.288.825.187.195.46.288.817.288zm6.25.841c-.14 0-.234-.023-.296-.078-.062-.047-.117-.156-.164-.304L7.696 5.71a1.364 1.364 0 01-.07-.312c0-.124.063-.195.187-.195h.763c.148 0 .249.024.303.078.063.047.11.156.156.304l1.308 5.155 1.214-5.155c.039-.156.085-.257.147-.304a.535.535 0 01.312-.078h.622c.148 0 .25.024.312.078.062.047.117.156.148.304l1.23 5.217 1.346-5.217c.046-.156.1-.257.155-.304a.508.508 0 01.304-.078h.724c.124 0 .194.063.194.195 0 .039-.008.078-.015.125a1.104 1.104 0 01-.055.194l-1.876 6.02c-.046.155-.1.256-.163.303a.497.497 0 01-.296.078h-.669c-.148 0-.249-.024-.311-.078-.063-.055-.117-.156-.148-.312l-1.206-5.022-1.199 5.015c-.039.155-.086.257-.148.311-.062.055-.171.078-.311.078h-.67zm10 .21a5.15 5.15 0 01-1.198-.14c-.39-.093-.693-.195-.895-.311-.125-.07-.21-.148-.242-.218a.55.55 0 01-.046-.218v-.398c0-.163.062-.24.179-.24a.44.44 0 01.14.022c.047.016.117.047.194.078.265.117.553.21.857.273.31.062.614.093.926.093.49 0 .871-.085 1.136-.257a.838.838 0 00.404-.74.758.758 0 00-.21-.544c-.14-.148-.404-.28-.786-.405l-1.128-.35c-.568-.18-.988-.445-1.245-.795a1.856 1.856 0 01-.39-1.129c0-.327.07-.615.21-.864.14-.25.328-.467.561-.639a2.47 2.47 0 01.81-.405 3.39 3.39 0 01.98-.132c.171 0 .35.008.521.031.18.024.343.055.506.086.156.039.304.078.444.124.14.047.249.094.327.14a.673.673 0 01.233.195.42.42 0 01.07.257V6.2c0 .164-.062.25-.179.25a.81.81 0 01-.295-.094 3.559 3.559 0 00-1.495-.304c-.443 0-.793.07-1.035.218-.241.148-.365.374-.365.693 0 .218.077.405.233.553.156.148.444.296.856.428l1.105.35c.56.18.965.429 1.207.748.24.32.358.685.358 1.09 0 .335-.07.639-.203.903-.14.265-.327.499-.568.686-.241.194-.53.335-.864.436a3.7 3.7 0 01-1.113.163z"/><g fill="%23F90" fill-rule="evenodd" clip-rule="evenodd"><path d="M21.456 16.103c-2.56 1.892-6.28 2.897-9.48 2.897-4.482 0-8.522-1.659-11.572-4.415-.242-.218-.024-.514.264-.343 3.3 1.916 7.37 3.076 11.58 3.076 2.841 0 5.962-.592 8.834-1.806.428-.195.794.28.374.591z"/><path d="M22.522 14.889c-.327-.42-2.164-.203-2.996-.101-.25.03-.288-.187-.063-.35 1.463-1.029 3.868-.733 4.148-.39.28.35-.077 2.756-1.447 3.909-.21.179-.413.085-.32-.148.312-.771 1.005-2.508.678-2.92z"/></g></svg>');
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/index.scss
deleted file mode 100644
index ba3c10a4ec..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/index.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-
-        @import './property-16';
-        @import './property-24';
-        @import './keyframes';
-        @import './placeholders';
-      
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/keyframes.scss
deleted file mode 100644
index f13b8723b8..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/keyframes.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@keyframes icon-aws-ec2-color {
-  100% {
-    background-image: var(--icon-aws-ec2-color-16);
-  }
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/placeholders.scss
deleted file mode 100644
index 5d755fce96..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/placeholders.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-
-%with-aws-ec2-color-icon {
-  --icon-name: icon-aws-ec2-color;
-  content: '';
-}
-%with-aws-ec2-color-mask {
-  --icon-name: icon-aws-ec2-color;
-  content: '';
-}
-  
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/property-16.scss
deleted file mode 100644
index 733f7111cb..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/property-16.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:root {
-  --icon-aws-ec2-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%239D5025" d="M1.702 2.98L1 3.312v9.376l.702.332 2.842-4.777L1.702 2.98z"/><path fill="%23F58536" d="M3.339 12.657l-1.637.363V2.98l1.637.353v9.324z"/><path fill="%239D5025" d="M2.476 2.612l.863-.406 4.096 6.216-4.096 5.372-.863-.406V2.612z"/><path fill="%23F58536" d="M5.38 13.248l-2.041.546V2.206l2.04.548v10.494z"/><path fill="%239D5025" d="M4.3 1.75l1.08-.512 6.043 7.864-6.043 5.66-1.08-.511V1.749z"/><path fill="%23F58536" d="M7.998 13.856l-2.618.906V1.238l2.618.908v11.71z"/><path fill="%239D5025" d="M6.602.66L7.998 0l6.538 8.453L7.998 16l-1.396-.66V.66z"/><path fill="%23F58536" d="M15 12.686L7.998 16V0L15 3.314v9.372z"/></svg>');
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/property-24.scss
deleted file mode 100644
index ce4f1c44bc..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2-color/property-24.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:root {
-  --icon-aws-ec2-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%239D5025" d="M3.003 4.47L2 4.967v14.064l1.003.499 4.06-7.167-4.06-7.895z"/><path fill="%23F58536" d="M5.341 18.985l-2.338.546V4.469L5.341 5v13.985z"/><path fill="%239D5025" d="M4.11 3.918L5.34 3.31l5.852 9.324-5.852 8.058-1.232-.61V3.919z"/><path fill="%23F58536" d="M8.257 19.872l-2.916.819V3.309l2.916.822v15.74z"/><path fill="%239D5025" d="M6.714 2.624l1.543-.767 8.633 11.796-8.633 8.49-1.543-.767V2.624z"/><path fill="%23F58536" d="M11.997 20.784l-3.74 1.359V1.857l3.74 1.362v17.565z"/><path fill="%239D5025" d="M10.002.991L11.997 0l9.34 12.68L11.997 24l-1.995-.991V.99z"/><path fill="%23F58536" d="M22 19.03L11.997 24V0L22 4.97v14.06z"/></svg>');
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/index.scss
deleted file mode 100644
index d0b08b41a2..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/index.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-
-        @import '../aws-ec2-color/property-16';
-        @import '../aws-ec2-color/property-24';
-        @import './keyframes';
-        @import './placeholders';
-      
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/keyframes.scss
deleted file mode 100644
index 5c0d89d287..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/keyframes.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-@keyframes icon-aws-ec2 {
-  100% {
-
-    -webkit-mask-image: var(--icon-aws-ec2-color-16);
-    mask-image: var(--icon-aws-ec2-color-16);
-    background-color: var(--icon-color, var(--color-aws-ec2-500, currentColor));
-
-  }
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/placeholders.scss
deleted file mode 100644
index 85140264d3..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/placeholders.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-
-%with-aws-ec2-icon {
-  --icon-name: icon-aws-ec2;
-  content: '';
-}
-%with-aws-ec2-mask {
-  --icon-name: icon-aws-ec2;
-  content: '';
-}
-  
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/property-16.scss
deleted file mode 100644
index 361e260334..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/property-16.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:root {
-  --icon-aws-ec2-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.602.66L7.998 0 15 3.314v9.372L7.998 16l-1.396-.66V.66zM5.38 1.238L4.3 1.75v12.502l1.08.51V1.239zM2.476 2.612l.863-.406v11.588l-.863-.406V2.612zM1.7 2.98V13.02l-.7-.332V3.312l.7-.33z"/></g></svg>');
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/property-24.scss
deleted file mode 100644
index 15622c3a8a..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws-ec2/property-24.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:root {
-  --icon-aws-ec2-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.602.66L7.998 0 15 3.314v9.372L7.998 16l-1.396-.66V.66zM5.38 1.238L4.3 1.75v12.502l1.08.51V1.239zM2.476 2.612l.863-.406v11.588l-.863-.406V2.612zM1.7 2.98V13.02l-.7-.332V3.312l.7-.33z"/></g></svg>');
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws/index.scss
deleted file mode 100644
index a8b4b9693f..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws/index.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-
-        @import '../aws-color/property-16';
-        @import '../aws-color/property-24';
-        @import './keyframes';
-        @import './placeholders';
-      
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws/keyframes.scss
deleted file mode 100644
index 6fe49edb96..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws/keyframes.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-@keyframes icon-aws {
-  100% {
-
-    -webkit-mask-image: var(--icon-aws-color-16);
-    mask-image: var(--icon-aws-color-16);
-    background-color: var(--icon-color, var(--color-aws-500, currentColor));
-
-  }
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws/placeholders.scss
deleted file mode 100644
index f89a3799bf..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws/placeholders.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-
-%with-aws-icon {
-  --icon-name: icon-aws;
-  content: '';
-}
-%with-aws-mask {
-  --icon-name: icon-aws;
-  content: '';
-}
-  
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws/property-16.scss
deleted file mode 100644
index 6241882d33..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws/property-16.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:root {
-  --icon-aws-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.51 7.687c0 .197.02.357.058.475.042.117.096.245.17.384a.233.233 0 01.037.123c0 .053-.032.107-.1.16l-.336.224a.255.255 0 01-.138.048c-.054 0-.107-.026-.16-.074a1.652 1.652 0 01-.192-.251 4.137 4.137 0 01-.164-.315c-.416.491-.937.737-1.565.737-.447 0-.804-.129-1.064-.385-.261-.256-.394-.598-.394-1.025 0-.454.16-.822.484-1.1.325-.278.756-.416 1.304-.416.18 0 .367.016.564.042.197.027.4.07.612.118v-.39c0-.406-.085-.689-.25-.854-.17-.166-.458-.246-.868-.246-.186 0-.377.022-.574.07a4.23 4.23 0 00-.575.181 1.525 1.525 0 01-.186.07.326.326 0 01-.085.016c-.075 0-.112-.054-.112-.166v-.262c0-.085.01-.15.037-.186a.399.399 0 01.15-.113c.185-.096.409-.176.67-.24.26-.07.537-.101.83-.101.633 0 1.096.144 1.394.432.293.288.442.726.442 1.314v1.73h.01zm-2.161.811c.175 0 .356-.032.548-.096.192-.064.362-.182.505-.342a.848.848 0 00.181-.341c.032-.129.054-.283.054-.465V7.03a4.43 4.43 0 00-.49-.09 3.996 3.996 0 00-.5-.033c-.357 0-.617.07-.793.214-.176.144-.26.347-.26.614 0 .25.063.437.196.566.128.133.314.197.559.197zm4.273.577c-.096 0-.16-.016-.202-.054-.043-.032-.08-.106-.112-.208l-1.25-4.127a.938.938 0 01-.048-.214c0-.085.042-.133.127-.133h.522c.1 0 .17.016.207.053.043.032.075.107.107.208l.894 3.535.83-3.535c.026-.106.058-.176.101-.208a.365.365 0 01.213-.053h.426c.1 0 .17.016.212.053.043.032.08.107.102.208l.84 3.578.92-3.578a.459.459 0 01.107-.208.347.347 0 01.208-.053h.495c.085 0 .133.043.133.133 0 .027-.006.054-.01.086a.768.768 0 01-.038.133l-1.283 4.127c-.031.107-.069.177-.111.209a.34.34 0 01-.203.053h-.457c-.101 0-.17-.016-.213-.053-.043-.038-.08-.107-.101-.214L8.213 5.37l-.82 3.439c-.026.107-.058.176-.1.213-.043.038-.118.054-.213.054h-.458zm6.838.144a3.51 3.51 0 01-.82-.096c-.266-.064-.473-.134-.612-.214-.085-.048-.143-.101-.165-.15a.38.38 0 01-.031-.149v-.272c0-.112.042-.166.122-.166a.3.3 0 01.096.016c.032.011.08.032.133.054.18.08.378.144.585.187.213.042.42.064.633.064.336 0 .596-.059.777-.176a.575.575 0 00.277-.508.52.52 0 00-.144-.373c-.095-.102-.276-.193-.537-.278l-.772-.24c-.388-.123-.676-.305-.851-.545a1.275 1.275 0 01-.266-.774c0-.224.048-.422.143-.593.096-.17.224-.32.384-.438.16-.122.34-.213.553-.277.213-.064.436-.091.67-.091.118 0 .24.005.357.021.122.016.234.038.346.06.106.026.208.052.303.085.096.032.17.064.224.096a.461.461 0 01.16.133.289.289 0 01.047.176v.251c0 .112-.042.171-.122.171a.552.552 0 01-.202-.064 2.428 2.428 0 00-1.022-.208c-.303 0-.543.048-.708.15-.165.1-.25.256-.25.475 0 .149.053.277.16.379.106.101.303.202.585.293l.756.24c.383.123.66.294.825.513.165.219.244.47.244.748 0 .23-.047.437-.138.619a1.435 1.435 0 01-.388.47c-.165.133-.362.23-.591.299-.24.075-.49.112-.761.112z"/><path fill-rule="evenodd" d="M14.465 11.813c-1.75 1.297-4.294 1.986-6.481 1.986-3.065 0-5.827-1.137-7.913-3.027-.165-.15-.016-.353.18-.235 2.257 1.313 5.04 2.109 7.92 2.109 1.941 0 4.075-.406 6.039-1.239.293-.133.543.192.255.406z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M15.194 10.98c-.223-.287-1.479-.138-2.048-.069-.17.022-.197-.128-.043-.24 1-.705 2.645-.502 2.836-.267.192.24-.053 1.89-.99 2.68-.143.123-.281.06-.217-.1.212-.53.686-1.72.462-2.003z" clip-rule="evenodd"/></g></svg>');
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/aws/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/aws/property-24.scss
deleted file mode 100644
index a84d413b91..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/aws/property-24.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:root {
-  --icon-aws-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.51 7.687c0 .197.02.357.058.475.042.117.096.245.17.384a.233.233 0 01.037.123c0 .053-.032.107-.1.16l-.336.224a.255.255 0 01-.138.048c-.054 0-.107-.026-.16-.074a1.652 1.652 0 01-.192-.251 4.137 4.137 0 01-.164-.315c-.416.491-.937.737-1.565.737-.447 0-.804-.129-1.064-.385-.261-.256-.394-.598-.394-1.025 0-.454.16-.822.484-1.1.325-.278.756-.416 1.304-.416.18 0 .367.016.564.042.197.027.4.07.612.118v-.39c0-.406-.085-.689-.25-.854-.17-.166-.458-.246-.868-.246-.186 0-.377.022-.574.07a4.23 4.23 0 00-.575.181 1.525 1.525 0 01-.186.07.326.326 0 01-.085.016c-.075 0-.112-.054-.112-.166v-.262c0-.085.01-.15.037-.186a.399.399 0 01.15-.113c.185-.096.409-.176.67-.24.26-.07.537-.101.83-.101.633 0 1.096.144 1.394.432.293.288.442.726.442 1.314v1.73h.01zm-2.161.811c.175 0 .356-.032.548-.096.192-.064.362-.182.505-.342a.848.848 0 00.181-.341c.032-.129.054-.283.054-.465V7.03a4.43 4.43 0 00-.49-.09 3.996 3.996 0 00-.5-.033c-.357 0-.617.07-.793.214-.176.144-.26.347-.26.614 0 .25.063.437.196.566.128.133.314.197.559.197zm4.273.577c-.096 0-.16-.016-.202-.054-.043-.032-.08-.106-.112-.208l-1.25-4.127a.938.938 0 01-.048-.214c0-.085.042-.133.127-.133h.522c.1 0 .17.016.207.053.043.032.075.107.107.208l.894 3.535.83-3.535c.026-.106.058-.176.101-.208a.365.365 0 01.213-.053h.426c.1 0 .17.016.212.053.043.032.08.107.102.208l.84 3.578.92-3.578a.459.459 0 01.107-.208.347.347 0 01.208-.053h.495c.085 0 .133.043.133.133 0 .027-.006.054-.01.086a.768.768 0 01-.038.133l-1.283 4.127c-.031.107-.069.177-.111.209a.34.34 0 01-.203.053h-.457c-.101 0-.17-.016-.213-.053-.043-.038-.08-.107-.101-.214L8.213 5.37l-.82 3.439c-.026.107-.058.176-.1.213-.043.038-.118.054-.213.054h-.458zm6.838.144a3.51 3.51 0 01-.82-.096c-.266-.064-.473-.134-.612-.214-.085-.048-.143-.101-.165-.15a.38.38 0 01-.031-.149v-.272c0-.112.042-.166.122-.166a.3.3 0 01.096.016c.032.011.08.032.133.054.18.08.378.144.585.187.213.042.42.064.633.064.336 0 .596-.059.777-.176a.575.575 0 00.277-.508.52.52 0 00-.144-.373c-.095-.102-.276-.193-.537-.278l-.772-.24c-.388-.123-.676-.305-.851-.545a1.275 1.275 0 01-.266-.774c0-.224.048-.422.143-.593.096-.17.224-.32.384-.438.16-.122.34-.213.553-.277.213-.064.436-.091.67-.091.118 0 .24.005.357.021.122.016.234.038.346.06.106.026.208.052.303.085.096.032.17.064.224.096a.461.461 0 01.16.133.289.289 0 01.047.176v.251c0 .112-.042.171-.122.171a.552.552 0 01-.202-.064 2.428 2.428 0 00-1.022-.208c-.303 0-.543.048-.708.15-.165.1-.25.256-.25.475 0 .149.053.277.16.379.106.101.303.202.585.293l.756.24c.383.123.66.294.825.513.165.219.244.47.244.748 0 .23-.047.437-.138.619a1.435 1.435 0 01-.388.47c-.165.133-.362.23-.591.299-.24.075-.49.112-.761.112z"/><path fill-rule="evenodd" d="M14.465 11.813c-1.75 1.297-4.294 1.986-6.481 1.986-3.065 0-5.827-1.137-7.913-3.027-.165-.15-.016-.353.18-.235 2.257 1.313 5.04 2.109 7.92 2.109 1.941 0 4.075-.406 6.039-1.239.293-.133.543.192.255.406z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M15.194 10.98c-.223-.287-1.479-.138-2.048-.069-.17.022-.197-.128-.043-.24 1-.705 2.645-.502 2.836-.267.192.24-.053 1.89-.99 2.68-.143.123-.281.06-.217-.1.212-.53.686-1.72.462-2.003z" clip-rule="evenodd"/></g></svg>');
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/index.scss
index 8f8663c4ca..da3904fb6c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/index.scss
@@ -75,8 +75,6 @@
 // @import './lock-open/index.scss';
 // @import './logo-alicloud-color/index.scss';
 // @import './logo-alicloud-monochrome/index.scss';
-// @import './logo-aws-color/index.scss';
-// @import './logo-aws-monochrome/index.scss';
 // @import './logo-azure-color/index.scss';
 // @import './logo-azure-dev-ops-color/index.scss';
 // @import './logo-azure-dev-ops-monochrome/index.scss';
@@ -192,10 +190,6 @@
 // @import './auth0-color/index.scss';
 // @import './auto-apply/index.scss';
 // @import './award/index.scss';
-@import './aws/index.scss';
-@import './aws-color/index.scss';
-// @import './aws-ec2/index.scss';
-// @import './aws-ec2-color/index.scss';
 // @import './azure/index.scss';
 // @import './azure-color/index.scss';
 // @import './azure-devops/index.scss';
@@ -455,8 +449,6 @@
 @import './network-alt/index.scss';
 // @import './newspaper/index.scss';
 // @import './node/index.scss';
-// @import './nomad/index.scss';
-// @import './nomad-color/index.scss';
 // @import './octagon/index.scss';
 // @import './okta/index.scss';
 // @import './okta-color/index.scss';
@@ -635,17 +627,13 @@
 // @import './layers/index.scss';
 @import './loading-motion/index.scss';
 @import './logo-auth0-color/index.scss';
-@import './logo-consul-color/index.scss';
 @import './logo-ember-circle-color/index.scss';
 @import './logo-glimmer-color/index.scss';
 // @import './logo-hashicorp-color/index.scss';
 @import './logo-jwt-color/index.scss';
 @import './logo-microsoft-color/index.scss';
-@import './logo-nomad-color/index.scss';
 @import './logo-oidc-color/index.scss';
 @import './logo-okta-color/index.scss';
-@import './logo-terraform-color/index.scss';
-// @import './logo-vault-color/index.scss';
 @import './mesh/index.scss';
 // @import './path/index.scss';
 @import './port/index.scss';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-nomad-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-nomad-color/index.scss
deleted file mode 100644
index fd3f9ca136..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-nomad-color/index.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-
-        @import '../nomad-color/property-16';
-        @import '../nomad-color/property-24';
-        @import './keyframes';
-        @import './placeholders';
-      
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-nomad-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-nomad-color/keyframes.scss
deleted file mode 100644
index 58e14319d3..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-nomad-color/keyframes.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@keyframes icon-logo-nomad-color {
-  100% {
-    background-image: var(--icon-nomad-color-16);
-  }
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-nomad-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-nomad-color/placeholders.scss
deleted file mode 100644
index a9766f756f..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-nomad-color/placeholders.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-
-%with-logo-nomad-color-icon {
-  --icon-name: icon-logo-nomad-color;
-  content: '';
-}
-%with-logo-nomad-color-mask {
-  --icon-name: icon-logo-nomad-color;
-  content: '';
-}
-  
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-terraform-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-terraform-color/index.scss
deleted file mode 100644
index c9683ccebe..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-terraform-color/index.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-
-        @import '../terraform-color/property-16';
-        @import '../terraform-color/property-24';
-        @import './keyframes';
-        @import './placeholders';
-      
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-terraform-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-terraform-color/keyframes.scss
deleted file mode 100644
index 11a564eb80..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-terraform-color/keyframes.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@keyframes icon-logo-terraform-color {
-  100% {
-    background-image: var(--icon-terraform-color-16);
-  }
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-terraform-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-terraform-color/placeholders.scss
deleted file mode 100644
index 45c088b817..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-terraform-color/placeholders.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-
-%with-logo-terraform-color-icon {
-  --icon-name: icon-logo-terraform-color;
-  content: '';
-}
-%with-logo-terraform-color-mask {
-  --icon-name: icon-logo-terraform-color;
-  content: '';
-}
-  
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/index.scss
deleted file mode 100644
index 86cee0b297..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/index.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-
-        @import './property-16';
-        
-        @import './keyframes';
-        @import './placeholders';
-      
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/keyframes.scss
deleted file mode 100644
index 65bf05e356..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/keyframes.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@keyframes icon-logo-vault-color {
-  100% {
-    background-image: var(--icon-logo-vault-color-16);
-  }
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/placeholders.scss
deleted file mode 100644
index 9be269b4e8..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/placeholders.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-
-%with-logo-vault-color-icon {
-  --icon-name: icon-logo-vault-color;
-  content: '';
-}
-%with-logo-vault-color-mask {
-  --icon-name: icon-logo-vault-color;
-  content: '';
-}
-  
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/property-16.scss
deleted file mode 100644
index 34e0849f04..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/property-16.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:root {
-  --icon-logo-vault-color-16: url('data:image/svg+xml;charset=UTF-8,<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M0 0L14.9453 30L30 0H0ZM16.724 6.02083H18.4635V7.76042H16.724V6.02083ZM11.5208 12.9766H13.2604V11.237H11.5208V12.9766ZM13.2604 10.3724H11.5208V8.6302H13.2604V10.3724ZM11.5208 7.76823H13.2604V6.02083H11.5208V7.76823ZM15.8646 15.5937H14.1302V13.8463H15.8698L15.8646 15.5937ZM14.1302 12.9896H15.8646L15.8698 11.237H14.1302V12.9896ZM15.8646 10.3854H14.1302V8.6302H15.8698L15.8646 10.3854ZM14.1302 7.78125H15.8646L15.8698 6.02083H14.1302V7.78125ZM16.7187 8.65105H18.4635V10.3906H16.7239L16.7187 8.65105ZM16.7344 11.237V13L18.4896 12.9766V11.237H16.7344Z" fill="%23000"/></svg>');
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/property-24.scss
deleted file mode 100644
index c191e6b951..0000000000
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vault-color/property-24.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:root {
-  --icon-logo-vault-color-24: url('data:image/svg+xml;charset=UTF-8,<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M0 0L14.9453 30L30 0H0ZM16.724 6.02083H18.4635V7.76042H16.724V6.02083ZM11.5208 12.9766H13.2604V11.237H11.5208V12.9766ZM13.2604 10.3724H11.5208V8.6302H13.2604V10.3724ZM11.5208 7.76823H13.2604V6.02083H11.5208V7.76823ZM15.8646 15.5937H14.1302V13.8463H15.8698L15.8646 15.5937ZM14.1302 12.9896H15.8646L15.8698 11.237H14.1302V12.9896ZM15.8646 10.3854H14.1302V8.6302H15.8698L15.8646 10.3854ZM14.1302 7.78125H15.8646L15.8698 6.02083H14.1302V7.78125ZM16.7187 8.65105H18.4635V10.3906H16.7239L16.7187 8.65105ZM16.7344 11.237V13L18.4896 12.9766V11.237H16.7344Z" fill="%23000"/></svg>');
-}
\ No newline at end of file