diff --git a/ecdb/trunk/data/themes/default/images/audio.png b/ecdb/trunk/data/themes/default/images/audio.png
new file mode 100644
index 0000000..0e68ace
Binary files /dev/null and b/ecdb/trunk/data/themes/default/images/audio.png differ
diff --git a/ecdb/trunk/data/themes/default/images/clear.png b/ecdb/trunk/data/themes/default/images/clear.png
new file mode 100644
index 0000000..5542948
Binary files /dev/null and b/ecdb/trunk/data/themes/default/images/clear.png differ
diff --git a/ecdb/trunk/data/themes/default/images/drive_optical.png b/ecdb/trunk/data/themes/default/images/drive_optical.png
new file mode 100644
index 0000000..bf2e8c8
Binary files /dev/null and b/ecdb/trunk/data/themes/default/images/drive_optical.png differ
diff --git a/ecdb/trunk/data/themes/default/images/images.edc b/ecdb/trunk/data/themes/default/images/images.edc
index fbc8122..923e521 100644
--- a/ecdb/trunk/data/themes/default/images/images.edc
+++ b/ecdb/trunk/data/themes/default/images/images.edc
@@ -7,4 +7,8 @@ images {
 	image: "button_shadow.png" COMP;
 	image: "button_shadow_overlay.png" COMP;
 	image: "button.png" COMP;
+	image: "drive_optical.png" COMP;
+	image: "audio.png" COMP;
+	image: "clear.png" COMP;
+	image: "iso.png" COMP;
 }
diff --git a/ecdb/trunk/data/themes/default/images/iso.png b/ecdb/trunk/data/themes/default/images/iso.png
new file mode 100644
index 0000000..db5c52b
Binary files /dev/null and b/ecdb/trunk/data/themes/default/images/iso.png differ
diff --git a/ecdb/trunk/src/ecdb_gui.c b/ecdb/trunk/src/ecdb_gui.c
index 866c77a..a01a223 100644
--- a/ecdb/trunk/src/ecdb_gui.c
+++ b/ecdb/trunk/src/ecdb_gui.c
@@ -241,7 +241,7 @@ ecdb_set_main_theme(const char *theme_name, const char *group)
 						"/themes/default.edj", group))
 		{
 			printf("Error setting default theme: %s\n",
-					PACKAGE_DATA_DIR"/themes/default/edj");
+					PACKAGE_DATA_DIR"/themes/default.edj");
 			return;
 		}
 		evas_font_path_append(ecore_evas_get(em->main_win_ee),
diff --git a/ecdb/trunk/src/ecdb_misc.c b/ecdb/trunk/src/ecdb_misc.c
index 7407446..3fbae40 100644
--- a/ecdb/trunk/src/ecdb_misc.c
+++ b/ecdb/trunk/src/ecdb_misc.c
@@ -123,3 +123,17 @@ ecdb_strip_next_argument(const char *strip)
 	return NULL;
 }
 
+void
+ecdb_button_icon_swallow(Evas *e, Evas_Object *b, const char *iname)
+{
+	Evas_Object *icon;
+
+	icon = evas_object_image_add(e);
+
+	/* FIXME WRONG HERE */
+	evas_object_image_file_set(icon, PACKAGE_DATA_DIR"/themes/default.edj",
+								iname);
+	edje_object_part_swallow(b, "icon", icon);
+}
+
+
diff --git a/ecdb/trunk/src/ecdb_misc.h b/ecdb/trunk/src/ecdb_misc.h
index 06537ab..eb9e9ee 100644
--- a/ecdb/trunk/src/ecdb_misc.h
+++ b/ecdb/trunk/src/ecdb_misc.h
@@ -13,4 +13,6 @@ int 		 ecdb_image_init(void);
 /* This is misc after all */
 int		 ecdb_match_keyword(const char *chk, const char *key, int len);
 char		*ecdb_strip_next_argument(const char *strip);
+void		 ecdb_button_icon_swallow(Evas *e, Evas_Object *b,
+							const char *iname);
 #endif