diff -r 33e0bc920834 -r 911fe254c4fe pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Wed Sep 09 12:41:40 2015 +0200
+++ b/pidgin/gtkstatusbox.c	Thu Apr 07 08:31:31 2016 +0200
@@ -1992,17 +1992,21 @@
 	PidginStatusBox *status_box = PIDGIN_STATUS_BOX(widget);
 	gtk_widget_draw(status_box->toggle_button, cr);
 
-	gtk_container_propagate_draw(GTK_CONTAINER(widget), status_box->icon_box, cr);
 	gtk_container_propagate_draw(GTK_CONTAINER(widget), status_box->vbox, cr);
 
-	if (status_box->icon_box && status_box->icon_opaque) {
-		GtkAllocation allocation;
-		GtkStyleContext *context;
-
-		gtk_widget_get_allocation(status_box->icon_box, &allocation);
-		context = gtk_widget_get_style_context(widget);
-		gtk_style_context_add_class(context, GTK_STYLE_CLASS_BUTTON);
-		gtk_render_frame(context, cr, allocation.x-1, allocation.y-1, 34, 34);
+	if (status_box->icon_box) {
+		gtk_container_propagate_draw(GTK_CONTAINER(widget),
+				status_box->icon_box, cr);
+
+		if (status_box->icon_opaque) {
+			GtkAllocation allocation;
+			GtkStyleContext *context;
+
+			gtk_widget_get_allocation(status_box->icon_box, &allocation);
+			context = gtk_widget_get_style_context(widget);
+			gtk_style_context_add_class(context, GTK_STYLE_CLASS_BUTTON);
+			gtk_render_frame(context, cr, allocation.x-1, allocation.y-1, 34, 34);
+		}
 	}
 	return FALSE;
 }