diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index 98c1c1ea..c8f2ae3f 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -3285,7 +3285,8 @@ search_handle_event(int search_type, session *sess)
         {
 #if HAVE_GTK3
                 gtk_entry_set_icon_from_icon_name (GTK_ENTRY (sess->gui->shentry), GTK_ENTRY_ICON_SECONDARY, "dialog-error");
-#else
+#endif
+#if !HAVE_GTK3
                 gtk_entry_set_icon_from_stock (GTK_ENTRY (sess->gui->shentry), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_DIALOG_ERROR);
 #endif
                 gtk_entry_set_icon_tooltip_text (GTK_ENTRY (sess->gui->shentry), GTK_ENTRY_ICON_SECONDARY, _(err->message));
@@ -3297,7 +3298,8 @@ search_handle_event(int search_type, session *sess)
                 {
 #if HAVE_GTK3
                         gtk_entry_set_icon_from_icon_name (GTK_ENTRY (sess->gui->shentry), GTK_ENTRY_ICON_SECONDARY, NULL);
-#else
+#endif
+#if !HAVE_GTK3
                         gtk_entry_set_icon_from_stock (GTK_ENTRY (sess->gui->shentry), GTK_ENTRY_ICON_SECONDARY, NULL);
 #endif
                 }
@@ -3309,7 +3311,8 @@ search_handle_event(int search_type, session *sess)
                         {
 #if HAVE_GTK3
                                 gtk_entry_set_icon_from_icon_name (GTK_ENTRY (sess->gui->shentry), GTK_ENTRY_ICON_SECONDARY, "dialog-error");
-#else
+#endif
+#if !HAVE_GTK3
                                 gtk_entry_set_icon_from_stock (GTK_ENTRY (sess->gui->shentry), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_DIALOG_ERROR);
 #endif
                                 gtk_entry_set_icon_tooltip_text (GTK_ENTRY (sess->gui->shentry), GTK_ENTRY_ICON_SECONDARY, _("No results found."));
@@ -3320,7 +3323,8 @@ search_handle_event(int search_type, session *sess)
         {
 #if HAVE_GTK3
                 gtk_entry_set_icon_from_icon_name (GTK_ENTRY (sess->gui->shentry), GTK_ENTRY_ICON_SECONDARY, NULL);
-#else
+#endif
+#if !HAVE_GTK3
                 gtk_entry_set_icon_from_stock (GTK_ENTRY (sess->gui->shentry), GTK_ENTRY_ICON_SECONDARY, NULL);
 #endif
         }
@@ -3371,7 +3375,8 @@ mg_search_toggle(session *sess)
                 /* Reset search state */
 #if HAVE_GTK3
                 gtk_entry_set_icon_from_icon_name (GTK_ENTRY (sess->gui->shentry), GTK_ENTRY_ICON_SECONDARY, NULL);
-#else
+#endif
+#if !HAVE_GTK3
                 gtk_entry_set_icon_from_stock (GTK_ENTRY (sess->gui->shentry), GTK_ENTRY_ICON_SECONDARY, NULL);
 #endif
 
diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c
index c175e51f..80a50516 100644
--- a/src/fe-gtk/servlistgui.c
+++ b/src/fe-gtk/servlistgui.c
@@ -1565,7 +1565,8 @@ servlist_username_changed_cb (GtkEntry *entry, gpointer userdata)
 	{
 #if HAVE_GTK3
 		gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY, "dialog-error");
-#else
+#endif
+#if !HAVE_GTK3
 		gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_DIALOG_ERROR);
 #endif
 		gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_SECONDARY,
@@ -1576,7 +1577,8 @@ servlist_username_changed_cb (GtkEntry *entry, gpointer userdata)
 	{
 #if HAVE_GTK3
 		gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
-#else
+#endif
+#if !HAVE_GTK3
 		gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
 #endif
 		gtk_widget_set_sensitive (connect_btn, TRUE);
@@ -1595,7 +1597,8 @@ servlist_nick_changed_cb (GtkEntry *entry, gpointer userdata)
 		entry = GTK_ENTRY(!nick1[0] ? entry_nick1 : entry_nick2);
 #if HAVE_GTK3
 		gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY, "dialog-error");
-#else
+#endif
+#if !HAVE_GTK3
 		gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_DIALOG_ERROR);
 #endif
 		gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_SECONDARY,
@@ -1606,7 +1609,8 @@ servlist_nick_changed_cb (GtkEntry *entry, gpointer userdata)
 	{
 #if HAVE_GTK3
 		gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY, "dialog-error");
-#else
+#endif
+#if !HAVE_GTK3
 		gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_DIALOG_ERROR);
 #endif
 		gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_SECONDARY,
@@ -1618,7 +1622,8 @@ servlist_nick_changed_cb (GtkEntry *entry, gpointer userdata)
 #if HAVE_GTK3
 		gtk_entry_set_icon_from_icon_name (GTK_ENTRY(entry_nick1), GTK_ENTRY_ICON_SECONDARY, NULL);
 		gtk_entry_set_icon_from_icon_name (GTK_ENTRY(entry_nick2), GTK_ENTRY_ICON_SECONDARY, NULL);
-#else
+#endif
+#if !HAVE_GTK3
 		gtk_entry_set_icon_from_stock (GTK_ENTRY(entry_nick1), GTK_ENTRY_ICON_SECONDARY, NULL);
 		gtk_entry_set_icon_from_stock (GTK_ENTRY(entry_nick2), GTK_ENTRY_ICON_SECONDARY, NULL);
 #endif