diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c
index 426089fd..a0b23f9e 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -651,7 +651,7 @@ xfce_tasklist_get_window_icon (WnckWindow *window,
 {
   GdkPixbuf *pixbuf;
 
-  if (show_labels || type == CHILD_TYPE_GROUP_MENU || size <= 31)
+  if (size <= 31)
     pixbuf = wnck_window_get_mini_icon (window);
   else
     pixbuf = wnck_window_get_icon (window);
@@ -3739,7 +3739,7 @@ xfce_tasklist_group_button_button_draw (GtkWidget         *widget,
       pango_layout_get_pixel_extents (n_windows_layout, &ink_extent, &log_extent);
       icon_size = xfce_panel_plugin_get_icon_size (XFCE_PANEL_PLUGIN (xfce_tasklist_get_panel_plugin (group_child->tasklist)));
       radius = log_extent.height / 2;
-      if (group_child->tasklist->show_labels || icon_size <= 31)
+      if (icon_size <= 31)
         {
           if (xfce_tasklist_vertical (group_child->tasklist))
             {
@@ -3900,9 +3900,7 @@ xfce_tasklist_group_button_icon_changed (WnckClassGroup    *class_group,
   context = gtk_widget_get_style_context (GTK_WIDGET (group_child->icon));
 
   /* get the class group icon */
-  if (group_child->tasklist->show_labels)
-    pixbuf = wnck_class_group_get_mini_icon (class_group);
-  else if (icon_size <= 31)
+  if (icon_size <= 31)
     pixbuf = wnck_class_group_get_mini_icon (class_group);
   else
     pixbuf = wnck_class_group_get_icon (class_group);