diff --git a/data/themes/default_pager.edc b/data/themes/default_pager.edc
index e4b6a5cd9..3c37a8ca7 100644
--- a/data/themes/default_pager.edc
+++ b/data/themes/default_pager.edc
@@ -125,9 +125,9 @@ group {
 	    }
 	    image {
 	       normal: "e17_pager_window.png";
-	       border: 4 4 4 4;
+	       border: 4 7 4 1;
 	    }
 	 }
       }
    }
-}
\ No newline at end of file
+}
diff --git a/data/themes/images/e17_pager_desk.png b/data/themes/images/e17_pager_desk.png
index 51e856b9d..c614d2323 100644
Binary files a/data/themes/images/e17_pager_desk.png and b/data/themes/images/e17_pager_desk.png differ
diff --git a/data/themes/images/e17_pager_screen.png b/data/themes/images/e17_pager_screen.png
index 009318d46..27e9af23c 100644
Binary files a/data/themes/images/e17_pager_screen.png and b/data/themes/images/e17_pager_screen.png differ
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 5155c00cc..f2a0e3e9e 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -1,3 +1,7 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
 #include "e.h"
 #include "e_mod_main.h"
 
@@ -17,6 +21,8 @@ static void    _pager_cb_up(void *data, Evas *e, Evas_Object *obj, void *event_i
 static void    _pager_cb_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static int     _pager_cb_event_container_resize(void *data, int type, void *event);
 
+static int     _pager_cb_event_border_events(void *data, int type, void *event);
+
 static void    _pager_reconfigure(Pager *e);
 static void    _pager_refresh(Pager *e);
 
@@ -166,6 +172,11 @@ _pager_init(E_Module *m)
    e->ev_handler_container_resize =
    ecore_event_handler_add(E_EVENT_CONTAINER_RESIZE,
                            _pager_cb_event_container_resize, e);
+
+   ecore_event_handler_add(E_EVENT_BORDER_RESIZE,
+			   _pager_cb_event_border_events, e);
+   ecore_event_handler_add(E_EVENT_BORDER_MOVE,
+			   _pager_cb_event_border_events, e);
    
    _pager_reconfigure(e);
    return e;
@@ -297,6 +308,11 @@ _pager_refresh(Pager *e)
 	    {
 	       Evas_Coord winx, winy, winw, winh;
 	       border = (E_Border *) clients->data;
+	       if (border->iconic)
+		 {
+		    clients = clients->next;
+		    continue;
+		 }
 	       winx = (Evas_Coord) ((double) border->x) * scalex;
 	       winy = (Evas_Coord) ((double) border->y) * scaley;
 	       winw = (Evas_Coord) ((double) border->w) * scalex;
@@ -482,3 +498,13 @@ _pager_cb_event_container_resize(void *data, int type, void *event)
    _pager_reconfigure(e);
    return 1;
 }
+
+static int
+_pager_cb_event_border_events(void *data, int type, void *event)
+{
+   Pager *e;
+
+   e = data;
+   _pager_refresh(e);
+   return 1;
+}