diff --git a/UPDATING b/UPDATING
index 29cb0ac22fe51..e784f379d62b3 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,21 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20230924:
+  AFFECTS: users of XFCE desktop (x11-wm/xfce4)
+  AUTHOR: madpilot@FreeBSD.org
+
+  XFCE 4.18 is incompatible with the latest version of the adwaita
+  icon theme (version 42.0 and newer), which was used as the default one.
+  Due to this the default icon theme has been changed to
+  x11-themes/xfce-icons-elementary.
+
+  Users that have XFCE already installed and are using the adwaita
+  icon theme will notice missing icons. To fix this you can install
+  any other icon theme (like x11-themes/xfce-icons-elementary) and
+  configure XFCE to use that via the "appearance" settings application,
+  under the "icons" tab.
+
 20230919:
   AFFECTS: users of net-p2p/transmission
   AUTHOR:  mondo.debater_0q@icloud.com
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index fa3d82052cbe0..c36caaf20f0c0 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xfce4-settings
 PORTVERSION=	4.18.3
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
@@ -51,9 +52,9 @@ CONFIGURE_ARGS+=	--enable-debug=yes
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|Rodent|Adwaita|g' \
+	@${REINPLACE_CMD} -e 's|Rodent|elementary-xfce|g' \
 		${WRKSRC}/dialogs/appearance-settings/main.c
-	@${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="Adwaita|' \
+	@${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="elementary-xfce|' \
 		${WRKSRC}/xfsettingsd/xsettings.xml
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 4ee604b7eebc5..558d08c652b3f 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xfce
 PORTVERSION=	4.18
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 
 MAINTAINER=	xfce@FreeBSD.org
@@ -22,7 +23,7 @@ APPFINDER_RUN_DEPENDS=	xfce4-appfinder:misc/xfce4-appfinder
 APPFINDER_DESC=		Launcher and finder
 GREYBIRD_DESC=		Install Greybird theme
 GREYBIRD_RUN_DEPENDS=	greybird-theme>0:x11-themes/greybird-theme
-ICONS_RUN_DEPENDS=	adwaita-icon-theme>0:x11-themes/adwaita-icon-theme
+ICONS_RUN_DEPENDS=	xfce-icons-elementary>0:x11-themes/xfce-icons-elementary
 LIGHTDM_RUN_DEPENDS=	lightdm-gtk-greeter:x11/lightdm-gtk-greeter
 LIGHTDM_DESC=		LightDM display manger
 MOUSEPAD_RUN_DEPENDS=	mousepad:editors/mousepad