diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index cc5e0caa..79205ece 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -447,6 +447,7 @@ const struct prefs vars[] =
 	{"gui_dialog_top", P_OFFINT (hex_gui_dialog_top), TYPE_INT},
 	{"gui_prefs.hex_gui_dialog_width", P_OFFINT (hex_gui_dialog_width), TYPE_INT},
 	{"gui_hide_menu", P_OFFINT (hex_gui_hide_menu), TYPE_BOOL},
+	{"gui_input_icon", P_OFFINT (hex_gui_input_icon), TYPE_BOOL},
 	{"gui_input_nick", P_OFFINT (hex_gui_input_nick), TYPE_BOOL},
 	{"gui_input_spell", P_OFFINT (hex_gui_input_spell), TYPE_BOOL},
 	{"gui_input_style", P_OFFINT (hex_gui_input_style), TYPE_BOOL},
@@ -670,6 +671,7 @@ load_config (void)
 	prefs.hex_gui_autoopen_dialog = 1;
 	prefs.hex_gui_autoopen_recv = 1;
 	prefs.hex_gui_autoopen_send = 1;
+	prefs.hex_gui_input_icon = 1;
 	prefs.hex_gui_input_nick = 1;
 	prefs.hex_gui_input_spell = 1;
 	prefs.hex_gui_input_style = 1;
diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index 5ad6a383..3b2a366b 100644
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -130,6 +130,7 @@ struct hexchatprefs
 	unsigned int hex_gui_autoopen_send;
 	unsigned int hex_gui_compact;
 	unsigned int hex_gui_hide_menu;
+	unsigned int hex_gui_input_icon;
 	unsigned int hex_gui_input_nick;
 	unsigned int hex_gui_input_spell;
 	unsigned int hex_gui_input_style;
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index 27f26d2b..f79c4ff8 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -334,7 +334,7 @@ mg_set_access_icon (session_gui *gui, GdkPixbuf *pix, gboolean away)
 		gui->op_xpm = NULL;
 	}
 
-	if (pix)
+	if (pix && prefs.hex_gui_input_icon)
 	{
 		gui->op_xpm = gtk_image_new_from_pixbuf (pix);
 		gtk_box_pack_start (GTK_BOX (gui->nick_box), gui->op_xpm, 0, 0, 0);
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index 10c68bf8..d405ff02 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -213,6 +213,7 @@ static const setting inputbox_settings[] =
 	{ST_HEADER, N_("Input Box"),0,0,0},
 	{ST_TOGGLE, N_("Use the Text box font and colors"), P_OFFINTNL(hex_gui_input_style),0,0,0},
 	{ST_TOGGLE, N_("Show nick box"), P_OFFINTNL(hex_gui_input_nick),0,0,0},
+	{ST_TOGGLE, N_("Show user mode icon in nick box"), P_OFFINTNL(hex_gui_input_icon),0,0,0},
 #if defined(USE_GTKSPELL) || defined(USE_LIBSEXY)
 	{ST_TOGGLE, N_("Spell checking"), P_OFFINTNL(hex_gui_input_spell),0,0,2},
 	{ST_ENTRY,	N_("Dictionaries to use:"), P_OFFSETNL(hex_text_spell_langs),0,0,sizeof prefs.hex_text_spell_langs},