diff --git a/data/themes/default.edc b/data/themes/default.edc
index a4e494a05..5463a67b8 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -3,7 +3,7 @@
 //	Icons:
 //		EFM - All popup icons ... eg, paste copy delete properties
 //		EFM - folders (perhaps?), dynamic mime icons
-//		Icons - settings, engine, better looking SD card
+//		Icons - engine, better looking SD card
 //		Icons for all modules in Module list.
 //
 
@@ -22451,11 +22451,10 @@ ICON("widget/reset","icon_reset.png",64)
 
 ICON("enlightenment/engine","icon_dummy.png",64)
 ICON("enlightenment/toolbar","icon_dummy.png",64)
-ICON("enlightenment/settings","icon_dummy.png",64)
-ICON("enlightenment/warning","icon_dummy.png",64)
 
 /// Normal Icons ///
 
+ICON("enlightenment/warning", "icon_warning.png",128)
 ICON("enlightenment/website","icon_globe.png",64)
 ICON("enlightenment/background","icon_wallpaper.png",64)
 ICON("enlightenment/picture","icon_wallpaper.png",64)
@@ -22481,6 +22480,7 @@ ICON("enlightenment/modules","icon_modules.png",64)
 ICON("enlightenment/favorites","icon_favorites.png",64)
 ICON("enlightenment/desktops","icon_desktops.png",64)
 ICON("enlightenment/configuration","icon_configuration.png",64)
+ICON("enlightenment/settings","icon_configuration.png",64)
 ICON("enlightenment/dialogs","icon_dummy.png",64)
 ICON("enlightenment/intl","icon_intl.png",64)
 ICON("enlightenment/interaction","icon_interaction.png",64)
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 0e87c193e..c21ff354a 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -436,6 +436,7 @@ icon_wallpaper_center.png \
 icon_wallpaper_grad_screen.png \
 icon_wallpaper.png \
 icon_wallpaper_screen.png \
+icon_warning.png \
 icon_window_focus.png \
 icon_window_manipulation.png \
 icon_window_remembers.png \
diff --git a/data/themes/images/icon_warning.png b/data/themes/images/icon_warning.png
new file mode 100644
index 000000000..d93e571f6
Binary files /dev/null and b/data/themes/images/icon_warning.png differ