diff --git a/legacy/elementary/data/themes/default-desktop.edc b/legacy/elementary/data/themes/default-desktop.edc
index 50ee286dcc..1bccc32896 100644
--- a/legacy/elementary/data/themes/default-desktop.edc
+++ b/legacy/elementary/data/themes/default-desktop.edc
@@ -1907,153 +1907,168 @@ collections {
       }
    }
 
-   group { name: "elm/entry/cursor/default";
-      images {
-         image: "cur_box.png" COMP;
-         image: "cur_hi.png" COMP;
-         image: "cur_shad.png" COMP;
-         image: "cur_shine.png" COMP;
-         image: "cur_glow.png" COMP;
-      }
-      parts {
-         part { name: "clip2";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "clip";
-               rel2.to: "clip";
-               visible: 0;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
+group { name: "elm/entry/cursor/default";
+   images {
+      image: "cur_box.png" COMP;
+      image: "cur_hi.png" COMP;
+      image: "cur_shad.png" COMP;
+      image: "cur_shine.png" COMP;
+      image: "cur_glow.png" COMP;
+   }
+   parts {
+      part { name: "clip2";
+         type: RECT;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "clip";
+            rel2.to: "clip";
+            visible: 0;
          }
-         part { name: "clip";
-            type: RECT;
-            mouse_events: 0;
-            clip_to: "clip2";
-            description { state: "default" 0.0;
-               rel1.offset: -10 0;
-               rel2.offset: 9 9;
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "bg";
-            mouse_events: 0;
-            clip_to: "clip";
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel1.offset: -2 0;
-               rel2.to: "base";
-               rel2.offset: 1 1;
-               image.border: 2 2 2 2;
-               image.normal: "cur_shad.png";
-            }
-         }
-         part { name: "base";
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "clip";
-            description { state: "default" 0.0;
-               min: 2 2;
-               align: 0.5 1.0;
-               rel1.relative: 0.0 1.0;
-               rel1.offset: 0 -1;
-               rel2.relative: 1.0 1.0;
-               rel2.offset: -1 -1;
-               image.normal: "cur_box.png";
-            }
-         }
-         part { name: "hi";
-            mouse_events: 0;
-            clip_to: "clip";
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-               rel2.relative: 1.0 0.5;
-               image.normal: "cur_hi.png";
-            }
-         }
-         part { name: "shine";
-            mouse_events: 0;
-            clip_to: "clip";
-            clip_to: "clip2";
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-               rel2.relative: 1.0 0.75;
-               image.border: 2 2 1 0;
-               image.normal: "cur_shine.png";
-               fill.smooth: 0;
-            }
-         }
-         part { name: "glow";
-            mouse_events: 0;
-            clip_to: "clip2";
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel1.relative: 0.0 -2.0;
-               rel1.offset: -2 0;
-               rel2.to: "base";
-               rel2.relative: 1.0 0.0;
-               rel2.offset: 1 1;
-               image.border: 2 2 0 4;
-               image.normal: "cur_glow.png";
-               fill.smooth: 0;
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 0;
-            }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
          }
       }
-      programs {
-         program { name: "show";
-            signal: "show";
-            source: "";
-            action: STATE_SET "hidden" 0.0;
-            in: 1.0 0.0;
-            transition: DECELERATE 2.0;
-            target: "glow";
-            after: "show2";
+      part { name: "clip";
+         type: RECT;
+         mouse_events: 0;
+         clip_to: "clip2";
+         description { state: "default" 0.0;
+            rel1.offset: -10 0;
+            rel2.offset: 9 9;
+            visible: 0;
          }
-         program { name: "show2";
-            action: STATE_SET "hidden" 0.0;
-            in: 0.2 0.0;
-            target: "clip";
-            after: "show3";
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
          }
-         program { name: "show3";
-            action: STATE_SET "default" 0.0;
-            in: 0.5 0.0;
-            target: "clip";
-            after: "show4";
+      }
+      part { name: "bg";
+         mouse_events: 0;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel1.offset: -2 0;
+            rel2.to: "base";
+            rel2.offset: 1 1;
+            image.border: 2 2 2 2;
+            image.normal: "cur_shad.png";
          }
-         program { name: "show4";
-            action: STATE_SET "default" 0.0;
-            in: 0.5 0.0;
-            transition: DECELERATE 0.5;
-            target: "glow";
-            after: "show";
+      }
+      part { name: "base";
+         mouse_events: 0;
+         scale: 1;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            min: 2 2;
+            align: 0.5 1.0;
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 0 -1;
+            rel2.relative: 1.0 1.0;
+            rel2.offset: -1 -1;
+            image.normal: "cur_box.png";
          }
-         program { name: "focused";
-            signal: "elm,action,focus";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "clip2";
+      }
+      part { name: "hi";
+         mouse_events: 0;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            rel2.relative: 1.0 0.5;
+            image.normal: "cur_hi.png";
          }
-         program { name: "unfocused";
-            signal: "elm,action,unfocus";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "clip2";
+      }
+      part { name: "shine";
+         mouse_events: 0;
+         clip_to: "clip";
+         clip_to: "clip2";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            rel2.relative: 1.0 0.75;
+            image.border: 2 2 1 0;
+            image.normal: "cur_shine.png";
+            fill.smooth: 0;
+         }
+      }
+      part { name: "glow";
+         mouse_events: 0;
+         clip_to: "clip2";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel1.relative: 0.0 -2.0;
+            rel1.offset: -2 0;
+            rel2.to: "base";
+            rel2.relative: 1.0 0.0;
+            rel2.offset: 1 1;
+            image.border: 2 2 0 4;
+            image.normal: "cur_glow.png";
+            fill.smooth: 0;
+            color: 255 255 255 0;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 55;
+            visible: 1;
          }
       }
    }
+   programs {
+      program { name: "blink";
+         action: STATE_SET "visible" 0.0;
+         in: 0.2 0.0;
+         target: "clip";
+         after: "blink2";
+      }
+      program { name: "blink2";
+         action: STATE_SET "visible" 0.0;
+         in: 0.2 0.0;
+         target: "glow";
+         after: "blink3";
+      }
+      program { name: "blink3";
+         action: STATE_SET "default" 0.0;
+         in: 0.2 0.0;
+         target: "glow";
+         after: "blink4";
+      }
+      program { name: "blink4";
+         action: STATE_SET "default" 0.0;
+         in: 0.2 0.0;
+         target: "clip";
+         after: "blink";
+      }
+      program { name: "noblink";
+         action: ACTION_STOP;
+         target: "blink";
+         target: "blink2";
+         target: "blink3";
+         target: "blink4";
+         after: "noblink2";
+      }
+      program { name: "noblink2";
+         action: STATE_SET "default" 0.0;
+         target: "clip";
+         target: "glow";
+      }
+      program { name: "focused";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "clip2";
+         after: "blink";
+      }
+      program { name: "unfocused";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "clip2";
+         after: "noblink";
+      }
+   }
+}
 
    group { name: "elm/entry/selection/default";
       parts {
diff --git a/legacy/elementary/data/themes/widgets/entry.edc b/legacy/elementary/data/themes/widgets/entry.edc
index 3254c79ed3..6f75bcfb22 100644
--- a/legacy/elementary/data/themes/widgets/entry.edc
+++ b/legacy/elementary/data/themes/widgets/entry.edc
@@ -1251,11 +1251,12 @@ group { name: "elm/entry/cursor/default";
          description { state: "default" 0.0;
             rel1.offset: -10 0;
             rel2.offset: 9 9;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
             visible: 0;
          }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
       }
       part { name: "bg";
          mouse_events: 0;
@@ -1319,53 +1320,67 @@ group { name: "elm/entry/cursor/default";
             image.border: 2 2 0 4;
             image.normal: "cur_glow.png";
             fill.smooth: 0;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
             color: 255 255 255 0;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 55;
+            visible: 1;
          }
       }
    }
    programs {
-      program { name: "show";
-         signal: "show";
-         source: "";
-         action: STATE_SET "hidden" 0.0;
-         in: 1.0 0.0;
-         transition: DECELERATE 2.0;
-         target: "glow";
-         after: "show2";
-      }
-      program { name: "show2";
-         action: STATE_SET "hidden" 0.0;
+      program { name: "blink";
+         action: STATE_SET "visible" 0.0;
          in: 0.2 0.0;
          target: "clip";
-         after: "show3";
+         after: "blink2";
       }
-      program { name: "show3";
-         action: STATE_SET "default" 0.0;
-         in: 0.5 0.0;
-         target: "clip";
-         after: "show4";
-      }
-      program { name: "show4";
-         action: STATE_SET "default" 0.0;
-         in: 0.5 0.0;
-         transition: DECELERATE 0.5;
+      program { name: "blink2";
+         action: STATE_SET "visible" 0.0;
+         in: 0.2 0.0;
+         target: "glow";
+         after: "blink3";
+      }
+      program { name: "blink3";
+         action: STATE_SET "default" 0.0;
+         in: 0.2 0.0;
+         target: "glow";
+         after: "blink4";
+      }
+      program { name: "blink4";
+         action: STATE_SET "default" 0.0;
+         in: 0.2 0.0;
+         target: "clip";
+         after: "blink";
+      }
+      program { name: "noblink";
+         action: ACTION_STOP;
+         target: "blink";
+         target: "blink2";
+         target: "blink3";
+         target: "blink4";
+         after: "noblink2";
+      }
+      program { name: "noblink2";
+         action: STATE_SET "default" 0.0;
+         target: "clip";
          target: "glow";
-         after: "show";
       }
       program { name: "focused";
          signal: "elm,action,focus";
          source: "elm";
          action: STATE_SET "focused" 0.0;
          target: "clip2";
+         after: "blink";
       }
       program { name: "unfocused";
          signal: "elm,action,unfocus";
          source: "elm";
          action: STATE_SET "default" 0.0;
          target: "clip2";
+         after: "noblink";
       }
    }
 }