diff --git a/AppKit/Themes/Aristo/Resources/window-standard-close-button-inactive.png b/AppKit/Themes/Aristo/Resources/window-standard-close-button-inactive.png
new file mode 100644
index 000000000..3e9c48782
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-close-button-inactive.png differ
diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 8b64c950c..0cdaab1ae 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -3109,6 +3109,7 @@ var themedButtonValues = nil,
             }),
 
         closeButtonImage =                  PatternImage(@"window-standard-close-button.png", 16, 16),
+        closeButtonImageInactive =          PatternImage(@"window-standard-close-button-inactive.png", 16, 16),
         closeButtonImageHighlighted =       PatternImage(@"window-standard-button-highlighted.png",16, 16),
         unsavedButtonImage =                PatternImage(@"window-standard-button-unsaved.png",16, 16),
         unsavedButtonImageHighlighted =     PatternImage(@"window-standard-close-button-unsaved-highlighted.png",16, 16),
@@ -3141,7 +3142,9 @@ var themedButtonValues = nil,
 
             [@"unsaved-image-button"                ,unsavedButtonImage],
             [@"unsaved-image-highlighted-button"    ,unsavedButtonImageHighlighted],
-            [@"close-image-button"                  ,closeButtonImage],
+            [@"close-image-button"                  ,closeButtonImageInactive, CPThemeStateNormal],
+            [@"close-image-button"                  ,closeButtonImage, CPThemeStateKeyWindow],
+            [@"close-image-button"                  ,closeButtonImage, CPThemeStateMainWindow],
             [@"close-image-highlighted-button"      ,closeButtonImageHighlighted],
             [@"minimize-image-button"               ,minimizeButtonImage],
             [@"minimize-image-highlighted-button"   ,minimizeButtonImageHighlighted],