diff --git a/data/elementary/themes/edc/efl/cursor.edc b/data/elementary/themes/edc/efl/cursor.edc
index a62817708b..3d4c3e8554 100644
--- a/data/elementary/themes/edc/efl/cursor.edc
+++ b/data/elementary/themes/edc/efl/cursor.edc
@@ -82,6 +82,7 @@ group { name: "efl/cursor/hand1";
    images.image: "pointer_hand1.png" COMP;
    parts {
       part { name: "base"; mouse_events: 0; scale: 1;
+         scale: 1;
          description { state: "default" 0.0;
             FIXED_SIZE(32, 32)
             image.normal: "pointer_hand1.png";
@@ -91,10 +92,10 @@ group { name: "efl/cursor/hand1";
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.relative: (26/32) (9/32);
+            rel1.relative: (21/32) (7/32);
             rel1.to: "base";
             rel2.to: "base";
-            rel2.relative: (26/32) (9/32);
+            rel2.relative: (21/32) (7/32);
             rel2.offset: 0 0;
          }
       }
@@ -117,25 +118,20 @@ group { name: "efl/cursor/blank";
 }
 
 group { name: "efl/cursor/xterm";
-   images.image: "pointer_entry_bar.png" COMP;
-   images.image: "led_dot_white.png" COMP;
+   images.image: "pointer_entry.png" COMP;
    parts {
       part { name: "base"; mouse_events: 0; scale: 1;
+         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;
+            image.normal: "pointer_entry.png";
+            FIXED_SIZE(16, 32)
          }
       }
       part { name: "efl.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
             rel1.relative: 0.5 0.5;
             rel2.relative: 0.5 0.5;
             rel2.offset: 0 0;
@@ -143,15 +139,5 @@ group { name: "efl/cursor/xterm";
       }
       /* efl.content.hotspot is the old name for the above part */
       alias: "efl.content.hotspot" "efl.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;
-         }
-      }
    }
 }
diff --git a/data/elementary/themes/edc/elm/cursor.edc b/data/elementary/themes/edc/elm/cursor.edc
index f836f9da4b..ad0cad34a9 100644
--- a/data/elementary/themes/edc/elm/cursor.edc
+++ b/data/elementary/themes/edc/elm/cursor.edc
@@ -82,6 +82,7 @@ group { name: "elm/cursor/hand1/default";
    images.image: "pointer_hand1.png" COMP;
    parts {
       part { name: "base"; mouse_events: 0; scale: 1;
+         scale: 1;
          description { state: "default" 0.0;
             FIXED_SIZE(32, 32)
             image.normal: "pointer_hand1.png";
@@ -89,12 +90,12 @@ group { name: "elm/cursor/hand1/default";
       }
       part { name: "elm.swallow.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
-            visible: 0;
             fixed: 1 1;
-            rel1.relative: (26/32) (9/32);
+            visible: 0;
+            rel1.relative: (21/32) (7/32);
             rel1.to: "base";
             rel2.to: "base";
-            rel2.relative: (26/32) (9/32);
+            rel2.relative: (21/32) (7/32);
             rel2.offset: 0 0;
          }
       }
@@ -117,25 +118,20 @@ group { name: "elm/cursor/blank/default";
 }
 
 group { name: "elm/cursor/xterm/default";
-   images.image: "pointer_entry_bar.png" COMP;
-   images.image: "led_dot_white.png" COMP;
+   images.image: "pointer_entry.png" COMP;
    parts {
       part { name: "base"; mouse_events: 0; scale: 1;
+         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;
+            image.normal: "pointer_entry.png";
+            FIXED_SIZE(16, 32)
          }
       }
       part { name: "elm.swallow.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
             rel1.relative: 0.5 0.5;
             rel2.relative: 0.5 0.5;
             rel2.offset: 0 0;
@@ -143,15 +139,5 @@ group { name: "elm/cursor/xterm/default";
       }
       /* 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;
-         }
-      }
    }
 }
diff --git a/data/elementary/themes/edc/pointer.edc b/data/elementary/themes/edc/pointer.edc
index b988b85916..6fb7aebfbc 100644
--- a/data/elementary/themes/edc/pointer.edc
+++ b/data/elementary/themes/edc/pointer.edc
@@ -3,8 +3,10 @@ group { name: "e/pointer/enlightenment/default/color";
    data.item: "can_suspend" "1";
    parts {
       part { name: "parent"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
             color: 255 255 255 255;
+            FIXED_SIZE(32, 32)
          }
          description { state: "suspend" 0.0;
             inherit: "default" 0.0;
@@ -383,7 +385,7 @@ group { name: "e/pointer/enlightenment/rotate/color";
 }
 
 group { name: "e/pointer/enlightenment/plus/color";
-inherit: "e/pointer/enlightenment/default/color";
+   inherit: "e/pointer/enlightenment/default/color";
    images.image: "pointer_plus.png" COMP;
    parts {
       part { name: "add";
@@ -422,9 +424,11 @@ group { name: "e/pointer/enlightenment/entry/color";
    images.image: "pointer_entry.png" COMP;
    parts {
       part { name: "base";
+         scale: 1;
          description { state: "default" 0.0;
             image.normal: "pointer_entry.png";
             aspect: (44/88) (44/88); aspect_preference: VERTICAL;
+            FIXED_SIZE(32, 32)
          }
       }
       part { name: "e.swallow.hotspot"; type: SWALLOW;
diff --git a/data/elementary/themes/img/pointer_hand1.png b/data/elementary/themes/img/pointer_hand1.png
index 68f356d069..98c5b64954 100644
Binary files a/data/elementary/themes/img/pointer_hand1.png and b/data/elementary/themes/img/pointer_hand1.png differ