diff --git a/src/main.c b/src/main.c
index fa9647b782a28394c10783861603f7d7cf52e77d..c5acbd5c66275d8c47f68d8a6657938f21011e13 100644
--- a/src/main.c
+++ b/src/main.c
@@ -367,17 +367,25 @@ static gint
 get_default_compositor (DisplayInfo *display_info)
 {
     /* 
-       Check if the XServer is black listed.
+     * Don't even check for the render speed if there is no compositor.
+     */
+    if (!display_info->enable_compositor)
+    {
+        return 0;
+    }
+
+    /* 
+     * Check if the XServer is black listed.
      */
     if (!compositorTestServer (display_info))
     {
         g_warning ("The XServer currently in use on this system is not suitable for the compositor");
         return 0;
     }
-    
+
     /* 
-       Test if the XRender implementation is fast enough for the
-       compositor.
+     * Test if the XRender implementation is fast enough for the
+     * compositor.
      */
     if (!myDisplayTestXrender (display_info, 0.025))
     {
diff --git a/themes/default/close-active.png b/themes/default/close-active.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/close-active.png and b/themes/default/close-active.png differ
diff --git a/themes/default/close-inactive.png b/themes/default/close-inactive.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/close-inactive.png and b/themes/default/close-inactive.png differ
diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png
index dde1e254e504aaafa8300ba39496f36b8a365885..9a1d82c30b8eddfa21fc9e6de8d2d52a497dabdb 100644
Binary files a/themes/default/close-pressed.png and b/themes/default/close-pressed.png differ
diff --git a/themes/default/hide-active.png b/themes/default/hide-active.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/hide-active.png and b/themes/default/hide-active.png differ
diff --git a/themes/default/hide-inactive.png b/themes/default/hide-inactive.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/hide-inactive.png and b/themes/default/hide-inactive.png differ
diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png
index dde1e254e504aaafa8300ba39496f36b8a365885..9a1d82c30b8eddfa21fc9e6de8d2d52a497dabdb 100644
Binary files a/themes/default/hide-pressed.png and b/themes/default/hide-pressed.png differ
diff --git a/themes/default/maximize-active.png b/themes/default/maximize-active.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/maximize-active.png and b/themes/default/maximize-active.png differ
diff --git a/themes/default/maximize-inactive.png b/themes/default/maximize-inactive.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/maximize-inactive.png and b/themes/default/maximize-inactive.png differ
diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png
index dde1e254e504aaafa8300ba39496f36b8a365885..9a1d82c30b8eddfa21fc9e6de8d2d52a497dabdb 100644
Binary files a/themes/default/maximize-pressed.png and b/themes/default/maximize-pressed.png differ
diff --git a/themes/default/maximize-toggled-active.png b/themes/default/maximize-toggled-active.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/maximize-toggled-active.png and b/themes/default/maximize-toggled-active.png differ
diff --git a/themes/default/maximize-toggled-inactive.png b/themes/default/maximize-toggled-inactive.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/maximize-toggled-inactive.png and b/themes/default/maximize-toggled-inactive.png differ
diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png
index dde1e254e504aaafa8300ba39496f36b8a365885..9a1d82c30b8eddfa21fc9e6de8d2d52a497dabdb 100644
Binary files a/themes/default/maximize-toggled-pressed.png and b/themes/default/maximize-toggled-pressed.png differ
diff --git a/themes/default/shade-active.png b/themes/default/shade-active.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/shade-active.png and b/themes/default/shade-active.png differ
diff --git a/themes/default/shade-inactive.png b/themes/default/shade-inactive.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/shade-inactive.png and b/themes/default/shade-inactive.png differ
diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png
index dde1e254e504aaafa8300ba39496f36b8a365885..9a1d82c30b8eddfa21fc9e6de8d2d52a497dabdb 100644
Binary files a/themes/default/shade-pressed.png and b/themes/default/shade-pressed.png differ
diff --git a/themes/default/shade-toggled-active.png b/themes/default/shade-toggled-active.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/shade-toggled-active.png and b/themes/default/shade-toggled-active.png differ
diff --git a/themes/default/shade-toggled-inactive.png b/themes/default/shade-toggled-inactive.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/shade-toggled-inactive.png and b/themes/default/shade-toggled-inactive.png differ
diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png
index dde1e254e504aaafa8300ba39496f36b8a365885..9a1d82c30b8eddfa21fc9e6de8d2d52a497dabdb 100644
Binary files a/themes/default/shade-toggled-pressed.png and b/themes/default/shade-toggled-pressed.png differ
diff --git a/themes/default/stick-active.png b/themes/default/stick-active.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/stick-active.png and b/themes/default/stick-active.png differ
diff --git a/themes/default/stick-inactive.png b/themes/default/stick-inactive.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/stick-inactive.png and b/themes/default/stick-inactive.png differ
diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png
index dde1e254e504aaafa8300ba39496f36b8a365885..9a1d82c30b8eddfa21fc9e6de8d2d52a497dabdb 100644
Binary files a/themes/default/stick-pressed.png and b/themes/default/stick-pressed.png differ
diff --git a/themes/default/stick-toggled-active.png b/themes/default/stick-toggled-active.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/stick-toggled-active.png and b/themes/default/stick-toggled-active.png differ
diff --git a/themes/default/stick-toggled-inactive.png b/themes/default/stick-toggled-inactive.png
index 530efe0a7bbfe53e613c5e6fe98d05c014819bdc..12cdf020442d2fe78c10e690ed4b46b4013cad45 100644
Binary files a/themes/default/stick-toggled-inactive.png and b/themes/default/stick-toggled-inactive.png differ
diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png
index dde1e254e504aaafa8300ba39496f36b8a365885..9a1d82c30b8eddfa21fc9e6de8d2d52a497dabdb 100644
Binary files a/themes/default/stick-toggled-pressed.png and b/themes/default/stick-toggled-pressed.png differ
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index a93611f8884fcf892361f1646002fd7b7f97c431..bc37b1ae8596de0b2e70872b972fbb23ffc678fa 100644
Binary files a/themes/default/top-left-active.png and b/themes/default/top-left-active.png differ
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index a93611f8884fcf892361f1646002fd7b7f97c431..bc37b1ae8596de0b2e70872b972fbb23ffc678fa 100644
Binary files a/themes/default/top-left-inactive.png and b/themes/default/top-left-inactive.png differ
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index 052eb8e756feb9735f20cd8f03268afc4a40682f..83442b3f733b41b9976e708ccaf359908f3cb630 100644
Binary files a/themes/default/top-right-active.png and b/themes/default/top-right-active.png differ
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index 052eb8e756feb9735f20cd8f03268afc4a40682f..83442b3f733b41b9976e708ccaf359908f3cb630 100644
Binary files a/themes/default/top-right-inactive.png and b/themes/default/top-right-inactive.png differ