diff --git a/Makefile b/Makefile
index 145fc39..2298c31 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,18 @@ dist:
 		$(PACKAGE)-$(VERSION)/src/plugins/smscrypt.c \
 		$(PACKAGE)-$(VERSION)/src/plugins/Makefile \
 		$(PACKAGE)-$(VERSION)/src/plugins/project.conf \
+		$(PACKAGE)-$(VERSION)/src/plugins/16x16/Makefile \
+		$(PACKAGE)-$(VERSION)/src/plugins/16x16/phone-openmoko.png \
+		$(PACKAGE)-$(VERSION)/src/plugins/16x16/project.conf \
+		$(PACKAGE)-$(VERSION)/src/plugins/24x24/Makefile \
+		$(PACKAGE)-$(VERSION)/src/plugins/24x24/phone-openmoko.png \
+		$(PACKAGE)-$(VERSION)/src/plugins/24x24/project.conf \
+		$(PACKAGE)-$(VERSION)/src/plugins/32x32/Makefile \
+		$(PACKAGE)-$(VERSION)/src/plugins/32x32/phone-openmoko.png \
+		$(PACKAGE)-$(VERSION)/src/plugins/32x32/project.conf \
+		$(PACKAGE)-$(VERSION)/src/plugins/48x48/Makefile \
+		$(PACKAGE)-$(VERSION)/src/plugins/48x48/phone-openmoko.png \
+		$(PACKAGE)-$(VERSION)/src/plugins/48x48/project.conf \
 		$(PACKAGE)-$(VERSION)/tools/engineering.c \
 		$(PACKAGE)-$(VERSION)/tools/pdu.c \
 		$(PACKAGE)-$(VERSION)/tools/smscrypt.c \
diff --git a/src/plugins/16x16/Makefile b/src/plugins/16x16/Makefile
new file mode 100644
index 0000000..725cfaa
--- /dev/null
+++ b/src/plugins/16x16/Makefile
@@ -0,0 +1,21 @@
+PREFIX	= /usr/local
+DESTDIR	= 
+MKDIR	= mkdir -p
+INSTALL	= install
+RM	= rm -f
+
+
+all:
+
+clean:
+
+distclean: clean
+
+install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
+	$(INSTALL) -m 0644 -- phone-openmoko.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-openmoko.png
+
+uninstall:
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-openmoko.png
+
+.PHONY: all clean distclean install uninstall
diff --git a/src/plugins/16x16/phone-openmoko.png b/src/plugins/16x16/phone-openmoko.png
new file mode 100644
index 0000000..0be573f
Binary files /dev/null and b/src/plugins/16x16/phone-openmoko.png differ
diff --git a/src/plugins/16x16/project.conf b/src/plugins/16x16/project.conf
new file mode 100644
index 0000000..799af87
--- /dev/null
+++ b/src/plugins/16x16/project.conf
@@ -0,0 +1,4 @@
+dist=Makefile,phone-openmoko.png
+
+[phone-openmoko.png]
+install=$(PREFIX)/share/icons/hicolor/16x16/apps
diff --git a/src/plugins/24x24/Makefile b/src/plugins/24x24/Makefile
new file mode 100644
index 0000000..34fe8eb
--- /dev/null
+++ b/src/plugins/24x24/Makefile
@@ -0,0 +1,21 @@
+PREFIX	= /usr/local
+DESTDIR	= 
+MKDIR	= mkdir -p
+INSTALL	= install
+RM	= rm -f
+
+
+all:
+
+clean:
+
+distclean: clean
+
+install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps
+	$(INSTALL) -m 0644 -- phone-openmoko.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-openmoko.png
+
+uninstall:
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-openmoko.png
+
+.PHONY: all clean distclean install uninstall
diff --git a/src/plugins/24x24/phone-openmoko.png b/src/plugins/24x24/phone-openmoko.png
new file mode 100644
index 0000000..f0d219f
Binary files /dev/null and b/src/plugins/24x24/phone-openmoko.png differ
diff --git a/src/plugins/24x24/project.conf b/src/plugins/24x24/project.conf
new file mode 100644
index 0000000..87c7e4e
--- /dev/null
+++ b/src/plugins/24x24/project.conf
@@ -0,0 +1,4 @@
+dist=Makefile,phone-openmoko.png
+
+[phone-openmoko.png]
+install=$(PREFIX)/share/icons/hicolor/24x24/apps
diff --git a/src/plugins/32x32/Makefile b/src/plugins/32x32/Makefile
new file mode 100644
index 0000000..fa53749
--- /dev/null
+++ b/src/plugins/32x32/Makefile
@@ -0,0 +1,21 @@
+PREFIX	= /usr/local
+DESTDIR	= 
+MKDIR	= mkdir -p
+INSTALL	= install
+RM	= rm -f
+
+
+all:
+
+clean:
+
+distclean: clean
+
+install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps
+	$(INSTALL) -m 0644 -- phone-openmoko.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-openmoko.png
+
+uninstall:
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-openmoko.png
+
+.PHONY: all clean distclean install uninstall
diff --git a/src/plugins/32x32/phone-openmoko.png b/src/plugins/32x32/phone-openmoko.png
new file mode 100644
index 0000000..945bb91
Binary files /dev/null and b/src/plugins/32x32/phone-openmoko.png differ
diff --git a/src/plugins/32x32/project.conf b/src/plugins/32x32/project.conf
new file mode 100644
index 0000000..dd39c6c
--- /dev/null
+++ b/src/plugins/32x32/project.conf
@@ -0,0 +1,4 @@
+dist=Makefile,phone-openmoko.png
+
+[phone-openmoko.png]
+install=$(PREFIX)/share/icons/hicolor/32x32/apps
diff --git a/src/plugins/48x48/Makefile b/src/plugins/48x48/Makefile
new file mode 100644
index 0000000..36309aa
--- /dev/null
+++ b/src/plugins/48x48/Makefile
@@ -0,0 +1,21 @@
+PREFIX	= /usr/local
+DESTDIR	= 
+MKDIR	= mkdir -p
+INSTALL	= install
+RM	= rm -f
+
+
+all:
+
+clean:
+
+distclean: clean
+
+install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
+	$(INSTALL) -m 0644 -- phone-openmoko.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-openmoko.png
+
+uninstall:
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-openmoko.png
+
+.PHONY: all clean distclean install uninstall
diff --git a/src/plugins/48x48/phone-openmoko.png b/src/plugins/48x48/phone-openmoko.png
new file mode 100644
index 0000000..f324a9a
Binary files /dev/null and b/src/plugins/48x48/phone-openmoko.png differ
diff --git a/src/plugins/48x48/project.conf b/src/plugins/48x48/project.conf
new file mode 100644
index 0000000..512c3fd
--- /dev/null
+++ b/src/plugins/48x48/project.conf
@@ -0,0 +1,4 @@
+dist=Makefile,phone-openmoko.png
+
+[phone-openmoko.png]
+install=$(PREFIX)/share/icons/hicolor/48x48/apps
diff --git a/src/plugins/Makefile b/src/plugins/Makefile
index d28ba4d..c150e2d 100644
--- a/src/plugins/Makefile
+++ b/src/plugins/Makefile
@@ -1,3 +1,4 @@
+SUBDIRS	= 16x16 24x24 32x32 48x48
 TARGETS	= blacklist.so debug.so engineering.so gprs.so openmoko.so oss.so panel.so profiles.so smscrypt.so
 PREFIX	= /usr/local
 DESTDIR	= 
@@ -16,7 +17,10 @@ MKDIR	= mkdir -p
 INSTALL	= install
 
 
-all: $(TARGETS)
+all: subdirs $(TARGETS)
+
+subdirs:
+	@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
 
 blacklist_OBJS = blacklist.o
 blacklist_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
@@ -109,12 +113,16 @@ smscrypt.o: smscrypt.c ../../include/Phone.h
 	$(CC) $(smscrypt_CFLAGS) -c smscrypt.c
 
 clean:
+	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done
 	$(RM) -- $(blacklist_OBJS) $(debug_OBJS) $(engineering_OBJS) $(gprs_OBJS) $(openmoko_OBJS) $(oss_OBJS) $(panel_OBJS) $(profiles_OBJS) $(smscrypt_OBJS)
 
-distclean: clean
+distclean:
+	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done
+	$(RM) -- $(blacklist_OBJS) $(debug_OBJS) $(engineering_OBJS) $(gprs_OBJS) $(openmoko_OBJS) $(oss_OBJS) $(panel_OBJS) $(profiles_OBJS) $(smscrypt_OBJS)
 	$(RM) -- $(TARGETS)
 
 install: $(TARGETS)
+	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
 	$(MKDIR) $(DESTDIR)$(LIBDIR)/Phone/plugins
 	$(INSTALL) -m 0644 -- blacklist.so $(DESTDIR)$(LIBDIR)/Phone/plugins/blacklist.so
 	$(MKDIR) $(DESTDIR)$(LIBDIR)/Phone/plugins
@@ -133,6 +141,7 @@ install: $(TARGETS)
 	$(INSTALL) -m 0644 -- smscrypt.so $(DESTDIR)$(LIBDIR)/Phone/plugins/smscrypt.so
 
 uninstall:
+	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done
 	$(RM) -- $(DESTDIR)$(LIBDIR)/Phone/plugins/blacklist.so
 	$(RM) -- $(DESTDIR)$(LIBDIR)/Phone/plugins/debug.so
 	$(RM) -- $(DESTDIR)$(LIBDIR)/Phone/plugins/engineering.so
@@ -142,4 +151,4 @@ uninstall:
 	$(RM) -- $(DESTDIR)$(LIBDIR)/Phone/plugins/profiles.so
 	$(RM) -- $(DESTDIR)$(LIBDIR)/Phone/plugins/smscrypt.so
 
-.PHONY: all clean distclean install uninstall
+.PHONY: all subdirs clean distclean install uninstall
diff --git a/src/plugins/openmoko.c b/src/plugins/openmoko.c
index 32e5ba2..dee40c4 100644
--- a/src/plugins/openmoko.c
+++ b/src/plugins/openmoko.c
@@ -79,7 +79,7 @@ PhonePlugin plugin =
 {
 	NULL,
 	"Openmoko",
-	"stock_cell-phone",
+	"phone-openmoko",
 	_openmoko_init,
 	_openmoko_destroy,
 	_openmoko_event,
diff --git a/src/plugins/project.conf b/src/plugins/project.conf
index 99bb104..e906af2 100644
--- a/src/plugins/project.conf
+++ b/src/plugins/project.conf
@@ -1,3 +1,4 @@
+subdirs=16x16,24x24,32x32,48x48
 targets=blacklist,debug,engineering,gprs,openmoko,oss,panel,profiles,smscrypt
 cppflags_force=-I ../../include
 cppflags=