diff --git a/draw.c b/draw.c
index 92f6b409b..2293d4ad7 100644
--- a/draw.c
+++ b/draw.c
@@ -70,7 +70,7 @@ drawtext(Display *disp, DC drawcontext, Drawable drawable, const char *text, uns
 }
 
 void
-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast], Display *disp, DC drawcontext, Statusbar *statusbar)
+drawsquare(Display *disp, DC drawcontext, Bool filled, Bool empty, unsigned long col[ColLast], Statusbar *statusbar)
 {
     int x;
     XGCValues gcv;
diff --git a/draw.h b/draw.h
index b05e772f8..5b025e720 100644
--- a/draw.h
+++ b/draw.h
@@ -26,7 +26,7 @@
 
 #define textw(set, xfont, text, height)         (textnw(set, xfont, text, a_strlen(text)) + height)
 
-void drawsquare(Bool, Bool, unsigned long *, Display *, DC, Statusbar *);
+void drawsquare(Display *, DC, Bool, Bool, unsigned long *, Statusbar *);
 void drawtext(Display *, DC, Drawable, const char *, unsigned long *);
 unsigned int textnw(XFontSet, XFontStruct *, const char *, unsigned int);
 
diff --git a/statusbar.c b/statusbar.c
index ec803b2c8..80a8bb97e 100644
--- a/statusbar.c
+++ b/statusbar.c
@@ -55,12 +55,12 @@ drawstatusbar(Display *disp, int screen, DC *drawcontext, awesome_config * aweso
         if(awesomeconf->selected_tags[i])
         {
             drawtext(disp, *drawcontext, awesomeconf->statusbar.drawable, awesomeconf->tags[i], drawcontext->sel);
-            drawsquare(sel && sel->tags[i], isoccupied(i, screen), drawcontext->sel, disp, *drawcontext, &awesomeconf->statusbar);
+            drawsquare(disp, *drawcontext, sel && sel->tags[i], isoccupied(i, screen), drawcontext->sel, &awesomeconf->statusbar);
         }
         else
         {
             drawtext(disp, *drawcontext, awesomeconf->statusbar.drawable, awesomeconf->tags[i], drawcontext->norm);
-            drawsquare(sel && sel->tags[i], isoccupied(i, screen), drawcontext->norm, disp, *drawcontext, &awesomeconf->statusbar);
+            drawsquare(disp, *drawcontext, sel && sel->tags[i], isoccupied(i, screen), drawcontext->norm, &awesomeconf->statusbar);
         }
         drawcontext->x += drawcontext->w;
     }
@@ -81,7 +81,7 @@ drawstatusbar(Display *disp, int screen, DC *drawcontext, awesome_config * aweso
         if(sel)
         {
             drawtext(disp, *drawcontext, awesomeconf->statusbar.drawable, sel->name, drawcontext->sel);
-            drawsquare(sel->ismax, sel->isfloating, drawcontext->sel, disp, *drawcontext, &awesomeconf->statusbar);
+            drawsquare(disp, *drawcontext, sel->ismax, sel->isfloating, drawcontext->sel, &awesomeconf->statusbar);
         }
         else
             drawtext(disp, *drawcontext, awesomeconf->statusbar.drawable, NULL, drawcontext->norm);