diff --git a/data/icons/default.edc b/data/icons/default.edc
index 000b99541..35eb45ecd 100644
--- a/data/icons/default.edc
+++ b/data/icons/default.edc
@@ -7,6 +7,10 @@ images {
    
    image: "reset_button_0.png" LOSSY 90;
    image: "reset_button_glow_0.png" LOSSY 90;
+
+   image: "windows.png" LOSSY 90;
+   
+   image: "module.png" LOSSY 90;
 }
 
 collections {
@@ -190,4 +194,40 @@ collections {
 	 }
       }
    }
+   group {
+      name: "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: "windows.png";
+	       }
+	    }
+	 }
+      }
+   }
+   group {
+      name: "module";
+      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: "module.png";
+	       }
+	    }
+	 }
+      }
+   }
 }
diff --git a/data/icons/images/Makefile.am b/data/icons/images/Makefile.am
index f9eadb9cd..c4f2c14ca 100644
--- a/data/icons/images/Makefile.am
+++ b/data/icons/images/Makefile.am
@@ -9,4 +9,6 @@ power_button_glow_1.png \
 reset_button_0.png \
 reset_button_1.png \
 reset_button_glow_0.png \
-reset_button_glow_1.png
+reset_button_glow_1.png \
+windows.png \
+modules.png
diff --git a/data/icons/images/module.png b/data/icons/images/module.png
new file mode 100644
index 000000000..f4ad08a52
Binary files /dev/null and b/data/icons/images/module.png differ
diff --git a/data/icons/images/windows.png b/data/icons/images/windows.png
new file mode 100644
index 000000000..e892e0d7a
Binary files /dev/null and b/data/icons/images/windows.png differ
diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c
index 6f4946bb4..c433aec2c 100644
--- a/src/bin/e_focus.c
+++ b/src/bin/e_focus.c
@@ -56,10 +56,20 @@ _e_focus_cb_window_focus_in(void *data, int ev_type, void *ev)
    };
    
    e = ev;
-   printf("FI 0x%x md=%s dt=%s\n", 
-	  e->win,
-	  modes[e->mode],
-	  details[e->detail]);
+   if (e_border_find_by_client_window(e->win))
+     {
+	printf("BI 0x%x md=%s dt=%s\n", 
+	       e->win,
+	       modes[e->mode],
+	       details[e->detail]);
+     }
+   else
+     {
+	printf("FI 0x%x md=%s dt=%s\n", 
+	       e->win,
+	       modes[e->mode],
+	       details[e->detail]);
+     }
    return 1;
 }
 
@@ -85,9 +95,19 @@ _e_focus_cb_window_focus_out(void *data, int ev_type, void *ev)
    };
    
    e = ev;
-   printf("FO 0x%x md=%s dt=%s\n", 
-	  e->win,
-	  modes[e->mode],
-	  details[e->detail]);
+   if (e_border_find_by_client_window(e->win))
+     {
+	printf("BO 0x%x md=%s dt=%s\n", 
+	       e->win,
+	       modes[e->mode],
+	       details[e->detail]);
+     }
+   else
+     {
+	printf("FO 0x%x md=%s dt=%s\n", 
+	       e->win,
+	       modes[e->mode],
+	       details[e->detail]);
+     }
    return 1;
 }
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 2678a66b5..b7969c9fb 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -53,11 +53,15 @@ e_int_menus_main_new(void)
    dat->modules = subm;
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, "Modules");
+   e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+			     "module");
    e_menu_item_submenu_set(mi, subm);
   
    subm = e_int_menus_clients_new();
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, "Windows");
+   e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
+			     "windows");
    e_menu_item_submenu_set(mi, subm);
   
    mi = e_menu_item_new(m);