diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/DarculaTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/DarculaTheme.java
index 3fbc03fe..1efd34bb 100644
--- a/theme/src/main/java/com/github/weisj/darklaf/theme/DarculaTheme.java
+++ b/theme/src/main/java/com/github/weisj/darklaf/theme/DarculaTheme.java
@@ -25,7 +25,6 @@ import java.util.Properties;
 
 import javax.swing.*;
 
-import com.github.weisj.darklaf.PropertyLoader;
 import com.github.weisj.darklaf.annotations.SynthesiseLaf;
 import com.github.weisj.darklaf.theme.info.ColorToneRule;
 import com.github.weisj.darklaf.theme.info.PresetIconRule;
@@ -77,8 +76,8 @@ public class DarculaTheme extends Theme {
     }
 
     @Override
-    public void customizeIconTheme(final Properties properties, final UIDefaults currentDefaults) {
-        super.customizeIconTheme(properties, currentDefaults);
-        PropertyLoader.putProperties(loadPropertyFile("icons"), properties, currentDefaults);
+    public void loadIconTheme(final Properties properties, final UIDefaults currentDefaults) {
+        super.loadIconTheme(properties, currentDefaults);
+        loadCustomProperties("icons", properties, currentDefaults);
     }
 }
diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastDarkTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastDarkTheme.java
index a29cde4c..87083520 100644
--- a/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastDarkTheme.java
+++ b/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastDarkTheme.java
@@ -37,7 +37,7 @@ public class HighContrastDarkTheme extends Theme {
 
     @Override
     protected PresetIconRule getPresetIconRule() {
-        return PresetIconRule.DARK;
+        return PresetIconRule.NONE;
     }
 
     @Override
@@ -81,10 +81,4 @@ public class HighContrastDarkTheme extends Theme {
         super.customizePlatformProperties(properties, currentDefaults);
         loadCustomProperties("platform", properties, currentDefaults);
     }
-
-    @Override
-    public void customizeIconTheme(final Properties properties, final UIDefaults currentDefaults) {
-        super.customizeIconTheme(properties, currentDefaults);
-        loadCustomProperties("icons", properties, currentDefaults);
-    }
 }
diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java
index b13b7218..8ae77208 100644
--- a/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java
+++ b/theme/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java
@@ -37,7 +37,7 @@ public class HighContrastLightTheme extends Theme {
 
     @Override
     protected PresetIconRule getPresetIconRule() {
-        return PresetIconRule.LIGHT;
+        return PresetIconRule.NONE;
     }
 
     @Override
@@ -81,10 +81,4 @@ public class HighContrastLightTheme extends Theme {
         super.customizePlatformProperties(properties, currentDefaults);
         loadCustomProperties("platform", properties, currentDefaults);
     }
-
-    @Override
-    public void customizeIconTheme(final Properties properties, final UIDefaults currentDefaults) {
-        super.customizeIconTheme(properties, currentDefaults);
-        loadCustomProperties("icons", properties, currentDefaults);
-    }
 }
diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/IntelliJTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/IntelliJTheme.java
index 7cf08960..8dc69a7e 100644
--- a/theme/src/main/java/com/github/weisj/darklaf/theme/IntelliJTheme.java
+++ b/theme/src/main/java/com/github/weisj/darklaf/theme/IntelliJTheme.java
@@ -72,8 +72,8 @@ public class IntelliJTheme extends Theme {
     }
 
     @Override
-    public void customizeIconTheme(final Properties properties, final UIDefaults currentDefaults) {
-        super.customizeIconTheme(properties, currentDefaults);
+    public void loadIconTheme(final Properties properties, final UIDefaults currentDefaults) {
+        super.loadIconTheme(properties, currentDefaults);
         loadCustomProperties("icons", properties, currentDefaults);
     }
 
diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/OneDarkTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/OneDarkTheme.java
index 497165b5..d8f9fa78 100644
--- a/theme/src/main/java/com/github/weisj/darklaf/theme/OneDarkTheme.java
+++ b/theme/src/main/java/com/github/weisj/darklaf/theme/OneDarkTheme.java
@@ -81,7 +81,6 @@ public class OneDarkTheme extends Theme {
 
     @Override
     public void customizeIconTheme(final Properties properties, final UIDefaults currentDefaults) {
-        super.customizeIconTheme(properties, currentDefaults);
         loadCustomProperties("icons_adjustments", properties, currentDefaults);
     }
 }