diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc
index a6f908d44..620b18f37 100644
--- a/data/themes/default_icons.edc
+++ b/data/themes/default_icons.edc
@@ -16,6 +16,8 @@ images {
    
    image: "e17_icon_configuration.png" LOSSY 90;
    image: "e17_icon_run.png" LOSSY 90;
+   image: "e17_icon_system.png" LOSSY 90;
+   image: "e17_icon_directories.png" LOSSY 90;
 
    image: "e17_icon_font.png" LOSSY 90;
    image: "e17_icon_background.png" LOSSY 90;
@@ -429,6 +431,25 @@ group {
       }
    }
 }
+group {
+   name: "e/icons/enlightenment/system";
+   max:  64 64;
+   parts {
+      part {
+     name:          "icon";
+     mouse_events:  0;
+     description {
+        state:    "default" 0.0;
+        aspect:   1.0 1.0;
+        aspect_preference: BOTH;
+        max:      64 64;
+        image {
+           normal: "e17_icon_system.png";
+        }
+     }
+      }
+   }
+}
 group {
    name: "e/icons/enlightenment/run";
    max:  64 64;
@@ -448,6 +469,25 @@ group {
       }
    }
 }
+group {
+   name: "e/icons/enlightenment/directories";
+   max:  64 64;
+   parts {
+      part {
+     name:          "icon";
+     mouse_events:  0;
+     description {
+        state:    "default" 0.0;
+        aspect:   1.0 1.0;
+        aspect_preference: BOTH;
+        max:      64 64;
+        image {
+           normal: "e17_icon_directories.png";
+        }
+     }
+      }
+   }
+}
 group {
    name: "e/icons/enlightenment/fileman";
    max:  64 64;
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index cf9e30285..f0cb932e2 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -317,12 +317,14 @@ e17_winlist_bottom.png \
 e17_pager_window_shaded.png \
 e17_transition_vswipe_gap.png \
 e17_icon_configuration.png \
+e17_icon_system.png \
 e17_icon_desktop.png \
 e17_icon_e_0.png \
 e17_icon_e_glow_0.png \
 e17_icon_favorites.png \
 e17_icon_module.png \
 e17_icon_run.png \
+e17_icon_directories.png \
 e17_icon_theme.png \
 e17_icon_windows.png \
 e17_icon_window_focus.png \
diff --git a/data/themes/images/e17_icon_desklock.png b/data/themes/images/e17_icon_desklock.png
index c49122032..5abe7e259 100644
Binary files a/data/themes/images/e17_icon_desklock.png and b/data/themes/images/e17_icon_desklock.png differ
diff --git a/data/themes/images/e17_icon_directories.png b/data/themes/images/e17_icon_directories.png
new file mode 100644
index 000000000..cdd5a60d9
Binary files /dev/null and b/data/themes/images/e17_icon_directories.png differ