diff --git a/src/chat_control.py b/src/chat_control.py
index 1a2a6a0e3..be4d6a5c0 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -207,7 +207,7 @@ class ChatControlBase(MessageControl):
 				return True
 		elif event.keyval == gtk.keysyms.m and \
 			(event.state & gtk.gdk.MOD1_MASK): # alt + m opens emoticons menu
-			if gajim.config.get('useemoticons'):
+			if gajim.config.get('emoticons_theme'):
 				msg_tv = self.msg_textview
 				def set_emoticons_menu_position(w, msg_tv = self.msg_textview):
 					window = msg_tv.get_window(gtk.TEXT_WINDOW_WIDGET)
@@ -412,7 +412,7 @@ class ChatControlBase(MessageControl):
 		'''hide show emoticons_button and make sure emoticons_menu is always there
 		when needed'''
 		emoticons_button = self.xml.get_widget('emoticons_button')
-		if gajim.config.get('useemoticons'):
+		if gajim.config.get('emoticons_theme'):
 			self.emoticons_menu = self.prepare_emoticons_menu()
 			emoticons_button.show()
 			emoticons_button.set_no_show_all(False)
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index f55ea7738..724d95012 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -418,7 +418,7 @@ class ConversationTextview(gtk.TextView):
 		index = 0
 
 		# basic: links + mail + formatting is always checked (we like that)
-		if gajim.config.get('useemoticons'): # search for emoticons & urls
+		if gajim.config.get('emoticons_theme'): # search for emoticons & urls
 			iterator = gajim.interface.emot_and_basic_re.finditer(otext)
 		else: # search for just urls + mail + formatting
 			iterator = gajim.interface.basic_pattern_re.finditer(otext)
@@ -448,7 +448,7 @@ class ConversationTextview(gtk.TextView):
 		buffer = self.get_buffer()
 
 		possible_emot_ascii_caps = special_text.upper() # emoticons keys are CAPS
-		if gajim.config.get('useemoticons') and \
+		if gajim.config.get('emoticons_theme') and \
 		possible_emot_ascii_caps in gajim.interface.emoticons.keys():
 			#it's an emoticon
 			emot_ascii = possible_emot_ascii_caps
diff --git a/src/gajim.py b/src/gajim.py
index ac8c2fdcf..ee3ee30b9 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1357,7 +1357,7 @@ class Interface:
 		self.basic_pattern_re = sre.compile(basic_pattern, sre.IGNORECASE)
 		
 		emoticons_pattern = ''
-		if gajim.config.get('useemoticons'):
+		if gajim.config.get('emoticons_theme'):
 			# When an emoticon is bordered by an alpha-numeric character it is NOT
 			# expanded.  e.g., foo:) NO, foo :) YES, (brb) NO, (:)) YES, etc.
 			# We still allow multiple emoticons side-by-side like :P:P:P
@@ -1408,7 +1408,7 @@ class Interface:
 		helpers.launch_browser_mailer(kind, url)
 
 	def init_emoticons(self):
-		if not gajim.config.get('useemoticons'):
+		if not gajim.config.get('emoticons_theme'):
 			return
 
 		#initialize emoticons dictionary and unique images list