diff --git a/recipes-hawaii/hawaii-icon-theme/hawaii-icon-theme_git.bb b/recipes-hawaii/hawaii-icon-theme/hawaii-icon-theme_git.bb
new file mode 100644
index 00000000..f92f593d
--- /dev/null
+++ b/recipes-hawaii/hawaii-icon-theme/hawaii-icon-theme_git.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Icon themes for the Hawaii desktop environment"
+LICENSE = "GPLv3 & LGPLv3"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+"
+
+inherit hawaii gtk-icon-cache
+
+SRCREV = "dfa9938a4ccc47c7b8ce7974afe1f6836b1e58cf"
+PV = "v0.6.90+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "${datadir}/icons"
+
+RREPLACES_${PN} = "hawaii-icon-themes"
+RPROVIDES_${PN} = "hawaii-icon-themes"
+RCONFLICTS_${PN} = "hawaii-icon-themes"
+
diff --git a/recipes-hawaii/hawaii-icon-themes/hawaii-icon-themes_git.bb b/recipes-hawaii/hawaii-icon-themes/hawaii-icon-themes_git.bb
deleted file mode 100644
index 2e2f0329..00000000
--- a/recipes-hawaii/hawaii-icon-themes/hawaii-icon-themes_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "Icon themes for the Hawaii desktop environment"
-LICENSE = "LGPLv3 | CC-BY-SA-3.0"
-LIC_FILES_CHKSUM = " \
-    file://src/cursors/COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
-    file://src/cursors/COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \
-    file://src/cursors/COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://src/symbolic/COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
-    file://src/symbolic/COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \
-    file://src/symbolic/COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-"
-
-inherit hawaii
-
-SRCREV = "1ff24655d3881762294e9dde4a83770e6ff80c3b"
-PV = "0.4.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-PACKAGE_ARCH = "all"
-
-FILES_${PN} += "${datadir}/icons"
diff --git a/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb b/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb
index cf1fb8f0..8825cc91 100644
--- a/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb
+++ b/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb
@@ -47,7 +47,7 @@ RDEPENDS_${PN} = "qttools-tools qtwayland-plugins"
 # REVISIT optionals
 RRECOMMENDS_${PN} += " \
     hawaii-wallpapers \
-    hawaii-icon-themes \
+    hawaii-icon-theme \
 "
 
 FILES_${PN} += " \
diff --git a/recipes-hawaii/packagegroups/hawaii-world.bb b/recipes-hawaii/packagegroups/hawaii-world.bb
index 3b639bcd..e6bd3243 100644
--- a/recipes-hawaii/packagegroups/hawaii-world.bb
+++ b/recipes-hawaii/packagegroups/hawaii-world.bb
@@ -9,7 +9,7 @@ RDEPENDS_${PN} = " \
     eyesight \
     greenisland \
     hawaii-baseapps \
-    hawaii-icon-themes \
+    hawaii-icon-theme \
     ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "hawaii-shell", "",d)} \
     hawaii-system-preferences \
     hawaii-terminal \