TH - scaling and start work on making lots of icons scale better

7 files changed, 138 insertions, 292 deletions

diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc
index 579eb79b0b..69ff6af67b 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -8,14 +8,7 @@
  */
 
 group { name: "elm/border/base/default";
-   images.image: "border_close.png" COMP;
-   images.image: "border_maximize.png" COMP;
-   images.image: "border_minimize.png" COMP;
-
-   images.image: "glow_round_corners_small.png" COMP;
-   images.image: "knob_round_small_busy.png" COMP;
-
-   images.image: "win_shadow.png" COMP;
+   images.image: "win_shad_flat.png" COMP;
    data.item: "shadow" "1";
    data.item: "version" "119";
    parts {
@@ -37,10 +30,17 @@ group { name: "elm/border/base/default";
             rel2.relative: 1.0 0.0;
          }
       }
-      /* shadow spacer and clipper */
-      spacer { "shadow_spacer";
+      part { name: "shadow_clip"; type: RECT; mouse_events: 0;
+         description { state: "default";
+            rel.to: "_sh1";
+         }
+         description { state: "hidden";
+            visible: 0;
+         }
+      }
+      part { name: "shadow_base"; type: SPACER;
          scale: 1;
-         desc { "default";
+         description { state: "default" 0.0;
             WIN_SHADOW_SPACER;
          }
          desc { "hidden";
@@ -48,17 +48,9 @@ group { name: "elm/border/base/default";
             rel2.offset: -1 -1;
          }
       }
-      image { "shadow"; nomouse;
-         scale: 1;
-         desc { "default";
-            rel.to: "shadow_spacer";
-            WIN_SHADOW;
-         }
-         desc { "hidden"; inherit: "default"; hid; }
-      }
+      WIN_SHAD("shadow_base", "shadow_clip", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
       /* window background: solid color */
-      rect { "bg_clip";
-         nomouse;
+      rect { "bg_clip"; nomouse;
          desc { "default";
             rel1.to: "top_clip";
             rel1.relative: 0.0 1.0;
@@ -69,8 +61,7 @@ group { name: "elm/border/base/default";
          required; // @since 1.19
          clip: "bg_clip";
          desc { "default";
-            color: 255 255 255 255;
-            color_class: "elm/win/background"; // FIXME: color_class naming scheme
+            color: 64 64 64 255;
             visible: 0;
          }
          desc { "visible";
@@ -101,6 +92,8 @@ group { name: "elm/border/base/default";
             color: 64 64 64 255; // FIXME: color_class
             align: 0.5 0.0;
             rel.to: "elm.swallow.menu";
+            fixed: 1 1;
+            visible: 0;
          }
       }
       swallow { "elm.swallow.menu";
@@ -108,12 +101,16 @@ group { name: "elm/border/base/default";
          desc { "default";
             rel.to: "top_clip";
             visible: 0;
-            align: 0.5 0.0;
+            align: 0.5 1.0;
             fixed: 1 1;
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 0 -1;
          }
          desc { "visible"; inherit: "default";
-            visible: 1;
-            fixed: 0 1;
+//            rel1.offset: 0 0;
+//            align: 0.5 0.0;
+//            visible: 1;
+//            fixed: 0 1;
          }
       }
 
@@ -162,21 +159,21 @@ group { name: "elm/border/base/default";
 
       /* top title bar - spacer and clipper */
       rect { "top_clip"; //nomouse;
-//         scale: 1;
+         scale: 1;
          desc { "default";
-            rel1.to: "shadow_spacer";
+            rel1.to: "shadow_base";
+            rel2.to_x: "shadow_base";
             rel2.to_y: "elm.text.title";
-            rel2.to_x: "shadow_spacer";
-            rel2.offset: -1 3;
+            rel2.offset: -1 2;
             vis;
-//            offscale;
+            offscale;
          }
          desc { "hidden";
             inherit: "default";
             rel1.to: "";
             rel2.to: "";
             rel1.relative: 0.0 0.0;
-            rel2.to: "shadow_spacer";
+            rel2.to: "shadow_base";
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 0;
             max: -1 0;
@@ -202,13 +199,13 @@ group { name: "elm/border/base/default";
          clip: "top_clip";
          description { state: "default" 0.0;
             rel1.relative: 1.0 0.0;
-            rel1.offset: 1 3;
+            rel1.offset: 1 4;
             rel1.to_x: "icon";
-            rel1.to_y: "shadow_spacer";
+            rel1.to_y: "shadow_base";
             rel2.relative: 0.0 0.0;
-            rel2.offset: -2 3;
+            rel2.offset: -2 4;
             rel2.to_x: "elm.event.minimize";
-            rel2.to_y: "shadow_spacer";
+            rel2.to_y: "shadow_base";
             align: 0.5 0.0;
             color: 160 160 160 255;
             min: 0 16;
@@ -218,7 +215,7 @@ group { name: "elm/border/base/default";
                min: 0 1;
             }
             fixed: 0 1;
-//            offscale;
+            offscale;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
@@ -250,49 +247,6 @@ group { name: "elm/border/base/default";
             rel2.offset: 0 0;
          }
       }
-      rect {  "busy_clip"; nomouse;
-         desc { "default";
-            color: 255 255 255 0;
-            visible: 0;
-         }
-         desc { "hung";
-            inherit: "default";
-            color: 255 255 255 255;
-            visible: 1;
-         }
-      }
-      image { "knob"; nomouse;
-         clip: "busy_clip";
-         desc { "default";
-            fixed: 1 1;
-            image.normal: "knob_round_small_busy.png";
-            aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            max: 20 20;
-            rel1.relative: 1.0 0.0;
-            rel1.offset: 2 -0;
-            rel1.to: "elm.event.icon";
-            rel2.relative: 1.0 1.0;
-            rel2.offset: 2 -1;
-            rel2.to: "elm.event.icon";
-            align: 0.0 0.5;
-            fixed: 1 1;
-         }
-      }
-      image { "knob_spinner"; nomouse;
-         clip: "busy_clip";
-         desc { "default";
-            fixed: 1 1;
-            rel.to: "knob";
-            image.normal: "glow_round_corners_small.png";
-            map.on: 1;
-            map.smooth: 1;
-            map.rotation.center: "knob";
-         }
-         desc { "spin";
-            inherit: "default";
-            map.rotation.z: 360;
-         }
-      }
       rect {  "clip1"; nomouse;
          desc { "default";
             rel.to: "top_clip";
@@ -314,8 +268,9 @@ group { name: "elm/border/base/default";
       }
       image { "close1";  nomouse;
          clip: "clip1";
+         scale: 1;
          desc { "default";
-            image.normal: "border_close.png";
+            image.normal: "i-close";
             rel.to: "elm.event.close";
             min: 15 15; max: 15 15;
             fixed: 1 1;
@@ -328,8 +283,9 @@ group { name: "elm/border/base/default";
       }
       image { "max1"; nomouse;
          clip: "clip1";
+         scale: 1;
          desc { "default";
-            image.normal: "border_maximize.png";
+            image.normal: "i-arrow-u";
             rel.to: "elm.event.maximize";
             min: 15 15; max: 15 15;
             fixed: 1 1;
@@ -342,8 +298,9 @@ group { name: "elm/border/base/default";
       }
       image { "min1"; nomouse;
          clip: "clip1";
+         scale: 1;
          desc { "default";
-            image.normal: "border_minimize.png";
+            image.normal: "i-arrow-d";
             rel.to: "elm.event.minimize";
             min: 15 15; max: 15 15;
             fixed: 1 1;
@@ -356,44 +313,47 @@ group { name: "elm/border/base/default";
       }
       image { "close2";  nomouse;
          clip: "clip2";
+         scale: 1;
          desc { "default";
-            image.normal: "border_close.png";
+            image.normal: "i-close";
             rel.to: "elm.event.close";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 160 160 160 255;
+            color: 255 255 255 255;
          }
          desc { "selected";
             inherit: "default";
-            color: 255 255 255 255;
+            color: 220 220 220 255;
          }
       }
       image { "max2"; nomouse;
          clip: "clip2";
+         scale: 1;
          desc { "default";
-            image.normal: "border_maximize.png";
+            image.normal: "i-arrow-u";
             rel.to: "elm.event.maximize";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 160 160 160 255;
+            color: 255 255 255 255;
          }
          desc { "selected";
             inherit: "default";
-            color: 255 255 255 255;
+            color: 220 220 220 255;
          }
       }
       image { "min2"; nomouse;
          clip: "clip2";
+         scale: 1;
          desc { "default";
-            image.normal: "border_minimize.png";
+            image.normal: "i-arrow-d";
             rel.to: "elm.event.minimize";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 160 160 160 255;
+            color: 255 255 255 255;
          }
          desc { "selected";
             inherit: "default";
-            color: 255 255 255 255;
+            color: 220 220 220 255;
          }
       }
       rect {  "elm.event.icon";
@@ -524,14 +484,16 @@ group { name: "elm/border/base/default";
       rect { "bottom_clip";
          scale: 1;
          desc { "default";
-            rel.to: "shadow_spacer";
-            rel1 { relative: 0.0 1.0; offset: 0 -5; }
+            rel.to: "shadow_base";
+            rel1 { relative: 0.0 1.0; offset: 0 -1; }
+            align: 0.0 1.0;
             min: 0 5;
             fixed: 0 1;
          }
          desc { "hidden";
             inherit: "default";
             rel1 { relative: 0.0 1.0; offset: 0 0; }
+            rel2 { relative: 1.0 1.0; offset: 0 0; }
             min: 0 0;
             hid;
          }
@@ -671,12 +633,14 @@ group { name: "elm/border/base/default";
       program {
          signal: "elm,state,shadow,on"; source: "elm";
          action: STATE_SET "default";
-         targets: "shadow_spacer" "shadow";
+         target: "shadow_clip";
+         target: "shadow_base";
       }
       program {
          signal: "elm,state,shadow,off"; source: "elm";
          action: STATE_SET "hidden";
-         targets: "shadow_spacer" "shadow";
+         target: "shadow_clip";
+         target: "shadow_base";
       }
       program {
          signal: "elm,state,background,solid,on"; source: "elm";
@@ -737,41 +701,6 @@ group { name: "elm/border/base/default";
          action: STATE_SET "default";
          target: "icon";
       }
-      program { name: "spin";
-         signal: "elm,state,hung"; source: "elm";
-         action: STATE_SET "spin";
-         transition: LINEAR 1.0;
-         target: "knob_spinner";
-         after: "spin2";
-      }
-      program { name: "spin2";
-         action: STATE_SET "default";
-         target: "knob_spinner";
-         after: "spin";
-      }
-      program {
-         signal: "elm,state,hung"; source: "elm";
-         action: STATE_SET "hung";
-         transition: SINUSOIDAL 0.25;
-         target: "busy_clip";
-      }
-      program {
-         signal: "elm,state,unhung"; source: "elm";
-         action: STATE_SET "default";
-         transition: SINUSOIDAL 1.0;
-         target: "busy_clip";
-         after: "spin3";
-      }
-      program { name: "spin3";
-         action: ACTION_STOP;
-         target: "spin";
-         target: "spin2";
-         after: "spin4";
-      }
-      program { name: "spin4";
-         action: STATE_SET "default";
-         target: "knob_spinner";
-      }
 
       /* maximize & unmaximize */
       program {
@@ -1096,25 +1025,22 @@ group { name: "elm/border/dialog/default";
 
 group { name: "elm/border/naviframe/default";
    inherit:   "elm/border/dialog/default";
-   images.image: "sym_left_dark_normal.png" COMP;
-   images.image: "sym_left_glow_normal.png" COMP;
-   images.image: "sym_left_light_normal.png" COMP;
    parts {
       image { "close1";
          desc { "default";
-            image.normal: "sym_left_dark_normal.png";
+            image.normal: "i-arrow-l";
          }
          desc { "selected";
-            image.normal: "sym_left_glow_normal.png";
+            image.normal: "i-arrow-l";
          }
       }
       image { "close2"; nomouse;
          clip: "clip2";
          desc { "default";
-            image.normal: "sym_left_light_normal.png";
+            image.normal: "i-arrow-l";
          }
          desc { "selected";
-            image.normal: "sym_left_glow_normal.png";
+            image.normal: "i-arrow-l";
          }
       }
    }
diff --git a/data/elementary/themes/edc/elm/button.edc b/data/elementary/themes/edc/elm/button.edc
index 0e3464df42..6665bd4141 100644
--- a/data/elementary/themes/edc/elm/button.edc
+++ b/data/elementary/themes/edc/elm/button.edc
@@ -627,7 +627,7 @@ group { name: "elm/button/base/colorselector/left/default";
             fixed: 1 1;
             min: 15 15;
             max: 15 15;
-            image.normal: "ic-arrow-l";
+            image.normal: "i-arrow-l";
             color: 160 160 160 255;
          }
       }
@@ -643,7 +643,7 @@ group { name: "elm/button/base/colorselector/right/default";
             fixed: 1 1;
             min: 15 15;
             max: 15 15;
-            image.normal: "ic-arrow-r";
+            image.normal: "i-arrow-r";
             color: 160 160 160 255;
          }
       }
@@ -1178,18 +1178,6 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
 }
 
 /******************* SPINNER BUTTONS STYLES **********************/
-#define IC(_NAME, _ICON) \
-set { name: _NAME; \
-   image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
-   image {image: _ICON"-030.png" COMP; size: 16 16    30    30; } \
-   image {image: _ICON"-015.png" COMP; size:  0  0    15    15; } \
-}
-IC("ic-arrow-l", "arrow-l")
-IC("ic-arrow-r", "arrow-r")
-IC("ic-arrow-u", "arrow-u")
-IC("ic-arrow-d", "arrow-d")
-#undef IC
-
    group { name: "elm/button/base/spinner/increase/default";
       alias: "elm/button/base/spinner/increase/colorselector/default";
       alias: "elm/button/base/spin_button/increase/default";
@@ -1204,7 +1192,7 @@ IC("ic-arrow-d", "arrow-d")
             scale: 1;
             description { state: "default" 0.0;
                FIXED_SIZE(15, 15)
-               image.normal: "ic-arrow-r";
+               image.normal: "i-arrow-r";
                color: 160 160 160 255;
             }
             description { state: "pressed" 0.0;
@@ -1335,13 +1323,13 @@ IC("ic-arrow-d", "arrow-d")
       parts {
          part { name: "arrow.image";
             description { state: "default" 0.0;
-               image.normal: "ic-arrow-l";
+               image.normal: "i-arrow-l";
             }
             description { state: "pressed" 0.0;
-               image.normal: "ic-arrow-l";
+               image.normal: "i-arrow-l";
             }
             description { state: "disabled" 0.0;
-               image.normal: "ic-arrow-l";
+               image.normal: "i-arrow-l";
             }
          }
       }
@@ -1424,13 +1412,13 @@ IC("ic-arrow-d", "arrow-d")
       parts {
          part { name: "arrow.image";
             description { state: "default" 0.0;
-               image.normal: "ic-arrow-u";
+               image.normal: "i-arrow-u";
             }
             description { state: "pressed" 0.0;
-               image.normal: "ic-arrow-u";
+               image.normal: "i-arrow-u";
             }
             description { state: "disabled" 0.0;
-               image.normal: "ic-arrow-u";
+               image.normal: "i-arrow-u";
             }
          }
       }
@@ -1445,13 +1433,13 @@ IC("ic-arrow-d", "arrow-d")
       parts {
          part { name: "arrow.image";
             description { state: "default" 0.0;
-               image.normal: "ic-arrow-d";
+               image.normal: "i-arrow-d";
             }
             description { state: "pressed" 0.0;
-               image.normal: "ic-arrow-d";
+               image.normal: "i-arrow-d";
             }
             description { state: "disabled" 0.0;
-               image.normal: "ic-arrow-d";
+               image.normal: "i-arrow-d";
             }
          }
       }
diff --git a/data/elementary/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc
index 4c3f3b8939..6cdb311c82 100644
--- a/data/elementary/themes/edc/elm/entry.edc
+++ b/data/elementary/themes/edc/elm/entry.edc
@@ -3,7 +3,7 @@ group { name: "elm/scroller/entry/default";
    parts {
       part { name: "bg";
          description { state: "default" 0.0;
-            color: DARK_GREY_BG_COLOR;
+            color: 48 48 48 255;
          }
       }
       part { name: "validation_glow"; type: RECT; mouse_events: 0;
@@ -40,9 +40,8 @@ group { name: "elm/scroller/entry/default";
          insert_before: "elm.swallow.content";
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "bg";
+            rel.to: "bg";
             rel1.relative: 0.0 1.0;
-            rel2.to: "bg";
             rel1.offset: 0 0;
             color: 51 153 255 0;
             visible: 0;
@@ -55,26 +54,27 @@ group { name: "elm/scroller/entry/default";
             visible: 1;
          }
       }
-      program {
-         signal: "elm,action,focus_highlight,show"; source: "elm";
+      program { signal: "elm,action,focus_highlight,show"; source: "elm";
          action: STATE_SET "focused" 0.0;
          transition: DECELERATE 0.3;
          target: "glow";
       }
-      program {
-         signal: "elm,action,focus_highlight,hide"; source: "elm";
+      program { signal: "elm,action,focus_highlight,hide"; source: "elm";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.3;
          target: "glow";
       }
       part { name: "elm.swallow.content";
+         scale: 1;
+         clip_to: "clipper";
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.icon";
+            rel1.to_x: "elm.swallow.icon";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 0;
-            rel2.to: "elm.swallow.end";
+            rel1.offset: 2 2;
+            rel2.to_x: "elm.swallow.end";
             rel2.relative: 0.0 1.0;
-            rel2.offset: -1 -1;
+            rel2.offset: -3 -3;
+            offscale;
          }
       }
       part { name: "elm.swallow.icon"; type: SWALLOW;
@@ -82,10 +82,9 @@ group { name: "elm/scroller/entry/default";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "bg";
-            rel1.offset: 0 2;
-            rel2.to: "bg";
-            rel2.offset: 0 -3;
+            rel.to: "bg";
+            rel1.offset: -1 2;
+            rel2.offset: -1 -3;
             rel2.relative: 0.0 1.0;
             visible: 0;
             align: 0.0 0.5;
@@ -101,13 +100,11 @@ group { name: "elm/scroller/entry/default";
             aspect: 1.0 1.0;
          }
       }
-      program {
-         signal: "elm,action,show,icon"; source: "elm";
+      program { signal: "elm,action,show,icon"; source: "elm";
          action: STATE_SET "visible" 0.0;
          target: "elm.swallow.icon";
       }
-      program {
-         signal: "elm,action,hide,icon"; source: "elm";
+      program { signal: "elm,action,hide,icon"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.icon";
       }
@@ -116,10 +113,9 @@ group { name: "elm/scroller/entry/default";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "bg";
+            rel.to: "bg";
             rel1.offset: 0 2;
             rel1.relative: 1.0 0.0;
-            rel2.to: "bg";
             rel2.offset: 0 -3;
             visible: 0;
             align: 1.0 0.5;
@@ -135,13 +131,11 @@ group { name: "elm/scroller/entry/default";
             aspect: 1.0 1.0;
          }
       }
-      program {
-         signal: "elm,action,show,end"; source: "elm";
+      program { signal: "elm,action,show,end"; source: "elm";
          action: STATE_SET "visible" 0.0;
          target: "elm.swallow.end";
       }
-      program {
-         signal: "elm,action,hide,end"; source: "elm";
+      program { signal: "elm,action,hide,end"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.end";
       }
@@ -201,10 +195,8 @@ group { name: "elm/scroller/entry_single/default";
       }
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.background";
-            rel2.to: "elm.swallow.background";
-            color: DARK_GREY_BG_COLOR;
-            color_class: "scroller_bg";
+            rel.to: "elm.swallow.background";
+            color: 48 48 48 255;
          }
       }
       part { name: "elm.swallow.background"; type: SWALLOW;
@@ -226,9 +218,8 @@ group { name: "elm/scroller/entry_single/default";
       part { name: "glow"; type: RECT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "bg";
+            rel.to: "bg";
             rel1.relative: 0.0 1.0;
-            rel2.to: "bg";
             rel1.offset: 0 0;
             color: 51 153 255 0;
             visible: 0;
@@ -241,14 +232,12 @@ group { name: "elm/scroller/entry_single/default";
             visible: 1;
          }
       }
-      program {
-         signal: "elm,action,focus_highlight,show"; source: "elm";
+      program { signal: "elm,action,focus_highlight,show"; source: "elm";
          action: STATE_SET "focused" 0.0;
          transition: DECELERATE 0.2;
          target: "glow";
       }
-      program {
-         signal: "elm,action,focus_highlight,hide"; source: "elm";
+      program { signal: "elm,action,focus_highlight,hide"; source: "elm";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.2;
          target: "glow";
@@ -271,6 +260,7 @@ group { name: "elm/scroller/entry_single/default";
          scale: 1;
          clip_to: "clipper";
          description { state: "default" 0.0;
+            fixed: 1 1;
             rel2.relative: 0.0 1.0;
             rel1.offset: -1 2;
             rel2.offset: -1 -3;
@@ -288,13 +278,11 @@ group { name: "elm/scroller/entry_single/default";
             aspect: 1.0 1.0;
          }
       }
-      program {
-         signal: "elm,action,show,icon"; source: "elm";
+      program { signal: "elm,action,show,icon"; source: "elm";
          action: STATE_SET "visible" 0.0;
          target: "elm.swallow.icon";
       }
-      program {
-         signal: "elm,action,hide,icon"; source: "elm";
+      program { signal: "elm,action,hide,icon"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.icon";
       }
@@ -303,6 +291,7 @@ group { name: "elm/scroller/entry_single/default";
          scale: 1;
          clip_to: "clipper";
          description { state: "default" 0.0;
+            fixed: 1 1;
             rel1.relative: 1.0 0.0;
             rel1.offset: 0 2;
             rel2.offset: 0 -3;
@@ -320,13 +309,11 @@ group { name: "elm/scroller/entry_single/default";
             aspect: 1.0 1.0;
          }
       }
-      program {
-         signal: "elm,action,show,end"; source: "elm";
+      program { signal: "elm,action,show,end"; source: "elm";
          action: STATE_SET "visible" 0.0;
          target: "elm.swallow.end";
       }
-      program {
-         signal: "elm,action,hide,end"; source: "elm";
+      program { signal: "elm,action,hide,end"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.end";
       }
diff --git a/data/elementary/themes/edc/elm/gengrid.edc b/data/elementary/themes/edc/elm/gengrid.edc
index ecf71e6cbc..055f213bee 100644
--- a/data/elementary/themes/edc/elm/gengrid.edc
+++ b/data/elementary/themes/edc/elm/gengrid.edc
@@ -473,7 +473,7 @@ group { name: "elm/gengrid/item/album-preview/default";
          description { state: "default" 0.0;
             aspect: 1.0 1.0; aspect_preference: BOTH;
             rel.to: "icon_area";
-            image.normal: "efm_folder_icon";
+            image.normal: "i-folder";
          }
       }
       part { name: "elm.swallow.icon.1"; type: SWALLOW; mouse_events: 0;
diff --git a/data/elementary/themes/edc/elm/panel.edc b/data/elementary/themes/edc/elm/panel.edc
index 9968d9567a..cf153ffc21 100644
--- a/data/elementary/themes/edc/elm/panel.edc
+++ b/data/elementary/themes/edc/elm/panel.edc
@@ -361,20 +361,6 @@ group { name: "elm/scroller/panel/bottom/default";
    }
 }
 
-#define IC(_NAME, _ICON) \
-   set { name: _NAME; \
-      image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
-      image {image: _ICON"-030.png" COMP; size: 16 16    30    30; } \
-      image {image: _ICON"-015.png" COMP; size:  0  0    15    15; } \
-   }
-IC("ic-arrow-l", "arrow-l")
-IC("ic-arrow-r", "arrow-r")
-IC("ic-arrow-u", "arrow-u")
-IC("ic-arrow-d", "arrow-d")
-IC("ic-reload", "reload")
-IC("ic-heart", "heart")
-#undef IC
-
 group { name: "elm/panel/left/default";
    data.item: "focus_highlight" "on";
    script {
@@ -456,11 +442,11 @@ group { name: "elm/panel/left/default";
             fixed: 1 1;
             min: 30 30; max: 30 30;
             rel.to: "btn";
-            image.normal: "ic-arrow-l";
+            image.normal: "i-arrow-l";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
-            image.normal: "ic-arrow-r";
+            image.normal: "i-arrow-r";
          }
       }
    }
@@ -631,10 +617,10 @@ group { name: "elm/panel/right/default";
       }
       part { name: "icn";
          description { state: "default" 0.0;
-            image.normal: "ic-arrow-r";
+            image.normal: "i-arrow-r";
          }
          description { state: "hidden" 0.0;
-            image.normal: "ic-arrow-l";
+            image.normal: "i-arrow-l";
          }
       }
    }
@@ -681,10 +667,10 @@ group { name: "elm/panel/top/default";
       }
       part { name: "icn";
          description { state: "default" 0.0;
-            image.normal: "ic-arrow-u";
+            image.normal: "i-arrow-u";
          }
          description { state: "hidden" 0.0;
-            image.normal: "ic-arrow-d";
+            image.normal: "i-arrow-d";
          }
       }
    }
@@ -765,10 +751,10 @@ group { name: "elm/panel/bottom/default";
       }
       part { name: "icn";
          description { state: "default" 0.0;
-            image.normal: "ic-arrow-d";
+            image.normal: "i-arrow-d";
          }
          description { state: "hidden" 0.0;
-            image.normal: "ic-arrow-u";
+            image.normal: "i-arrow-u";
          }
       }
    }
diff --git a/data/elementary/themes/edc/elm/pointer.edc b/data/elementary/themes/edc/elm/pointer.edc
index 26336b1440..350786e190 100644
--- a/data/elementary/themes/edc/elm/pointer.edc
+++ b/data/elementary/themes/edc/elm/pointer.edc
@@ -3,11 +3,10 @@ group { name: "elm/pointer/base/default";
       image: "pointer.png" COMP;
    }
    parts {
-      part {
-         name: "base";
+      part { name: "base";
          mouse_events: 0;
-         description {
-            state: "default" 0.0;
+         scale: 1;
+         description { state: "default" 0.0;
             aspect: 1.0 1.0;
             min: 32 32;
             /* force a specific aspect ratio so
@@ -22,45 +21,36 @@ group { name: "elm/pointer/base/default";
             }
          }
       }
-      part {
-         name: "elm.swallow.hotspot";
+      part { name: "elm.swallow.hotspot"; type: SWALLOW;
          /* this is a "fake" swallow part
           * that is used by e to determine
           * the pointer hotspot - or where
           * the actual mouse events get
           * reported from on the cursor */
-         type: SWALLOW;
-         description {
-            state: "default" 0.0;
+         description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1 {
+            rel1 { to: "base";
                /* the hotspot will scale with the cursor here */
-               to: "base";
                relative: 0.1875 0.1875;
                offset: 0 0;
             }
-            rel2 {
-               to: "base";
+            rel2 { to: "base";
                relative: 0.1875 0.1875;
                offset: 0 0;
             }
          }
       }
    }
-   programs {
-   }
 }
 
 group { name: "elm/pointer/base/bottom_right_corner";
    inherit: "elm/pointer/base/default";
-   images.image: "mini_box_glow.png" COMP;
    parts {
-      part { name: "box";
+      part { name: "box"; type: RECT;
          insert_after: "base";
          description { state: "default" 0.0;
-            image.normal: "mini_box_glow.png";
-            image.border: 7 7 7 7;
+            color: 51 153 255 192;
             rel1.relative: 0.3 0.3;
             rel2.relative: 0.7 0.7;
          }
@@ -202,13 +192,11 @@ group { name: "elm/pointer/base/right_side";
 
 group { name: "elm/pointer/base/hand1";
    inherit: "elm/pointer/base/default";
-   images.image: "mini_box_glow.png" COMP;
    parts {
-      part { name: "box";
+      part { name: "box"; type: RECT;
          insert_after: "base";
          description { state: "default" 0.0;
-            image.normal: "mini_box_glow.png";
-            image.border: 7 7 7 7;
+            color: 51 153 255 192;
             rel1.relative: 0.5 0.5;
             rel2.relative: 1.0 1.0;
          }
@@ -277,13 +265,11 @@ group { name: "elm/pointer/base/move";
 
 group { name: "elm/pointer/base/rotate";
    inherit: "elm/pointer/base/default";
-   images.image: "mini_box_glow.png" COMP;
    parts {
-      part { name: "box";
+      part { name: "box"; type: RECT;
          insert_after: "base";
          description { state: "default" 0.0;
-            image.normal: "mini_box_glow.png";
-            image.border: 7 7 7 7;
+            color: 51 153 255 192;
             rel1.relative: 0.3 0.3;
             rel2.relative: 0.8 0.8;
             map.on: 1;
@@ -361,39 +347,26 @@ group { name: "elm/pointer/base/plus";
 }
 
 group { name: "elm/pointer/base/xterm";
-   images.image: "therm_base.png" COMP;
-   images.image: "led_dot_white.png" COMP;
+   images.image: "pointer_entry.png" COMP;
    parts {
       part { name: "base";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "therm_base.png";
-            max: 15 99999;
-            min: 15 20;
-            image.normal: "therm_base.png";
-            image.border: 0 0 10 10;
-            rel1.offset: 0 2;
-            rel2.offset: -1 -3;
+            image.normal: "pointer_entry.png";
+            aspect: (44/88) (44/88); aspect_preference: VERTICAL;
+            FIXED_SIZE(32, 32)
          }
       }
       part { name: "elm.swallow.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
             fixed: 1 1;
             visible: 0;
-            rel1.relative: 0.5 0.5;
             rel1.to: "base";
+            rel1.relative: 0.5 0.5;
             rel2.to: "base";
             rel2.relative: 0.5 0.5;
             rel2.offset: 0 0;
         }
       }
-      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/toolbar.edc b/data/elementary/themes/edc/elm/toolbar.edc
index b9ca677492..dbda5b9ff8 100644
--- a/data/elementary/themes/edc/elm/toolbar.edc
+++ b/data/elementary/themes/edc/elm/toolbar.edc
@@ -1,18 +1,4 @@
 // === toolbar default base with scrolling arrows etc.
-#define IC(_NAME, _ICON) \
-set { name: _NAME; \
-image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
-image {image: _ICON"-030.png" COMP; size: 16 16    30    30; } \
-image {image: _ICON"-015.png" COMP; size:  0  0    15    15; } \
-}
-IC("ic-arrow-l", "arrow-l")
-IC("ic-arrow-r", "arrow-r")
-IC("ic-arrow-u", "arrow-u")
-IC("ic-arrow-d", "arrow-d")
-IC("ic-reload", "reload")
-IC("ic-heart", "heart")
-#undef IC
-
 group { name: "elm/toolbar/base/default";
    parts {
       part { name: "base"; type: RECT;
@@ -61,7 +47,7 @@ group { name: "elm/toolbar/base/default";
          description { state: "default" 0.0;
             fixed: 1 1;
             rel.to: "arrow_l_ev";
-            image.normal: "ic-arrow-l";
+            image.normal: "i-arrow-l";
             FIXED_SIZE(15, 15)
             color: 160 160 160 255;
          }
@@ -101,7 +87,7 @@ group { name: "elm/toolbar/base/default";
          description { state: "default" 0.0;
             fixed: 1 1;
             rel.to: "arrow_r_ev";
-            image.normal: "ic-arrow-r";
+            image.normal: "i-arrow-r";
             FIXED_SIZE(15, 15)
             color: 160 160 160 255;
          }
@@ -141,7 +127,7 @@ group { name: "elm/toolbar/base/default";
          description { state: "default" 0.0;
             fixed: 1 1;
             rel.to: "arrow_u_ev";
-            image.normal: "ic-arrow-u";
+            image.normal: "i-arrow-u";
             FIXED_SIZE(15, 15)
             color: 160 160 160 255;
          }
@@ -181,7 +167,7 @@ group { name: "elm/toolbar/base/default";
          description { state: "default" 0.0;
             fixed: 1 1;
             rel.to: "arrow_d_ev";
-            image.normal: "ic-arrow-d";
+            image.normal: "i-arrow-d";
             FIXED_SIZE(15, 15)
             color: 160 160 160 255;
          }