diff --git a/data/themes/default_pager.edc b/data/themes/default_pager.edc
index 53d9a2554..2a865ac94 100644
--- a/data/themes/default_pager.edc
+++ b/data/themes/default_pager.edc
@@ -145,10 +145,211 @@ group {
 	    color: 0 0 0 0;
 	 }
       }
+      part {
+	 name:           "title_glint_clip";
+	 type:           RECT;
+	 mouse_events:   0;
+	 description {
+	    state: "default" 0.0;
+	    rel1 {
+	       offset:   1    1;
+	       to:       "overlay";
+	    }
+	    rel2 {
+	       offset:   -2  -2;
+	       to:       "overlay";
+	    }
+	    color: 255 255 255 255;
+	 }
+      }
+      part {
+	 name:          "title_glint_1";
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    visible:  0;
+	    color:    255 255 255 0;
+	    align:    0.0 0.0;
+	    max:      34 13;
+	    rel1 {
+	       relative: 0.0  0.0;
+	       offset:   0    0;
+	       to:       "overlay";
+	    }
+	    rel2 {
+	       relative: 1.0  1.0;
+	       offset:   -1   -1;
+	       to:       "overlay";
+	    }
+	    image {
+	       normal: "e17_titlebar_glint1.png";
+	       border: 5 0 5 0;
+	    }
+	 }
+	 description {
+	    state:    "active" 0.0;
+	    inherit:  "default" 0.0;
+	    visible:  1;
+	    color:    255 255 255 255;
+	 }
+      }
+      part {
+	 name:          "title_glint_2";
+	 mouse_events:  0;
+	 clip_to:       "title_glint_clip";
+	 description {
+	    state:    "default" 0.0;
+	    visible:  0;
+	    color:    255 255 255 0;
+	    align:    1.0 0.5;
+	    max:      0 0;
+	    rel1 {
+	       relative: 0.0  0.0;
+	       offset:   1    1;
+	       to:       "overlay";
+	    }
+	    rel2 {
+	       relative: 0.0  1.0;
+	       offset:   1    -2;
+	       to:       "overlay";
+	    }
+	    image {
+	       normal: "e17_titlebar_glint2.png";
+	       border: 0 0 5 5;
+	    }
+	 }
+	 description {
+	    state:    "active" 0.0;
+	    inherit:  "default" 0.0;
+	    visible:  1;
+	    color:    255 255 255 255;
+	    max:      169 9999;
+	    min:      169 8;
+	    align:    0.5 0.5;
+	    rel1 {
+	       relative: 0.0  0.0;
+	       offset:   1    1;
+	    }
+	    rel2 {
+	       relative: 0.0  1.0;
+	       offset:   1    -2;
+	    }
+	 }
+	 description {
+	    state:    "active2" 0.0;
+	    inherit:  "default" 0.0;
+	    visible:  1;
+	    color:    255 255 255 128;
+	    max:      169 9999;
+	    min:      169 8;
+	    align:    0.5 0.5;
+	    rel1 {
+	       relative: 1.0  0.0;
+	       offset:   -2   1;
+	    }
+	    rel2 {
+	       relative: 1.0  1.0;
+	       offset:   -2   -2;
+	    }
+	 }
+	 description {
+	    state:    "active3" 0.0;
+	    inherit:  "default" 0.0;
+	    visible:  0;
+	    color:    255 255 255 0;
+	    max:      169 9999;
+	    min:      169 8;
+	    align:    0.0 0.5;
+	    rel1 {
+	       relative: 1.0  0.0;
+	       offset:   -2   1;
+	    }
+	    rel2 {
+	       relative: 1.0  1.0;
+	       offset:   -2   -2;
+	    }
+	 }
+      }
+      part {
+	 name:          "title_glint_3";
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    visible:  0;
+	    color:    255 255 255 0;
+	    align:    1.0 1.0;
+	    max:      34 13;
+	    rel1 {
+	       relative: 0.0  0.0;
+	       offset:   0    0;
+	       to:       "overlay";
+	    }
+	    rel2 {
+	       relative: 1.0  1.0;
+	       offset:   -1   -1;
+	       to:       "overlay";
+	    }
+	    image {
+	       normal: "e17_titlebar_glint3.png";
+	       border: 0 5 0 5;
+	    }
+	 }
+	 description {
+	    state:    "active" 0.0;
+	    inherit:  "default" 0.0;
+	    visible:  1;
+	    color:    255 255 255 255;
+	 }
+      }
    }
    programs {
       program {
-	 name:    "go_active";
+	 name:    "go_active3b";
+	 signal:  "active";
+	 source:  "";
+	 action:  STATE_SET "active" 0.0;
+	 target:  "title_glint_1";
+	 target:  "title_glint_2";
+	 transition: LINEAR 0.05;
+	 after:   "go_active4";
+	 after:   "go_active4b";
+      }
+      program {
+	 name:    "go_active4";
+	 action:  STATE_SET "active2" 0.0;
+	 target:  "title_glint_2";
+	 transition: LINEAR 0.2;
+	 after:   "go_active5";
+	 after:   "go_active5b";
+      }
+      program {
+	 name:    "go_active4b";
+	 action:  STATE_SET "active" 0.0;
+	 target:  "title_glint_3";
+	 transition: LINEAR 0.2;
+      }
+      program {
+	 name:    "go_active5";
+	 action:  STATE_SET "active3" 0.0;
+	 target:  "title_glint_2";
+	 transition: LINEAR 0.05;
+      }
+      program {
+	 name:    "go_active5b";
+	 action:  STATE_SET "default" 0.0;
+	 target:  "title_glint_3";
+	 transition: LINEAR 0.1;
+	 after:   "go_active6";
+      }
+      program {
+	 name:    "go_active6";
+	 action:  STATE_SET "default" 0.0;
+	 target:  "title_glint_1";
+	 target:  "title_glint_2";
+	 target:  "title_glint_3";
+      }
+      program {
+	 name:    "go_active_content";
 	 signal:  "active";
 	 source:  "";
 	 action:  STATE_SET "active" 0.0;
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index b4eff9410..5bea07414 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -240,17 +240,17 @@ _pager_new()
 static void
 _pager_free(Pager *pager)
 {
-   Evas_List *list;
+   Evas_List *l;
 
    E_CONFIG_DD_FREE(_conf_edd);
    E_CONFIG_DD_FREE(_conf_face_edd);
 
-   for (list = pager->faces; list; list = list->next)
-     _pager_face_free(list->data);
+   for (l = pager->faces; l; l = l->next)
+     _pager_face_free(l->data);
    evas_list_free(pager->faces);
 
-   for (list = pager->menus; list; list = list->next)
-     e_object_del(E_OBJECT(list->data));
+   for (l = pager->menus; l; l = l->next)
+     e_object_del(E_OBJECT(l->data));
    evas_list_free(pager->menus);
    e_object_del(E_OBJECT(pager->config_menu));
 
@@ -909,14 +909,11 @@ _pager_face_cb_event_border_unstick(void *data, int type, void *event)
 	pd = l->data;
         if (ev->border->desk != pd->desk)
 	  {
-	     for (ll = pd->wins; ll; ll = ll->next)
-	       {
-		  Pager_Win *pw;
-		  
-		  pw = ll->data;
-		  if (pw->border == ev->border)
-		    pd->wins = evas_list_remove_list(pd->wins, ll);
-	       }
+	     Pager_Win *pw;
+	     
+	     pw = _pager_desk_border_find(pd, ev->border);
+	     if (pw)
+	       pd->wins = evas_list_remove(pd->wins, pw);
 	  }
      }
    return 1;