Added icon properties.

Changed all icons from [aware],[dual] to [themed] Signed-off-by: weisj <weisj@arcor.de>
5 years ago · da8d30d0ed
32 changed files with 612 additions and 121 deletions
--- a/src/main/resources/com/github/weisj/darklaf/properties/globals.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/globals.properties
@ -34,7 +34,7 @@ global.selectionForeground         = %textSelectionForeground
 global.selectionForegroundInactive = %textSelectionForegroundInactive
 global.selectionBackground         = %textSelectionBackground
-###General###
+####General####
 activeCaption                      = %backgroundColorful
 activeCaptionBorder                = null
 activeCaptionText                  = %textForeground
@ -42,8 +42,8 @@ info                               = %backgroundColorful
 control                            = %background
 ####Icons####
-ArrowButton.up.icon                = navigation/arrowUp.svg[aware]
+ArrowButton.up.icon                = navigation/arrowUp.svg[themed]
-ArrowButton.down.icon              = navigation/arrowDown.svg[aware]
+ArrowButton.down.icon              = navigation/arrowDown.svg[themed]
 link.foreground                    = %hyperlink
 Hyperlink.linkColor                = %hyperlink
--- a/src/main/resources/com/github/weisj/darklaf/properties/icons/control.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/icons/control.properties
@ -0,0 +1,83 @@
 # suppress inspection "UnusedProperty" for whole file
 #
 # MIT License
 #
 # Copyright (c) 2019 Jannis Weis
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 Icons.CheckBox.activeFillColor                                         = %CheckBox.activeBorderColor
 Icons.CheckBox.activeBorderColor                                       = %CheckBox.activeBorderColor
 Icons.CheckBoxDisabled.inactiveFillColor                               = %CheckBox.inactiveFillColor
 Icons.CheckBoxDisabled.inactiveBorderColor                             = %CheckBox.inactiveBorderColor
 Icons.CheckBoxFocused.activeFillColor                                  = %CheckBox.activeFillColor
 Icons.CheckBoxFocused.focusBorderColor                                 = %CheckBox.focusBorderColor
 Icons.CheckBoxFocused.glowFocus                                        = %glowFocus
 Icons.CheckBoxIndeterminateSelected.selectedFillColor                  = %CheckBox.selectedFillColor
 Icons.CheckBoxIndeterminateSelected.selectedBorderColor                = %CheckBox.selectedBorderColor
 Icons.CheckBoxIndeterminateSelected.selectionSelectedColor             = %CheckBox.selectionSelectedColor
 Icons.CheckBoxIndeterminateSelectedDisabled.inactiveFillColor          = %CheckBox.inactiveFillColor
 Icons.CheckBoxIndeterminateSelectedDisabled.inactiveBorderColor        = %CheckBox.inactiveBorderColor
 Icons.CheckBoxIndeterminateSelectedDisabled.selectionDisabledColor     = %CheckBox.selectionDisabledColor
 Icons.CheckBoxIndeterminateSelectedFocused.selectedFillColor           = %CheckBox.selectedFillColor
 Icons.CheckBoxIndeterminateSelectedFocused.focusSelectedBorderColor    = %CheckBox.focusSelectedBorderColor
 Icons.CheckBoxIndeterminateSelectedFocused.selectionFocusSelectedColor = %CheckBox.selectionFocusSelectedColor
 Icons.CheckBoxIndeterminateSelectedFocused.glowFocus                   = %glowFocus
 Icons.CheckBoxSelected.selectedFillColor                               = %CheckBox.selectedFillColor
 Icons.CheckBoxSelected.selectedBorderColor                             = %CheckBox.selectedBorderColor
 Icons.CheckBoxSelected.selectionSelectedColor                          = %CheckBox.selectionSelectedColor
 Icons.CheckBoxSelectedDisabled.inactiveFillColor                       = %CheckBox.inactiveFillColor
 Icons.CheckBoxSelectedDisabled.inactiveBorderColor                     = %CheckBox.inactiveBorderColor
 Icons.CheckBoxSelectedDisabled.selectionDisabledColor                  = %CheckBox.selectionDisabledColor
 Icons.CheckBoxSelectedFocused.selectedFillColor                        = %CheckBox.selectedFillColor
 Icons.CheckBoxSelectedFocused.focusSelectedBorderColor                 = %CheckBox.focusSelectedBorderColor
 Icons.CheckBoxSelectedFocused.glowFocus                                = %glowFocus
 Icons.CheckBoxSelectedFocused.selectionFocusSelectedColor              = %CheckBox.selectionFocusSelectedColor
 Icons.RadioButton.activeFillColor                                      = %RadioButton.activeFillColor
 Icons.RadioButton.activeBorderColor                                    = %RadioButton.activeBorderColor
 Icons.RadioButtonDisabled.inactiveFillColor                            = %RadioButton.inactiveFillColor
 Icons.RadioButtonDisabled.inactiveBorderColor                          = %RadioButton.inactiveBorderColor
 Icons.RadioButtonFocused.activeFillColor                               = %RadioButton.activeFillColor
 Icons.RadioButtonFocused.focusBorderColor                              = %RadioButton.focusBorderColor
 Icons.RadioButtonFocused.glowFocus                                     = %glowFocus
 Icons.RadioButtonSelected.selectedFillColor                            = %RadioButton.selectedFillColor
 Icons.RadioButtonSelected.selectedBorderColor                          = %RadioButton.selectedBorderColor
 Icons.RadioButtonSelected.selectionSelectedColor                       = %RadioButton.selectionSelectedColor
 Icons.RadioButtonSelectedDisabled.inactiveFillColor                    = %RadioButton.inactiveFillColor
 Icons.RadioButtonSelectedDisabled.inactiveBorderColor                  = %RadioButton.inactiveBorderColor
 Icons.RadioButtonSelectedDisabled.selectionDisabledColor               = %RadioButton.selectionDisabledColor
 Icons.RadioButtonSelectedFocused.selectedFillColor                     = %RadioButton.selectedFillColor
 Icons.RadioButtonSelectedFocused.focusSelectedBorderColor              = %RadioButton.focusSelectedBorderColor
 Icons.RadioButtonSelectedFocused.selectionFocusSelectedColor           = %RadioButton.selectionFocusSelectedColor
 Icons.RadioButtonSelectedFocused.glowFocus                             = %glowFocus
--- a/src/main/resources/com/github/weisj/darklaf/properties/icons/dialog.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/icons/dialog.properties
@ -0,0 +1,28 @@
 # suppress inspection "UnusedProperty" for whole file
 #
 # MIT License
 #
 # Copyright (c) 2019 Jannis Weis
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 Icons.errorDialog.color       = %errorIconColor
 Icons.informationDialog.color = %informationIconColor
 Icons.questionDialog.color    = %questionIconColor
 Icons.warningDialog.color     = %warningIconColor
--- a/src/main/resources/com/github/weisj/darklaf/properties/icons/files.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/icons/files.properties
@ -0,0 +1,45 @@
 # suppress inspection "UnusedProperty" for whole file
 #
 # MIT License
 #
 # Copyright (c) 2019 Jannis Weis
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 Icons.desktop.color             = %menuIconEnabled
 Icons.drive.color               = %fileIconBackground
 Icons.drive.dotColor            = %fileIconHighlight
 Icons.folder.color              = %fileIconBackground
 Icons.generalFile.color         = %fileIconBackground
 Icons.homeFolder.color          = %menuIconEnabled
 Icons.newFolder.color           = %menuIconEnabled
 Icons.textFile.color            = %fileIconBackground
 Icons.textFile.foregroundColor  = %fileIconForeground
 Icons.unknownFile.color         = %fileIconBackground
 Icons.unknownFile.questionColor = %menuIconHighlight
 Icons.upFolder.color            = %fileIconBackground
 Icons.upFolder.arrowColor       = %menuIconHighlight
--- a/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/icons/indicator.properties
@ -0,0 +1,48 @@
 # suppress inspection "UnusedProperty" for whole file
 #
 # MIT License
 #
 # Copyright (c) 2019 Jannis Weis
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 Icons.speaker0.color               = %menuIconEnabled
 Icons.speaker0.crossColor          = %menuIconEnabled
 Icons.speaker0Disabled.color       = %menuIconDisabled
 Icons.speaker0Disabled.crossColor  = %menuIconDisabled
 Icons.speaker1.color               = %menuIconEnabled
 Icons.speaker1.volumeColor         = %menuIconEnabled
 Icons.speaker1Disabled.color       = %menuIconDisabled
 Icons.speaker1Disabled.volumeColor = %menuIconDisabled
 Icons.speaker2.color               = %menuIconEnabled
 Icons.speaker2.volumeColor         = %menuIconEnabled
 Icons.speaker2Disabled.color       = %menuIconDisabled
 Icons.speaker2Disabled.volumeColor = %menuIconDisabled
 Icons.speaker3.color               = %menuIconEnabled
 Icons.speaker3.volumeColor         = %menuIconEnabled
 Icons.speaker3Disabled.color       = %menuIconDisabled
 Icons.speaker3Disabled.volumeColor = %menuIconDisabled
 Icons.speaker4.color               = %menuIconEnabled
 Icons.speaker4.volumeColor         = %menuIconEnabled
 Icons.speaker4Disabled.color       = %menuIconDisabled
 Icons.speaker4Disabled.volumeColor = %menuIconDisabled
--- a/src/main/resources/com/github/weisj/darklaf/properties/icons/menu.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/icons/menu.properties
@ -0,0 +1,34 @@
 # suppress inspection "UnusedProperty" for whole file
 #
 # MIT License
 #
 # Copyright (c) 2019 Jannis Weis
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 Icons.copy.color             = %menuIconEnabled
 Icons.cut.color              = %menuIconEnabled
 Icons.delete.color           = %menuIconEnabled
 Icons.arrowDownSort.color    = %menuIconEnabled
 Icons.groupBy.color          = %menuIconEnabled
 Icons.listFiles.color        = %menuIconEnabled
 Icons.paste.color            = %menuIconEnabled
 Icons.save.color             = %menuIconEnabled
 Icons.arrowUpSort.color      = %menuIconEnabled
 Icons.arrowsUpDownSort.color = %menuIconEnabled
--- a/src/main/resources/com/github/weisj/darklaf/properties/icons/misc.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/icons/misc.properties
@ -0,0 +1,32 @@
 # suppress inspection "UnusedProperty" for whole file
 #
 # MIT License
 #
 # Copyright (c) 2019 Jannis Weis
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 Icons.minus.color           = %menuIconEnabled
 Icons.minusSelected.color   = %menuIconSelected
 Icons.pipette.color         = %menuIconEnabled
 Icons.pipetteRollover.color = %errorIconColor
 Icons.plus.color            = %menuIconEnabled
 Icons.plusSelected.color    = %menuIconSelected
 Icons.eye.color             = %menuIconEnabled
 Icons.eyeHovered.color      = %menuIconDisabled
--- a/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation.properties
@ -0,0 +1,88 @@
 # suppress inspection "UnusedProperty" for whole file
 #
 # MIT License
 #
 # Copyright (c) 2019 Jannis Weis
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 Icons.add.color                       = %menuIconEnabled
 Icons.arrowDivider.color              = %menuIconEnabled
 Icons.arrowDown.color                 = %menuIconEnabled
 Icons.arrowDownHover.color            = %menuIconHovered
 Icons.arrowDownSelected.color         = %menuIconSelected
 Icons.arrowDownDisabled.color         = %menuIconDisabled
 Icons.arrowLeft.color                 = %menuIconEnabled
 Icons.arrowLeftHover.color            = %menuIconHovered
 Icons.arrowLeftSelected.color         = %menuIconSelected
 Icons.arrowLeftDisabled.color         = %menuIconDisabled
 Icons.arrowRight.color                = %menuIconEnabled
 Icons.arrowRightHover.color           = %menuIconHovered
 Icons.arrowRightSelected.color        = %menuIconSelected
 Icons.arrowRightDisabled.color        = %menuIconDisabled
 Icons.arrowUp.color                   = %menuIconEnabled
 Icons.arrowUpHover.color              = %menuIconHovered
 Icons.arrowUpSelected.color           = %menuIconSelected
 Icons.arrowUpDisabled.color           = %menuIconDisabled
 Icons.arrowSplitCenterH.color         = %menuIconEnabled
 Icons.arrowSplitCenterV.color         = %menuIconEnabled
 Icons.checkmark.color                 = %textIconEnabled
 Icons.checkmarkDisabled.color         = %textIconDisabled
 Icons.checkmarkSelected.color         = %textIconSelected
 Icons.clear.color                     = %menuIconEnabled
 Icons.close.color                     = %menuIconEnabled
 Icons.closeHovered.color              = %menuIconDisabled
 Icons.collapse.color                  = %menuIconEnabled
 Icons.divider.color                   = %borderSecondary
 Icons.moreTabs.color                  = %menuIconEnabled
 Icons.separatorH.color                = %menuIconEnabled
 Icons.separatorV.color                = %menuIconEnabled
 Icons.verticalGlue.color              = %menuIconEnabled
 Icons.verticalGrip.color              = %menuIconEnabled
 Icons.horizontalGlue.color            = %menuIconEnabled
 Icons.horizontalGrip.color            = %menuIconEnabled
 Icons.moveToBottomLeft.color          = %menuIconEnabled
 Icons.moveToBottomRight.color         = %menuIconEnabled
 Icons.moveToLeftBottom.color          = %menuIconEnabled
 Icons.moveToLeftTop.color             = %menuIconEnabled
 Icons.moveToRightBottom.color         = %menuIconEnabled
 Icons.moveToRightTop.color            = %menuIconEnabled
 Icons.moveToTopLeft.color             = %menuIconEnabled
 Icons.moveToTopRight.color            = %menuIconEnabled
 Icons.moveToBottomLeftDisabled.color  = %menuIconDisabled
 Icons.moveToBottomRightDisabled.color = %menuIconDisabled
 Icons.moveToLeftBottomDisabled.color  = %menuIconDisabled
 Icons.moveToLeftTopDisabled.color     = %menuIconDisabled
 Icons.moveToRightBottomDisabled.color = %menuIconDisabled
 Icons.moveToRightTopDisabled.color    = %menuIconDisabled
 Icons.moveToTopLeftDisabled.color     = %menuIconDisabled
 Icons.moveToTopRightDisabled.color    = %menuIconDisabled
 Icons.search.color                    = %menuIconEnabled
 Icons.searchWithHistory.color         = %menuIconEnabled
 Icons.searchWithHistory.arrowColor    = %menuIconEnabled
--- a/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/dark_icons.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/dark_icons.properties
@ -0,0 +1,46 @@
 #
 # MIT License
 #
 # Copyright (c) 2019 Jannis Weis
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # suppress inspection "UnusedProperty" for whole file
 %menuIconEnabled      = AFB1B3
 %menuIconHovered      = dddddd
 %menuIconSelected     = AFB1B3
 %menuIconDisabled     = 6E6E6E
 %menuIconHighlight    = 40B6E0
 %fileIconBackground   = 9AA7B0
 %fileIconForeground   = 231F20
 %fileIconHighlight    = 499C54
 %textIconEnabled      = FFFFFF
 %textIconDisabled     = 000000
 %textIconSelected     = FFFFFF
 %windowButton         = A9A9A9
 %windowButtonDisabled = 8C8C8C
 %windowCloseHovered   = FFFFFF
 %errorIconColor       = C75450
 %informationIconColor = 3592C4
 %warningIconColor     = F0A732
 %questionIconColor    = 3592C4
--- a/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/light_icons.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/light_icons.properties
@ -0,0 +1,46 @@
 #
 # MIT License
 #
 # Copyright (c) 2019 Jannis Weis
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 # suppress inspection "UnusedProperty" for whole file
 %menuIconEnabled      = 6E6E6E
 %menuIconHovered      = ECECEC
 %menuIconSelected     = FFFFFF
 %menuIconDisabled     = AFB1B3
 %menuIconHighlight    = 389FD6
 %fileIconBackground   = 9AA7B0
 %fileIconForeground   = 231F20
 %fileIconHighlight    = 59A869
 %textIconEnabled      = 3E3E3C
 %textIconDisabled     = B8BABA
 %textIconSelected     = FFFFFF
 %windowButton         = 050708
 %windowButtonDisabled = 9B9C9C
 %windowCloseHovered   = FFFFFF
 %errorIconColor       = DB5860
 %informationIconColor = 389FD6
 %warningIconColor     = 389FD6
 %questionIconColor    = EDA200
--- a/src/main/resources/com/github/weisj/darklaf/properties/icons/window.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/icons/window.properties
@ -0,0 +1,41 @@
 # suppress inspection "UnusedProperty" for whole file
 #
 # MIT License
 #
 # Copyright (c) 2019 Jannis Weis
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
 Icons.windowClose.color            = %windowButton
 Icons.windowCloseHover.color       = %windowCloseHovered
 Icons.windowCloseInactive.color    = %windowButtonDisabled
 Icons.windowHelp.color             = %windowButton
 Icons.windowHelpInactive.color     = %windowButtonDisabled
 Icons.windowMaximize.color         = %windowButton
 Icons.windowMaximizeInactive.color = %windowButtonDisabled
 Icons.windowMinimize.color         = %windowButton
 Icons.windowMinimizeInactive.color = %windowButtonDisabled
 Icons.windowRestore.color          = %windowButton
 Icons.windowRestoreInactive.color  = %windowButtonDisabled
 Icons.frame.color                  = %menuIconEnabled
--- a/src/main/resources/com/github/weisj/darklaf/properties/platform/windows.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/platform/windows.properties
@ -22,12 +22,12 @@
 #
 # suppress inspection "UnusedProperty" for whole file
 #TitlePane
-TitlePane.minimize.icon                        = window/minimize.svg[aware]
+TitlePane.minimize.icon                        = window/minimize.svg[themed]
-TitlePane.minimizeInactive.icon                = window/minimizeInactive.svg[aware]
+TitlePane.minimizeInactive.icon                = window/minimizeInactive.svg[themed]
-TitlePane.maximize.icon                        = window/maximize.svg[aware]
+TitlePane.maximize.icon                        = window/maximize.svg[themed]
-TitlePane.maximizeInactive.icon                = window/maximizeInactive.svg[aware]
+TitlePane.maximizeInactive.icon                = window/maximizeInactive.svg[themed]
-TitlePane.restore.icon                         = window/restore.svg[aware]
+TitlePane.restore.icon                         = window/restore.svg[themed]
-TitlePane.restoreInactive.icon                 = window/restoreInactive.svg[aware]
+TitlePane.restoreInactive.icon                 = window/restoreInactive.svg[themed]
 TitlePane.close.icon                           = window/closeActive.svg[aware]
 TitlePane.closeInactive.icon                   = window/closeInactive.svg[aware]
 TitlePane.closeHover.icon                      = window/closeHover.svg[aware]
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/checkBox.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/checkBox.properties
@ -39,12 +39,12 @@ CheckBox.arc                         = %arcSecondary
 CheckBox.borderThickness             = %borderThickness
 #Icons
-CheckBox.unchecked.icon              = control/checkBox.svg[patch](19,19)
+CheckBox.unchecked.icon              = control/checkBox.svg[themed](19,19)
-CheckBox.uncheckedDisabled.icon      = control/checkBoxDisabled.svg[patch](19,19)
+CheckBox.uncheckedDisabled.icon      = control/checkBoxDisabled.svg[themed](19,19)
-CheckBox.uncheckedFocused.icon       = control/checkBoxFocused.svg[patch](19,19)
+CheckBox.uncheckedFocused.icon       = control/checkBoxFocused.svg[themed](19,19)
-CheckBox.indeterminate.icon          = control/checkBoxIndeterminateSelected.svg[patch](19,19)
+CheckBox.indeterminate.icon          = control/checkBoxIndeterminateSelected.svg[themed](19,19)
-CheckBox.indeterminateDisabled.icon  = control/checkBoxIndeterminateSelectedDisabled.svg[patch](19,19)
+CheckBox.indeterminateDisabled.icon  = control/checkBoxIndeterminateSelectedDisabled.svg[themed](19,19)
-CheckBox.indeterminateFocused.icon   = control/checkBoxIndeterminateSelectedFocused.svg[patch](19,19)
+CheckBox.indeterminateFocused.icon   = control/checkBoxIndeterminateSelectedFocused.svg[themed](19,19)
-CheckBox.selected.icon               = control/checkBoxSelected.svg[patch](19,19)
+CheckBox.selected.icon               = control/checkBoxSelected.svg[themed](19,19)
-CheckBox.selectedDisabled.icon       = control/checkBoxSelectedDisabled.svg[patch](19,19)
+CheckBox.selectedDisabled.icon       = control/checkBoxSelectedDisabled.svg[themed](19,19)
-CheckBox.selectedFocused.icon        = control/checkBoxSelectedFocused.svg[patch](19,19)
+CheckBox.selectedFocused.icon        = control/checkBoxSelectedFocused.svg[themed](19,19)
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/colorChooser.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/colorChooser.properties
@ -40,5 +40,5 @@ ColorChooser.errorDelay                    = 600
 ColorChooser.swatchesDefaultRecentColor    = %background
 ColorChooser.colorWheelBackground          = %background
 #Icons
-ColorChooser.pipette.icon                  = misc/pipette.svg[aware]
+ColorChooser.pipette.icon                  = misc/pipette.svg[themed]
-ColorChooser.pipetteRollover.icon          = misc/pipette_rollover.svg[aware]
+ColorChooser.pipetteRollover.icon          = misc/pipetteRollover.svg[themed]
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/comboBox.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/comboBox.properties
@ -41,5 +41,5 @@ ComboBox.borderThickness      = %borderThickness
 ComboBox.selectionForeground  = %textSelectionForeground
 #Icons
-ComboBox.arrow.icon           = navigation/arrowDown.svg[aware]
+ComboBox.arrow.icon           = navigation/arrowDown.svg[themed]
-ComboBox.arrowInactive.icon   = navigation/arrowDown.svg[dual]
+ComboBox.arrowInactive.icon   = navigation/arrowDownDisabled.svg[themed]
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/fileChooser.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/fileChooser.properties
@ -23,13 +23,13 @@
 # SOFTWARE.
 #
 FileChooserUI                    = com.github.weisj.darklaf.ui.filechooser.DarkFileChooserUI
-FileChooser.newFolderIcon        = files/newFolder.svg[aware]
+FileChooser.newFolderIcon        = files/newFolder.svg[themed]
-FileChooser.upFolderIcon         = files/upFolder.svg[aware]
+FileChooser.upFolderIcon         = files/upFolder.svg[themed]
-FileChooser.homeFolderIcon       = files/homeFolder.svg[aware]
+FileChooser.homeFolderIcon       = files/homeFolder.svg[themed]
 FileChooser.listViewBorder       = com.github.weisj.darklaf.ui.filechooser.DarkFileChooserListViewBorder
-FileChooser.detailsViewIcon      = menu/listFiles.svg[aware]
+FileChooser.detailsViewIcon      = menu/listFiles.svg[themed]
-FileChooser.listViewIcon         = menu/groupBy.svg[aware]
+FileChooser.listViewIcon         = menu/groupBy.svg[themed]
 FileChooser.borderColor          = %border
 FileChooser.rowHeight            = 20
@ -45,8 +45,8 @@ FileView.background              = %textBackground
 FileView.foreground              = %textForeground
 FileView.fullRowSelection        = true
-FileView.fileIcon                = files/general.svg[aware]
+FileView.fileIcon                = files/general.svg[themed]
-FileView.directoryIcon           = files/folder.svg[aware]
+FileView.directoryIcon           = files/folder.svg[themed]
-FileView.computerIcon            = files/desktop.svg[aware]
+FileView.computerIcon            = files/desktop.svg[themed]
-FileView.floppyDriveIcon         = menu/save.svg[aware]
+FileView.floppyDriveIcon         = menu/save.svg[themed]
-FileView.hardDriveIcon           = files/drive.svg[aware]
+FileView.hardDriveIcon           = files/drive.svg[themed]
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/internalFrame.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/internalFrame.properties
@ -52,8 +52,8 @@ desktop                                         = %backgroundColorful
 #Icons
 InternalFrame.icon                              = duke.svg
-InternalFrameTitlePane.close.icon               = window/closeActive.svg[aware]
+InternalFrameTitlePane.close.icon               = window/closeActive.svg[themed]
-InternalFrameTitlePane.minimize.icon            = window/restore.svg[aware]
+InternalFrameTitlePane.minimize.icon            = window/restore.svg[themed]
-InternalFrameTitlePane.maximize.icon            = window/maximize.svg[aware]
+InternalFrameTitlePane.maximize.icon            = window/maximize.svg[themed]
-InternalFrameTitlePane.iconify.icon             = window/minimize.svg[aware]
+InternalFrameTitlePane.iconify.icon             = window/minimize.svg[themed]
-DesktopIcon.drag.icon                           = navigation/horizontalGrip.svg[aware](5,20)
+DesktopIcon.drag.icon                           = navigation/horizontalGrip.svg[themed](5,20)
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/menu.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/menu.properties
@ -33,4 +33,4 @@ Menu.submenuPopupOffsetY            = -2
 Menu.background                     = %background
 #Icons
-Menu.arrowIcon                      = navigation/arrowRight.svg[aware]
+Menu.arrowIcon                      = navigation/arrowRight.svg[themed]
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/menuItem.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/menuItem.properties
@ -45,8 +45,8 @@ CheckBoxMenuItem.selectionBackground               = %highlightFillFocus
 CheckBoxMenuItem.foreground                        = %textForeground
 #Icons
-MenuItem.arrowIcon                                 = navigation/arrowRight.svg[aware]
+MenuItem.arrowIcon                                 = navigation/arrowRight.svg[themed]
-MenuItem.arrowHover.icon                           = navigation/arrowRightHover.svg[aware]
+MenuItem.arrowHover.icon                           = navigation/arrowRightHover.svg[themed]
 RadioButtonMenuItem.arrowIcon                      = empty(16,16)
 CheckBoxMenuItem.checkIcon                         = empty(19,19)
 RadioButtonMenuItem.checkIcon                      = empty(19,19)
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/optionPane.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/optionPane.properties
@ -30,7 +30,7 @@ OptionPane.buttonOrientation = 0
 OptionPane.sameSizeButtons   = false
 #Icons
-OptionPane.informationIcon   = dialog/informationDialog.svg[aware](32,32)
+OptionPane.informationIcon   = dialog/informationDialog.svg[themed](32,32)
-OptionPane.questionIcon      = dialog/questionDialog.svg[aware](32,32)
+OptionPane.questionIcon      = dialog/questionDialog.svg[themed](32,32)
-OptionPane.warningIcon       = dialog/warningDialog.svg[aware](32,32)
+OptionPane.warningIcon       = dialog/warningDialog.svg[themed](32,32)
-OptionPane.errorIcon         = dialog/errorDialog.svg[aware](32,32)
+OptionPane.errorIcon         = dialog/errorDialog.svg[themed](32,32)
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/radioButton.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/radioButton.properties
@ -38,9 +38,9 @@ RadioButton.activeBorderColor           = %controlBorder
 RadioButton.inactiveBorderColor         = %controlBorderDisabled
 #Icons
-RadioButton.unchecked.icon              = control/radio.svg[patch](19,19)
+RadioButton.unchecked.icon              = control/radio.svg[themed](19,19)
-RadioButton.uncheckedDisabled.icon      = control/radioDisabled.svg[patch](19,19)
+RadioButton.uncheckedDisabled.icon      = control/radioDisabled.svg[themed](19,19)
-RadioButton.uncheckedFocused.icon       = control/radioFocused.svg[patch](19,19)
+RadioButton.uncheckedFocused.icon       = control/radioFocused.svg[themed](19,19)
-RadioButton.selected.icon               = control/radioSelected.svg[patch](19,19)
+RadioButton.selected.icon               = control/radioSelected.svg[themed](19,19)
-RadioButton.selectedDisabled.icon       = control/radioSelectedDisabled.svg[patch](19,19)
+RadioButton.selectedDisabled.icon       = control/radioSelectedDisabled.svg[themed](19,19)
-RadioButton.selectedFocused.icon        = control/radioSelectedFocused.svg[patch](19,19)
+RadioButton.selectedFocused.icon        = control/radioSelectedFocused.svg[themed](19,19)
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/slider.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/slider.properties
@ -48,13 +48,13 @@ Slider.thumbSize                    = 10,18
 #Icons
 Slider.horizontalThumbIcon          = empty(0,0)
 Slider.verticalThumbIcon            = empty(0,0)
-Slider.volume.enabled_level_0.icon  = indicator/speaker_0.svg[aware]
+Slider.volume.enabled_level_0.icon  = indicator/speaker_0.svg[themed]
 Slider.volume.enabled_level_1.icon  = indicator/speaker_1.svg[aware]
 Slider.volume.enabled_level_2.icon  = indicator/speaker_2.svg[aware]
 Slider.volume.enabled_level_3.icon  = indicator/speaker_3.svg[aware]
 Slider.volume.enabled_level_4.icon  = indicator/speaker_4.svg[aware]
-Slider.volume.disabled_level_0.icon = indicator/speaker_0.svg[dual]
+Slider.volume.disabled_level_0.icon = indicator/speaker_0Disabled.svg[aware]
-Slider.volume.disabled_level_1.icon = indicator/speaker_1.svg[dual]
+Slider.volume.disabled_level_1.icon = indicator/speaker_1Disabled.svg[aware]
-Slider.volume.disabled_level_2.icon = indicator/speaker_2.svg[dual]
+Slider.volume.disabled_level_2.icon = indicator/speaker_2Disabled.svg[aware]
-Slider.volume.disabled_level_3.icon = indicator/speaker_3.svg[dual]
+Slider.volume.disabled_level_3.icon = indicator/speaker_3Disabled.svg[aware]
-Slider.volume.disabled_level_4.icon = indicator/speaker_4.svg[dual]
+Slider.volume.disabled_level_4.icon = indicator/speaker_4Disabled.svg[aware]
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/spinner.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/spinner.properties
@ -38,11 +38,11 @@ Spinner.arrowButtonBorder      = null
 Spinner.arc                    = %arc
 Spinner.borderThickness        = %borderThickness
-Spinner.plus.icon              = misc/plus.svg[aware]
+Spinner.plus.icon              = misc/plus.svg[themed]
-Spinner.plusInactive.icon      = misc/plus.svg[aware]
+Spinner.plusInactive.icon      = misc/plus.svg[themed]
-Spinner.minus.icon             = misc/minus.svg[aware]
+Spinner.minus.icon             = misc/minus.svg[themed]
-Spinner.minusInactive.icon     = misc/minus.svg[aware]
+Spinner.minusInactive.icon     = misc/minus.svg[themed]
-Spinner.arrowUp.icon           = navigation/arrowUp.svg[aware]
+Spinner.arrowUp.icon           = navigation/arrowUp.svg[themed]
-Spinner.arrowUpInactive.icon   = navigation/arrowUp.svg[dual]
+Spinner.arrowUpInactive.icon   = navigation/arrowUpDisabled.svg[themed]
-Spinner.arrowDown.icon         = navigation/arrowDown.svg[aware]
+Spinner.arrowDown.icon         = navigation/arrowDown.svg[themed]
-Spinner.arrowDownInactive.icon = navigation/arrowDown.svg[dual]
+Spinner.arrowDownInactive.icon = navigation/arrowDownDisabled.svg[themed]
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/splitPane.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/splitPane.properties
@ -31,9 +31,9 @@ SplitPane.dividerFocusColor          = null
 SplitPane.centerOneTouchButtons      = true
 #Icons
-SplitPane.horizontalGlue.icon        = navigation/horizontalGlue.svg[aware](4,13)
+SplitPane.horizontalGlue.icon        = navigation/horizontalGlue.svg[themed](4,13)
-SplitPane.verticalGlue.icon          = navigation/verticalGlue.svg[aware](13,4)
+SplitPane.verticalGlue.icon          = navigation/verticalGlue.svg[themed](13,4)
-SplitPaneDivider.leftOneTouch.icon   = navigation/arrowLeft.svg[aware]
+SplitPaneDivider.leftOneTouch.icon   = navigation/arrowLeft.svg[themed]
-SplitPaneDivider.rightOneTouch.icon  = navigation/arrowRight.svg[aware]
+SplitPaneDivider.rightOneTouch.icon  = navigation/arrowRight.svg[themed]
-SplitPaneDivider.topOneTouch.icon    = navigation/arrowUp.svg[aware](13,13)
+SplitPaneDivider.topOneTouch.icon    = navigation/arrowUp.svg[themed](13,13)
-SplitPaneDivider.bottomOneTouch.icon = navigation/arrowDown.svg[aware](13,13)
+SplitPaneDivider.bottomOneTouch.icon = navigation/arrowDown.svg[themed](13,13)
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/tabFrame.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/tabFrame.properties
@ -63,21 +63,21 @@ TabFrame.dropBackground                          = %dropBackground
 TabFrame.dragBorderColor                         = %borderTertiary
 #Icons
-TabFramePopup.close.icon                         = navigation/collapse.svg[aware]
+TabFramePopup.close.icon                         = navigation/collapse.svg[themed]
-TabFrame.moveToBottomLeft.icon                   = navigation/moveToBottomLeft.svg[aware]
+TabFrame.moveToBottomLeft.icon                   = navigation/moveToBottomLeft.svg[themed]
-TabFrame.moveToBottomRight.icon                  = navigation/moveToBottomRight.svg[aware]
+TabFrame.moveToBottomRight.icon                  = navigation/moveToBottomRight.svg[themed]
-TabFrame.moveToLeftBottom.icon                   = navigation/moveToLeftBottom.svg[aware]
+TabFrame.moveToLeftBottom.icon                   = navigation/moveToLeftBottom.svg[themed]
-TabFrame.moveToLeftTop.icon                      = navigation/moveToLeftTop.svg[aware]
+TabFrame.moveToLeftTop.icon                      = navigation/moveToLeftTop.svg[themed]
-TabFrame.moveToRightBottom.icon                  = navigation/moveToRightBottom.svg[aware]
+TabFrame.moveToRightBottom.icon                  = navigation/moveToRightBottom.svg[themed]
-TabFrame.moveToRightTop.icon                     = navigation/moveToRightTop.svg[aware]
+TabFrame.moveToRightTop.icon                     = navigation/moveToRightTop.svg[themed]
-TabFrame.moveToTopLeft.icon                      = navigation/moveToTopLeft.svg[aware]
+TabFrame.moveToTopLeft.icon                      = navigation/moveToTopLeft.svg[themed]
-TabFrame.moveToTopRight.icon                     = navigation/moveToTopRight.svg[aware]
+TabFrame.moveToTopRight.icon                     = navigation/moveToTopRight.svg[themed]
-TabFrame.moveToBottomLeftDisabled.icon           = navigation/moveToBottomLeft.svg[dual]
+TabFrame.moveToBottomLeftDisabled.icon           = navigation/moveToBottomLeftDisabled.svg[themed]
-TabFrame.moveToBottomRightDisabled.icon          = navigation/moveToBottomRight.svg[dual]
+TabFrame.moveToBottomRightDisabled.icon          = navigation/moveToBottomRightDisabled.svg[themed]
-TabFrame.moveToLeftBottomDisabled.icon           = navigation/moveToLeftBottom.svg[dual]
+TabFrame.moveToLeftBottomDisabled.icon           = navigation/moveToLeftBottomDisabled.svg[themed]
-TabFrame.moveToLeftTopDisabled.icon              = navigation/moveToLeftTop.svg[dual]
+TabFrame.moveToLeftTopDisabled.icon              = navigation/moveToLeftTopDisabled.svg[themed]
-TabFrame.moveToRightBottomDisabled.icon          = navigation/moveToRightBottom.svg[dual]
+TabFrame.moveToRightBottomDisabled.icon          = navigation/moveToRightBottomDisabled.svg[themed]
-TabFrame.moveToRightTopDisabled.icon             = navigation/moveToRightTop.svg[dual]
+TabFrame.moveToRightTopDisabled.icon             = navigation/moveToRightTopDisabled.svg[themed]
-TabFrame.moveToTopLeftDisabled.icon              = navigation/moveToTopLeft.svg[dual]
+TabFrame.moveToTopLeftDisabled.icon              = navigation/moveToTopLeftDisabled.svg[themed]
-TabFrame.moveToTopRightDisabled.icon             = navigation/moveToTopRight.svg[dual]
+TabFrame.moveToTopRightDisabled.icon             = navigation/moveToTopRightDisabled.svg[themed]
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/tabbedPane.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/tabbedPane.properties
@ -50,7 +50,7 @@ TabbedPane.selectedTabPadInsets    = 0,0,0,0
 TabbedPane.tabAreaInsets           = 0,0,0,0
 #Icons
-TabbedPane.newTab.icon             = navigation/add.svg[aware]
+TabbedPane.newTab.icon             = navigation/add.svg[themed]
-TabbedPane.moreTabs.icon           = navigation/moreTabs.svg[aware]
+TabbedPane.moreTabs.icon           = navigation/moreTabs.svg[themed]
-TabbedPane.tabCloseIcon            = navigation/close.svg[aware]
+TabbedPane.tabCloseIcon            = navigation/close.svg[themed]
-TabbedPane.tabCloseHoverIcon       = navigation/closeHovered.svg[aware]
+TabbedPane.tabCloseHoverIcon       = navigation/closeHovered.svg[themed]
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/table.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/table.properties
@ -59,5 +59,5 @@ Table.booleanRenderType                = checkBox
 Table.rowHeight                        = 22
 #Icons
-Table.ascendingSortIcon                = menu/up.svg[aware](8,16)
+Table.ascendingSortIcon                = menu/up.svg[themed](8,16)
-Table.descendingSortIcon               = menu/down.svg[aware](8,16)
+Table.descendingSortIcon               = menu/down.svg[themed](8,16)
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/taskPane.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/taskPane.properties
@ -40,5 +40,5 @@ TaskPane.titleBackgroundGradientStart = %widgetFillInactive
 TaskPaneContainer.background          = %backgroundContainer
 #Icons
-TaskPane.collapsed.icon               = navigation/arrowUp.svg[aware]
+TaskPane.collapsed.icon               = navigation/arrowUp.svg[themed]
-TaskPane.open.icon                    = navigation/arrowDown.svg[aware]
+TaskPane.open.icon                    = navigation/arrowDown.svg[themed]
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/text.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/text.properties
@ -86,9 +86,9 @@ PasswordField.arc                       = %arcSecondary
 PasswordField.borderThickness           = %borderThickness
 #Icons
-PasswordField.show.icon                 = navigation/eye.svg[dual]
+PasswordField.show.icon                 = misc/eye.svgHovered[themed]
-PasswordField.showPressed.icon          = navigation/eye.svg[aware]
+PasswordField.showPressed.icon          = misc/eye.svg[themed]
-TextField.search.searchWithHistory.icon = navigation/searchWithHistory.svg[aware]
+TextField.search.searchWithHistory.icon = navigation/searchWithHistory.svg[themed]
-TextField.search.search.icon            = navigation/search.svg[aware]
+TextField.search.search.icon            = navigation/search.svg[themed]
-TextField.search.clear.icon             = navigation/close.svg[aware]
+TextField.search.clear.icon             = navigation/close.svg[themed]
-TextField.search.clearHover.icon        = navigation/closeHovered.svg[aware]
+TextField.search.clearHover.icon        = navigation/closeHovered.svg[themed]
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/toolBar.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/toolBar.properties
@ -33,5 +33,5 @@ ToolBar.floatingForeground  = %textForeground
 ToolBar.borderColor         = %borderSecondary
 #Icons
-ToolBar.horizontalGrip.icon = navigation/horizontalGrip.svg[aware](5,20)
+ToolBar.horizontalGrip.icon = navigation/horizontalGrip.svg[themed](5,20)
-ToolBar.verticalGrip.icon   = navigation/verticalGrip.svg[aware](20,5)
+ToolBar.verticalGrip.icon   = navigation/verticalGrip.svg[themed](20,5)
--- a/src/main/resources/com/github/weisj/darklaf/properties/ui/tree.properties
+++ b/src/main/resources/com/github/weisj/darklaf/properties/ui/tree.properties
@ -50,17 +50,17 @@ Tree.renderBooleanAsCheckBox             = true
 Tree.booleanRenderType                   = checkBox
 #Icons
-Tree.collapsedIcon                       = navigation/arrowRight.svg[aware]
+Tree.collapsedIcon                       = navigation/arrowRight.svg[themed]
-Tree.expandedIcon                        = navigation/arrowDown.svg[aware]
+Tree.expandedIcon                        = navigation/arrowDown.svg[themed]
-Tree.closedIcon                          = files/folder.svg[aware]
+Tree.closedIcon                          = files/folder.svg[themed]
-Tree.openIcon                            = files/folder.svg[aware]
+Tree.openIcon                            = files/folder.svg[themed]
-Tree.leafIcon                            = files/general.svg[aware]
+Tree.leafIcon                            = files/general.svg[themed]
-Tree.collapsed.selected.focused.icon     = navigation/arrowRightSelected.svg[aware]
+Tree.collapsed.selected.focused.icon     = navigation/arrowRightSelected.svg[themed]
-Tree.collapsed.selected.unfocused.icon   = navigation/arrowRight.svg[aware]
+Tree.collapsed.selected.unfocused.icon   = navigation/arrowRight.svg[themed]
-Tree.collapsed.unselected.focused.icon   = navigation/arrowRight.svg[aware]
+Tree.collapsed.unselected.focused.icon   = navigation/arrowRight.svg[themed]
-Tree.collapsed.unselected.unfocused.icon = navigation/arrowRight.svg[aware]
+Tree.collapsed.unselected.unfocused.icon = navigation/arrowRight.svg[themed]
-Tree.expanded.selected.focused.icon      = navigation/arrowDownSelected.svg[aware]
+Tree.expanded.selected.focused.icon      = navigation/arrowDownSelected.svg[themed]
-Tree.expanded.selected.unfocused.icon    = navigation/arrowDown.svg[aware]
+Tree.expanded.selected.unfocused.icon    = navigation/arrowDown.svg[themed]
-Tree.expanded.unselected.focused.icon    = navigation/arrowDown.svg[aware]
+Tree.expanded.unselected.focused.icon    = navigation/arrowDown.svg[themed]
-Tree.expanded.unselected.unfocused.icon  = navigation/arrowDown.svg[aware]
+Tree.expanded.unselected.unfocused.icon  = navigation/arrowDown.svg[themed]
--- a/src/main/resources/com/github/weisj/darklaf/theme/intellij/intellij_mac.properties
+++ b/src/main/resources/com/github/weisj/darklaf/theme/intellij/intellij_mac.properties
@ -23,11 +23,11 @@
 #
 ComboBox.arrowBackgroundStart = 68B2FA
 ComboBox.arrowBackgroundEnd   = 0E80FF
-ComboBox.arrow.icon           = navigation/arrowDownSelected.svg[aware]
+ComboBox.arrow.icon           = navigation/arrowDownSelected.svg[themed]
 Spinner.arrowBackgroundStart  = 68B2FA
 Spinner.arrowBackgroundEnd    = 0E80FF
-Spinner.plus.icon             = misc/plusSelected.svg[aware]
+Spinner.plus.icon             = misc/plusSelected.svg[themed]
-Spinner.minus.icon            = misc/minusSelected.svg[aware]
+Spinner.minus.icon            = misc/minusSelected.svg[themed]
-Spinner.arrowUp.icon          = navigation/arrowUpSelected.svg[aware]
+Spinner.arrowUp.icon          = navigation/arrowUpSelected.svg[themed]
-Spinner.arrowDown.icon        = navigation/arrowDownSelected.svg[aware]
+Spinner.arrowDown.icon        = navigation/arrowDownSelected.svg[themed]