diff --git a/src/addressbook/gui/widgets/eab-contact-formatter.c b/src/addressbook/gui/widgets/eab-contact-formatter.c
index 081d630afba0a39d3c22e882ca0595a00b41184b..b6f2acdf99eb04485750d495108104fc5657b808 100644
--- a/src/addressbook/gui/widgets/eab-contact-formatter.c
+++ b/src/addressbook/gui/widgets/eab-contact-formatter.c
@@ -99,7 +99,7 @@ icon_available (const gchar *icon)
 	icon_theme = gtk_icon_theme_get_default ();
 	icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon, 16, 0);
 	if (icon_info != NULL)
-		gtk_icon_info_free (icon_info);
+		g_object_unref (icon_info);
 
 	return icon_info != NULL;
 }
diff --git a/src/e-util/e-attachment-view.c b/src/e-util/e-attachment-view.c
index 9e7a012207ad4e78f74cf3e48d4adf9974fb8393..469f9aa0ad357d9f823f17223ec21d2ebfd9348f 100644
--- a/src/e-util/e-attachment-view.c
+++ b/src/e-util/e-attachment-view.c
@@ -1914,7 +1914,7 @@ e_attachment_view_drag_begin (EAttachmentView *view,
 				g_error_free (error);
 			}
 
-			gtk_icon_info_free (icon_info);
+			g_object_unref (icon_info);
 		}
 
 		g_object_unref (icon);
diff --git a/src/e-util/e-emoticon.c b/src/e-util/e-emoticon.c
index 8082e7238ba54b0048d9457c88df5d481427a888..fdea149e337a5f0cd819f6f6faaca184860553d4 100644
--- a/src/e-util/e-emoticon.c
+++ b/src/e-util/e-emoticon.c
@@ -116,7 +116,7 @@ e_emoticon_dup_uri (const EEmoticon *emoticon)
 	if (filename != NULL) {
 		uri = g_filename_to_uri (filename, NULL, NULL);
 	}
-	gtk_icon_info_free (icon_info);
+	g_object_unref (icon_info);
 	g_return_val_if_fail (uri != NULL, NULL);
 
 	return uri;
diff --git a/src/e-util/e-icon-factory.c b/src/e-util/e-icon-factory.c
index e43290de96f7b0264477cc338f7eefd9d68700e7..a397067a261aaa15574c4c2256ba689b70104724 100644
--- a/src/e-util/e-icon-factory.c
+++ b/src/e-util/e-icon-factory.c
@@ -87,7 +87,7 @@ e_icon_factory_get_icon_filename (const gchar *icon_name,
 	if (icon_info != NULL) {
 		filename = g_strdup (
 			gtk_icon_info_get_filename (icon_info));
-		gtk_icon_info_free (icon_info);
+		g_object_unref (icon_info);
 	}
 
 	return filename;
diff --git a/src/e-util/e-image-chooser.c b/src/e-util/e-image-chooser.c
index 317e87aea4d6f8a09aaf375222cfd4dfd1d769e5..58222c2e531faf8a88273e564f82c69e978803aa 100644
--- a/src/e-util/e-image-chooser.c
+++ b/src/e-util/e-image-chooser.c
@@ -322,7 +322,7 @@ image_chooser_set_icon_name (EImageChooser *chooser,
 
 	filename = gtk_icon_info_get_filename (icon_info);
 	e_image_chooser_set_from_file (chooser, filename);
-	gtk_icon_info_free (icon_info);
+	g_object_unref (icon_info);
 }
 
 static void
diff --git a/src/e-util/e-online-button.c b/src/e-util/e-online-button.c
index 3d48f2f49503410b2fc56791dbcfafd5a76b4270..a1d287fd8c98902c468d60cdb2a2e8808acf77e5 100644
--- a/src/e-util/e-online-button.c
+++ b/src/e-util/e-online-button.c
@@ -210,7 +210,7 @@ e_online_button_set_online (EOnlineButton *button,
 		icon_theme, icon_name, GTK_ICON_SIZE_BUTTON, 0);
 	filename = gtk_icon_info_get_filename (icon_info);
 	online_button_update_icon (image, filename);
-	gtk_icon_info_free (icon_info);
+	g_object_unref (icon_info);
 
 	g_object_notify (G_OBJECT (button), "online");
 }
diff --git a/src/e-util/e-stock-request.c b/src/e-util/e-stock-request.c
index 9ffe183b0f4855161e051b03ad56e67fd66e4d07..2875104fa8219d40c24d6792b224bf0c7e1afeef 100644
--- a/src/e-util/e-stock-request.c
+++ b/src/e-util/e-stock-request.c
@@ -179,7 +179,7 @@ process_stock_request_idle_cb (gpointer user_data)
 				}
 			}
 
-			gtk_icon_info_free (icon_info);
+			g_object_unref (icon_info);
 		} else if (g_strcmp0 (g_uri_get_host (guri), "x-evolution-arrow-down") == 0) {
 			GdkPixbuf *pixbuf;
 			GdkRGBA rgba;