diff --git a/legacy/elementary/doc/widgets/widget_preview_gengrid.c b/legacy/elementary/doc/widgets/widget_preview_gengrid.c
index 4775a9aeea..f2cda97db9 100644
--- a/legacy/elementary/doc/widgets/widget_preview_gengrid.c
+++ b/legacy/elementary/doc/widgets/widget_preview_gengrid.c
@@ -14,7 +14,7 @@ _grid_label_get(void        *data __UNUSED__,
 }
 
 static Evas_Object *
-_grid_icon_get(void        *data __UNUSED__,
+_grid_content_get(void        *data __UNUSED__,
                Evas_Object *obj,
                const char  *part)
 {
@@ -41,7 +41,7 @@ evas_object_show(gengrid);
 Elm_Gengrid_Item_Class gic;
 gic.item_style = "default";
 gic.func.label_get = _grid_label_get;
-gic.func.icon_get = _grid_icon_get;
+gic.func.content_get = _grid_content_get;
 gic.func.state_get = NULL;
 gic.func.del = NULL;
 
diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist1.c b/legacy/elementary/doc/widgets/widget_preview_genlist1.c
index d515956f14..67f70fa874 100644
--- a/legacy/elementary/doc/widgets/widget_preview_genlist1.c
+++ b/legacy/elementary/doc/widgets/widget_preview_genlist1.c
@@ -14,7 +14,7 @@ _label_get(void        *data __UNUSED__,
 }
 
 static Evas_Object *
-_icon_get(void        *data __UNUSED__,
+_content_get(void        *data __UNUSED__,
           Evas_Object *obj,
           const char  *part __UNUSED__)
 {
@@ -37,7 +37,7 @@ Elm_Genlist_Item_Class gic;
 Elm_Genlist_Item *it, *top;
 gic.item_style = "default";
 gic.func.label_get = _label_get;
-gic.func.icon_get = _icon_get;
+gic.func.content_get = _content_get;
 gic.func.state_get = NULL;
 gic.func.del = NULL;
 
diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist2.c b/legacy/elementary/doc/widgets/widget_preview_genlist2.c
index 15a1421934..e33b5f5b25 100644
--- a/legacy/elementary/doc/widgets/widget_preview_genlist2.c
+++ b/legacy/elementary/doc/widgets/widget_preview_genlist2.c
@@ -14,7 +14,7 @@ _label_get(void        *data __UNUSED__,
 }
 
 static Evas_Object *
-_icon_get(void        *data __UNUSED__,
+_content_get(void        *data __UNUSED__,
           Evas_Object *obj,
           const char  *part __UNUSED__)
 {
@@ -36,7 +36,7 @@ evas_object_show(genlist);
 Elm_Genlist_Item_Class gic;
 gic.item_style = "double_label";
 gic.func.label_get = _label_get;
-gic.func.icon_get = _icon_get;
+gic.func.content_get = _content_get;
 gic.func.state_get = NULL;
 gic.func.del = NULL;
 
diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist3.c b/legacy/elementary/doc/widgets/widget_preview_genlist3.c
index 0bbddbad4a..7dd7efb67f 100644
--- a/legacy/elementary/doc/widgets/widget_preview_genlist3.c
+++ b/legacy/elementary/doc/widgets/widget_preview_genlist3.c
@@ -14,7 +14,7 @@ _label_get(void        *data __UNUSED__,
 }
 
 static Evas_Object *
-_icon_get(void        *data __UNUSED__,
+_content_get(void        *data __UNUSED__,
           Evas_Object *obj,
           const char  *part __UNUSED__)
 {
@@ -36,7 +36,7 @@ evas_object_show(genlist);
 Elm_Genlist_Item_Class gic;
 gic.item_style = "icon_top_text_bottom";
 gic.func.label_get = _label_get;
-gic.func.icon_get = _icon_get;
+gic.func.content_get = _content_get;
 gic.func.state_get = NULL;
 gic.func.del = NULL;
 
diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist4.c b/legacy/elementary/doc/widgets/widget_preview_genlist4.c
index 4cdc4c0912..efe4d82269 100644
--- a/legacy/elementary/doc/widgets/widget_preview_genlist4.c
+++ b/legacy/elementary/doc/widgets/widget_preview_genlist4.c
@@ -14,7 +14,7 @@ _label_get(void        *data __UNUSED__,
 }
 
 static Evas_Object *
-_icon_get(void        *data __UNUSED__,
+_content_get(void        *data __UNUSED__,
           Evas_Object *obj,
           const char  *part __UNUSED__)
 {
@@ -36,7 +36,7 @@ evas_object_show(genlist);
 Elm_Genlist_Item_Class gic;
 gic.item_style = "group_index";
 gic.func.label_get = _label_get;
-gic.func.icon_get = _icon_get;
+gic.func.content_get = _content_get;
 gic.func.state_get = NULL;
 gic.func.del = NULL;
 
diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist5.c b/legacy/elementary/doc/widgets/widget_preview_genlist5.c
index 5cdf682817..3a2f396f78 100644
--- a/legacy/elementary/doc/widgets/widget_preview_genlist5.c
+++ b/legacy/elementary/doc/widgets/widget_preview_genlist5.c
@@ -14,7 +14,7 @@ _label_get(void        *data __UNUSED__,
 }
 
 static Evas_Object *
-_icon_get(void        *data __UNUSED__,
+_content_get(void        *data __UNUSED__,
           Evas_Object *obj,
           const char  *part __UNUSED__)
 {
@@ -36,7 +36,7 @@ evas_object_show(genlist);
 Elm_Genlist_Item_Class gic;
 gic.item_style = "default";
 gic.func.label_get = _label_get;
-gic.func.icon_get = _icon_get;
+gic.func.content_get = _content_get;
 gic.func.state_get = NULL;
 gic.func.del = NULL;
 
diff --git a/legacy/elementary/src/bin/test_cursor.c b/legacy/elementary/src/bin/test_cursor.c
index f14b80c0a6..17b6302225 100644
--- a/legacy/elementary/src/bin/test_cursor.c
+++ b/legacy/elementary/src/bin/test_cursor.c
@@ -25,7 +25,7 @@ grd_lbl_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__
 }
 
 Evas_Object *
-grd_icon_get(void *data, Evas_Object *obj, const char *part)
+grd_content_get(void *data, Evas_Object *obj, const char *part)
 {
    const Testitem *ti = data;
    if (!strcmp(part, "elm.swallow.icon"))
@@ -260,7 +260,7 @@ test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
 
    gic.item_style = "default";
    gic.func.label_get = grd_lbl_get;
-   gic.func.icon_get = grd_icon_get;
+   gic.func.content_get = grd_content_get;
 
    n = 0;
    for (i = 0; i < 3 * 3; i++)
diff --git a/legacy/elementary/src/bin/test_eio.c b/legacy/elementary/src/bin/test_eio.c
index f235ac29a1..def4ced459 100644
--- a/legacy/elementary/src/bin/test_eio.c
+++ b/legacy/elementary/src/bin/test_eio.c
@@ -21,7 +21,7 @@ static void _ls_done_cb(void *data, Eio_File *handler);
 static void _ls_error_cb(void *data, Eio_File *handler, int error);
 static void _file_chosen(void *data, Evas_Object *obj, void *event_info);
 static char *_gl_label_get(void *data, Evas_Object *obj, const char *part);
-static Evas_Object *_gl_icon_get(void *data, Evas_Object *obj, const char *part);
+static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *part);
 static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part);
 static void _gl_del(void *data, Evas_Object *obj);
 static void _test_eio_clear(void *data, Evas_Object *obj, void *event);
@@ -92,7 +92,7 @@ _gl_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED
 }
 
 static Evas_Object *
-_gl_icon_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+_gl_content_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
 {
    return NULL;
 }
@@ -121,7 +121,7 @@ test_eio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
 
    it_eio.item_style     = "default";
    it_eio.func.label_get = _gl_label_get;
-   it_eio.func.icon_get  = _gl_icon_get;
+   it_eio.func.content_get  = _gl_content_get;
    it_eio.func.state_get = _gl_state_get;
    it_eio.func.del       = _gl_del;
 
diff --git a/legacy/elementary/src/bin/test_floating.c b/legacy/elementary/src/bin/test_floating.c
index 898466a597..30a09b4487 100644
--- a/legacy/elementary/src/bin/test_floating.c
+++ b/legacy/elementary/src/bin/test_floating.c
@@ -19,7 +19,7 @@ static char *glf_label_get(void *data, Evas_Object *obj __UNUSED__, const char *
    return strdup(buf);
 }
 
-static Evas_Object *glf_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__)
+static Evas_Object *glf_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__)
 {
    char buf[PATH_MAX];
    Evas_Object *ic = elm_icon_add(obj);
@@ -87,7 +87,7 @@ test_floating(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    itc1.item_style     = "default";
    itc1.func.label_get = glf_label_get;
-   itc1.func.icon_get  = glf_icon_get;
+   itc1.func.content_get  = glf_content_get;
    itc1.func.state_get = glf_state_get;
    itc1.func.del       = glf_del;
 
diff --git a/legacy/elementary/src/bin/test_gengrid.c b/legacy/elementary/src/bin/test_gengrid.c
index a3705a1c1f..4af9d283c5 100644
--- a/legacy/elementary/src/bin/test_gengrid.c
+++ b/legacy/elementary/src/bin/test_gengrid.c
@@ -105,7 +105,7 @@ grid_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSE
 }
 
 Evas_Object *
-grid_icon_get(void *data, Evas_Object *obj, const char *part)
+grid_content_get(void *data, Evas_Object *obj, const char *part)
 {
    const Testitem *ti = data;
    if (!strcmp(part, "elm.swallow.icon"))
@@ -182,7 +182,7 @@ test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
 
    gic.item_style = "default";
    gic.func.label_get = grid_label_get;
-   gic.func.icon_get = grid_icon_get;
+   gic.func.content_get = grid_content_get;
    gic.func.state_get = grid_state_get;
    gic.func.del = grid_del;
 
@@ -374,7 +374,7 @@ test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    gic.item_style = "default";
    gic.func.label_get = grid_label_get;
-   gic.func.icon_get = grid_icon_get;
+   gic.func.content_get = grid_content_get;
    gic.func.state_get = grid_state_get;
    gic.func.del = grid_del;
 
@@ -419,13 +419,13 @@ test_gengrid3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    gic.item_style = "default";
    gic.func.label_get = grid_label_get;
-   gic.func.icon_get = grid_icon_get;
+   gic.func.content_get = grid_content_get;
    gic.func.state_get = grid_state_get;
    gic.func.del = grid_del;
 
    ggic.item_style = "group_index";
    ggic.func.label_get = grid_label_get;
-   ggic.func.icon_get = NULL;
+   ggic.func.content_get = NULL;
    ggic.func.state_get = NULL;
    ggic.func.del = NULL;
 
diff --git a/legacy/elementary/src/bin/test_genlist.c b/legacy/elementary/src/bin/test_genlist.c
index 05e14a4025..dd8e5bb327 100644
--- a/legacy/elementary/src/bin/test_genlist.c
+++ b/legacy/elementary/src/bin/test_genlist.c
@@ -28,7 +28,7 @@ char *gl_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __U
    return strdup(buf);
 }
 
-Evas_Object *gl_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
+Evas_Object *gl_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
 {
    char buf[PATH_MAX];
    Evas_Object *ic = elm_icon_add(obj);
@@ -142,7 +142,7 @@ test_genlist(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
 
    itc1.item_style     = "default";
    itc1.func.label_get = gl_label_get;
-   itc1.func.icon_get  = gl_icon_get;
+   itc1.func.content_get  = gl_content_get;
    itc1.func.state_get = gl_state_get;
    itc1.func.del       = gl_del;
 
@@ -190,7 +190,7 @@ my_gl_add(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 
    itc1.item_style     = "default";
    itc1.func.label_get = gl_label_get;
-   itc1.func.icon_get  = gl_icon_get;
+   itc1.func.content_get  = gl_content_get;
    itc1.func.state_get = gl_state_get;
    itc1.func.del       = gl_del;
 
@@ -212,7 +212,7 @@ my_gl_insert_before(void *data, Evas_Object *obj __UNUSED__, void *event_info __
 
    itc1.item_style     = "default";
    itc1.func.label_get = gl_label_get;
-   itc1.func.icon_get  = gl_icon_get;
+   itc1.func.content_get  = gl_content_get;
    itc1.func.state_get = gl_state_get;
    itc1.func.del       = gl_del;
 
@@ -242,7 +242,7 @@ my_gl_insert_after(void *data, Evas_Object *obj __UNUSED__, void *event_info __U
 
    itc1.item_style     = "default";
    itc1.func.label_get = gl_label_get;
-   itc1.func.icon_get  = gl_icon_get;
+   itc1.func.content_get  = gl_content_get;
    itc1.func.state_get = gl_state_get;
    itc1.func.del       = gl_del;
 
@@ -369,7 +369,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    itc1.item_style     = "default";
    itc1.func.label_get = gl_label_get;
-   itc1.func.icon_get  = gl_icon_get;
+   itc1.func.content_get  = gl_content_get;
    itc1.func.state_get = gl_state_get;
    itc1.func.del       = gl_del;
 
@@ -519,7 +519,7 @@ char *gl2_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __
    snprintf(buf, sizeof(buf), "Item mode %i", tit->mode);
    return strdup(buf);
 }
-Evas_Object *gl2_icon_get(void *data, Evas_Object *obj, const char *part)
+Evas_Object *gl2_content_get(void *data, Evas_Object *obj, const char *part)
 {
    const Testitem *tit = data;
    char buf[PATH_MAX];
@@ -594,7 +594,7 @@ test_genlist3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    itc2.item_style     = "default";
    itc2.func.label_get = gl2_label_get;
-   itc2.func.icon_get  = gl2_icon_get;
+   itc2.func.content_get  = gl2_content_get;
    itc2.func.state_get = gl2_state_get;
    itc2.func.del       = gl2_del;
 
@@ -669,7 +669,7 @@ char *gl3_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __
    snprintf(buf, sizeof(buf), "Item mode %i", tit->mode);
    return strdup(buf);
 }
-Evas_Object *gl3_icon_get(void *data, Evas_Object *obj, const char *part)
+Evas_Object *gl3_content_get(void *data, Evas_Object *obj, const char *part)
 {
    const Testitem *tit = data;
    if (!strcmp(part, "elm.swallow.icon"))
@@ -730,7 +730,7 @@ test_genlist4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    itc3.item_style     = "default";
    itc3.func.label_get = gl3_label_get;
-   itc3.func.icon_get  = gl3_icon_get;
+   itc3.func.content_get  = gl3_content_get;
    itc3.func.state_get = gl3_state_get;
    itc3.func.del       = gl3_del;
 
@@ -812,7 +812,7 @@ char *gl5_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
      }
    return strdup(buf);
 }
-Evas_Object *gl5_icon_get(void *data, Evas_Object *obj, const char *part)
+Evas_Object *gl5_content_get(void *data, Evas_Object *obj, const char *part)
 {
    const Testitem *tit = data;
    char buf[PATH_MAX];
@@ -949,7 +949,7 @@ test_genlist5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(gl);
    itc5.item_style     = "double_label";
    itc5.func.label_get = gl5_label_get;
-   itc5.func.icon_get  = gl5_icon_get;
+   itc5.func.content_get  = gl5_content_get;
    itc5.func.state_get = gl5_state_get;
    itc5.func.del       = gl5_del;
 
@@ -1078,7 +1078,7 @@ char *gl4_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __
    snprintf(buf, sizeof(buf), "Item mode %i", (int)(long)data);
    return strdup(buf);
 }
-Evas_Object *gl4_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
+Evas_Object *gl4_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
 {
    char buf[PATH_MAX];
    if (!strcmp(part, "elm.swallow.icon"))
@@ -1134,7 +1134,7 @@ test_genlist6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    itc4.item_style     = "default";
    itc4.func.label_get = gl4_label_get;
-   itc4.func.icon_get  = gl4_icon_get;
+   itc4.func.content_get  = gl4_content_get;
    itc4.func.state_get = gl4_state_get;
    itc4.func.del       = gl4_del;
 
@@ -1288,13 +1288,13 @@ test_genlist7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    itc2.item_style     = "default";
    itc2.func.label_get = gl2_label_get;
-   itc2.func.icon_get  = gl2_icon_get;
+   itc2.func.content_get  = gl2_content_get;
    itc2.func.state_get = gl2_state_get;
    itc2.func.del       = gl2_del;
 
    itc7.item_style     = "double_label";
    itc7.func.label_get = gl5_label_get;
-   itc7.func.icon_get  = gl5_icon_get;
+   itc7.func.content_get  = gl5_content_get;
    itc7.func.state_get = gl5_state_get;
    itc7.func.del       = gl5_del;
 
@@ -1375,13 +1375,13 @@ test_genlist8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    itc1.item_style     = "default";
    itc1.func.label_get = gl_label_get;
-   itc1.func.icon_get  = gl_icon_get;
+   itc1.func.content_get  = gl_content_get;
    itc1.func.state_get = gl_state_get;
    itc1.func.del       = gl_del;
 
    itc_group.item_style     = "group_index";
    itc_group.func.label_get = gl8_label_get;
-   itc_group.func.icon_get  = NULL;
+   itc_group.func.content_get  = NULL;
    itc_group.func.state_get = NULL;
    itc_group.func.del       = gl_del;
 
@@ -1586,13 +1586,13 @@ test_genlist9(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    itc1.item_style     = "default";
    itc1.func.label_get = gl_label_get;
-   itc1.func.icon_get  = gl_icon_get;
+   itc1.func.content_get  = gl_content_get;
    itc1.func.state_get = gl_state_get;
    itc1.func.del       = gl_del;
 
    itc_group.item_style     = "group_index";
    itc_group.func.label_get = gl8_label_get;
-   itc_group.func.icon_get  = NULL;
+   itc_group.func.content_get  = NULL;
    itc_group.func.state_get = NULL;
    itc_group.func.del       = gl_del;
 
@@ -1646,7 +1646,7 @@ char *gl10_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
    return strdup(buf);
 }
 
-Evas_Object *gl10_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
+Evas_Object *gl10_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
 {
    char buf[PATH_MAX];
    Evas_Object *ic = elm_icon_add(obj);
@@ -1764,7 +1764,7 @@ test_genlist10(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    itc10.item_style     = "default";
    itc10.func.label_get = gl10_label_get;
-   itc10.func.icon_get  = gl10_icon_get;
+   itc10.func.content_get  = gl10_content_get;
    itc10.func.state_get = gl_state_get;
    itc10.func.del       = gl_del;
    elm_genlist_mode_item_style_set(gl, "mode");
@@ -1859,7 +1859,7 @@ test_genlist11(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    itc1.item_style     = "default";
    itc1.func.label_get = gl_label_get;
-   itc1.func.icon_get  = gl_icon_get;
+   itc1.func.content_get  = gl_content_get;
    itc1.func.state_get = gl_state_get;
    itc1.func.del       = gl_del;
    evas_object_smart_callback_add(gl, "moved", (Evas_Smart_Cb)gl_moved, gl);
@@ -1914,7 +1914,7 @@ test_genlist12(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    itc1.item_style     = "message";
    itc1.func.label_get = gl12_label_get;
-   itc1.func.icon_get  = gl_icon_get;
+   itc1.func.content_get  = gl_content_get;
    itc1.func.state_get = gl_state_get;
    itc1.func.del       = gl_del;
 
diff --git a/legacy/elementary/src/bin/test_icon_desktops.c b/legacy/elementary/src/bin/test_icon_desktops.c
index 3a350819fa..ce19faad47 100644
--- a/legacy/elementary/src/bin/test_icon_desktops.c
+++ b/legacy/elementary/src/bin/test_icon_desktops.c
@@ -17,7 +17,7 @@ desk_gl_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UN
 #endif
 }
 static Evas_Object *
-desk_gl_icon_get(void *data, Evas_Object *obj, const char *part)
+desk_gl_content_get(void *data, Evas_Object *obj, const char *part)
 {
 #ifdef ELM_EFREET
    Efreet_Desktop *d = (Efreet_Desktop *)data;
@@ -75,7 +75,7 @@ test_icon_desktops(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
 
    it_desk.item_style     = "default";
    it_desk.func.label_get = desk_gl_label_get;
-   it_desk.func.icon_get  = desk_gl_icon_get;
+   it_desk.func.content_get  = desk_gl_content_get;
    it_desk.func.state_get = NULL;
    it_desk.func.del       = desk_gl_del;
 
diff --git a/legacy/elementary/src/bin/test_index.c b/legacy/elementary/src/bin/test_index.c
index a7a938b941..07eb6bd1ab 100644
--- a/legacy/elementary/src/bin/test_index.c
+++ b/legacy/elementary/src/bin/test_index.c
@@ -66,7 +66,7 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    itci.item_style     = "default";
    itci.func.label_get = gli_label_get;
-   itci.func.icon_get  = NULL;
+   itci.func.content_get  = NULL;
    itci.func.state_get = NULL;
    itci.func.del       = NULL;
 
diff --git a/legacy/elementary/src/bin/test_panel.c b/legacy/elementary/src/bin/test_panel.c
index 7f98804d47..adfaa2b1e2 100644
--- a/legacy/elementary/src/bin/test_panel.c
+++ b/legacy/elementary/src/bin/test_panel.c
@@ -9,7 +9,7 @@ static Elm_Genlist_Item_Class itc;
 static void _bstatus(void *data, Evas_Object *obj, void *event_info);
 static void _tstatus(void *data, Evas_Object *obj, void *event_info);
 static char *_label_get(void *data, Evas_Object *obj, const char *source);
-static Evas_Object *_icon_get(void *data, Evas_Object *obj, const char *source);
+static Evas_Object *_content_get(void *data, Evas_Object *obj, const char *source);
 static Eina_Bool _state_get(void *data, Evas_Object *obj, const char *source);
 static void _item_del(void *data, Evas_Object *obj);
 static void _fill_list(Evas_Object *obj);
@@ -52,7 +52,7 @@ _label_get(void *data, Evas_Object *obj __UNUSED__, const char *source __UNUSED_
 }
 
 static Evas_Object *
-_icon_get(void *data, Evas_Object *obj, const char *source)
+_content_get(void *data, Evas_Object *obj, const char *source)
 {
    if (!strcmp(source, "elm.swallow.icon"))
      {
@@ -199,7 +199,7 @@ test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    itc.item_style = "default";
    itc.func.label_get = _label_get;
-   itc.func.icon_get = _icon_get;
+   itc.func.content_get = _content_get;
    itc.func.state_get = _state_get;
    itc.func.del = _item_del;
 
diff --git a/legacy/elementary/src/bin/test_tooltip.c b/legacy/elementary/src/bin/test_tooltip.c
index dc1d8220e7..8e0bc12e15 100644
--- a/legacy/elementary/src/bin/test_tooltip.c
+++ b/legacy/elementary/src/bin/test_tooltip.c
@@ -26,7 +26,7 @@ grdt_lbl_get(void            *data,
 }
 
 Evas_Object *
-grdt_icon_get(void        *data,
+grdt_content_get(void        *data,
               Evas_Object *obj,
               const char  *part)
 {
@@ -548,7 +548,7 @@ test_tooltip2(void *data       __UNUSED__,
 
    gic.item_style = "default";
    gic.func.label_get = grdt_lbl_get;
-   gic.func.icon_get = grdt_icon_get;
+   gic.func.content_get = grdt_content_get;
 
    n = 0;
    for (i = 0; i < 9; i++)
diff --git a/legacy/elementary/src/examples/entry_example.c b/legacy/elementary/src/examples/entry_example.c
index 10bbca8873..5d14a184c0 100644
--- a/legacy/elementary/src/examples/entry_example.c
+++ b/legacy/elementary/src/examples/entry_example.c
@@ -55,7 +55,7 @@ _emo_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSE
 }
 
 static Evas_Object *
-_emo_icon_get(void *data, Evas_Object *obj, const char *part)
+_emo_content_get(void *data, Evas_Object *obj, const char *part)
 {
    Evas_Object *o;
 
@@ -82,7 +82,7 @@ _page_grid_add(Evas_Object *parent, App_Inwin_Data *aid)
         "default",
         {
            _emo_label_get,
-           _emo_icon_get,
+           _emo_content_get,
            NULL,
            _emo_del
         }
diff --git a/legacy/elementary/src/examples/gengrid_example.c b/legacy/elementary/src/examples/gengrid_example.c
index c68e5e52f7..1b2e72005d 100644
--- a/legacy/elementary/src/examples/gengrid_example.c
+++ b/legacy/elementary/src/examples/gengrid_example.c
@@ -313,7 +313,7 @@ _grid_label_get(void        *data,
 
 /* icon fetching callback */
 static Evas_Object *
-_grid_icon_get(void        *data,
+_grid_content_get(void        *data,
                Evas_Object *obj,
                const char  *part)
 {
@@ -606,7 +606,7 @@ elm_main(int    argc __UNUSED__,
 
    gic.item_style = "default";
    gic.func.label_get = _grid_label_get;
-   gic.func.icon_get = _grid_icon_get;
+   gic.func.content_get = _grid_icon_get;
    gic.func.state_get = _grid_state_get;
    gic.func.del = _grid_del;
 
diff --git a/legacy/elementary/src/examples/genlist_example_01.c b/legacy/elementary/src/examples/genlist_example_01.c
index ecad6a0a82..cc7042fff9 100644
--- a/legacy/elementary/src/examples/genlist_example_01.c
+++ b/legacy/elementary/src/examples/genlist_example_01.c
@@ -21,7 +21,7 @@ _item_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUS
 }
 
 static Evas_Object *
-_item_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
+_item_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
 {
    Evas_Object *ic = elm_icon_add(obj);
 
@@ -59,7 +59,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    _itc.item_style = "default";
    _itc.func.label_get = _item_label_get;
-   _itc.func.icon_get = _item_icon_get;
+   _itc.func.content_get = _item_icon_get;
    _itc.func.state_get = NULL;
    _itc.func.del = NULL;
 
diff --git a/legacy/elementary/src/examples/genlist_example_02.c b/legacy/elementary/src/examples/genlist_example_02.c
index da8f46b3b1..613c84b31e 100644
--- a/legacy/elementary/src/examples/genlist_example_02.c
+++ b/legacy/elementary/src/examples/genlist_example_02.c
@@ -32,7 +32,7 @@ _item_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUS
 }
 
 static Evas_Object *
-_item_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
+_item_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
 {
    Evas_Object *ic = elm_icon_add(obj);
 
@@ -116,7 +116,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    _itc.item_style = "default";
    _itc.func.label_get = _item_label_get;
-   _itc.func.icon_get = _item_icon_get;
+   _itc.func.content_get = _item_icon_get;
    _itc.func.state_get = NULL;
    _itc.func.del = NULL;
 
diff --git a/legacy/elementary/src/examples/genlist_example_03.c b/legacy/elementary/src/examples/genlist_example_03.c
index fe31ade32e..712f778763 100644
--- a/legacy/elementary/src/examples/genlist_example_03.c
+++ b/legacy/elementary/src/examples/genlist_example_03.c
@@ -33,7 +33,7 @@ _item_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
 }
 
 static Evas_Object *
-_item_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
+_item_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
 {
    Evas_Object *ic = elm_icon_add(obj);
 
@@ -104,7 +104,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    _itc.item_style = "double_label";
    _itc.func.label_get = _item_label_get;
-   _itc.func.icon_get = _item_icon_get;
+   _itc.func.content_get = _item_icon_get;
    _itc.func.state_get = NULL;
    _itc.func.del = NULL;
 
diff --git a/legacy/elementary/src/examples/genlist_example_04.c b/legacy/elementary/src/examples/genlist_example_04.c
index a06fc02f63..bb309e1564 100644
--- a/legacy/elementary/src/examples/genlist_example_04.c
+++ b/legacy/elementary/src/examples/genlist_example_04.c
@@ -35,7 +35,7 @@ _item_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
 }
 
 static Evas_Object *
-_item_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
+_item_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
 {
    Evas_Object *ic = elm_icon_add(obj);
 
@@ -65,7 +65,7 @@ _group_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNU
 }
 
 static Evas_Object *
-_group_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__)
+_group_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__)
 {
    Evas_Object *ic = elm_icon_add(obj);
 
@@ -289,13 +289,13 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    _itc.item_style = "double_label";
    _itc.func.label_get = _item_label_get;
-   _itc.func.icon_get = _item_icon_get;
+   _itc.func.content_get = _item_icon_get;
    _itc.func.state_get = NULL;
    _itc.func.del = NULL;
 
    _itc_group.item_style = "group_index";
    _itc_group.func.label_get = _group_label_get;
-   _itc_group.func.icon_get = _group_icon_get;
+   _itc_group.func.content_get = _group_icon_get;
    _itc_group.func.state_get = NULL;
    _itc_group.func.del = NULL;
 
diff --git a/legacy/elementary/src/examples/genlist_example_05.c b/legacy/elementary/src/examples/genlist_example_05.c
index 66da41256a..5c4b38981f 100644
--- a/legacy/elementary/src/examples/genlist_example_05.c
+++ b/legacy/elementary/src/examples/genlist_example_05.c
@@ -35,7 +35,7 @@ _item_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
 }
 
 static Evas_Object *
-_item_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
+_item_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
 {
    Evas_Object *ic = elm_icon_add(obj);
 
@@ -66,7 +66,7 @@ _parent_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UN
 }
 
 static Evas_Object *
-_parent_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__)
+_parent_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__)
 {
    Evas_Object *ic = elm_icon_add(obj);
 
@@ -90,7 +90,7 @@ _favorite_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
 }
 
 static Evas_Object *
-_favorite_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
+_favorite_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
 {
    Evas_Object *ic = elm_icon_add(obj);
 
@@ -337,19 +337,19 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    _itc.item_style = "default";
    _itc.func.label_get = _item_label_get;
-   _itc.func.icon_get = _item_icon_get;
+   _itc.func.content_get = _item_icon_get;
    _itc.func.state_get = NULL;
    _itc.func.del = NULL;
 
    _itp.item_style = "default";
    _itp.func.label_get = _parent_label_get;
-   _itp.func.icon_get = _parent_icon_get;
+   _itp.func.content_get = _parent_icon_get;
    _itp.func.state_get = NULL;
    _itp.func.del = NULL;
 
    _itfav.item_style = "default";
    _itfav.func.label_get = _favorite_label_get;
-   _itfav.func.icon_get = _favorite_icon_get;
+   _itfav.func.content_get = _favorite_icon_get;
    _itfav.func.state_get = NULL;
    _itfav.func.del = NULL;
 
diff --git a/legacy/elementary/src/examples/index_example_02.c b/legacy/elementary/src/examples/index_example_02.c
index 2b9733f41e..6f41e518fa 100644
--- a/legacy/elementary/src/examples/index_example_02.c
+++ b/legacy/elementary/src/examples/index_example_02.c
@@ -55,7 +55,7 @@ _grid_label_get(void        *data,
 }
 
 Evas_Object *
-_grid_icon_get(void        *data __UNUSED__,
+_grid_content_get(void        *data __UNUSED__,
                Evas_Object *obj,
                const char  *part)
 {
@@ -116,7 +116,7 @@ elm_main(int    argc __UNUSED__,
 
    gic.item_style = "default";
    gic.func.label_get = _grid_label_get;
-   gic.func.icon_get = _grid_icon_get;
+   gic.func.content_get = _grid_icon_get;
    gic.func.state_get = NULL;
    gic.func.del = NULL;
 
diff --git a/legacy/elementary/src/examples/map_example_02.c b/legacy/elementary/src/examples/map_example_02.c
index fdeab9ea41..7557f2028f 100644
--- a/legacy/elementary/src/examples/map_example_02.c
+++ b/legacy/elementary/src/examples/map_example_02.c
@@ -57,7 +57,7 @@ _marker_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data)
 }
 
 static Evas_Object *
-_marker_city_icon_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data __UNUSED__)
+_marker_city_content_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data __UNUSED__)
 {
    Evas_Object *icon = elm_icon_add(obj);
    elm_icon_file_set(icon, PACKAGE_DATA_DIR"/images/icon_07.png", NULL);
@@ -67,7 +67,7 @@ _marker_city_icon_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void
 }
 
 static Evas_Object *
-_group_city_icon_get(Evas_Object *obj, void *data __UNUSED__)
+_group_city_content_get(Evas_Object *obj, void *data __UNUSED__)
 {
    Evas_Object *icon = elm_icon_add(obj);
    elm_icon_file_set(icon, PACKAGE_DATA_DIR"/images/icon_05.png", NULL);
@@ -76,7 +76,7 @@ _group_city_icon_get(Evas_Object *obj, void *data __UNUSED__)
 }
 
 static Evas_Object *
-_marker_country_icon_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data __UNUSED__)
+_marker_country_content_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data __UNUSED__)
 {
    Evas_Object *icon = elm_icon_add(obj);
    elm_icon_file_set(icon, PACKAGE_DATA_DIR"/images/icon_06.png", NULL);
@@ -85,7 +85,7 @@ _marker_country_icon_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, vo
 }
 
 static Evas_Object *
-_group_country_icon_get(Evas_Object *obj, void *data __UNUSED__)
+_group_country_content_get(Evas_Object *obj, void *data __UNUSED__)
 {
    Evas_Object *icon = elm_icon_add(obj);
    elm_icon_file_set(icon, PACKAGE_DATA_DIR"/images/icon_04.png", NULL);
@@ -207,22 +207,22 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    mc_city = elm_map_marker_class_new(map);
    elm_map_marker_class_get_cb_set(mc_city, _marker_get);
-   elm_map_marker_class_icon_cb_set(mc_city, _marker_city_icon_get);
+   elm_map_marker_class_icon_cb_set(mc_city, _marker_city_content_get);
    elm_map_marker_class_style_set(mc_city, "radio");
 
    gc_city = elm_map_group_class_new(map);
    elm_map_group_class_style_set(gc_city, "radio2");
-   elm_map_group_class_icon_cb_set(gc_city, _group_city_icon_get);
+   elm_map_group_class_icon_cb_set(gc_city, _group_city_content_get);
    elm_map_group_class_zoom_displayed_set(gc_city, 3);
 
    mc_country = elm_map_marker_class_new(map);
    elm_map_marker_class_get_cb_set(mc_country, _marker_get);
-   elm_map_marker_class_icon_cb_set(mc_country, _marker_country_icon_get);
+   elm_map_marker_class_icon_cb_set(mc_country, _marker_country_content_get);
    elm_map_marker_class_style_set(mc_country, "empty");
 
    gc_country = elm_map_group_class_new(map);
    elm_map_group_class_style_set(gc_country, "empty");
-   elm_map_group_class_icon_cb_set(gc_country, _group_country_icon_get);
+   elm_map_group_class_icon_cb_set(gc_country, _group_country_content_get);
    elm_map_group_class_zoom_displayed_set(gc_country, 1);
 
    m = elm_map_marker_add(map, -43.2, -22.9, mc_city, gc_city, &data_rio);
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 01019e1b5b..0c7af405ff 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -7899,7 +7899,7 @@ extern "C" {
    typedef struct _Elm_Gen_Item_Class Elm_Gen_Item_Class;
    typedef struct _Elm_Gen_Item_Class_Func Elm_Gen_Item_Class_Func; /**< Class functions for gen item classes. */
    typedef char        *(*Elm_Gen_Item_Label_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Label fetching class function for gen item classes. */
-   typedef Evas_Object *(*Elm_Gen_Item_Icon_Get_Cb)  (void *data, Evas_Object *obj, const char *part); /**< Icon fetching class function for gen item classes. */
+   typedef Evas_Object *(*Elm_Gen_Item_Content_Get_Cb)  (void *data, Evas_Object *obj, const char *part); /**< Content(swallowed object) fetching class function for gen item classes. */
    typedef Eina_Bool    (*Elm_Gen_Item_State_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< State fetching class function for gen item classes. */
    typedef void         (*Elm_Gen_Item_Del_Cb)      (void *data, Evas_Object *obj); /**< Deletion class function for gen item classes. */
    struct _Elm_Gen_Item_Class
@@ -7908,7 +7908,7 @@ extern "C" {
         struct _Elm_Gen_Item_Class_Func
           {
              Elm_Gen_Item_Label_Get_Cb label_get;
-             Elm_Gen_Item_Icon_Get_Cb  icon_get;
+             Elm_Gen_Item_Content_Get_Cb  content_get;
              Elm_Gen_Item_State_Get_Cb state_get;
              Elm_Gen_Item_Del_Cb       del;
           } func;
@@ -8010,16 +8010,16 @@ extern "C" {
     * item's theme. This function @b must return a strdup'()ed string,
     * as the caller will free() it when done. See
     * #Elm_Gengrid_Item_Label_Get_Cb.
-    * - @c func.icon_get - This function is called when an item object
+    * - @c func.content_get - This function is called when an item object
     * is actually created. The @c data parameter will point to the
     * same data passed to elm_gengrid_item_append() and related item
     * creation functions. The @c obj parameter is the gengrid object
     * itself, while the @c part one is the name string of one of the
-    * existing (icon) swallow parts in the Edje group implementing the
-    * item's theme. It must return @c NULL, when no icon is desired,
+    * existing (content) swallow parts in the Edje group implementing the
+    * item's theme. It must return @c NULL, when no content is desired,
     * or a valid object handle, otherwise. The object will be deleted
     * by the gengrid on its deletion or when the item is "unrealized".
-    * See #Elm_Gengrid_Item_Icon_Get_Cb.
+    * See #Elm_Gengrid_Item_Content_Get_Cb.
     * - @c func.state_get - This function is called when an item
     * object is actually created. The @c data parameter will point to
     * the same data passed to elm_gengrid_item_append() and related
@@ -8050,7 +8050,7 @@ extern "C" {
     * modified (added, deleted, selected or unselected) of child items
     * on a gengrid.
     *
-    * If an item changes (internal (boolean) state, label or icon
+    * If an item changes (internal (boolean) state, label or content 
     * changes), then use elm_gengrid_item_update() to have gengrid
     * update the item with the new state. A gengrid will re-"realize"
     * the item, thus calling the functions in the
@@ -8151,7 +8151,7 @@ extern "C" {
    #define Elm_Gengrid_Item Elm_Gen_Item /**< Item of Elm_Genlist. Sub-type of Elm_Widget_Item */
    typedef struct _Elm_Gengrid_Item_Class_Func Elm_Gengrid_Item_Class_Func; /**< Class functions for gengrid item classes. */
    typedef char        *(*Elm_Gengrid_Item_Label_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Label fetching class function for gengrid item classes. */
-   typedef Evas_Object *(*Elm_Gengrid_Item_Icon_Get_Cb)  (void *data, Evas_Object *obj, const char *part); /**< Icon fetching class function for gengrid item classes. */
+   typedef Evas_Object *(*Elm_Gengrid_Item_Content_Get_Cb)  (void *data, Evas_Object *obj, const char *part); /**< Content (swallowed object) fetching class function for gengrid item classes. */
    typedef Eina_Bool    (*Elm_Gengrid_Item_State_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< State fetching class function for gengrid item classes. */
    typedef void         (*Elm_Gengrid_Item_Del_Cb)      (void *data, Evas_Object *obj); /**< Deletion class function for gengrid item classes. */
 
@@ -8167,7 +8167,7 @@ extern "C" {
         struct _Elm_Gengrid_Item_Class_Func
           {
              Elm_Gengrid_Item_Label_Get_Cb label_get;
-             Elm_Gengrid_Item_Icon_Get_Cb  icon_get;
+             Elm_Gengrid_Item_Content_Get_Cb content_get;
              Elm_Gengrid_Item_State_Get_Cb state_get;
              Elm_Gengrid_Item_Del_Cb       del;
           } func;
@@ -8873,7 +8873,7 @@ extern "C" {
     * @param item The gengrid item
     *
     * This updates an item by calling all the item class functions
-    * again to get the icons, labels and states. Use this when the
+    * again to get the contents, labels and states. Use this when the
     * original item data has changed and you want thta changes to be
     * reflected.
     *
@@ -17859,9 +17859,9 @@ extern "C" {
     *   existing text parts in the Edje group implementing the item's theme.
     *   This function @b must return a strdup'()ed string, as the caller will
     *   free() it when done. See #Elm_Genlist_Item_Label_Get_Cb.
-    * - @c icon_get - The @c part parameter is the name string of one of the
-    *   existing (icon) swallow parts in the Edje group implementing the item's
-    *   theme. It must return @c NULL, when no icon is desired, or a valid
+    * - @c content_get - The @c part parameter is the name string of one of the
+    *   existing (content) swallow parts in the Edje group implementing the item's
+    *   theme. It must return @c NULL, when no content is desired, or a valid
     *   object handle, otherwise.  The object will be deleted by the genlist on
     *   its deletion or when the item is "unrealized".  See
     *   #Elm_Genlist_Item_Icon_Get_Cb.
@@ -17902,15 +17902,15 @@ extern "C" {
     *
     * An item in a genlist can have 0 or more text labels (they can be regular
     * text or textblock Evas objects - that's up to the style to determine), 0
-    * or more icons (which are simply objects swallowed into the genlist item's
+    * or more contents (which are simply objects swallowed into the genlist item's
     * theming Edje object) and 0 or more <b>boolean states</b>, which have the
     * behavior left to the user to define. The Edje part names for each of
     * these properties will be looked up, in the theme file for the genlist,
-    * under the Edje (string) data items named @c "labels", @c "icons" and @c
+    * under the Edje (string) data items named @c "labels", @c "contents" and @c
     * "states", respectively. For each of those properties, if more than one
     * part is provided, they must have names listed separated by spaces in the
     * data fields. For the default genlist item theme, we have @b one label
-    * part (@c "elm.text"), @b two icon parts (@c "elm.swalllow.icon" and @c
+    * part (@c "elm.text"), @b two content parts (@c "elm.swalllow.icon" and @c
     * "elm.swallow.end") and @b no state parts.
     *
     * A genlist item may be at one of several styles. Elementary provides one
@@ -17976,7 +17976,7 @@ extern "C" {
     * elm_genlist_item_data_get() returns the data pointer set by the item
     * creation functions.
     *
-    * If an item changes (state of boolean changes, label or icons change),
+    * If an item changes (state of boolean changes, label or contents change),
     * then use elm_genlist_item_update() to have genlist update the item with
     * the new state. Genlist will re-realize the item thus call the functions
     * in the _Elm_Genlist_Item_Class for that item.
@@ -18079,7 +18079,7 @@ extern "C" {
     *   caller to not use the object pointer from elm_genlist_item_object_get()
     *   in a way where it may point to freed objects.
     * - @c "unrealized" - This is called just before an item is unrealized.
-    *   After this call icon objects provided will be deleted and the item
+    *   After this call content objects provided will be deleted and the item
     *   object itself delete or be put into a floating cache.
     * - @c "drag,start,up" - This is called when the item in the list has been
     *   dragged (not scrolled) up.
@@ -18163,7 +18163,7 @@ extern "C" {
    #define Elm_Genlist_Item Elm_Gen_Item /**< Item of Elm_Genlist. Sub-type of Elm_Widget_Item */
    typedef struct _Elm_Genlist_Item_Class_Func Elm_Genlist_Item_Class_Func; /**< Class functions for genlist item class */
    typedef char        *(*Elm_Genlist_Item_Label_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< Label fetching class function for genlist item classes. */
-   typedef Evas_Object *(*Elm_Genlist_Item_Icon_Get_Cb)  (void *data, Evas_Object *obj, const char *part); /**< Icon fetching class function for genlist item classes. */
+   typedef Evas_Object *(*Elm_Genlist_Item_Content_Get_Cb)  (void *data, Evas_Object *obj, const char *part); /**< Content (swallowed object) fetching class function for genlist item classes. */
    typedef Eina_Bool    (*Elm_Genlist_Item_State_Get_Cb) (void *data, Evas_Object *obj, const char *part); /**< State fetching class function for genlist item classes. */
    typedef void         (*Elm_Genlist_Item_Del_Cb)      (void *data, Evas_Object *obj); /**< Deletion class function for genlist item classes. */
 
@@ -18183,7 +18183,7 @@ extern "C" {
         struct Elm_Genlist_Item_Class_Func
           {
              Elm_Genlist_Item_Label_Get_Cb  label_get; /**< Label fetching class function for genlist item classes.*/
-             Elm_Genlist_Item_Icon_Get_Cb   icon_get; /**< Icon fetching class function for genlist item classes. */
+             Elm_Genlist_Item_Content_Get_Cb   content_get; /**< Content fetching class function for genlist item classes. */
              Elm_Genlist_Item_State_Get_Cb  state_get; /**< State fetching class function for genlist item classes. */
              Elm_Genlist_Item_Del_Cb        del; /**< Deletion class function for genlist item classes. */
           } func;
@@ -19150,7 +19150,8 @@ extern "C" {
     *
     * @ingroup Genlist
     */
-   EAPI void               elm_genlist_item_icons_orphan(Elm_Genlist_Item *it) EINA_ARG_NONNULL(1);
+   EAPI void               elm_genlist_item_contents_orphan(Elm_Genlist_Item *it) EINA_ARG_NONNULL(1);
+   EINA_DEPRECATED EAPI void               elm_genlist_item_icons_orphan(Elm_Genlist_Item *it) EINA_ARG_NONNULL(1);
    /**
     * Get the real Evas object created to implement the view of a
     * given genlist item
diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c
index 4551748edc..c0d17e57d2 100644
--- a/legacy/elementary/src/lib/elc_fileselector.c
+++ b/legacy/elementary/src/lib/elc_fileselector.c
@@ -863,9 +863,9 @@ elm_fileselector_add(Evas_Object *parent)
    elm_widget_sub_object_add(obj, bt);
    wd->home_button = bt;
 
-   list_itc[ELM_DIRECTORY].func.icon_get = grid_itc[ELM_DIRECTORY].func.icon_get = _itc_icon_folder_get;
-   list_itc[ELM_FILE_IMAGE].func.icon_get = grid_itc[ELM_FILE_IMAGE].func.icon_get = _itc_icon_image_get;
-   list_itc[ELM_FILE_UNKNOW].func.icon_get = grid_itc[ELM_FILE_UNKNOW].func.icon_get = _itc_icon_file_get;
+   list_itc[ELM_DIRECTORY].func.content_get = grid_itc[ELM_DIRECTORY].func.content_get = _itc_icon_folder_get;
+   list_itc[ELM_FILE_IMAGE].func.content_get = grid_itc[ELM_FILE_IMAGE].func.content_get = _itc_icon_image_get;
+   list_itc[ELM_FILE_UNKNOW].func.content_get = grid_itc[ELM_FILE_UNKNOW].func.content_get = _itc_icon_file_get;
 
    for (i = 0; i < ELM_FILE_LAST; ++i)
      {
diff --git a/legacy/elementary/src/lib/elm_gen.c b/legacy/elementary/src/lib/elm_gen.c
index 0d66974ddb..a8d24f8139 100644
--- a/legacy/elementary/src/lib/elm_gen.c
+++ b/legacy/elementary/src/lib/elm_gen.c
@@ -353,7 +353,7 @@ void
 elm_gen_item_unrealize(Elm_Gen_Item *it,
                        Eina_Bool     calc)
 {
-   Evas_Object *icon;
+   Evas_Object *content;
 
    if (!it->realized) return;
    if (it->wd->reorder_it == it) return;
@@ -368,13 +368,13 @@ elm_gen_item_unrealize(Elm_Gen_Item *it,
 
    elm_widget_stringlist_free(it->labels);
    it->labels = NULL;
-   elm_widget_stringlist_free(it->icons);
-   it->icons = NULL;
+   elm_widget_stringlist_free(it->contents);
+   it->contents = NULL;
    elm_widget_stringlist_free(it->states);
    it->states = NULL;
 
-   EINA_LIST_FREE(it->icon_objs, icon)
-     evas_object_del(icon);
+   EINA_LIST_FREE(it->content_objs, content)
+     evas_object_del(content);
 
    it->unrealize_cb(it);
 
diff --git a/legacy/elementary/src/lib/elm_gen.h b/legacy/elementary/src/lib/elm_gen.h
index 18ba6d4b56..e36af59eb9 100644
--- a/legacy/elementary/src/lib/elm_gen.h
+++ b/legacy/elementary/src/lib/elm_gen.h
@@ -36,7 +36,7 @@ struct Elm_Gen_Item
    Evas_Coord                    x, y, dx, dy;
    Evas_Object                  *spacer;
    Elm_Gen_Item                 *parent;
-   Eina_List                    *labels, *icons, *states, *icon_objs;
+   Eina_List                    *labels, *contents, *states, *content_objs;
    Ecore_Timer                  *long_timer;
    int                           relcount;
    int                           walking;
diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index 55ab4fe5a5..007bee1aa6 100644
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -957,21 +957,23 @@ _item_realize(Elm_Gen_Item *it)
           }
      }
 
-   if (it->itc->func.icon_get)
+   if (it->itc->func.content_get)
      {
         const Eina_List *l;
         const char *key;
+        Evas_Object *ic = NULL;
 
-        it->icons =
+        it->contents =
            elm_widget_stringlist_get(edje_object_data_get(VIEW(it),
                                                           "icons"));
-        EINA_LIST_FOREACH(it->icons, l, key)
+        EINA_LIST_FOREACH(it->contents, l, key)
           {
-             Evas_Object *ic = it->itc->func.icon_get
-                ((void *)it->base.data, WIDGET(it), l->data);
+             if (it->itc->func.content_get)
+               ic = it->itc->func.content_get
+                  ((void *)it->base.data, WIDGET(it), key);
              if (ic)
                {
-                  it->icon_objs = eina_list_append(it->icon_objs, ic);
+                  it->content_objs = eina_list_append(it->content_objs, ic);
                   edje_object_part_swallow(VIEW(it), key, ic);
                   evas_object_show(ic);
                   elm_widget_sub_object_add(WIDGET(it), ic);
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index f3c6b220ef..2d9959fa51 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -34,7 +34,7 @@ struct Elm_Gen_Item_Type
    Evas_Coord                    w, h, minw, minh;
    Elm_Gen_Item                 *group_item;
    Elm_Genlist_Item_Flags        flags;
-   Eina_List                    *mode_labels, *mode_icons, *mode_states, *mode_icon_objs;
+   Eina_List                    *mode_labels, *mode_contents, *mode_states, *mode_content_objs;
    Ecore_Timer                  *swipe_timer;
    Evas_Coord                    scrl_x, scrl_y, old_scrl_y;
 
@@ -1690,23 +1690,24 @@ _item_label_realize(Elm_Gen_Item *it,
 }
 
 static Eina_List *
-_item_icon_realize(Elm_Gen_Item *it,
+_item_content_realize(Elm_Gen_Item *it,
                    Evas_Object *target,
                    Eina_List **source)
 {
    Eina_List *res = NULL;
 
-   if (it->itc->func.icon_get)
+   if (it->itc->func.content_get)
      {
         const Eina_List *l;
         const char *key;
+        Evas_Object *ic = NULL;
 
         *source = elm_widget_stringlist_get(edje_object_data_get(target, "icons"));
         EINA_LIST_FOREACH(*source, l, key)
           {
-             Evas_Object *ic = it->itc->func.icon_get
-                ((void *)it->base.data, WIDGET(it), key);
-
+             if (it->itc->func.content_get)
+               ic = it->itc->func.content_get
+                  ((void *)it->base.data, WIDGET(it), key);
              if (ic)
                {
                   res = eina_list_append(res, ic);
@@ -1892,10 +1893,10 @@ _item_realize(Elm_Gen_Item *it,
      {
         /* FIXME: If you see that assert, please notify us and we
            will clean our mess */
-        assert(eina_list_count(it->icon_objs) == 0);
+        assert(eina_list_count(it->content_objs) == 0);
 
         _item_label_realize(it, VIEW(it), &it->labels);
-        it->icon_objs = _item_icon_realize(it, VIEW(it), &it->icons);
+        it->content_objs = _item_content_realize(it, VIEW(it), &it->contents);
         _item_state_realize(it, VIEW(it), &it->states);
 
         if (!it->item->mincalcd)
@@ -2864,15 +2865,15 @@ _mode_item_realize(Elm_Gen_Item *it)
    evas_object_event_callback_add(it->item->mode_view, EVAS_CALLBACK_MOUSE_MOVE,
                                   _mouse_move, it);
 
-   /* label_get, icon_get, state_get */
+   /* label_get, content_get, state_get */
    /* FIXME: If you see that assert, please notify us and we
       will clean our mess */
-   assert(eina_list_count(it->item->mode_icon_objs) == 0);
+   assert(eina_list_count(it->item->mode_content_objs) == 0);
 
    _item_label_realize(it, it->item->mode_view, &it->item->mode_labels);
-   it->item->mode_icon_objs = _item_icon_realize(it,
+   it->item->mode_content_objs = _item_content_realize(it,
 					   it->item->mode_view,
-					   &it->item->mode_icons);
+					   &it->item->mode_contents);
    _item_state_realize(it, it->item->mode_view, &it->item->mode_states);
 
    edje_object_part_swallow(it->item->mode_view,
@@ -2888,18 +2889,18 @@ static void
 _mode_item_unrealize(Elm_Gen_Item *it)
 {
    Widget_Data *wd = it->wd;
-   Evas_Object *icon;
+   Evas_Object *content;
    if (!it->item->mode_view) return;
 
    evas_event_freeze(evas_object_evas_get(it->wd->obj));
    elm_widget_stringlist_free(it->item->mode_labels);
    it->item->mode_labels = NULL;
-   elm_widget_stringlist_free(it->item->mode_icons);
-   it->item->mode_icons = NULL;
+   elm_widget_stringlist_free(it->item->mode_contents);
+   it->item->mode_contents = NULL;
    elm_widget_stringlist_free(it->item->mode_states);
 
-   EINA_LIST_FREE(it->item->mode_icon_objs, icon)
-     evas_object_del(icon);
+   EINA_LIST_FREE(it->item->mode_content_objs, content)
+     evas_object_del(content);
 
    edje_object_part_unswallow(it->item->mode_view, VIEW(it));
    evas_object_smart_member_add(VIEW(it), wd->pan_smart);
@@ -3909,7 +3910,7 @@ elm_genlist_item_disabled_set(Elm_Gen_Item *it,
           edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
         else
           edje_object_signal_emit(VIEW(it), "elm,state,enabled", "elm");
-        EINA_LIST_FOREACH(it->icon_objs, l, obj)
+        EINA_LIST_FOREACH(it->content_objs, l, obj)
           elm_widget_disabled_set(obj, disabled);
      }
 }
@@ -4144,13 +4145,19 @@ elm_genlist_item_data_get(const Elm_Gen_Item *it)
 EAPI void
 elm_genlist_item_icons_orphan(Elm_Gen_Item *it)
 {
-   Evas_Object *icon;
+   elm_genlist_item_contents_orphan(it);
+}
+
+EAPI void
+elm_genlist_item_contents_orphan(Elm_Gen_Item *it)
+{
+   Evas_Object *content;
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   EINA_LIST_FREE(it->icon_objs, icon)
+   EINA_LIST_FREE(it->content_objs, content)
      {
-        elm_widget_sub_object_del(WIDGET(it), icon);
-        evas_object_smart_member_del(icon);
-        evas_object_hide(icon);
+        elm_widget_sub_object_del(WIDGET(it), content);
+        evas_object_smart_member_del(content);
+        evas_object_hide(content);
      }
 }
 
diff --git a/legacy/elementary/src/lib/elm_store.c b/legacy/elementary/src/lib/elm_store.c
index a9adff3c16..ce1cfcf94f 100644
--- a/legacy/elementary/src/lib/elm_store.c
+++ b/legacy/elementary/src/lib/elm_store.c
@@ -313,7 +313,7 @@ _store_item_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part)
 }
 
 static Evas_Object *
-_store_item_icon_get(void *data, Evas_Object *obj, const char *part)
+_store_item_content_get(void *data, Evas_Object *obj, const char *part)
 {
    Elm_Store_Item *sti = data;
    LKL(sti->lock);
@@ -476,7 +476,7 @@ _store_filesystem_list_update(void *data, Ecore_Thread *th __UNUSED__, void *msg
    else
      {
         itc->func.label_get = _store_item_label_get;
-        itc->func.icon_get  = _store_item_icon_get;
+        itc->func.content_get  = _store_item_content_get;
         itc->func.state_get = NULL; // FIXME: support state gets later
         itc->func.del       = _store_item_del;
      }
@@ -508,7 +508,7 @@ _elm_store_new(size_t size)
    // setup default item class (always the same) if list cb doesnt provide one
    _store_item_class.item_style = "default";
    _store_item_class.func.label_get = _store_item_label_get;
-   _store_item_class.func.icon_get  = _store_item_icon_get;
+   _store_item_class.func.content_get  = _store_item_content_get;
    _store_item_class.func.state_get = NULL; // FIXME: support state gets later
    _store_item_class.func.del       = _store_item_del;
    // TODO: END - move to elm_store_init()