diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index f1dcc259e1..b52013e3a3 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1704,6 +1704,8 @@ _internal_efl_ui_image_icon_set(Evas_Object *obj, const char *name, Eina_Bool *f
         _efl_ui_image_sizing_eval(obj);
         return EINA_TRUE;
      }
+   else
+     eina_stringshare_replace(&sd->stdicon, NULL);
 
    if (_path_is_absolute(name))
      {
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index 366b061c53..96ca9af305 100644
--- a/src/tests/elementary/elm_test_image.c
+++ b/src/tests/elementary/elm_test_image.c
@@ -197,7 +197,7 @@ START_TEST (efl_ui_image_icon)
    ok = efl_ui_image_icon_set(image, "None");
    ck_assert(ok == 0);
    icon_name = efl_ui_image_icon_get(image);
-   ck_assert_str_eq(icon_name, NULL);
+   ck_assert(icon_name == NULL);
 
    elm_run();