diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Devs/Monitors/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Devs/Monitors/mmakefile.src
index d2e0d38064..7e20a5c724 100644
--- a/images/IconSets/Gorilla/Icons/Medium/AROS/Devs/Monitors/mmakefile.src
+++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Devs/Monitors/mmakefile.src
@@ -1,9 +1,9 @@
-# Copyright (C) 2010-2023, The AROS Development Team. All rights reserved.
+# Copyright (C) 2010-2025, The AROS Development Team. All rights reserved.
 
 include $(SRCDIR)/config/aros.cfg
 
-STORAGEICONS := Wrapper
-PCDEVSICONS    := ATI IntelGMA NVidia VMWare
+STORAGEICONS := Wrapper ATI IntelGMA NVidia
+PCDEVSICONS    := VMWare
 ifneq ($(AROS_TARGET_ARCH),pc)
 PCDEVSDIR := $(AROSDIR)/Storage/Monitors
 else
diff --git a/workbench/devs/monitors/IntelGMA/mmakefile.src b/workbench/devs/monitors/IntelGMA/mmakefile.src
index 128d4c5c94..4da634ed9c 100644
--- a/workbench/devs/monitors/IntelGMA/mmakefile.src
+++ b/workbench/devs/monitors/IntelGMA/mmakefile.src
@@ -5,7 +5,7 @@ include $(SRCDIR)/workbench/libs/mesa/mesa.cfg
 ifneq ($(AROS_TARGET_ARCH),pc)
 EXEDIR := $(AROSDIR)/Storage/Monitors
 else
-EXEDIR := $(AROSDIR)/Devs/Monitors
+EXEDIR := $(AROSDIR)/Storage/Monitors
 endif
 
 GALLIUM_PATH = $(top_srcdir)/src/gallium
diff --git a/workbench/devs/monitors/wrapper/mmakefile.src b/workbench/devs/monitors/wrapper/mmakefile.src
index 46f3bd0d12..1cdb96b699 100644
--- a/workbench/devs/monitors/wrapper/mmakefile.src
+++ b/workbench/devs/monitors/wrapper/mmakefile.src
@@ -24,16 +24,16 @@ endif
 
 #MM
 devs-monitors-wrapper-copy: \
-			    $(PCDEVSDIR)/ATI \
-			    $(PCDEVSDIR)/NVidia \
+			    $(STORAGEDIR)/ATI \
+			    $(STORAGEDIR)/NVidia \
 			    $(PCDEVSDIR)/VMWare \
 			    $(AMIGADEVSDIR)/SAGA
 
-$(PCDEVSDIR)/ATI: $(STORAGEDIR)/Wrapper | $(PCDEVSDIR)
+$(STORAGEDIR)/ATI: $(STORAGEDIR)/Wrapper | $(PCDEVSDIR)
 	%fileactionmsg msg="Creating   " file="$@" elipses="..."
 	@$(CP) -f $< $@
 
-$(PCDEVSDIR)/NVidia: $(STORAGEDIR)/Wrapper | $(PCDEVSDIR)
+$(STORAGEDIR)/NVidia: $(STORAGEDIR)/Wrapper | $(PCDEVSDIR)
 	%fileactionmsg msg="Creating   " file="$@" elipses="..."
 	@$(CP) -f $< $@