diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index fc3a36f2865f..3773751be988 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -82,10 +82,14 @@ CONFIGURE_ARGS+=	--disable-x86-asm
 
 .if defined(WITH_BEASTIE)
 STARTUP_PIXMAP=		bsd-daemon.xpm
+THEMES_START_XPM_SFX=	-suppressed
 .else
 STARTUP_PIXMAP=		icewm-logo.xpm
+THEMES_START_XPM_SFX=
 .endif
 
+PLIST_SUB+=	THEMES_START_XPM_SFX=${THEMES_START_XPM_SFX}
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls --disable-i18n
 PLIST_SUB+=	NLS="@comment "
@@ -97,6 +101,11 @@ PLIST_SUB+=	NLS=""
 post-extract:
 	@cd ${WRKSRC}/lib/taskbar && ${MV} start.xpm icewm-logo.xpm
 	@${CP} -f ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
+.if defined(WITH_BEASTIE)
+	@for icon in ${WRKSRC}/lib/themes/*/taskbar/start.xpm ; do \
+		${MV} "$${icon}" "$${icon%.xpm}${THEMES_START_XPM_SFX}.xpm" ; \
+	done
+.endif
 
 post-patch:
 .for file in configure
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index 7ad7824c9a9b..c0c10b0aa644 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -126,7 +126,7 @@ bin/icewmtray
 %%DATADIR%%/themes/Infadel2/rollupA.xpm
 %%DATADIR%%/themes/Infadel2/rollupI.xpm
 %%DATADIR%%/themes/Infadel2/snap.pcf
-%%DATADIR%%/themes/Infadel2/taskbar/start.xpm
+%%DATADIR%%/themes/Infadel2/taskbar/start%%THEMES_START_XPM_SFX%%.xpm
 %%DATADIR%%/themes/Infadel2/taskbar/windows.xpm
 %%DATADIR%%/themes/Infadel2/titleAB.xpm
 %%DATADIR%%/themes/Infadel2/titleAJ.xpm