diff --git a/data/activities/default/doing_chores/buying_groceries.png b/data/activities/default/doing_chores/buying_groceries.png
new file mode 100644
index 000000000..027079d16
Binary files /dev/null and b/data/activities/default/doing_chores/buying_groceries.png differ
diff --git a/data/activities/default/doing_chores/cleaning.png b/data/activities/default/doing_chores/cleaning.png
new file mode 100644
index 000000000..18549f38a
Binary files /dev/null and b/data/activities/default/doing_chores/cleaning.png differ
diff --git a/data/activities/default/doing_chores/cooking.png b/data/activities/default/doing_chores/cooking.png
new file mode 100644
index 000000000..bcd238539
Binary files /dev/null and b/data/activities/default/doing_chores/cooking.png differ
diff --git a/data/activities/default/doing_chores/doing_maintenance.png b/data/activities/default/doing_chores/doing_maintenance.png
new file mode 100644
index 000000000..514103474
Binary files /dev/null and b/data/activities/default/doing_chores/doing_maintenance.png differ
diff --git a/data/activities/default/doing_chores/doing_the_dishes.png b/data/activities/default/doing_chores/doing_the_dishes.png
new file mode 100644
index 000000000..77b6d87c8
Binary files /dev/null and b/data/activities/default/doing_chores/doing_the_dishes.png differ
diff --git a/data/activities/default/doing_chores/doing_the_laundry.png b/data/activities/default/doing_chores/doing_the_laundry.png
new file mode 100644
index 000000000..e11c86cee
Binary files /dev/null and b/data/activities/default/doing_chores/doing_the_laundry.png differ
diff --git a/data/activities/default/doing_chores/gardening.png b/data/activities/default/doing_chores/gardening.png
new file mode 100644
index 000000000..3e0415b55
Binary files /dev/null and b/data/activities/default/doing_chores/gardening.png differ
diff --git a/data/activities/default/doing_chores/running_an_errand.png b/data/activities/default/doing_chores/running_an_errand.png
new file mode 100644
index 000000000..6e74ba6d5
Binary files /dev/null and b/data/activities/default/doing_chores/running_an_errand.png differ
diff --git a/data/activities/default/doing_chores/walking_the_dog.png b/data/activities/default/doing_chores/walking_the_dog.png
new file mode 100644
index 000000000..de96a9e20
Binary files /dev/null and b/data/activities/default/doing_chores/walking_the_dog.png differ
diff --git a/data/activities/default/drinking/having_a_beer.png b/data/activities/default/drinking/having_a_beer.png
new file mode 100644
index 000000000..433368930
Binary files /dev/null and b/data/activities/default/drinking/having_a_beer.png differ
diff --git a/data/activities/default/drinking/having_coffee.png b/data/activities/default/drinking/having_coffee.png
new file mode 100644
index 000000000..c27608b53
Binary files /dev/null and b/data/activities/default/drinking/having_coffee.png differ
diff --git a/data/activities/default/drinking/having_tea.png b/data/activities/default/drinking/having_tea.png
new file mode 100644
index 000000000..8ca497048
Binary files /dev/null and b/data/activities/default/drinking/having_tea.png differ
diff --git a/data/activities/default/eating/having_a_snack.png b/data/activities/default/eating/having_a_snack.png
new file mode 100644
index 000000000..f6d699c84
Binary files /dev/null and b/data/activities/default/eating/having_a_snack.png differ
diff --git a/data/activities/default/eating/having_breakfast.png b/data/activities/default/eating/having_breakfast.png
new file mode 100644
index 000000000..eced76e94
Binary files /dev/null and b/data/activities/default/eating/having_breakfast.png differ
diff --git a/data/activities/default/eating/having_dinner.png b/data/activities/default/eating/having_dinner.png
new file mode 100644
index 000000000..b40a1fdb9
Binary files /dev/null and b/data/activities/default/eating/having_dinner.png differ
diff --git a/data/activities/default/eating/having_lunch.png b/data/activities/default/eating/having_lunch.png
new file mode 100644
index 000000000..a25a5c6a8
Binary files /dev/null and b/data/activities/default/eating/having_lunch.png differ
diff --git a/data/activities/default/exercising/cycling.png b/data/activities/default/exercising/cycling.png
new file mode 100644
index 000000000..9d97f656b
Binary files /dev/null and b/data/activities/default/exercising/cycling.png differ
diff --git a/data/activities/default/exercising/hiking.png b/data/activities/default/exercising/hiking.png
new file mode 100644
index 000000000..541d308aa
Binary files /dev/null and b/data/activities/default/exercising/hiking.png differ
diff --git a/data/activities/default/exercising/jogging.png b/data/activities/default/exercising/jogging.png
new file mode 100644
index 000000000..d7c98bbee
Binary files /dev/null and b/data/activities/default/exercising/jogging.png differ
diff --git a/data/activities/default/exercising/playing_sports.png b/data/activities/default/exercising/playing_sports.png
new file mode 100644
index 000000000..33e32e6a6
Binary files /dev/null and b/data/activities/default/exercising/playing_sports.png differ
diff --git a/data/activities/default/exercising/running.png b/data/activities/default/exercising/running.png
new file mode 100644
index 000000000..85237cfd3
Binary files /dev/null and b/data/activities/default/exercising/running.png differ
diff --git a/data/activities/default/exercising/skiing.png b/data/activities/default/exercising/skiing.png
new file mode 100644
index 000000000..b33bb97bb
Binary files /dev/null and b/data/activities/default/exercising/skiing.png differ
diff --git a/data/activities/default/exercising/swimming.png b/data/activities/default/exercising/swimming.png
new file mode 100644
index 000000000..fad7c6ced
Binary files /dev/null and b/data/activities/default/exercising/swimming.png differ
diff --git a/data/activities/default/exercising/working_out.png b/data/activities/default/exercising/working_out.png
new file mode 100644
index 000000000..9df00db59
Binary files /dev/null and b/data/activities/default/exercising/working_out.png differ
diff --git a/data/activities/default/grooming/at_the_spa.png b/data/activities/default/grooming/at_the_spa.png
new file mode 100644
index 000000000..26d444022
Binary files /dev/null and b/data/activities/default/grooming/at_the_spa.png differ
diff --git a/data/activities/default/grooming/brushing_teeth.png b/data/activities/default/grooming/brushing_teeth.png
new file mode 100644
index 000000000..f24d0773d
Binary files /dev/null and b/data/activities/default/grooming/brushing_teeth.png differ
diff --git a/data/activities/default/grooming/getting_a_haircut.png b/data/activities/default/grooming/getting_a_haircut.png
new file mode 100644
index 000000000..13396d71e
Binary files /dev/null and b/data/activities/default/grooming/getting_a_haircut.png differ
diff --git a/data/activities/default/grooming/shaving.png b/data/activities/default/grooming/shaving.png
new file mode 100644
index 000000000..d1da19f22
Binary files /dev/null and b/data/activities/default/grooming/shaving.png differ
diff --git a/data/activities/default/grooming/taking_a_bath.png b/data/activities/default/grooming/taking_a_bath.png
new file mode 100644
index 000000000..f487cc25d
Binary files /dev/null and b/data/activities/default/grooming/taking_a_bath.png differ
diff --git a/data/activities/default/grooming/taking_a_shower.png b/data/activities/default/grooming/taking_a_shower.png
new file mode 100644
index 000000000..111321508
Binary files /dev/null and b/data/activities/default/grooming/taking_a_shower.png differ
diff --git a/data/activities/default/inactive/day_off.png b/data/activities/default/inactive/day_off.png
new file mode 100644
index 000000000..f79791473
Binary files /dev/null and b/data/activities/default/inactive/day_off.png differ
diff --git a/data/activities/default/inactive/hanging_out.png b/data/activities/default/inactive/hanging_out.png
new file mode 100644
index 000000000..c06931f44
Binary files /dev/null and b/data/activities/default/inactive/hanging_out.png differ
diff --git a/data/activities/default/inactive/on_vacation.png b/data/activities/default/inactive/on_vacation.png
new file mode 100644
index 000000000..36c10ed38
Binary files /dev/null and b/data/activities/default/inactive/on_vacation.png differ
diff --git a/data/activities/default/inactive/scheduled_holiday.png b/data/activities/default/inactive/scheduled_holiday.png
new file mode 100644
index 000000000..6fbeb2a88
Binary files /dev/null and b/data/activities/default/inactive/scheduled_holiday.png differ
diff --git a/data/activities/default/inactive/sleeping.png b/data/activities/default/inactive/sleeping.png
new file mode 100644
index 000000000..8b80b50f6
Binary files /dev/null and b/data/activities/default/inactive/sleeping.png differ
diff --git a/data/activities/default/relaxing/gaming.png b/data/activities/default/relaxing/gaming.png
new file mode 100644
index 000000000..1a817fbc3
Binary files /dev/null and b/data/activities/default/relaxing/gaming.png differ
diff --git a/data/activities/default/relaxing/going_out.png b/data/activities/default/relaxing/going_out.png
new file mode 100644
index 000000000..05bf1c1f8
Binary files /dev/null and b/data/activities/default/relaxing/going_out.png differ
diff --git a/data/activities/default/relaxing/partying.png b/data/activities/default/relaxing/partying.png
new file mode 100644
index 000000000..31835b5ed
Binary files /dev/null and b/data/activities/default/relaxing/partying.png differ
diff --git a/data/activities/default/relaxing/reading.png b/data/activities/default/relaxing/reading.png
new file mode 100644
index 000000000..4e7eb8c54
Binary files /dev/null and b/data/activities/default/relaxing/reading.png differ
diff --git a/data/activities/default/relaxing/rehearsing.png b/data/activities/default/relaxing/rehearsing.png
new file mode 100644
index 000000000..5be9a8b2d
Binary files /dev/null and b/data/activities/default/relaxing/rehearsing.png differ
diff --git a/data/activities/default/relaxing/shopping.png b/data/activities/default/relaxing/shopping.png
new file mode 100644
index 000000000..8f969fb7b
Binary files /dev/null and b/data/activities/default/relaxing/shopping.png differ
diff --git a/data/activities/default/relaxing/socializing.png b/data/activities/default/relaxing/socializing.png
new file mode 100644
index 000000000..45fe7fc5b
Binary files /dev/null and b/data/activities/default/relaxing/socializing.png differ
diff --git a/data/activities/default/relaxing/sunbathing.png b/data/activities/default/relaxing/sunbathing.png
new file mode 100644
index 000000000..8d6e2c94e
Binary files /dev/null and b/data/activities/default/relaxing/sunbathing.png differ
diff --git a/data/activities/default/relaxing/watching_a_movie.png b/data/activities/default/relaxing/watching_a_movie.png
new file mode 100644
index 000000000..bd66835d7
Binary files /dev/null and b/data/activities/default/relaxing/watching_a_movie.png differ
diff --git a/data/activities/default/relaxing/watching_tv.png b/data/activities/default/relaxing/watching_tv.png
new file mode 100644
index 000000000..82255b80c
Binary files /dev/null and b/data/activities/default/relaxing/watching_tv.png differ
diff --git a/data/activities/default/talking/in_real_life.png b/data/activities/default/talking/in_real_life.png
new file mode 100644
index 000000000..76c96eaaa
Binary files /dev/null and b/data/activities/default/talking/in_real_life.png differ
diff --git a/data/activities/default/talking/on_the_phone.png b/data/activities/default/talking/on_the_phone.png
new file mode 100644
index 000000000..bdfb88001
Binary files /dev/null and b/data/activities/default/talking/on_the_phone.png differ
diff --git a/data/activities/default/talking/on_the_video_phone.png b/data/activities/default/talking/on_the_video_phone.png
new file mode 100644
index 000000000..672c43805
Binary files /dev/null and b/data/activities/default/talking/on_the_video_phone.png differ
diff --git a/data/activities/default/traveling/commuting.png b/data/activities/default/traveling/commuting.png
new file mode 100644
index 000000000..525edb6fc
Binary files /dev/null and b/data/activities/default/traveling/commuting.png differ
diff --git a/data/activities/default/traveling/cycling.png b/data/activities/default/traveling/cycling.png
new file mode 100644
index 000000000..60f2bd57d
Binary files /dev/null and b/data/activities/default/traveling/cycling.png differ
diff --git a/data/activities/default/traveling/driving.png b/data/activities/default/traveling/driving.png
new file mode 100644
index 000000000..1dcb517fa
Binary files /dev/null and b/data/activities/default/traveling/driving.png differ
diff --git a/data/activities/default/traveling/in_a_car.png b/data/activities/default/traveling/in_a_car.png
new file mode 100644
index 000000000..8a4d18d05
Binary files /dev/null and b/data/activities/default/traveling/in_a_car.png differ
diff --git a/data/activities/default/traveling/on_a_bus.png b/data/activities/default/traveling/on_a_bus.png
new file mode 100644
index 000000000..7bacc1e67
Binary files /dev/null and b/data/activities/default/traveling/on_a_bus.png differ
diff --git a/data/activities/default/traveling/on_a_plane.png b/data/activities/default/traveling/on_a_plane.png
new file mode 100644
index 000000000..7c38c58d0
Binary files /dev/null and b/data/activities/default/traveling/on_a_plane.png differ
diff --git a/data/activities/default/traveling/on_a_train.png b/data/activities/default/traveling/on_a_train.png
new file mode 100644
index 000000000..b17ce472f
Binary files /dev/null and b/data/activities/default/traveling/on_a_train.png differ
diff --git a/data/activities/default/traveling/on_a_trip.png b/data/activities/default/traveling/on_a_trip.png
new file mode 100644
index 000000000..fbcc243ee
Binary files /dev/null and b/data/activities/default/traveling/on_a_trip.png differ
diff --git a/data/activities/default/traveling/walking.png b/data/activities/default/traveling/walking.png
new file mode 100644
index 000000000..3066c76dd
Binary files /dev/null and b/data/activities/default/traveling/walking.png differ
diff --git a/data/activities/default/working/coding.png b/data/activities/default/working/coding.png
new file mode 100644
index 000000000..0105225fe
Binary files /dev/null and b/data/activities/default/working/coding.png differ
diff --git a/data/activities/default/working/in_a_meeting.png b/data/activities/default/working/in_a_meeting.png
new file mode 100644
index 000000000..4870e6843
Binary files /dev/null and b/data/activities/default/working/in_a_meeting.png differ
diff --git a/data/activities/default/working/studying.png b/data/activities/default/working/studying.png
new file mode 100644
index 000000000..b05fa8477
Binary files /dev/null and b/data/activities/default/working/studying.png differ
diff --git a/data/activities/default/working/writing.png b/data/activities/default/working/writing.png
new file mode 100644
index 000000000..c63554e39
Binary files /dev/null and b/data/activities/default/working/writing.png differ
diff --git a/src/dialogs.py b/src/dialogs.py
index b79275948..a50983b6b 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -358,9 +358,13 @@ class ChangeActivityDialog:
 			else:
 				rbtns[act] = group = gtk.RadioButton()
 
+			hbox = gtk.HBox(False, 5)
+			hbox.pack_start(gtkgui_helpers.load_activity_icon(category),
+				False, False, 0)
 			lbl = gtk.Label('<b>' + pep.ACTIVITIES[category]['category'] + '</b>')
 			lbl.set_use_markup(True)
-			rbtns[act].add(lbl)
+			hbox.pack_start(lbl, False, False, 0)
+			rbtns[act].add(hbox)
 			rbtns[act].connect('toggled', self.on_rbtn_toggled,
 				[category, 'other'])
 			vbox.pack_start(rbtns[act], False, False, 0)
@@ -381,9 +385,14 @@ class ChangeActivityDialog:
 				else:
 					rbtns[act] = group = gtk.RadioButton()
 
-				rbtns[act].set_label(pep.ACTIVITIES[category][activity])
+				hbox = gtk.HBox(False, 5)
+				hbox.pack_start(gtkgui_helpers.load_activity_icon(category,
+					activity), False, False, 0)
+				hbox.pack_start(gtk.Label(pep.ACTIVITIES[category][activity]),
+					False, False, 0)
 				rbtns[act].connect('toggled', self.on_rbtn_toggled,
 					[category, activity])
+				rbtns[act].add(hbox)
 				vbox.pack_start(rbtns[act], False, False, 0)
 
 		rbtns['working_other'].set_active(True)
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index 6900a856a..98f0511b3 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -902,13 +902,17 @@ def load_mood_icon(icon_name):
 	icon_list = _load_icon_list([icon_name], path)
 	return icon_list[icon_name]
 
-def load_activity_icon(activity, sub_activity = None):
+def load_activity_icon(category, activity = None):
 	'''load an icon from the activity iconset in 16x16'''
+	print category
+	print activity
 	iconset = gajim.config.get('activity_iconset')
 	path = os.path.join(helpers.get_activity_iconset_path(iconset),
-		activity, '')
-	icon_list = _load_icon_list(['category'], path)
-	return icon_list['category']
+		category, '')
+	if activity is None:
+		activity = 'category'
+	icon_list = _load_icon_list([activity], path)
+	return icon_list[activity]
 
 def load_icons_meta():
 	'''load and return  - AND + small icons to put on top left of an icon