diff --git a/src/main/java/com/github/weisj/darklaf/theme/SolarizedDarkTheme.java b/src/main/java/com/github/weisj/darklaf/theme/SolarizedDarkTheme.java
index 9f6563b2..1ea499a9 100644
--- a/src/main/java/com/github/weisj/darklaf/theme/SolarizedDarkTheme.java
+++ b/src/main/java/com/github/weisj/darklaf/theme/SolarizedDarkTheme.java
@@ -54,6 +54,6 @@ public class SolarizedDarkTheme extends Theme {
 
     @Override
     protected IconTheme getPresetIconTheme() {
-        return IconTheme.DARK;
+        return IconTheme.NONE;
     }
 }
diff --git a/src/main/java/com/github/weisj/darklaf/theme/SolarizedLightTheme.java b/src/main/java/com/github/weisj/darklaf/theme/SolarizedLightTheme.java
index 8d8ee3a7..475f34de 100644
--- a/src/main/java/com/github/weisj/darklaf/theme/SolarizedLightTheme.java
+++ b/src/main/java/com/github/weisj/darklaf/theme/SolarizedLightTheme.java
@@ -54,6 +54,6 @@ public class SolarizedLightTheme extends Theme {
 
     @Override
     protected IconTheme getPresetIconTheme() {
-        return IconTheme.LIGHT;
+        return IconTheme.NONE;
     }
 }
diff --git a/src/main/resources/com/github/weisj/darklaf/platform/windows/x64/jniplatform.dll b/src/main/resources/com/github/weisj/darklaf/platform/windows/x64/jniplatform.dll
index e53952d6..5d9c5acf 100644
Binary files a/src/main/resources/com/github/weisj/darklaf/platform/windows/x64/jniplatform.dll and b/src/main/resources/com/github/weisj/darklaf/platform/windows/x64/jniplatform.dll differ
diff --git a/src/main/resources/com/github/weisj/darklaf/platform/windows/x86/jniplatform.dll b/src/main/resources/com/github/weisj/darklaf/platform/windows/x86/jniplatform.dll
index 4ec2ad41..d5c760d5 100644
Binary files a/src/main/resources/com/github/weisj/darklaf/platform/windows/x86/jniplatform.dll and b/src/main/resources/com/github/weisj/darklaf/platform/windows/x86/jniplatform.dll differ
diff --git a/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_icons.properties b/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_icons.properties
index 0790cd05..7b2f81f0 100644
--- a/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_icons.properties
+++ b/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_icons.properties
@@ -22,15 +22,15 @@
 # SOFTWARE.
 #
 # suppress inspection "UnusedProperty" for whole file
-%menuIconEnabled      = AFB1B3
-%menuIconHovered      = dddddd
-%menuIconSelected     = AFB1B3
-%menuIconDisabled     = 6E6E6E
-%menuIconHighlight    = 268bd2
+%menuIconEnabled      = 93A1A1
+%menuIconHovered      = E9FFFF
+%menuIconSelected     = 93A1A1
+%menuIconDisabled     = 5A5A5A
+%menuIconHighlight    = 1D6B9C
 
-%fileIconBackground   = 9790ad
-%fileIconForeground   = 231F20
-%fileIconHighlight    = 5c65b8
+%fileIconBackground   = 798D90
+%fileIconForeground   = 002B36
+%fileIconHighlight    = 859900
 
 %textIconEnabled      = FFFFFF
 %textIconDisabled     = 000000
@@ -40,7 +40,7 @@
 %windowButtonDisabled = 8C8C8C
 %windowCloseHovered   = FFFFFF
 
-%errorIconColor       = dd3962
+%errorIconColor       = DC322F
 %informationIconColor = 598bff
 %warningIconColor     = b58900
 %questionIconColor    = 598bff
\ No newline at end of file
diff --git a/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_icons.properties b/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_icons.properties
index a70d81ca..cd4338a9 100644
--- a/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_icons.properties
+++ b/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_icons.properties
@@ -22,15 +22,15 @@
 # SOFTWARE.
 #
 # suppress inspection "UnusedProperty" for whole file
-%menuIconEnabled      = 6E6E6E
-%menuIconHovered      = ECECEC
+%menuIconEnabled      = 586E75
+%menuIconHovered      = BDECFB
 %menuIconSelected     = FFFFFF
-%menuIconDisabled     = AFB1B3
-%menuIconHighlight    = 268bd2
+%menuIconDisabled     = BCBCBC
+%menuIconHighlight    = 268BD2
 
-%fileIconBackground   = 9790ad
-%fileIconForeground   = 231F20
-%fileIconHighlight    = 239e62
+%fileIconBackground   = 849396
+%fileIconForeground   = 002B36
+%fileIconHighlight    = 859900
 
 %textIconEnabled      = 3E3E3C
 %textIconDisabled     = B8BABA
@@ -40,7 +40,7 @@
 %windowButtonDisabled = 9B9C9C
 %windowCloseHovered   = FFFFFF
 
-%errorIconColor       = dd3962
-%informationIconColor = 239e62
-%warningIconColor     = b58900
-%questionIconColor    = 239e62
\ No newline at end of file
+%errorIconColor       = DC322F
+%informationIconColor = 268BD2
+%warningIconColor     = B58900
+%questionIconColor    = 268BD2
\ No newline at end of file
diff --git a/src/test/java/UIDemo.java b/src/test/java/UIDemo.java
index 7298b935..5b86523d 100644
--- a/src/test/java/UIDemo.java
+++ b/src/test/java/UIDemo.java
@@ -42,7 +42,7 @@ public final class UIDemo {
                             UIDemo.class.getClassLoader().getResource("mima.png")
                     ));
 
-                    Icon folderIcon = IconLoader.get().getUIAwareIcon("files/folder.svg", 19, 19);
+                    Icon folderIcon = IconLoader.get().getIcon("files/folder.svg", 19, 19, true);
 
                     JPanel panel = new JPanel(new GridLayout(3, 4));
                     JPanel content = new JPanel(new BorderLayout());