diff --git a/data/elementary/themes/edc/elm/multibuttonentry.edc b/data/elementary/themes/edc/elm/multibuttonentry.edc
index d9fe2567f2..22470acde0 100644
--- a/data/elementary/themes/edc/elm/multibuttonentry.edc
+++ b/data/elementary/themes/edc/elm/multibuttonentry.edc
@@ -63,7 +63,6 @@ group { name: "elm/multibuttonentry/guidetext/default";
 }
 
 group { name: "elm/multibuttonentry/btn/default";
-   images.image: "border_close.png" COMP;
    styles {
       style { name: "multibuttonentry_textblock_style";
          base: "font="FN" align=0.5 font_size=10 color=#ffff text_class=multibuttonentry_item ellipsis=1.0";
@@ -113,7 +112,7 @@ group { name: "elm/multibuttonentry/btn/default";
       }
       part { name: "close"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "border_close.png";
+            image.normal: "i-close";
             rel.to: "del";
             min: 15 15;
             max: 15 15;
diff --git a/data/elementary/themes/edc/evrything.edc b/data/elementary/themes/edc/evrything.edc
index 00c6cda495..8a559b2714 100644
--- a/data/elementary/themes/edc/evrything.edc
+++ b/data/elementary/themes/edc/evrything.edc
@@ -1132,8 +1132,6 @@ group { name: "e/modules/everything/thumbview/main/scrollframe";
 }
 
 group { name: "e/modules/everything/thumbview/item/thumb";
-   images.image: "border_close.png" COMP;
-   images.image: "calendar_next.png" COMP;
    parts {
       part { name: "sel_base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
@@ -1206,7 +1204,7 @@ group { name: "e/modules/everything/thumbview/item/thumb";
          description { state: "default" 0.0;
             visible: 0;
             color: 255 255 255 255;
-            image.normal: "border_close.png";
+            image.normal: "i-close";
             min: 15 15;
             max: 15 15;
             rel1.offset: 4 4;
@@ -1225,7 +1223,7 @@ group { name: "e/modules/everything/thumbview/item/thumb";
          description { state: "default" 0.0;
             visible: 0;
             color: 255 255 255 255;
-            image.normal: "calendar_next.png";
+            image.normal: "i-arrow-r";
             min: 15 15;
             max: 15 15;
             rel1.offset: -5 4;
@@ -1301,8 +1299,6 @@ group { name: "e/modules/everything/thumbview/item/thumb";
 group { name: "e/modules/everything/thumbview/item/list";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
-   images.image: "border_close.png" COMP;
-   images.image: "calendar_next.png" COMP;
    parts {
       part { name: "sel_base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
@@ -1408,7 +1404,7 @@ group { name: "e/modules/everything/thumbview/item/list";
          description { state: "default" 0.0;
             visible: 0;
             color: 255 255 255 255;
-            image.normal: "border_close.png";
+            image.normal: "i-close";
             min: 15 15;
             max: 15 15;
             rel1.offset: 4 4;
@@ -1427,7 +1423,7 @@ group { name: "e/modules/everything/thumbview/item/list";
          description { state: "default" 0.0;
             visible: 0;
             color: 255 255 255 255;
-            image.normal: "calendar_next.png";
+            image.normal: "i-arrow-r";
             min: 15 15;
             max: 15 15;
             rel1.offset: -5 4;
diff --git a/data/elementary/themes/edc/notification.edc b/data/elementary/themes/edc/notification.edc
index 1d0565d7a6..29cc83d5fe 100644
--- a/data/elementary/themes/edc/notification.edc
+++ b/data/elementary/themes/edc/notification.edc
@@ -21,7 +21,6 @@ group { name: "e/modules/notification/logo";
 }
 
 group { name: "e/modules/notification/main";
-   images.image: "border_close.png" COMP;
    images.image: "win_shadow.png" COMP;
    data.item: "app_icon_max" "48 48";
    styles {
@@ -163,7 +162,7 @@ group { name: "e/modules/notification/main";
 
       part { name: "close";
          description { state: "default" 0.0;
-            image.normal: "border_close.png";
+            image.normal: "i-close";
             rel.to: "notification.event.close";
             min: 15 15;
             max: 15 15;
diff --git a/data/elementary/themes/edc/toolbar.edc b/data/elementary/themes/edc/toolbar.edc
index 9e11a5c0d1..1456533e59 100644
--- a/data/elementary/themes/edc/toolbar.edc
+++ b/data/elementary/themes/edc/toolbar.edc
@@ -1,6 +1,4 @@
 group { name: "e/widgets/toolbar";
-   images.image: "calendar_next.png" COMP;
-   images.image: "calendar_prev.png" COMP;
    parts {
       part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
@@ -59,7 +57,7 @@ group { name: "e/widgets/toolbar";
             fixed: 1 1;
             rel1.to: "arrow1_ev";
             rel2.to: "arrow1_ev";
-            image.normal: "calendar_prev.png";
+            image.normal: "i-arrow-l";
             FIXED_SIZE(15, 15)
             color: 160 160 160 255;
          }
@@ -91,7 +89,7 @@ group { name: "e/widgets/toolbar";
             fixed: 1 1;
             rel1.to: "arrow2_ev";
             rel2.to: "arrow2_ev";
-            image.normal: "calendar_next.png";
+            image.normal: "i-arrow-r";
             FIXED_SIZE(15, 15)
             color: 160 160 160 255;
          }
diff --git a/data/elementary/themes/img/border_close.png b/data/elementary/themes/img/border_close.png
deleted file mode 100644
index 8f33967d14..0000000000
Binary files a/data/elementary/themes/img/border_close.png and /dev/null differ
diff --git a/data/elementary/themes/img/calendar_next.png b/data/elementary/themes/img/calendar_next.png
deleted file mode 100644
index e55f2dafea..0000000000
Binary files a/data/elementary/themes/img/calendar_next.png and /dev/null differ
diff --git a/data/elementary/themes/img/calendar_prev.png b/data/elementary/themes/img/calendar_prev.png
deleted file mode 100644
index ff6875328c..0000000000
Binary files a/data/elementary/themes/img/calendar_prev.png and /dev/null differ