diff --git a/dist/plain-ui.css b/dist/plain-ui.css
index bbb5ab5..f2830de 100644
--- a/dist/plain-ui.css
+++ b/dist/plain-ui.css
@@ -2037,6 +2037,17 @@ h6, .h6 {
  *
  *
  */
+.icon {
+  width: 1em;
+  height: 1em;
+  max-height: 100%;
+  max-width: 100%;
+  vertical-align: middle;
+  overflow: hidden;
+  font-size: 1.4rem;
+  fill: var(--text);
+}
+
 /**
  *  <div class="hero">
  *      <img src="image.png" alt="image" />
@@ -2053,10 +2064,6 @@ h6, .h6 {
   -o-object-position: 50% 50%;
      object-position: 50% 50%;
 }
-.hero--contain {
-  -o-object-fit: contain;
-     object-fit: contain;
-}
 
 /**
  *
@@ -5062,25 +5069,6 @@ svg.field-choice__checked {
   color: #d95959;
 }
 
-.icon {
-  width: 1em;
-  height: 1em;
-  max-height: 100%;
-  max-width: 100%;
-  vertical-align: middle;
-  overflow: hidden;
-  font-size: 1.4rem;
-  fill: #3e3e3e;
-}
-
-.icon--success {
-  fill: #64ac64;
-}
-
-.icon--danger {
-  fill: #d95959;
-}
-
 .panel {
   border: 1px solid #3e3e3e;
   border-radius: 2px;
diff --git a/src/scss/components/_hero.scss b/src/scss/components/_hero.scss
index 8076f10..5c069bb 100644
--- a/src/scss/components/_hero.scss
+++ b/src/scss/components/_hero.scss
@@ -13,8 +13,4 @@
         object-fit: cover;
         object-position: 50% 50%;
     }
-
-    &--contain {
-        object-fit: contain;
-    }
 }
\ No newline at end of file
diff --git a/src/scss/components/_icon.scss b/src/scss/components/_icon.scss
index 69fff33..b37783a 100644
--- a/src/scss/components/_icon.scss
+++ b/src/scss/components/_icon.scss
@@ -5,27 +5,17 @@
  *
  */
 
-@mixin plain-ui__component__icon() {
-    .icon {
-        width: 1em;
-        height: 1em;
+.icon {
+    width: 1em;
+    height: 1em;
 
-        max-height: 100%;
-        max-width: 100%;
+    max-height: 100%;
+    max-width: 100%;
 
-        vertical-align: middle;
-        overflow: hidden;
+    vertical-align: middle;
+    overflow: hidden;
 
-        font-size: 1.4rem;
+    font-size: 1.4rem;
 
-        fill: $plain-ui__primary-light;
-    }
-
-    .icon--success {
-        fill: $plain-ui__success-light;
-    }
-
-    .icon--danger {
-        fill: $plain-ui__danger-light;
-    }
+    fill: var(--text);
 }
\ No newline at end of file
diff --git a/src/scss/helpers/_core.scss b/src/scss/helpers/_core.scss
index b137443..661fd6e 100644
--- a/src/scss/helpers/_core.scss
+++ b/src/scss/helpers/_core.scss
@@ -43,8 +43,6 @@
         }
     }
 
-
-
     /**
      *
      *
diff --git a/src/scss/plain-ui.scss b/src/scss/plain-ui.scss
index 4e9fc68..70296af 100644
--- a/src/scss/plain-ui.scss
+++ b/src/scss/plain-ui.scss
@@ -38,7 +38,6 @@
 @include plain-ui__component__button-colors();
 
 @include plain-ui__component__field();
-@include plain-ui__component__icon();
 @include plain-ui__component__panel();
 @include plain-ui__component__media();
 @include plain-ui__component__table();