diff --git a/legacy/elementary/data/objects/Makefile.am b/legacy/elementary/data/objects/Makefile.am
index e8d30d7912..7a2a16e11f 100644
--- a/legacy/elementary/data/objects/Makefile.am
+++ b/legacy/elementary/data/objects/Makefile.am
@@ -6,12 +6,13 @@ EDJE_FLAGS = -v -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects
 
 filesdir = $(datadir)/elementary/objects
 
-files_DATA = test.edj multip.edj colorpreview.edj
+files_DATA = test.edj multip.edj colorpreview.edj cursors.edj
 
 EXTRA_DIST = \
 test.edc \
 multip.edc \
 colorpreview.edc \
+cursors.edc \
 grid_bg.png \
 over.png \
 under.png \
@@ -33,6 +34,11 @@ colorpreview.edj: Makefile $(EXTRA_DIST)
 	$(EDJE_CC) $(EDJE_FLAGS) \
 	$(top_srcdir)/data/objects/colorpreview.edc \
 	$(top_builddir)/data/objects/colorpreview.edj
+
+cursors.edj: Makefile $(EXTRA_DIST)
+	$(EDJE_CC) $(EDJE_FLAGS) \
+	$(top_srcdir)/data/objects/cursors.edc \
+	$(top_builddir)/data/objects/cursors.edj
 			
 clean-local:
 	rm -f *.edj
diff --git a/legacy/elementary/data/objects/cursors.edc b/legacy/elementary/data/objects/cursors.edc
new file mode 100644
index 0000000000..a943037498
--- /dev/null
+++ b/legacy/elementary/data/objects/cursors.edc
@@ -0,0 +1,80 @@
+/////////////////////////////////////////////////////////////////////////////
+// CURSOR
+/////////////////////////////////////////////////////////////////////////////
+collections {
+   group { name: "elm/cursor/hand2/default";
+       min: 30 30;
+       max: 30 30;
+       data {
+           item: "hot_x" "0";
+           item: "hot_y" "0";
+       }
+      parts {
+         part { name: "base";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               color: 0 255 0 255;
+            }
+         }
+      }
+   }
+
+   group { name: "elm/cursor/hand3/default";
+       min: 30 30;
+       max: 30 30;
+       data {
+           item: "hot_x" "0";
+           item: "hot_y" "0";
+       }
+      parts {
+         part { name: "base";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               color: 255 0 0 255;
+            }
+            description { state: "blue" 0.0;
+               color: 0 0 255 255;
+            }
+         }
+      }
+      programs {
+	 program { name: "load";
+	    signal: "load";
+	    source: "";
+            after: "go_blue";
+         }
+	 program { name: "go_blue";
+	    action: STATE_SET "blue" 0.0;
+	    transition: LINEAR 1;
+	    target: "base";
+	    after: "go_red";
+	 }
+	 program { name: "go_red";
+	    action: STATE_SET "default" 0.0;
+	    transition: LINEAR 1;
+	    target: "base";
+	    after: "go_blue";
+	 }
+      }
+   }
+
+   group { name: "elm/cursor/hand3/transparent";
+       min: 30 30;
+       max: 30 30;
+       data {
+           item: "hot_x" "0";
+           item: "hot_y" "0";
+       }
+      parts {
+         part { name: "base";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               color: 255 0 0 120;
+            }
+         }
+      }
+   }
+}
diff --git a/legacy/elementary/data/themes/default.edc b/legacy/elementary/data/themes/default.edc
index fe030123be..561ed780b2 100644
--- a/legacy/elementary/data/themes/default.edc
+++ b/legacy/elementary/data/themes/default.edc
@@ -30424,85 +30424,6 @@ collections {
       }
    }
 
-/////////////////////////////////////////////////////////////////////////////
-// CURSOR
-/////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/cursor/hand2/default";
-       min: 30 30;
-       max: 30 30;
-       data {
-           item: "hot_x" "0";
-           item: "hot_y" "0";
-       }
-      parts {
-         part { name: "base";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               color: 0 255 0 255;
-            }
-         }
-      }
-   }
-
-   group { name: "elm/cursor/hand3/default";
-       min: 30 30;
-       max: 30 30;
-       data {
-           item: "hot_x" "0";
-           item: "hot_y" "0";
-       }
-      parts {
-         part { name: "base";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               color: 255 0 0 255;
-            }
-            description { state: "blue" 0.0;
-               color: 0 0 255 255;
-            }
-         }
-      }
-      programs {
-	 program { name: "load";
-	    signal: "load";
-	    source: "";
-            after: "go_blue";
-         }
-	 program { name: "go_blue";
-	    action: STATE_SET "blue" 0.0;
-	    transition: LINEAR 1;
-	    target: "base";
-	    after: "go_red";
-	 }
-	 program { name: "go_red";
-	    action: STATE_SET "default" 0.0;
-	    transition: LINEAR 1;
-	    target: "base";
-	    after: "go_blue";
-	 }
-      }
-   }
-
-   group { name: "elm/cursor/hand3/transparent";
-       min: 30 30;
-       max: 30 30;
-       data {
-           item: "hot_x" "0";
-           item: "hot_y" "0";
-       }
-      parts {
-         part { name: "base";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               color: 255 0 0 120;
-            }
-         }
-      }
-   }
-
 ///////////////////////////////////////////////////////////////////////////////
 #define FLIP_PICKER_MAX_LEN (50)
 #define FLIP_PICKER_MAX_LEN_STR "50"
diff --git a/legacy/elementary/src/bin/test_cursor.c b/legacy/elementary/src/bin/test_cursor.c
index ec5b862652..6203a38a9a 100644
--- a/legacy/elementary/src/bin/test_cursor.c
+++ b/legacy/elementary/src/bin/test_cursor.c
@@ -289,11 +289,15 @@ test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
 {
    Evas_Object *win, *bg, *bx, *o;
    Elm_List_Item *lit;
+   char buf[PATH_MAX];
 
    win = elm_win_add(NULL, "cursor", ELM_WIN_BASIC);
    elm_win_title_set(win, "Cursor 3");
    elm_win_autodel_set(win, 1);
 
+   snprintf(buf, sizeof(buf), "%s/objects/cursors.edj", PACKAGE_DATA_DIR);
+   elm_theme_extension_add(NULL, buf);
+
    bg = elm_bg_add(win);
    elm_win_resize_object_add(win, bg);
    evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);