diff --git a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
index 12e5ee70..247be717 100644
--- a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
+++ b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
@@ -156,14 +156,12 @@ open class ButtonIcon: Control {
     // MARK: - Configuration
     //--------------------------------------------------
     private var iconColorConfiguration: AnyColorable {
-        if selectedIconName != nil, selectable {
-            return selectedIconColorConfiguration
+        if kind == .highContrast {
+            return highContrastIconColorConfiguration
+        } else if kind == .lowContrast {
+            return  (surfaceType == .colorFill) ? lowContrastIconColorConfiguration : (floating ? lowContrastIconColorConfiguration : standardIconColorConfiguration)
         } else {
-            if kind == .highContrast {
-                return highContrastIconColorConfiguration
-            } else {
-                return standardIconColorConfiguration
-            }
+            return standardIconColorConfiguration
         }
     }
     
@@ -192,16 +190,16 @@ open class ButtonIcon: Control {
         }.eraseToAnyColorable()
     }()
     
-    private var highContrastIconColorConfiguration: AnyColorable = {
-        return SurfaceColorConfiguration(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOnlight).eraseToAnyColorable()
+    private var lowContrastIconColorConfiguration: AnyColorable = {
+        return ControlColorConfiguration().with {
+            $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal)
+            $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
+            $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.paletteBlack.withAlphaComponent(0.70), forState: .disabled)
+        }.eraseToAnyColorable()
     }()
     
-    private var selectedIconColorConfiguration: AnyColorable = {
-        return ControlColorConfiguration().with {
-            $0.setSurfaceColors(VDSColor.elementsBrandhighlight, VDSColor.elementsPrimaryOndark, forState: .normal)
-            $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
-            $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
-        }.eraseToAnyColorable()
+    private var highContrastIconColorConfiguration: AnyColorable = {
+        return SurfaceColorConfiguration(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOnlight).eraseToAnyColorable()
     }()
     
     private struct GhostConfiguration: Configuration {