diff --git a/data/icons/dialog-information.png b/data/icons/dialog-information.png
new file mode 100644
index 0000000..10f3aa3
Binary files /dev/null and b/data/icons/dialog-information.png differ
diff --git a/data/icons/dialog-question.png b/data/icons/dialog-question.png
new file mode 100644
index 0000000..29f90c2
Binary files /dev/null and b/data/icons/dialog-question.png differ
diff --git a/data/icons/document-save-as.png b/data/icons/document-save-as.png
new file mode 100644
index 0000000..67c38ee
Binary files /dev/null and b/data/icons/document-save-as.png differ
diff --git a/data/icons/empty.png b/data/icons/empty.png
new file mode 100644
index 0000000..9f7655a
Binary files /dev/null and b/data/icons/empty.png differ
diff --git a/data/icons/folder.png b/data/icons/folder.png
index 2bee581..a8ffeb0 100644
Binary files a/data/icons/folder.png and b/data/icons/folder.png differ
diff --git a/data/icons/go-down.png b/data/icons/go-down.png
index 305b79e..018c58b 100644
Binary files a/data/icons/go-down.png and b/data/icons/go-down.png differ
diff --git a/data/icons/go-up.png b/data/icons/go-up.png
index 7ee536c..9131ae8 100644
Binary files a/data/icons/go-up.png and b/data/icons/go-up.png differ
diff --git a/data/icons/image-x-generic.png b/data/icons/image-x-generic.png
new file mode 100644
index 0000000..c9de245
Binary files /dev/null and b/data/icons/image-x-generic.png differ
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 5984e21..cbbcfbc 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -10,7 +10,10 @@ install_data(['document-new.png', 'window-close.png', 'window-close.png',
               'object-flip-horizontal.png', 'object-flip-vertical.png',
               'edit-clear.png','applications-electronics.png', 'mail-send.png',
               'dialog-error.png', 'go-home.png', 'network-server.png',
-              'edit-delete.png',
+              'edit-delete.png', 'text-x-generic.png', 'text-x-csrc.png',
+              'image-x-generic.png', 'empty.png',
+              'document-save-as.png', 'dialog-question.png', 'dialog-error.png',
+              'dialog-information.png',
              ],
              install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'edi', 'icons')
 )
diff --git a/data/icons/text-x-csrc.png b/data/icons/text-x-csrc.png
new file mode 100644
index 0000000..9d94aaa
Binary files /dev/null and b/data/icons/text-x-csrc.png differ
diff --git a/data/icons/text-x-generic.png b/data/icons/text-x-generic.png
new file mode 100644
index 0000000..116e32e
Binary files /dev/null and b/data/icons/text-x-generic.png differ
diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index 020cce8..5a02c2f 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -95,17 +95,17 @@ _icon_status(Edi_Scm_Status_Code code, Eina_Bool *staged)
            *staged = EINA_TRUE;
            return NULL;
         case EDI_SCM_STATUS_ADDED:
-           return "document-new";
+           return edi_theme_icon_path_get("document-new");
         case EDI_SCM_STATUS_ADDED_STAGED:
            *staged = EINA_TRUE;
-           return "document-new";
+           return edi_theme_icon_path_get("document-new");
         case EDI_SCM_STATUS_MODIFIED:
-           return "document-save-as";
+           return edi_theme_icon_path_get("document-save-as");
         case EDI_SCM_STATUS_MODIFIED_STAGED:
            *staged = EINA_TRUE;
-           return "document-save-as";
+           return edi_theme_icon_path_get("document-save-as");
         case EDI_SCM_STATUS_UNTRACKED:
-           return "dialog-question";
+           return edi_theme_icon_path_get("dialog-question");
      }
 
    return NULL;
@@ -461,7 +461,7 @@ _item_menu_filetype_create(Evas_Object *menu, Elm_Object_Item *parent, const cha
    if (!provider)
      return;
 
-   elm_menu_item_add(menu, parent, provider->icon, provider->id, func, sd);
+   elm_menu_item_add(menu, parent, edi_theme_icon_path_get(provider->icon), provider->id, func, sd);
 }
 
 static void
@@ -722,9 +722,9 @@ _content_get(void *data, Evas_Object *obj, const char *source)
 
    provider = _get_provider_from_hashset(sd->path);
    if (provider)
-     icon_name = provider->icon;
+     icon_name = edi_theme_icon_path_get(provider->icon);
    else
-     icon_name = "empty";
+     icon_name = edi_theme_icon_path_get("empty");
 
    box = elm_box_add(obj);
    elm_box_horizontal_set(box, EINA_TRUE);
@@ -767,7 +767,7 @@ _content_get(void *data, Evas_Object *obj, const char *source)
         if (staged)
           {
              ic = elm_icon_add(mbox);
-             elm_icon_standard_set(ic, "dialog-information");
+             elm_icon_standard_set(ic, edi_theme_icon_path_get("dialog-information"));
              evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(16), ELM_SCALE_SIZE(16));
              evas_object_show(ic);
              elm_box_pack_end(rbox, ic);
@@ -777,7 +777,7 @@ _content_get(void *data, Evas_Object *obj, const char *source)
         else
           {
              ic = elm_icon_add(mbox);
-             elm_icon_standard_set(ic, "dialog-error");
+             elm_icon_standard_set(ic, edi_theme_icon_path_get("dialog-error"));
              evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(16), ELM_SCALE_SIZE(16));
              evas_object_show(ic);
              elm_box_pack_end(rbox, ic);