diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc
index 75496b17c..445b5478c 100644
--- a/data/themes/default_icons.edc
+++ b/data/themes/default_icons.edc
@@ -8,8 +8,7 @@ images {
    image: "e17_icon_reset_button_0.png" LOSSY 90;
    image: "e17_icon_reset_button_glow_0.png" LOSSY 90;
    
-   image: "e17_icon_theme_0.png" LOSSY 90;
-   image: "e17_icon_theme_glow_0.png" LOSSY 90;   
+   image: "e17_icon_theme.png" LOSSY 90;
 
    image: "e17_icon_windows.png" LOSSY 90;
 	
@@ -249,52 +248,10 @@ group {
 	    aspect:   1.0 1.0;
 	    max:      64 64;
 	    image {
-	       normal: "e17_icon_theme_0.png";
+	       normal: "e17_icon_theme.png";
 	    }
 	 }
       }
-      part {
-	 name:          "theme_button_glow";
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    visible:   0;
-	    rel1 {
-	       to:       "theme_button";
-	    }
-	    rel2 {
-	       to:       "theme_button";
-	    }
-	    color:       255 255 255 0;
-	    image {
-	       normal: "e17_icon_theme_glow_0.png";
-	    }
-	 }
-	 description {
-	    state:    "hilited" 0.0;
-	    inherit:  "default"  0.0;
-	    visible:   1;
-	    color:     255 255 255 255;
-	 }
-      }
-   }
-   programs {
-      program {	 
-	 name:       "theme_button_in";
-	 signal:     "active";
-	 source:     "";
-	 action:     STATE_SET "hilited" 0.0;
-	 transition: LINEAR 0.5;
-	 target:     "theme_button_glow";
-      }
-      program {
-	 name:       "theme_button_out";
-	 signal:     "passive";
-	 source:     "";
-	 action:     STATE_SET "default" 0.0;
-	 transition: LINEAR 0.5;
-	 target:     "theme_button_glow";
-      }
    }
 }   
 group {
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 30441c998..df374e6a3 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -309,8 +309,7 @@ e17_icon_power_button_glow_0.png \
 e17_icon_reset_button_0.png \
 e17_icon_reset_button_glow_0.png \
 e17_icon_run.png \
-e17_icon_theme_0.png \
-e17_icon_theme_glow_0.png \
+e17_icon_theme.png \
 e17_icon_windows.png \
 e17_icon_lost_windows.png \
 e17_pointer.png \
diff --git a/data/themes/images/e17_icon_theme.png b/data/themes/images/e17_icon_theme.png
new file mode 100644
index 000000000..8868f1114
Binary files /dev/null and b/data/themes/images/e17_icon_theme.png differ
diff --git a/data/themes/images/e17_icon_theme_0.png b/data/themes/images/e17_icon_theme_0.png
deleted file mode 100644
index 1a70dc58f..000000000
Binary files a/data/themes/images/e17_icon_theme_0.png and /dev/null differ
diff --git a/data/themes/images/e17_icon_theme_glow_0.png b/data/themes/images/e17_icon_theme_glow_0.png
deleted file mode 100644
index 5aa6349db..000000000
Binary files a/data/themes/images/e17_icon_theme_glow_0.png and /dev/null differ