diff --git a/Makefile.am b/Makefile.am
index f708a0855..4e70251bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src data po
+SUBDIRS = src data po icons
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/data/Makefile.am b/data/Makefile.am
index d7b4dc7f7..541dcc85e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = glade emoticons pixmaps iconsets moods activities icons
+SUBDIRS = glade emoticons pixmaps iconsets moods activities
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
diff --git a/data/icons/Makefile.am b/icons/Makefile.am
similarity index 100%
rename from data/icons/Makefile.am
rename to icons/Makefile.am
diff --git a/data/icons/hicolor/16x16/actions/gajim-upload.png b/icons/hicolor/16x16/actions/gajim-upload.png
similarity index 100%
rename from data/icons/hicolor/16x16/actions/gajim-upload.png
rename to icons/hicolor/16x16/actions/gajim-upload.png