diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc
new file mode 100644
index 000000000..90ceab093
--- /dev/null
+++ b/data/themes/default_icons.edc
@@ -0,0 +1,393 @@
+images {
+   image: "e17_icon_e_0.png" LOSSY 90;
+   image: "e17_icon_e_glow_0.png" LOSSY 90;
+   
+   image: "e17_icon_power_button_0.png" LOSSY 90;
+   image: "e17_icon_power_button_glow_0.png" LOSSY 90;
+   
+   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_windows.png" LOSSY 90;
+  
+   image: "e17_icon_module.png" LOSSY 90;
+   
+   image: "e17_icon_favorites.png" LOSSY 90;
+   
+   image: "e17_icon_desktop.png" LOSSY 90;
+   
+   image: "e17_icon_gadget.png" LOSSY 90;
+
+   image: "e17_icon_configuration.png" LOSSY 90;
+   image: "e17_icon_run.png" LOSSY 90;
+}
+
+   group {
+      name: "icons/enlightenment/e";
+      max:  64 64;
+      parts {
+	 part {      
+	    name:          "e";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       aspect:   1.0 1.0;
+	       max:      64 64;
+	       image {
+		  normal: "e17_icon_e_0.png";
+	       }
+	    }
+	 }
+	 part {
+	    name:          "e_glow";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       visible:   0;
+	       rel1 {
+		  to:       "e";
+	       }
+	       rel2 {
+		  to:       "e";
+	       }
+	       color:       255 255 255 0;
+	       image {
+		  normal: "e17_icon_e_glow_0.png";
+	       }
+	    }
+	    description {
+	       state:    "hilited" 0.0;
+	       inherit:  "default"  0.0;
+	       visible:   1;
+	       color:     255 255 255 255;
+	    }
+	 }
+      }
+      programs {
+         program {	 
+	    name:       "e_in";
+	    signal:     "active";
+	    source:     "";
+	    action:     STATE_SET "hilited" 0.0;
+	    transition: LINEAR 0.5;
+	    target:     "e_glow";
+	 }
+	 program {
+	    name:       "e_out";
+	    signal:     "passive";
+	    source:     "";
+	    action:     STATE_SET "default" 0.0;
+	    transition: LINEAR 0.5;
+	    target:     "e_glow";
+	 }
+      }
+   }
+   group {
+      name: "icons/enlightenment/exit";
+      max:  64 64;
+      parts {
+	 part {      
+	    name:          "power_button";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       aspect:   1.0 1.0;
+	       max:      64 64;
+	       image {
+		  normal: "e17_icon_power_button_0.png";
+	       }
+	    }
+	 }
+	 part {
+	    name:          "power_button_glow";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       visible:   0;
+	       rel1 {
+		  to:       "power_button";
+	       }
+	       rel2 {
+		  to:       "power_button";
+	       }
+	       color:       255 255 255 0;
+	       image {
+		  normal: "e17_icon_power_button_glow_0.png";
+	       }
+	    }
+	    description {
+	       state:    "hilited" 0.0;
+	       inherit:  "default"  0.0;
+	       visible:   1;
+	       color:     255 255 255 255;
+	    }
+	 }
+      }
+      programs {
+         program {	 
+	    name:       "power_button_in";
+	    signal:     "active";
+	    source:     "";
+	    action:     STATE_SET "hilited" 0.0;
+	    transition: LINEAR 0.5;
+	    target:     "power_button_glow";
+	 }
+	 program {
+	    name:       "power_button_out";
+	    signal:     "passive";
+	    source:     "";
+	    action:     STATE_SET "default" 0.0;
+	    transition: LINEAR 0.5;
+	    target:     "power_button_glow";
+	 }
+      }
+   }
+   group {
+      name: "icons/enlightenment/reset";
+      max:  64 64;
+      parts {
+	 part {      
+	    name:          "reset_button";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       aspect:   1.0 1.0;
+	       max:      64 64;
+	       image {
+		  normal: "e17_icon_reset_button_0.png";
+	       }
+	    }
+	 }
+	 part {
+	    name:          "reset_button_glow";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       visible:   0;
+	       rel1 {
+		  to:       "reset_button";
+	       }
+	       rel2 {
+		  to:       "reset_button";
+	       }
+	       color:       255 255 255 0;
+	       image {
+		  normal: "e17_icon_reset_button_glow_0.png";
+	       }
+	    }
+	    description {
+	       state:    "hilited" 0.0;
+	       inherit:  "default"  0.0;
+	       visible:   1;
+	       color:     255 255 255 255;
+	    }
+	 }
+      }
+      programs {
+         program {	 
+	    name:       "reset_button_in";
+	    signal:     "active";
+	    source:     "";
+	    action:     STATE_SET "hilited" 0.0;
+	    transition: LINEAR 0.5;
+	    target:     "reset_button_glow";
+	 }
+	 program {
+	    name:       "reset_button_out";
+	    signal:     "passive";
+	    source:     "";
+	    action:     STATE_SET "default" 0.0;
+	    transition: LINEAR 0.5;
+	    target:     "reset_button_glow";
+	 }
+      }
+   }
+   group {
+      name: "icons/enlightenment/themes";
+      max:  64 64;
+      parts {
+	 part {      
+	    name:          "theme_button";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       aspect:   1.0 1.0;
+	       max:      64 64;
+	       image {
+		  normal: "e17_icon_theme_0.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 {
+      name: "icons/enlightenment/windows";
+      max:  64 64;
+      parts {
+	 part {
+	    name:          "icon";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       aspect:   1.0 1.0;
+	       max:      64 64;
+	       image {
+		  normal: "e17_icon_windows.png";
+	       }
+	    }
+	 }
+      }
+   }
+   group {
+      name: "icons/enlightenment/modules";
+      max:  64 64;
+      parts {
+	 part {
+	    name:          "icon";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       aspect:   1.0 1.0;
+	       max:      64 64;
+	       image {
+		  normal: "e17_icon_module.png";
+	       }
+	    }
+	 }
+      }
+   }
+   group {
+      name: "icons/enlightenment/favorites";
+      max:  64 64;
+      parts {
+	 part {
+	    name:          "icon";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       aspect:   1.0 1.0;
+	       max:      64 64;
+	       image {
+		  normal: "e17_icon_favorites.png";
+	       }
+	    }
+	 }
+      }
+   }
+   group {
+      name: "icons/enlightenment/desktops";
+      max:  64 64;
+      parts {
+	 part {
+	    name:          "icon";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       aspect:   1.0 1.0;
+	       max:      64 64;
+	       image {
+		  normal: "e17_icon_desktop.png";
+	       }
+	    }
+	 }
+      }
+   }
+   group {
+      name: "icons/enlightenment/gadgets";
+      max:  64 64;
+      parts {
+	 part {
+	    name:          "icon";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       aspect:   1.0 1.0;
+	       max:      64 64;
+	       image {
+		  normal: "e17_icon_gadget.png";
+	       }
+	    }
+	 }
+      }
+   }
+   group {
+      name: "icons/enlightenment/configuration";
+      max:  64 64;
+      parts {
+	 part {
+	    name:          "icon";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       aspect:   1.0 1.0;
+	       max:      64 64;
+	       image {
+		  normal: "e17_icon_configuration.png";
+	       }
+	    }
+	 }
+      }
+   }
+   group {
+      name: "icons/enlightenment/run";
+      max:  64 64;
+      parts {
+	 part {
+	    name:          "icon";
+	    mouse_events:  0;
+	    description {
+	       state:    "default" 0.0;
+	       aspect:   1.0 1.0;
+	       max:      64 64;
+	       image {
+		  normal: "e17_icon_run.png";
+	       }
+	    }
+	 }
+      }
+   }