From b7d5b235a25be8f424f11e423c0ea575788fe269 Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Mon, 10 Aug 2020 10:18:34 +0100
Subject: [PATCH] TH - more icons...

---
 data/elementary/themes/edc/O/icons.edc | 8 --------
 data/elementary/themes/edc/elm/win.edc | 6 ++++--
 data/elementary/themes/edc/icons.edc   | 8 ++++++++
 data/elementary/themes/ic.edc          | 2 ++
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/data/elementary/themes/edc/O/icons.edc b/data/elementary/themes/edc/O/icons.edc
index 4fe85b1056..8342ae6e14 100644
--- a/data/elementary/themes/edc/O/icons.edc
+++ b/data/elementary/themes/edc/O/icons.edc
@@ -35,13 +35,6 @@
     * 3. Try to follow the naming convention
     */
    //Standard Action Icons
-   ICON("list-add","icon_add.png",64)                              // "widget/add"
-   ICON("list-remove","icon_del.png",64)                           // "widget/del"
-   ICON("go-up","icon_up_arrow.png",64)                            // "widget/up_arrow" "widget/up_dir"
-   ICON("go-down","icon_down_arrow.png",64)                        // "widget/down_arrow"
-   ICON("go-next","icon_right_arrow.png",64)                       // "widget/new_dialog"
-   ICON("go-previous","icon_left_arrow.png",64)                    // none
-   ICON("bookmark-new","icon_add_fav.png",64)                      // "widget/add_fav"
    ICON("edit-swap","icon_swap.png",64)                     // *** // "widget/swap"
    ICON("edit-copy","icon_efm_copy.png",16)                        // EFMBUTTON("copy"
    ICON("edit-cut","icon_efm_cut.png",16)                          // EFMBUTTON("cut"
@@ -102,7 +95,6 @@
    ICON("preferences-screen-vflip","icon_screen_vflip.png",64)   // *** // "enlightenment/screen_vflip"
    ICON("preferences-screen-hflip","icon_screen_hflip.png",64)   // *** // "enlightenment/screen_hflip"
    ICON("preferences-applications-add","icon_applications_new.png",64)         // *** // "enlightenment/add_application"
-   ICON("preferences-preferences","icon_config.png",64)                             // "enlightenment/configuration" "enlightenment/settings"
    ICON("preferences-illume","icon_illume.png",64)
    //Standard Module Category Icons 
    ICON("modules-utils","icon_gadget.png",64)
diff --git a/data/elementary/themes/edc/elm/win.edc b/data/elementary/themes/edc/elm/win.edc
index 364b744b3e..ba84eedd7c 100644
--- a/data/elementary/themes/edc/elm/win.edc
+++ b/data/elementary/themes/edc/elm/win.edc
@@ -6,15 +6,17 @@ group { name: "elm/win/base/default";
       swallow { "elm.swallow.menu";
          clip_to: "client_clip";
          desc { "default";
+            rel1.offset: 0 -1;
             rel2.relative: 1 0;
             align: 0.5 0.0;
             hid;
             link.base: "elm,action,hide" "elm";
-            min: 0 80;
+            min: 0 20;
          }
          desc { "visible";
             inherit: "default";
-            align: 0.5 0.0;
+            rel1.offset: 0 0;
+            rel2.offset: -1 0;
             fixed: 0 1;
             vis;
             link.base: "elm,action,show_menu" "elm";
diff --git a/data/elementary/themes/edc/icons.edc b/data/elementary/themes/edc/icons.edc
index 664c5b2eff..256cbea63b 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -95,6 +95,7 @@
    ICON("preferences-pager", "i-pager")
    ICON("preferences-network", "i-network")
    ICON("preferences-file-icons", "i-file")
+   ICON("preferences-preferences", "i-gear")
    ICON("modules-launcher", "i-gear-start")
    ICON("everything-launch", "i-gear-start")
    ICON("enlightenment/wallpaper_stretch", "i-fill-stretch")
@@ -103,6 +104,7 @@
    ICON("enlightenment/wallpaper_scale_aspect_in", "i-fill-within")
    ICON("enlightenment/wallpaper_scale_aspect_out", "i-fill-fill")
    ICON("enlightenment/wallpaper_pan",  "i-fill-pan")
+   ICON("bookmark-new", "i-favorite")
 #undef ICON
 
 // mono color default fg color icons
@@ -129,6 +131,12 @@
    ICON("application-exit", "i-system-logout")
    ICON("enlightenment", "i-enlightenment")
    ICON("help-about", "i-enlightenment")
+   ICON("go-up", "i-arrow-u")
+   ICON("go-down", "i-arrow-d")
+   ICON("go-next", "i-arrow-l")
+   ICON("go-previous", "i-arrow-r")
+   ICON("list-add", "i-plus")
+   ICON("list-remove", "i-minus")
 #undef ICON
 
 // mono border action icons
diff --git a/data/elementary/themes/ic.edc b/data/elementary/themes/ic.edc
index 1a3b8e9edc..2813b4a597 100644
--- a/data/elementary/themes/ic.edc
+++ b/data/elementary/themes/ic.edc
@@ -48,6 +48,8 @@ I060("i-skip-taskbar", "skip-taskbar")
 I060("i-skip-winlist", "skip-winlist")
 I060("i-border", "border")
 I060("i-sendto", "sendto")
+I060("i-minus", "minus")
+I060("i-plus", "plus")
 // lock double
 // exclam
 // folder