diff --git a/data/themes/default.edc b/data/themes/default.edc
index 29aebd89f..806d8dbcc 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -3,14 +3,7 @@
 //	Icons:
 //		EFM - All popup icons ... eg, paste copy delete properties
 //		EFM - folders (perhaps?), dynamic mime icons
-//		Icons - Favorite, system icons, window icons, icon theme
-//		           - Dialogs, Interactions, applications, settings
-//
-//
-// TODO Code:
-//	      - ilist e.swallow.icon should use e_ilist_icon_size_set to make a dummy box
-//		to compensate when there is no icon there.
-//	      - Make ibox/ibar use data.item: "selectraise" "on"; so it can do zooms correctly
+//		Icons - Icon theme, Dialogs, Interactions, applications, settings
 //
 
 /*
@@ -22586,13 +22579,7 @@ group { name: "e/icons/"NAME ;                          \
    }                                                    \
 }
 
-
-ICON("enlightenment/website","icon_globe.png",64)
-ICON("enlightenment/background","icon_wallpaper.png",64)
-ICON("enlightenment/picture","icon_wallpaper.png",64)
-ICON("enlightenment/gradient","icon_gradient.png",64)
-ICON("enlightenment/e","logo_white_128.png",64)
-ICON("enlightenment/about","logo_black_128.png",64)
+// Widget Icons //
 
 ICON("enlightenment/check","icon_check.png",64)
 ICON("widget/swap","icon_swap.png",64)
@@ -22612,16 +22599,21 @@ ICON("widget/resize","icon_resize.png",64)
 ICON("enlightenment/engine","icon_dummy.png",64)
 ICON("enlightenment/add_application","icon_dummy.png",64)
 ICON("enlightenment/profiles","icon_dummy.png",64)
-ICON("enlightenment/scale","icon_dummy.png",64)
 ICON("enlightenment/autoscroll","icon_dummy.png",64)
 ICON("enlightenment/showhide","icon_dummy.png",64)
 ICON("enlightenment/toolbar","icon_dummy.png",64)
 ICON("enlightenment/settings","icon_dummy.png",64)
 
-/// Old Icons from Bling ///
+/// Normal Icons ///
 
+ICON("enlightenment/website","icon_globe.png",64)
+ICON("enlightenment/background","icon_wallpaper.png",64)
+ICON("enlightenment/picture","icon_wallpaper.png",64)
+ICON("enlightenment/gradient","icon_gradient.png",64)
+ICON("enlightenment/e","logo_white_128.png",64)
+ICON("enlightenment/about","logo_black_128.png",64)
 ICON("enlightenment/reset","icon_reset.png",128)
-ICON("enlightenment/exit","icon_exit.png",64)
+ICON("enlightenment/exit","icon_logout.png",64)
 ICON("enlightenment/logout","icon_logout.png",128)
 ICON("enlightenment/halt","icon_halt.png",128)
 ICON("enlightenment/reboot","icon_reboot.png",128)
@@ -22681,6 +22673,7 @@ ICON("enlightenment/power_management","icon_power_management.png",64)
 ICON("enlightenment/screensaver","icon_screensaver.png",64)
 ICON("enlightenment/pager","icon_pager.png",64)
 ICON("enlightenment/mixer","icon_mixer.png",64)
+ICON("enlightenment/scale","icon_scale.png",64)
 ICON("enlightenment/screen_normal","icon_screen_normal.png",64)
 ICON("enlightenment/screen_around","icon_screen_around.png",64)
 ICON("enlightenment/screen_left","icon_screen_left.png",64)
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 2c031b05c..2df79ea1e 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -329,7 +329,6 @@ icon_efm_tmp.png \
 icon_efm_view_details.png \
 icon_efm_view_name.png \
 icon_efm_view.png \
-icon_exit.png \
 icon_extensions.png \
 icon_favorites.png \
 icon_file_icons.png \
@@ -390,6 +389,7 @@ icon_resize.png \
 icon_restart_applications.png \
 icon_right_arrow.png \
 icon_run.png \
+icon_scale.png \
 icon_screen_around.png \
 icon_screen_hflip.png \
 icon_screen_left.png \
diff --git a/data/themes/images/icon_desktops.png b/data/themes/images/icon_desktops.png
index 3387d3fe8..c1922cbdc 100644
Binary files a/data/themes/images/icon_desktops.png and b/data/themes/images/icon_desktops.png differ
diff --git a/data/themes/images/icon_exit.png b/data/themes/images/icon_exit.png
deleted file mode 100644
index fd3187e97..000000000
Binary files a/data/themes/images/icon_exit.png and /dev/null differ
diff --git a/data/themes/images/icon_scale.png b/data/themes/images/icon_scale.png
new file mode 100644
index 000000000..9426e4bba
Binary files /dev/null and b/data/themes/images/icon_scale.png differ
diff --git a/data/themes/images/icon_window_focus.png b/data/themes/images/icon_window_focus.png
index a4d549b9f..4eb2dbf4e 100644
Binary files a/data/themes/images/icon_window_focus.png and b/data/themes/images/icon_window_focus.png differ