diff --git a/src/roster_window.py b/src/roster_window.py
index 6a0b957e50d384617d79b730ab0fa1793b7f7ef1..f25c5db3d87abb22cce0f0b766a59d71fc4292d8 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -1119,7 +1119,7 @@ def build_account_menu(self, account):
 		# using self.jabber_status_images is poopoo
 		iconset = gajim.config.get('iconset')
 		if not iconset:
-			iconset = 'sun'
+			iconset = 'dcraven'
 		path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
 		state_images = self.load_iconset(path)
 
@@ -1201,7 +1201,7 @@ def mk_menu_account(self, event, iter):
 			menu = gtk.Menu()
 			iconset = gajim.config.get('iconset')
 			if not iconset:
-				iconset = 'sun'
+				iconset = 'dcraven'
 			path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
 			for account in gajim.connections:
 				state_images = self.load_iconset(path)
@@ -2173,7 +2173,7 @@ def make_jabber_state_images(self):
 		'''initialise jabber_state_images dict'''
 		iconset = gajim.config.get('iconset')
 		if not iconset:
-			iconset = 'sun'
+			iconset = 'dcraven'
 		path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '32x32')
 		if os.path.exists(path):
 			self.jabber_state_images['32'] = self.load_iconset(path)
diff --git a/src/systray.py b/src/systray.py
index 510573a7896a5c6ed90450010c27b0270a39ef5e..02895ae2f3a4d55187659342b40f174d6ff5a1c9 100644
--- a/src/systray.py
+++ b/src/systray.py
@@ -234,7 +234,7 @@ def on_quit_menuitem_activate(self, widget):
 	def make_groups_submenus_for_chat_with(self, account):
 		iconset = gajim.config.get('iconset')
 		if not iconset:
-			iconset = 'sun'
+			iconset = 'dcraven'
 		path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
 		state_images = gajim.interface.roster.load_iconset(path)
 		
diff --git a/src/systraywin32.py b/src/systraywin32.py
index 5a02e86bdc58e7c4faf9378d6f9af2bcb9043127..f6d9ae8e7c8bcb2cbd677fd5f030bbce1ee4697a 100644
--- a/src/systraywin32.py
+++ b/src/systraywin32.py
@@ -319,7 +319,7 @@ def load_icos(self):
 		'''load .ico files and return them to a dic of SHOW --> img_obj'''
 		iconset = str(gajim.config.get('iconset'))
 		if not iconset:
-			iconset = 'sun'
+			iconset = 'dcraven'
 		
 		imgs = {}
 		path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16', 'icos')
diff --git a/src/tooltips.py b/src/tooltips.py
index 6748dbb84b7c8ff0e8b972e4754245d31017a41d..eef737872aab49213b4dfc0192bc06928cb63e2e 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -210,7 +210,7 @@ def get_accounts_info(self):
 	def fill_table_with_accounts(self, accounts):
 		iconset = gajim.config.get('iconset')
 		if not iconset:
-			iconset = 'sun'
+			iconset = 'dcraven'
 		file_path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
 		for acct in accounts:
 			message = acct['message']
@@ -390,7 +390,7 @@ def populate(self, contacts):
 		else:
 			iconset = gajim.config.get('iconset')
 			if not iconset:
-				iconset = 'sun'
+				iconset = 'dcraven'
 			file_path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
 
 		files = []