diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc
index 8c69fbdbe..84c897a29 100644
--- a/data/themes/default_icons.edc
+++ b/data/themes/default_icons.edc
@@ -32,6 +32,9 @@ images {
    image: "e17_icon_desklock.png" LOSSY 90;
    image: "e17_icon_shelf.png" LOSSY 90;
 
+   image: "e17_icon_window_focus.png" LOSSY 90;
+   image: "e17_icon_screen_resolution.png" LOSSY 90;
+
    image: "e17_pager_window.png" COMP;
    
    image: "e17_icon_right_arrow.png" COMP;
@@ -310,6 +313,25 @@ group {
       }
    }
 }
+group {
+   name: "icons/enlightenment/focus";
+   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_window_focus.png";
+	    }
+	 }
+      }
+   }
+}
 group {
    name: "icons/enlightenment/modules";
    max:  64 64;
@@ -633,6 +655,25 @@ group {
       }
    }
 }
+group {
+   name: "icons/enlightenment/screen_resolution";
+   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_screen_resolution.png";
+	    }
+	 }
+      }
+   }
+}
 group {
    name: "icons/enlightenment/shelf";
    max:  64 64;
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index efec08fea..0c566bdf9 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -311,7 +311,9 @@ e17_icon_reset_button_glow_0.png \
 e17_icon_run.png \
 e17_icon_theme.png \
 e17_icon_windows.png \
+e17_icon_window_focus.png \
 e17_icon_lost_windows.png \
+e17_icon_screen_resolution.png \
 e17_pointer.png \
 e17_pointer_mono.png \
 e17_dialog_watermark.png \
diff --git a/data/themes/images/e17_icon_screen_resolution.png b/data/themes/images/e17_icon_screen_resolution.png
new file mode 100644
index 000000000..461b2c9ed
Binary files /dev/null and b/data/themes/images/e17_icon_screen_resolution.png differ
diff --git a/data/themes/images/e17_icon_window_focus.png b/data/themes/images/e17_icon_window_focus.png
new file mode 100644
index 000000000..9489c73f5
Binary files /dev/null and b/data/themes/images/e17_icon_window_focus.png differ