diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc
index fa468914c..3499118cd 100644
--- a/data/themes/default_icons.edc
+++ b/data/themes/default_icons.edc
@@ -2,12 +2,6 @@ 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.png" LOSSY 90;
 
    image: "e17_icon_windows.png" LOSSY 90;
@@ -78,6 +72,13 @@ images {
    image: "e17_wallpaper_screen.png" COMP;
    image: "e17_wallpaper_center_flat.png" COMP;
    image: "e17_wallpaper_grad_screen.png" COMP;
+   image: "e17_icon_e_exit.png" COMP;
+   image: "e17_icon_e_reset.png" COMP;
+   image: "e17_icon_logout.png" COMP;
+   image: "e17_icon_hibernate.png" COMP;
+   image: "e17_icon_suspend.png" COMP;
+   image: "e17_icon_halt.png" COMP;
+   image: "e17_icon_reboot.png" COMP;
 }
 
 group {
@@ -141,73 +142,12 @@ group {
       }
    }
 }
-group {
-   name: "e/icons/enlightenment/exit";
-   max:  64 64;
-   parts {
-      part {      
-	 name:          "power_button";
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    aspect:   1.0 1.0;
-	    aspect_preference: BOTH;
-	    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:     "e,state,selected";
-	 source:     "e";
-	 action:     STATE_SET "hilited" 0.0;
-	 transition: LINEAR 0.5;
-	 target:     "power_button_glow";
-      }
-      program {
-	 name:       "power_button_out";
-	 signal:     "e,state,unselected";
-	 source:     "e";
-	 action:     STATE_SET "default" 0.0;
-	 transition: LINEAR 0.5;
-	 target:     "power_button_glow";
-      }
-   }
-}
 group {
    name: "e/icons/enlightenment/reset";
    max:  64 64;
    parts {
-      part {      
-	 name:          "reset_button";
+      part {
+	 name:          "icon";
 	 mouse_events:  0;
 	 description {
 	    state:    "default" 0.0;
@@ -215,60 +155,132 @@ group {
 	    aspect_preference: BOTH;
 	    max:      64 64;
 	    image {
-	       normal: "e17_icon_reset_button_0.png";
+	       normal: "e17_icon_e_reset.png";
 	    }
 	 }
       }
+   }
+}   
+group {
+   name: "e/icons/enlightenment/exit";
+   max:  64 64;
+   parts {
       part {
-	 name:          "reset_button_glow";
+	 name:          "icon";
 	 mouse_events:  0;
 	 description {
 	    state:    "default" 0.0;
-	    visible:   0;
-	    rel1 {
-	       to:       "reset_button";
-	    }
-	    rel2 {
-	       to:       "reset_button";
-	    }
-	    color:       255 255 255 0;
+	    aspect:   1.0 1.0;
+	    aspect_preference: BOTH;
+	    max:      64 64;
 	    image {
-	       normal: "e17_icon_reset_button_glow_0.png";
+	       normal: "e17_icon_e_exit.png";
 	    }
 	 }
+      }
+   }
+}   
+group {
+   name: "e/icons/enlightenment/logout";
+   max:  64 64;
+   parts {
+      part {
+	 name:          "icon";
+	 mouse_events:  0;
 	 description {
-	    state:    "hilited" 0.0;
-	    inherit:  "default"  0.0;
-	    visible:   1;
-	    color:     255 255 255 255;
+	    state:    "default" 0.0;
+	    aspect:   1.0 1.0;
+	    aspect_preference: BOTH;
+	    max:      64 64;
+	    image {
+	       normal: "e17_icon_logout.png";
+	    }
 	 }
       }
    }
-   programs {
-      program {	 
-	 name:       "reset_button_in";
-	 signal:     "e,state,selected";
-	 source:     "e";
-	 action:     STATE_SET "hilited" 0.0;
-	 transition: LINEAR 0.5;
-	 target:     "reset_button_glow";
-      }
-      program {
-	 name:       "reset_button_out";
-	 signal:     "e,state,unselected";
-	 source:     "e";
-	 action:     STATE_SET "default" 0.0;
-	 transition: LINEAR 0.5;
-	 target:     "reset_button_glow";
+}   
+group {
+   name: "e/icons/enlightenment/halt";
+   max:  64 64;
+   parts {
+      part {
+	 name:          "icon";
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    aspect:   1.0 1.0;
+	    aspect_preference: BOTH;
+	    max:      64 64;
+	    image {
+	       normal: "e17_icon_halt.png";
+	    }
+	 }
       }
    }
-}
+}   
+group {
+   name: "e/icons/enlightenment/reboot";
+   max:  64 64;
+   parts {
+      part {
+	 name:          "icon";
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    aspect:   1.0 1.0;
+	    aspect_preference: BOTH;
+	    max:      64 64;
+	    image {
+	       normal: "e17_icon_reboot.png";
+	    }
+	 }
+      }
+   }
+}   
+group {
+   name: "e/icons/enlightenment/suspend";
+   max:  64 64;
+   parts {
+      part {
+	 name:          "icon";
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    aspect:   1.0 1.0;
+	    aspect_preference: BOTH;
+	    max:      64 64;
+	    image {
+	       normal: "e17_icon_suspend.png";
+	    }
+	 }
+      }
+   }
+}   
+group {
+   name: "e/icons/enlightenment/hibernate";
+   max:  64 64;
+   parts {
+      part {
+	 name:          "icon";
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    aspect:   1.0 1.0;
+	    aspect_preference: BOTH;
+	    max:      64 64;
+	    image {
+	       normal: "e17_icon_hibernate.png";
+	    }
+	 }
+      }
+   }
+}   
 group {
    name: "e/icons/enlightenment/themes";
    max:  64 64;
    parts {
       part {      
-	 name:          "e/theme_button";
+	 name:          "icon";
 	 mouse_events:  0;
 	 description {
 	    state:    "default" 0.0;
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 70ef34194..b89337042 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -322,10 +322,6 @@ e17_icon_e_0.png \
 e17_icon_e_glow_0.png \
 e17_icon_favorites.png \
 e17_icon_module.png \
-e17_icon_power_button_0.png \
-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.png \
 e17_icon_windows.png \
@@ -493,4 +489,11 @@ e17_wallpaper_center.png \
 e17_wallpaper_grad_screen.png \
 e17_wallpaper_screen.png \
 e17_wallpaper_center_flat.png \
-e17_well_overlay.png
+e17_well_overlay.png \
+e17_icon_e_exit.png \
+e17_icon_e_reset.png \
+e17_icon_logout.png \
+e17_icon_hibernate.png \
+e17_icon_suspend.png \
+e17_icon_halt.png \
+e17_icon_reboot.png
diff --git a/data/themes/images/e17_icon_e_exit.png b/data/themes/images/e17_icon_e_exit.png
new file mode 100644
index 000000000..fc2552225
Binary files /dev/null and b/data/themes/images/e17_icon_e_exit.png differ
diff --git a/data/themes/images/e17_icon_e_reset.png b/data/themes/images/e17_icon_e_reset.png
new file mode 100644
index 000000000..ee7b64a43
Binary files /dev/null and b/data/themes/images/e17_icon_e_reset.png differ
diff --git a/data/themes/images/e17_icon_gadget.png b/data/themes/images/e17_icon_gadget.png
new file mode 100644
index 000000000..007527357
Binary files /dev/null and b/data/themes/images/e17_icon_gadget.png differ
diff --git a/data/themes/images/e17_icon_halt.png b/data/themes/images/e17_icon_halt.png
new file mode 100644
index 000000000..ae0deb8ff
Binary files /dev/null and b/data/themes/images/e17_icon_halt.png differ
diff --git a/data/themes/images/e17_icon_hibernate.png b/data/themes/images/e17_icon_hibernate.png
new file mode 100644
index 000000000..6ca4fbb66
Binary files /dev/null and b/data/themes/images/e17_icon_hibernate.png differ
diff --git a/data/themes/images/e17_icon_logout.png b/data/themes/images/e17_icon_logout.png
new file mode 100644
index 000000000..45d9ba352
Binary files /dev/null and b/data/themes/images/e17_icon_logout.png differ
diff --git a/data/themes/images/e17_icon_power_button_0.png b/data/themes/images/e17_icon_power_button_0.png
deleted file mode 100644
index f051b64bd..000000000
Binary files a/data/themes/images/e17_icon_power_button_0.png and /dev/null differ
diff --git a/data/themes/images/e17_icon_power_button_glow_0.png b/data/themes/images/e17_icon_power_button_glow_0.png
deleted file mode 100644
index b4648b8a8..000000000
Binary files a/data/themes/images/e17_icon_power_button_glow_0.png and /dev/null differ
diff --git a/data/themes/images/e17_icon_reboot.png b/data/themes/images/e17_icon_reboot.png
new file mode 100644
index 000000000..6deb58a7d
Binary files /dev/null and b/data/themes/images/e17_icon_reboot.png differ
diff --git a/data/themes/images/e17_icon_reset_button_0.png b/data/themes/images/e17_icon_reset_button_0.png
deleted file mode 100644
index 734131c82..000000000
Binary files a/data/themes/images/e17_icon_reset_button_0.png and /dev/null differ
diff --git a/data/themes/images/e17_icon_reset_button_glow_0.png b/data/themes/images/e17_icon_reset_button_glow_0.png
deleted file mode 100644
index 70afd92d3..000000000
Binary files a/data/themes/images/e17_icon_reset_button_glow_0.png and /dev/null differ
diff --git a/data/themes/images/e17_icon_suspend.png b/data/themes/images/e17_icon_suspend.png
new file mode 100644
index 000000000..53f3134ef
Binary files /dev/null and b/data/themes/images/e17_icon_suspend.png differ
diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
index 3ff002781..54635d9fb 100644
--- a/src/bin/e_sys.c
+++ b/src/bin/e_sys.c
@@ -471,7 +471,7 @@ _e_sys_action_do(E_Sys_Action a, char *param)
 					    _("Shutting down your Computer.<br>"
 					      "<hilight>Please wait.</hilight>"));
 	     e_obj_dialog_show(od);
-	     e_obj_dialog_icon_set(od, "enlightenment/logout");
+	     e_obj_dialog_icon_set(od, "enlightenment/halt");
 	     if (_e_sys_dialog) e_object_del(E_OBJECT(_e_sys_dialog));
 	     _e_sys_dialog = od;
 	     /* FIXME: display halt status */
@@ -497,7 +497,7 @@ _e_sys_action_do(E_Sys_Action a, char *param)
 					    _("Rebooting your Computer.<br>"
 					      "<hilight>Please wait.</hilight>"));
 	     e_obj_dialog_show(od);
-	     e_obj_dialog_icon_set(od, "enlightenment/logout");
+	     e_obj_dialog_icon_set(od, "enlightenment/reboot");
 	     if (_e_sys_dialog) e_object_del(E_OBJECT(_e_sys_dialog));
 	     _e_sys_dialog = od;
 	     /* FIXME: display reboot status */
@@ -522,7 +522,7 @@ _e_sys_action_do(E_Sys_Action a, char *param)
 					    _("Suspending your Computer.<br>"
 					      "<hilight>Please wait.</hilight>"));
 	     e_obj_dialog_show(od);
-	     e_obj_dialog_icon_set(od, "enlightenment/logout");
+	     e_obj_dialog_icon_set(od, "enlightenment/suspend");
 	     if (_e_sys_dialog) e_object_del(E_OBJECT(_e_sys_dialog));
 	     _e_sys_dialog = od;
 	     /* FIXME: display suspend status */
@@ -547,7 +547,7 @@ _e_sys_action_do(E_Sys_Action a, char *param)
 					    _("Hibernating your Computer.<br>"
 					      "<hilight>Please wait.</hilight>"));
 	     e_obj_dialog_show(od);
-	     e_obj_dialog_icon_set(od, "enlightenment/logout");
+	     e_obj_dialog_icon_set(od, "enlightenment/hibernate");
 	     if (_e_sys_dialog) e_object_del(E_OBJECT(_e_sys_dialog));
 	     _e_sys_dialog = od;
 	     /* FIXME: display hibernate status */