diff --git a/src/borders.c b/src/borders.c
index 0083aaa2..6e4d6510 100644
--- a/src/borders.c
+++ b/src/borders.c
@@ -107,7 +107,7 @@ BorderWinpartITclassApply(EWin * ewin, int i, int force)
    ewb->ts = ts;
 
    ITApply(ewb->win, ewin->border->part[i].iclass, is, ewb->w, ewb->h,
-	   ewb->state, ewin->state.active, EoIsSticky(ewin), ewb->expose,
+	   ewb->state, ewin->state.active, EoIsSticky(ewin),
 	   ST_BORDER, ewin->border->part[i].tclass, ts, txt);
 }
 
diff --git a/src/buttons.c b/src/buttons.c
index df46b57d..77efa9f8 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -273,7 +273,7 @@ static void
 ButtonDraw(Button * b)
 {
    ITApply(EoGetWin(b), b->iclass, NULL, EoGetW(b), EoGetH(b),
-	   b->state, 0, 0, 0, ST_BUTTON, b->tclass, NULL, b->label);
+	   b->state, 0, 0, ST_BUTTON, b->tclass, NULL, b->label);
    EoShapeUpdate(b, 0);
 }
 
diff --git a/src/coords.c b/src/coords.c
index 8715173b..2e05f955 100644
--- a/src/coords.c
+++ b/src/coords.c
@@ -124,7 +124,7 @@ CoordsShow(EWin * ewin)
 	EobjMap(eo, 0);
      }
 
-   ITApply(eo->win, ic, NULL, cw, ch, STATE_NORMAL, 1, 0, 0, ST_SOLID,
+   ITApply(eo->win, ic, NULL, cw, ch, STATE_NORMAL, 1, 0, ST_SOLID,
 	   tc, NULL, s);
 
    EFlush();
diff --git a/src/desktops.c b/src/desktops.c
index 2004b24d..cedbac91 100644
--- a/src/desktops.c
+++ b/src/desktops.c
@@ -2274,7 +2274,7 @@ CB_DesktopDisplayRedraw(Dialog * d __UNUSED__, int val, void *data)
      {
 	ic = ImageclassFind("SETTINGS_DESKTOP_AREA", 0);
 	if (ic)
-	   ImageclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, 0, ST_SOLID);
+	   ImageclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, ST_SOLID);
 	for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
 	   wins[i] = 0;
 	called = 1;
@@ -2299,7 +2299,7 @@ CB_DesktopDisplayRedraw(Dialog * d __UNUSED__, int val, void *data)
 	       {
 		  ic = ImageclassFind("SETTINGS_DESKTOP_AREA", 0);
 		  if (ic)
-		     ImageclassApply(ic, wins[i], 64, 48, 0, 0, STATE_NORMAL, 0,
+		     ImageclassApply(ic, wins[i], 64, 48, 0, 0, STATE_NORMAL,
 				     ST_SOLID);
 	       }
 
@@ -2527,7 +2527,7 @@ CB_AreaDisplayRedraw(Dialog * d __UNUSED__, int val, void *data)
 
 	ic = ImageclassFind("SETTINGS_AREA_AREA", 0);
 	if (ic)
-	   ImageclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, 0, ST_SOLID);
+	   ImageclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, ST_SOLID);
 	awin = ECreateWindow(win, 0, 0, 18, 14, 0);
 	ic = ImageclassFind("SETTINGS_AREADESK_AREA", 0);
 	if (ic)
diff --git a/src/dialog.c b/src/dialog.c
index 478e1c6c..518cdb57 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -464,7 +464,7 @@ DialogDrawButton(Dialog * d __UNUSED__, DButton * db)
 	int                 h;
 
 	ImageclassApply(db->iclass, db->win, db->w, db->h, 0, 0, state,
-			0, ST_WIDGET);
+			ST_WIDGET);
 
 	pad = ImageclassGetPadding(ic);
 	h = db->h - (pad->top + pad->bottom);
@@ -478,7 +478,7 @@ DialogDrawButton(Dialog * d __UNUSED__, DButton * db)
      }
    else
      {
-	ITApply(db->win, db->iclass, NULL, db->w, db->h, state, 0, 0, 0,
+	ITApply(db->win, db->iclass, NULL, db->w, db->h, state, 0, 0,
 		ST_WIDGET, db->tclass, NULL, db->text);
      }
 }
@@ -508,7 +508,7 @@ DialogRedraw(Dialog * d)
    if (d->text)
      {
 	TextclassApply(d->iclass, d->pmm.pmap, d->w, d->h, 0, 0, STATE_NORMAL,
-		       1, d->tclass, d->text);
+		       d->tclass, d->text);
      }
    else if (d->item)
      {
@@ -1611,12 +1611,12 @@ DialogDrawItem(Dialog * d, DItem * di)
 	   ImageclassApply(di->item.slider.ic_base,
 			   di->item.slider.base_win,
 			   di->item.slider.base_w, di->item.slider.base_h,
-			   0, 0, STATE_NORMAL, 0, ST_WIDGET);
+			   0, 0, STATE_NORMAL, ST_WIDGET);
 	if (di->item.slider.border_win)
 	   ImageclassApply(di->item.slider.ic_border,
 			   di->item.slider.border_win,
 			   di->item.slider.border_w,
-			   di->item.slider.border_h, 0, 0, STATE_NORMAL, 0,
+			   di->item.slider.border_h, 0, 0, STATE_NORMAL,
 			   ST_WIDGET);
 	state = STATE_NORMAL;
 	if ((di->hilited) && (di->clicked))
@@ -1629,7 +1629,7 @@ DialogDrawItem(Dialog * d, DItem * di)
 	   ImageclassApply(di->item.slider.ic_knob,
 			   di->item.slider.knob_win,
 			   di->item.slider.knob_w, di->item.slider.knob_h,
-			   0, 0, state, 0, ST_WIDGET);
+			   0, 0, state, ST_WIDGET);
 	break;
 
      case DITEM_BUTTON:
@@ -1640,13 +1640,13 @@ DialogDrawItem(Dialog * d, DItem * di)
 	   state = STATE_HILITED;
 	else if (!(di->hilited) && (di->clicked))
 	   state = STATE_CLICKED;
-	ITApply(di->win, di->iclass, NULL, di->w, di->h, state, 0, 0, 0,
+	ITApply(di->win, di->iclass, NULL, di->w, di->h, state, 0, 0,
 		ST_WIDGET, di->tclass, NULL, di->text);
 	break;
 
      case DITEM_AREA:
 	ImageclassApply(di->iclass, di->win, di->w, di->h, 0, 0,
-			STATE_NORMAL, 0, ST_DIALOG);
+			STATE_NORMAL, ST_DIALOG);
 	break;
 
      case DITEM_CHECKBUTTON:
@@ -1660,8 +1660,7 @@ DialogDrawItem(Dialog * d, DItem * di)
 	ImageclassApply(di->iclass, di->item.check_button.check_win,
 			di->item.check_button.check_orig_w,
 			di->item.check_button.check_orig_h,
-			DialogItemCheckButtonGetState(di), 0, state,
-			0, ST_WIDGET);
+			DialogItemCheckButtonGetState(di), 0, state, ST_WIDGET);
 	if (!d->redraw)
 	   break;
 	pad = ImageclassGetPadding(di->iclass);
@@ -1681,10 +1680,10 @@ DialogDrawItem(Dialog * d, DItem * di)
 	   break;
 	if (di->item.separator.horizontal)
 	   ImageclassApply(di->iclass, di->win, di->w, di->h, 0, 0,
-			   STATE_NORMAL, 0, ST_WIDGET);
+			   STATE_NORMAL, ST_WIDGET);
 	else
 	   ImageclassApply(di->iclass, di->win, di->w, di->h, 0, 0,
-			   STATE_CLICKED, 0, ST_WIDGET);
+			   STATE_CLICKED, ST_WIDGET);
 	break;
 
      case DITEM_RADIOBUTTON:
@@ -1698,7 +1697,7 @@ DialogDrawItem(Dialog * d, DItem * di)
 	ImageclassApply(di->iclass, di->item.radio_button.radio_win,
 			di->item.radio_button.radio_orig_w,
 			di->item.radio_button.radio_orig_h,
-			di->item.radio_button.onoff, 0, state, 0, ST_WIDGET);
+			di->item.radio_button.onoff, 0, state, ST_WIDGET);
 	if (!d->redraw)
 	   break;
 	pad = ImageclassGetPadding(di->iclass);
diff --git a/src/dock.c b/src/dock.c
index 35ed0e96..5e5e3d6e 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -145,5 +145,5 @@ DockIt(EWin * ewin)
      }
 
    ImageclassApply(ic, EoGetWin(ewin), ewin->client.w, ewin->client.h,
-		   0, 0, STATE_NORMAL, 0, ST_BUTTON);
+		   0, 0, STATE_NORMAL, ST_BUTTON);
 }
diff --git a/src/hiwin.c b/src/hiwin.c
index f9a189d3..2095ad0d 100644
--- a/src/hiwin.c
+++ b/src/hiwin.c
@@ -143,7 +143,7 @@ static void
 HiwinRenderIclassDraw(Hiwin * phi)
 {
    ImageclassApply(hiwin_ic, EoGetWin(phi), EoGetW(phi), EoGetH(phi), 0, 0,
-		   STATE_NORMAL, 0, ST_PAGER);
+		   STATE_NORMAL, ST_PAGER);
    EClearWindow(EoGetWin(phi));
 }
 
diff --git a/src/iclass.c b/src/iclass.c
index 76c801cb..63f6acb6 100644
--- a/src/iclass.c
+++ b/src/iclass.c
@@ -1146,9 +1146,9 @@ ImagestateDrawBevel(ImageState * is, Drawable win, GC gc, int w, int h)
 }
 
 void
-ITApply(Window win, ImageClass * ic, ImageState * is, int w, int h, int state,
-	int active, int sticky, char expose, int image_type, TextClass * tc,
-	TextState * ts, const char *text)
+ITApply(Window win, ImageClass * ic, ImageState * is, int w, int h,
+	int state, int active, int sticky, int image_type,
+	TextClass * tc, TextState * ts, const char *text)
 {
    if (win == None || !ic)
       return;
@@ -1170,65 +1170,61 @@ ITApply(Window win, ImageClass * ic, ImageState * is, int w, int h, int state,
 	   ts = TextclassGetTextState(tc, state, active, sticky);
      }
 
-   if (!expose)			/* FIXME - Hmmm */
+   if (is->im == NULL && is->im_file)
+      ImagestateRealize(is);
+
+   /* Imlib2 will not render pixmaps with dimensions > 8192 */
+   if (is->im && w <= 8192 && h <= 8192)
      {
-	if (is->im == NULL && is->im_file)
-	   ImagestateRealize(is);
+	PmapMask            pmm;
 
-	/* Imlib2 will not render pixmaps with dimensions > 8192 */
-	if (is->im && w <= 8192 && h <= 8192)
+	ImagestateMakePmapMask(is, win, &pmm, 1, w, h, image_type);
+
+	if (pmm.pmap)
 	  {
-	     PmapMask            pmm;
+	     Pixmap              pmap = pmm.pmap;
 
-	     ImagestateMakePmapMask(is, win, &pmm, 1, w, h, image_type);
-
-	     if (pmm.pmap)
+	     if (ts && text)
 	       {
-		  Pixmap              pmap = pmm.pmap;
+		  if (pmm.type != 0)
+		     pmap = ECreatePixmapCopy(pmm.pmap, w, h, VRoot.depth);
 
-		  if (ts && text)
-		    {
-		       if (pmm.type != 0)
-			  pmap = ECreatePixmapCopy(pmm.pmap, w, h, VRoot.depth);
-
-		       TextstateDrawText(ts, pmap, text, ic->padding.left,
-					 ic->padding.top,
-					 w - (ic->padding.left +
-					      ic->padding.right),
-					 h - (ic->padding.top +
-					      ic->padding.bottom),
-					 0, TextclassGetJustification(tc));
-		    }
-
-		  /* Set window pixmap */
-		  ESetWindowBackgroundPixmap(win, pmap);
-		  if (pmap != pmm.pmap)
-		     EFreePixmap(pmap);
-
-		  if (pmm.w == w && pmm.h == h)
-		     EShapeCombineMask(win, ShapeBounding, 0, 0,
-				       pmm.mask, ShapeSet);
-		  else if (pmm.mask)
-		     EShapeCombineMaskTiled(win, ShapeBounding, 0, 0,
-					    pmm.mask, ShapeSet, w, h);
+		  TextstateDrawText(ts, pmap, text, ic->padding.left,
+				    ic->padding.top,
+				    w - (ic->padding.left +
+					 ic->padding.right),
+				    h - (ic->padding.top +
+					 ic->padding.bottom),
+				    0, TextclassGetJustification(tc));
 	       }
 
-	     FreePmapMask(&pmm);
-	     EClearWindow(win);
+	     /* Set window pixmap */
+	     ESetWindowBackgroundPixmap(win, pmap);
+	     if (pmap != pmm.pmap)
+		EFreePixmap(pmap);
 
-	     if ((is->unloadable) || (Conf.memory_paranoia))
-	       {
-		  EImageFree(is->im);
-		  is->im = NULL;
-	       }
+	     if (pmm.w == w && pmm.h == h)
+		EShapeCombineMask(win, ShapeBounding, 0, 0, pmm.mask, ShapeSet);
+	     else if (pmm.mask)
+		EShapeCombineMaskTiled(win, ShapeBounding, 0, 0,
+				       pmm.mask, ShapeSet, w, h);
 	  }
-	else
+
+	FreePmapMask(&pmm);
+	EClearWindow(win);
+
+	if ((is->unloadable) || (Conf.memory_paranoia))
 	  {
-	     /* FIXME - No text */
-	     ESetWindowBackground(win, is->bg.pixel);
-	     EClearWindow(win);
+	     EImageFree(is->im);
+	     is->im = NULL;
 	  }
      }
+   else
+     {
+	/* FIXME - No text */
+	ESetWindowBackground(win, is->bg.pixel);
+	EClearWindow(win);
+     }
 
    if (is->bevelstyle != BEVEL_NONE)
      {
@@ -1242,9 +1238,9 @@ ITApply(Window win, ImageClass * ic, ImageState * is, int w, int h, int state,
 
 void
 ImageclassApply(ImageClass * ic, Window win, int w, int h, int active,
-		int sticky, int state, char expose, int image_type)
+		int sticky, int state, int image_type)
 {
-   ITApply(win, ic, NULL, w, h, state, active, sticky, expose, image_type,
+   ITApply(win, ic, NULL, w, h, state, active, sticky, image_type,
 	   NULL, NULL, NULL);
 }
 
@@ -1543,7 +1539,7 @@ ImageclassIpc(const char *params, Client * c __UNUSED__)
 
 	     if (!EDrawableCheck(win, 0))	/* Grab server? */
 		return;
-	     ImageclassApply(ic, win, w, h, 0, 0, st, 0, ST_SOLID);
+	     ImageclassApply(ic, win, w, h, 0, 0, st, ST_SOLID);
 	  }
      }
    else if (!strcmp(param2, "apply_copy"))
diff --git a/src/iclass.h b/src/iclass.h
index 0c972362..80561526 100644
--- a/src/iclass.h
+++ b/src/iclass.h
@@ -110,7 +110,7 @@ Pixmap              ImageclassApplySimple(ImageClass * ic, Window win,
 					  int y, int w, int h);
 void                ImageclassApply(ImageClass * ic, Window win, int w, int h,
 				    int active, int sticky, int state,
-				    char expose, int image_type);
+				    int image_type);
 void                ImageclassApplyCopy(ImageClass * ic, Window win, int w,
 					int h, int active, int sticky,
 					int state, PmapMask * pmm,
@@ -121,7 +121,7 @@ EImage             *ImageclassGetImageBlended(ImageClass * ic, Window win,
 					      int image_type);
 void                ITApply(Window win, ImageClass * ic, ImageState * is, int w,
 			    int h, int state, int active, int sticky,
-			    char expose, int image_type, TextClass * tc,
+			    int image_type, TextClass * tc,
 			    TextState * ts, const char *text);
 
 #endif /* _ICLASS_H */
diff --git a/src/iconify.c b/src/iconify.c
index 62cabb39..197cf11b 100644
--- a/src/iconify.c
+++ b/src/iconify.c
@@ -1184,7 +1184,7 @@ IB_DrawScroll(Iconbox * ib)
 
 	ic = ImageclassFind("ICONBOX_SCROLLBAR_BASE_VERTICAL", 0);
 	if (ic)
-	   ImageclassApply(ic, ib->scroll_win, -1, -1, 0, 0, STATE_NORMAL, 0,
+	   ImageclassApply(ic, ib->scroll_win, -1, -1, 0, 0, STATE_NORMAL,
 			   ST_ICONBOX);
 
 	EMoveResizeWindow(ib->scrollbar_win,
@@ -1199,7 +1199,7 @@ IB_DrawScroll(Iconbox * ib)
 		state = STATE_HILITED;
 	     if (ib->scrollbar_clicked)
 		state = STATE_CLICKED;
-	     ImageclassApply(ic, ib->scrollbar_win, -1, -1, 0, 0, state, 0,
+	     ImageclassApply(ic, ib->scrollbar_win, -1, -1, 0, 0, state,
 			     ST_ICONBOX);
 	  }
 
@@ -1216,7 +1216,7 @@ IB_DrawScroll(Iconbox * ib)
 		state = STATE_HILITED;
 	     if (ib->scrollbar_clicked)
 		state = STATE_CLICKED;
-	     ImageclassApply(ic, ib->scrollbarknob_win, -1, -1, 0, 0, state, 0,
+	     ImageclassApply(ic, ib->scrollbarknob_win, -1, -1, 0, 0, state,
 			     ST_ICONBOX);
 	  }
 	else
@@ -1234,7 +1234,7 @@ IB_DrawScroll(Iconbox * ib)
 		     state = STATE_HILITED;
 		  if (ib->arrow1_clicked)
 		     state = STATE_CLICKED;
-		  ImageclassApply(ic, ib->arrow1_win, -1, -1, 0, 0, state, 0,
+		  ImageclassApply(ic, ib->arrow1_win, -1, -1, 0, 0, state,
 				  ST_ICONBOX);
 	       }
 
@@ -1246,7 +1246,7 @@ IB_DrawScroll(Iconbox * ib)
 		     state = STATE_HILITED;
 		  if (ib->arrow2_clicked)
 		     state = STATE_CLICKED;
-		  ImageclassApply(ic, ib->arrow2_win, -1, -1, 0, 0, state, 0,
+		  ImageclassApply(ic, ib->arrow2_win, -1, -1, 0, 0, state,
 				  ST_ICONBOX);
 	       }
 	  }
@@ -1404,7 +1404,7 @@ IB_DrawScroll(Iconbox * ib)
 
 	ic = ImageclassFind("ICONBOX_SCROLLBAR_BASE_HORIZONTAL", 0);
 	if (ic)
-	   ImageclassApply(ic, ib->scroll_win, -1, -1, 0, 0, STATE_NORMAL, 0,
+	   ImageclassApply(ic, ib->scroll_win, -1, -1, 0, 0, STATE_NORMAL,
 			   ST_ICONBOX);
 
 	ic = ImageclassFind("ICONBOX_SCROLLBAR_KNOB_HORIZONTAL", 0);
@@ -1415,7 +1415,7 @@ IB_DrawScroll(Iconbox * ib)
 		state = STATE_HILITED;
 	     if (ib->scrollbar_clicked)
 		state = STATE_CLICKED;
-	     ImageclassApply(ic, ib->scrollbar_win, -1, -1, 0, 0, state, 0,
+	     ImageclassApply(ic, ib->scrollbar_win, -1, -1, 0, 0, state,
 			     ST_ICONBOX);
 	  }
 
@@ -1432,7 +1432,7 @@ IB_DrawScroll(Iconbox * ib)
 		state = STATE_HILITED;
 	     if (ib->scrollbar_clicked)
 		state = STATE_CLICKED;
-	     ImageclassApply(ic, ib->scrollbarknob_win, -1, -1, 0, 0, state, 0,
+	     ImageclassApply(ic, ib->scrollbarknob_win, -1, -1, 0, 0, state,
 			     ST_ICONBOX);
 	  }
 	else
@@ -1450,7 +1450,7 @@ IB_DrawScroll(Iconbox * ib)
 		     state = STATE_HILITED;
 		  if (ib->arrow1_clicked)
 		     state = STATE_CLICKED;
-		  ImageclassApply(ic, ib->arrow1_win, -1, -1, 0, 0, state, 0,
+		  ImageclassApply(ic, ib->arrow1_win, -1, -1, 0, 0, state,
 				  ST_ICONBOX);
 	       }
 
@@ -1462,7 +1462,7 @@ IB_DrawScroll(Iconbox * ib)
 		     state = STATE_HILITED;
 		  if (ib->arrow2_clicked)
 		     state = STATE_CLICKED;
-		  ImageclassApply(ic, ib->arrow2_win, -1, -1, 0, 0, state, 0,
+		  ImageclassApply(ic, ib->arrow2_win, -1, -1, 0, 0, state,
 				  ST_ICONBOX);
 	       }
 	  }
@@ -1614,7 +1614,7 @@ IconboxDraw(Iconbox * ib)
 	EMoveResizeWindow(ib->cover_win, ib_xlt, ib_ylt, ib_ww, ib_hh);
 	EMapWindow(ib->cover_win);
 	ImageclassApply(ib_ic_cover, ib->cover_win, -1, -1, 0, 0, STATE_NORMAL,
-			0, ST_ICONBOX);
+			ST_ICONBOX);
      }
    else
      {
diff --git a/src/menus.c b/src/menus.c
index 70745c5b..20080b9a 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -816,7 +816,7 @@ MenuRealize(Menu * m)
 	     EGetGeometry(m->items[i]->icon_win, NULL, NULL, NULL, &iw, &ih,
 			  NULL, NULL);
 	     ImageclassApply(m->items[i]->icon_iclass, m->items[i]->icon_win,
-			     iw, ih, 0, 0, STATE_NORMAL, 0, ST_MENU_ITEM);
+			     iw, ih, 0, 0, STATE_NORMAL, ST_MENU_ITEM);
 	  }
 	if (x + maxw > mmw)
 	   mmw = x + maxw;
diff --git a/src/pager.c b/src/pager.c
index 4a757942..3ddc4cc4 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -606,7 +606,7 @@ PagerEwinMoveResize(EWin * ewin, int resize __UNUSED__)
      {
 	DeskGetArea(p->dsk, &cx, &cy);
 	EMoveResizeWindow(p->sel_win, cx * p->dw, cy * p->dh, p->dw, p->dh);
-	ImageclassApply(ic, p->sel_win, p->dw, p->dh, 0, 0, STATE_NORMAL, 0,
+	ImageclassApply(ic, p->sel_win, p->dw, p->dh, 0, 0, STATE_NORMAL,
 			ST_PAGER);
      }
 }
@@ -975,7 +975,7 @@ _PagerUpdateSel(Pager * p, void *prm __UNUSED__)
 	ic = ImageclassFind("PAGER_SEL", 0);
 	if (ic)
 	   ImageclassApply(ic, p->sel_win, p->dw, p->dh, 0, 0,
-			   STATE_NORMAL, 0, ST_PAGER);
+			   STATE_NORMAL, ST_PAGER);
      }
 }
 
diff --git a/src/progress.c b/src/progress.c
index 4d556c73..747fd0ad 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -164,9 +164,9 @@ ProgressbarSet(Progressbar * p, int progress)
       w = p->w;
    Esnprintf(s, sizeof(s), "%i%%", p->value);
 
-   TextclassApply(p->inc, p->n_win->win, p->h * 5, p->h, 0, 0, STATE_CLICKED, 0,
+   TextclassApply(p->inc, p->n_win->win, p->h * 5, p->h, 0, 0, STATE_CLICKED,
 		  p->tnc, s);
-   ImageclassApply(p->inc, p->p_win->win, w, p->h, 1, 0, STATE_NORMAL, 0,
+   ImageclassApply(p->inc, p->p_win->win, w, p->h, 1, 0, STATE_NORMAL,
 		   ST_SOLID);
 
    EobjResize(p->p_win, w, p->h);
@@ -186,10 +186,10 @@ ProgressbarShow(Progressbar * p)
       w = p->w;
 
    ImageclassApply(p->ic, p->win->win, p->w - (p->h * 5), p->h, 0, 0,
-		   STATE_NORMAL, 0, ST_SOLID);
+		   STATE_NORMAL, ST_SOLID);
    ImageclassApply(p->inc, p->n_win->win, (p->h * 5), p->h, 0, 0, STATE_CLICKED,
-		   0, ST_SOLID);
-   ImageclassApply(p->ipc, p->p_win->win, w, p->h, 1, 0, STATE_NORMAL, 0,
+		   ST_SOLID);
+   ImageclassApply(p->ipc, p->p_win->win, w, p->h, 1, 0, STATE_NORMAL,
 		   ST_SOLID);
 
    EobjMap(p->win, 0);
@@ -197,7 +197,7 @@ ProgressbarShow(Progressbar * p)
    EobjMap(p->p_win, 0);
    ESync();
    TextclassApply(p->ic, p->win->win, p->w - (p->h * 5), p->h, 0, 0,
-		  STATE_NORMAL, 0, p->tc, p->win->name);
+		  STATE_NORMAL, p->tc, p->win->name);
 }
 
 void
diff --git a/src/startup.c b/src/startup.c
index 1954b03c..10605eca 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -100,8 +100,8 @@ StartupWindowsCreate(void)
 	EMapRaised(b1);
 	EMapRaised(b2);
 
-	ImageclassApply(ic, b1, bw, bh, 0, 0, 0, 0, ST_SOLID);
-	ImageclassApply(ic, b2, bw, bh, 0, 0, 0, 0, ST_SOLID);
+	ImageclassApply(ic, b1, bw, bh, 0, 0, 0, ST_SOLID);
+	ImageclassApply(ic, b2, bw, bh, 0, 0, 0, ST_SOLID);
      }
 
    BackgroundSet(bg, win1, VRoot.w, VRoot.h);
diff --git a/src/tclass.c b/src/tclass.c
index 9774ede9..35a8df76 100644
--- a/src/tclass.c
+++ b/src/tclass.c
@@ -471,8 +471,8 @@ TextclassConfigLoad(FILE * fs)
 }
 
 void
-TextclassApply(ImageClass * iclass, Window win, int w, int h, int active,
-	       int sticky, int state, char expose __UNUSED__,
+TextclassApply(ImageClass * iclass, Window win, int w, int h,
+	       int active, int sticky, int state,
 	       TextClass * tclass, const char *text)
 {
    EImageBorder       *pad;
diff --git a/src/tclass.h b/src/tclass.h
index a6acfbfb..16e57e03 100644
--- a/src/tclass.h
+++ b/src/tclass.h
@@ -80,8 +80,7 @@ void                TextclassSetJustification(TextClass * tc, int just);
 TextClass          *TextclassFind(const char *name, int fallback);
 void                TextclassApply(ImageClass * ic, Window win, int w,
 				   int h, int active, int sticky, int state,
-				   char expose, TextClass * tclass,
-				   const char *text);
+				   TextClass * tclass, const char *text);
 
 /* text.c */
 TextState          *TextclassGetTextState(TextClass * tclass, int state,
diff --git a/src/tooltips.c b/src/tooltips.c
index f16eed11..4fc2b49f 100644
--- a/src/tooltips.c
+++ b/src/tooltips.c
@@ -446,7 +446,7 @@ TooltipShow(ToolTip * tt, const char *text, ActionClass * ac, int x, int y)
 	iy = (h - ih) / 2;
 	EMoveResizeWindow(tt->iwin, ix, iy, iw, ih);
 	EMapWindow(tt->iwin);
-	ImageclassApply(tt->tooltippic, tt->iwin, iw, ih, 0, 0, STATE_NORMAL, 0,
+	ImageclassApply(tt->tooltippic, tt->iwin, iw, ih, 0, 0, STATE_NORMAL,
 			ST_SOLID);
      }
    else
@@ -580,7 +580,7 @@ TooltipShow(ToolTip * tt, const char *text, ActionClass * ac, int x, int y)
 	eo = tt->win[i];
 	if (eo)
 	   ImageclassApply(tt->iclass[i], eo->win, eo->w, eo->h, 0, 0,
-			   STATE_NORMAL, 0, ST_TOOLTIP);
+			   STATE_NORMAL, ST_TOOLTIP);
      }
 
    for (i = 0; i < 5; i++)
diff --git a/src/warp.c b/src/warp.c
index b805bffa..31f20c72 100644
--- a/src/warp.c
+++ b/src/warp.c
@@ -205,7 +205,7 @@ WarpFocusWinPaint(WarpFocusWin * fw)
 
 	state = (i == warpFocusIndex) ? STATE_CLICKED : STATE_NORMAL;
 
-	ImageclassApply(fw->ic, wi->win, fw->mw, fw->mh, 0, 0, state, 0,
+	ImageclassApply(fw->ic, wi->win, fw->mw, fw->mh, 0, 0, state,
 			ST_WARPLIST);
 
 	/* New icon stuff */
@@ -232,7 +232,7 @@ WarpFocusWinPaint(WarpFocusWin * fw)
 	  }
 	else
 	  {
-	     TextclassApply(fw->ic, wi->win, fw->mw, fw->mh, 0, 0, state, 0,
+	     TextclassApply(fw->ic, wi->win, fw->mw, fw->mh, 0, 0, state,
 			    fw->tc, wi->txt);
 	  }
      }