diff --git a/configure.ac b/configure.ac
index 5039b59c2..ab2f89eb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,6 +228,7 @@ AC_CONFIG_FILES([
 	data/pixmaps/Makefile
 	data/iconsets/Makefile
 	data/moods/Makefile
+	data/activities/Makefile
 	data/gajim.desktop.in
 	data/defs.py
 	src/Makefile
diff --git a/data/activities/Makefile.am b/data/activities/Makefile.am
new file mode 100644
index 000000000..ab1eb1751
--- /dev/null
+++ b/data/activities/Makefile.am
@@ -0,0 +1,38 @@
+activitiesdir = $(pkgdatadir)/data/activities
+
+activities_DATA = 
+
+ACTIVITIES_DIRS = **/**
+
+ACTIVITIES_FILES = **/**/{*.png,*.gif}
+
+
+install-data-local:
+	@for d in $$(cd $(srcdir); echo $(ACTIVITIES_DIRS));do \
+		if test -d $(srcdir)/$$d;then \
+			echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/activities/$$d"; \
+			$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/activities/$$d || exit 1; \
+		fi; \
+	done; \
+	for f in $$(cd $(srcdir); echo $(ACTIVITIES_FILES));do \
+		if test -f $(srcdir)/$$f; then \
+			echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/activities/$$f"; \
+			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/activities/$$f || exit 1; \
+		fi; \
+	done; 
+
+dist-hook:
+	@for d in $$(cd $(srcdir); echo $(ACTIVITIES_DIRS));do \
+		if test -d $(srcdir)/$$d;then \
+			echo " $(mkdir_p) $(distdir)/$$d"; \
+			$(mkdir_p) $(distdir)/$$d || exit 1; \
+		fi; \
+	done; \
+	for f in $$(cd $(srcdir); echo $(ACTIVITIES_FILES));do \
+		if test -f $(srcdir)/$$f; then \
+			echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
+			cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
+		fi; \
+	done;
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/activities/default/doing_chores/category.png b/data/activities/default/doing_chores/category.png
new file mode 100644
index 000000000..c28e34210
Binary files /dev/null and b/data/activities/default/doing_chores/category.png differ
diff --git a/data/activities/default/drinking/category.png b/data/activities/default/drinking/category.png
new file mode 100644
index 000000000..4ad974aeb
Binary files /dev/null and b/data/activities/default/drinking/category.png differ
diff --git a/data/activities/default/eating/category.png b/data/activities/default/eating/category.png
new file mode 100644
index 000000000..a16468b2e
Binary files /dev/null and b/data/activities/default/eating/category.png differ
diff --git a/data/activities/default/exercising/category.png b/data/activities/default/exercising/category.png
new file mode 100644
index 000000000..8d91d786e
Binary files /dev/null and b/data/activities/default/exercising/category.png differ
diff --git a/data/activities/default/grooming/category.png b/data/activities/default/grooming/category.png
new file mode 100644
index 000000000..4df08cfec
Binary files /dev/null and b/data/activities/default/grooming/category.png differ
diff --git a/data/activities/default/having_appointment/category.png b/data/activities/default/having_appointment/category.png
new file mode 100644
index 000000000..cfa4480e2
Binary files /dev/null and b/data/activities/default/having_appointment/category.png differ
diff --git a/data/activities/default/inactive/category.png b/data/activities/default/inactive/category.png
new file mode 100644
index 000000000..a8a0a40be
Binary files /dev/null and b/data/activities/default/inactive/category.png differ
diff --git a/data/activities/default/relaxing/category.png b/data/activities/default/relaxing/category.png
new file mode 100644
index 000000000..7c54b181b
Binary files /dev/null and b/data/activities/default/relaxing/category.png differ
diff --git a/data/activities/default/talking/category.png b/data/activities/default/talking/category.png
new file mode 100644
index 000000000..97c001015
Binary files /dev/null and b/data/activities/default/talking/category.png differ
diff --git a/data/activities/default/traveling/category.png b/data/activities/default/traveling/category.png
new file mode 100644
index 000000000..25046c557
Binary files /dev/null and b/data/activities/default/traveling/category.png differ
diff --git a/data/activities/default/working/category.png b/data/activities/default/working/category.png
new file mode 100644
index 000000000..d86b2fa38
Binary files /dev/null and b/data/activities/default/working/category.png differ