diff --git a/components/lib/iconfield/style/IconFieldStyle.js b/components/lib/iconfield/style/IconFieldStyle.js
index ad75f0cd0..378a3ce58 100644
--- a/components/lib/iconfield/style/IconFieldStyle.js
+++ b/components/lib/iconfield/style/IconFieldStyle.js
@@ -9,7 +9,7 @@ const theme = ({ dt }) => `
     position: absolute;
     top: 50%;
     margin-top: -.5rem;
-    color: ${dt('iconfield.color')};
+    color: ${dt('iconfield.icon.color')};
 }
 
 .p-iconfield .p-inputicon:first-child {
diff --git a/components/lib/themes/aura/editor/index.js b/components/lib/themes/aura/editor/index.js
index b48b08919..0c490b406 100644
--- a/components/lib/themes/aura/editor/index.js
+++ b/components/lib/themes/aura/editor/index.js
@@ -1,56 +1,26 @@
 export default {
-    colorScheme: {
-        light: {
-            toolbar: {
-                background: '{surface.0}',
-                borderColor: '{surface.200}'
-            },
-            toolbarItem: {
-                color: '{surface.500}',
-                hoverColor: '{surface.700}',
-                activeColor: '{primary.color}'
-            },
-            overlay: {
-                background: '{surface.0}',
-                borderColor: '{surface.200}',
-                color: '{surface.700}'
-            },
-            overlayItem: {
-                hoverBackground: '{surface.100}',
-                color: '{surface.700}',
-                hoverColor: '{surface.800}'
-            },
-            content: {
-                background: '{surface.0}',
-                borderColor: '{surface.200}',
-                color: '{surface.700}'
-            }
-        },
-        dark: {
-            toolbar: {
-                background: '{surface.900}',
-                borderColor: '{surface.700}'
-            },
-            toolbarItem: {
-                color: '{surface.400}',
-                hoverColor: '{surface.0}',
-                activeColor: '{primary.color}'
-            },
-            overlay: {
-                background: '{surface.900}',
-                borderColor: '{surface.700}',
-                color: '{surface.0}'
-            },
-            overlayItem: {
-                hoverBackground: '{surface.800}',
-                color: '{surface.400}',
-                hoverColor: '{surface.0}'
-            },
-            content: {
-                background: '{surface.900}',
-                borderColor: '{surface.700}',
-                color: '{surface.0}'
-            }
-        }
+    toolbar: {
+        background: '{content.background}',
+        borderColor: '{content.border.color}'
+    },
+    toolbarItem: {
+        color: '{text.muted.color}',
+        hoverColor: '{text.color}',
+        activeColor: '{primary.color}'
+    },
+    overlay: {
+        background: '{content.background}',
+        borderColor: '{content.border.color}',
+        color: '{content.color}'
+    },
+    overlayItem: {
+        hoverBackground: '{content.hover.background}',
+        color: '{content.color}',
+        hoverColor: '{content.hover.color}'
+    },
+    content: {
+        background: '{content.background}',
+        borderColor: '{content.border.color}',
+        color: '{content.color}'
     }
 };
diff --git a/components/lib/themes/aura/iconfield/index.js b/components/lib/themes/aura/iconfield/index.js
index c6583bd5f..1e0102d5f 100644
--- a/components/lib/themes/aura/iconfield/index.js
+++ b/components/lib/themes/aura/iconfield/index.js
@@ -1,14 +1,5 @@
 export default {
-    colorScheme: {
-        light: {
-            root: {
-                color: '{surface.400}'
-            }
-        },
-        dark: {
-            root: {
-                color: '{surface.400}'
-            }
-        }
+    icon: {
+        color: '{form.field.icon.color}'
     }
 };