diff --git a/src/dock.c b/src/dock.c
index 60d8e2e..ace8466 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -513,7 +513,7 @@ static void keepIconsCallback(WMenu *menu, WMenuEntry *entry)
 				wm_backend->icon_update_pixmap(aicon->icon);
 
 				/* Paint it */
-				wm_backend->appicon_paint(aicon);
+				wAppIconPaint(aicon);
 			}
 		}
 		save_appicon(aicon);
@@ -2140,7 +2140,7 @@ Bool wDockAttachIcon(WDock *dock, WAppIcon *icon, int x, int y, Bool update_icon
 		wm_backend->icon_update_pixmap(icon->icon);
 
 	/* Paint it */
-	wm_backend->appicon_paint(icon);
+	wAppIconPaint(icon);
 
 	/* Save it */
 	save_appicon(icon);
@@ -2289,7 +2289,7 @@ Bool wDockMoveIconBetweenDocks(WDock *src, WDock *dest, WAppIcon *icon, int x, i
 		wm_backend->icon_update_pixmap(icon->icon);
 
 	/* Paint it */
-	wm_backend->appicon_paint(icon);
+	wAppIconPaint(icon);
 
 	return True;
 }
@@ -2370,7 +2370,7 @@ void wDockDetach(WDock *dock, WAppIcon *icon)
 			wm_backend->icon_update_pixmap(icon->icon);
 
 		/* Paint it */
-		wm_backend->appicon_paint(icon);
+		wAppIconPaint(icon);
 
 		if (wPreferences.auto_arrange_icons)
 			wArrangeIcons(dock->screen_ptr, True);
@@ -3190,7 +3190,7 @@ void wDockTrackWindowLaunch(WDock *dock, WNativeWindow window)
 					wLowerFrame(aicon->icon->core);
 				wm_backend->window_map((WNativeWindow)aicon->icon->core->window);
 				aicon->launching = 1;
-				wm_backend->appicon_paint(aicon);
+				wAppIconPaint(aicon);
 				slide_window(aicon->icon->core->window, x0, y0, icon->x_pos, icon->y_pos);
 				wm_backend->window_unmap((WNativeWindow)aicon->icon->core->window);
 				wAppIconDestroy(aicon);
@@ -4174,7 +4174,7 @@ int wClipMakeIconOmnipresent(WAppIcon *aicon, int omnipresent)
 		}
 	}
 
-	wm_backend->appicon_paint(aicon);
+	wAppIconPaint(aicon);
 
 	return status;
 }
diff --git a/src/dockedapp.c b/src/dockedapp.c
index 47fb77c..885637a 100644
--- a/src/dockedapp.c
+++ b/src/dockedapp.c
@@ -181,7 +181,7 @@ static void panelBtnCallback(WMWidget * self, void *data)
 			else if (wIsADrawer(aicon))
 				wm_backend->drawer_icon_paint(aicon);
 			else
-				wm_backend->appicon_paint(aicon);
+				wAppIconPaint(aicon);
 
 			wDefaultChangeIcon(aicon->wm_instance, aicon->wm_class, text);
 		}