diff --git a/data/elementary/themes/edc/efl/cursor.edc b/data/elementary/themes/edc/efl/cursor.edc
index 1302e4c228..78b8590531 100644
--- a/data/elementary/themes/edc/efl/cursor.edc
+++ b/data/elementary/themes/edc/efl/cursor.edc
@@ -78,14 +78,80 @@
 // "watch"
 // "xterm"
 
-group { "efl/cursor/hand1";
-   inherit: "elm/cursor/hand1/default";
+group { name: "efl/cursor/hand1";
+   images.image: "pointer_hand1.png" COMP;
+   parts {
+      part { name: "base"; mouse_events: 0; scale: 1;
+         description { state: "default" 0.0;
+            FIXED_SIZE(32, 32)
+            image.normal: "pointer_hand1.png";
+         }
+      }
+      part { name: "elm.swallow.hotspot"; type: SWALLOW;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            rel1.relative: (26/32) (9/32);
+            rel1.to: "base";
+            rel2.to: "base";
+            rel2.relative: (26/32) (9/32);
+            rel2.offset: 0 0;
+         }
+      }
+      /* elm.content.hotspot is the old name for the above part */
+      alias: "elm.content.hotspot" "elm.swallow.hotspot";
+   }
 }
 
-group { "efl/cursor/blank";
-   inherit: "elm/cursor/blank/default";
+group { name: "efl/cursor/blank";
+   parts {
+      part { name: "elm.swallow.hotspot"; type: SWALLOW;
+         description { state: "default" 0.0;
+            visible: 0;
+            max: 1 1;
+         }
+      }
+      /* elm.content.hotspot is the old name for the above part */
+      alias: "elm.content.hotspot" "elm.swallow.hotspot";
+   }
 }
 
-group { "efl/cursor/xterm";
-   inherit: "elm/cursor/xterm/default";
+group { name: "efl/cursor/xterm";
+   images.image: "pointer_entry_bar.png" COMP;
+   images.image: "led_dot_white.png" COMP;
+   parts {
+      part { name: "base"; mouse_events: 0; scale: 1;
+         description { state: "default" 0.0;
+            min: 15 20;
+            max: 15 99999;
+            image.normal: "pointer_entry_bar.png";
+            image.border: 0 0 10 10;
+            rel1.offset: 0 2;
+            rel2.offset: -1 -3;
+         }
+      }
+      part { name: "elm.swallow.hotspot"; type: SWALLOW;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            rel1.to: "base";
+            rel2.to: "base";
+            rel1.relative: 0.5 0.5;
+            rel2.relative: 0.5 0.5;
+            rel2.offset: 0 0;
+         }
+      }
+      /* elm.content.hotspot is the old name for the above part */
+      alias: "elm.content.hotspot" "elm.swallow.hotspot";
+      part { name: "shine";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            image.normal: "led_dot_white.png";
+            max: 27 27;
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+         }
+      }
+   }
 }