diff --git a/x11-themes/MoreWaita/Manifest b/x11-themes/MoreWaita/Manifest
index 73c7307476..43ad7b5f9c 100644
--- a/x11-themes/MoreWaita/Manifest
+++ b/x11-themes/MoreWaita/Manifest
@@ -1 +1 @@
-DIST MoreWaita-49.tar.gz 11044727 BLAKE2B b0d687276be38fd60646971e06db0625cacf79d02363f59e76c7f307bc13e48c0f828a69bddff517734411176eee570a9b033f169ba007cef46514fae0872fab SHA512 8eacaabcde9ee018365481608bd9723c606b9345127e065c64df001461122eafe57663457cc89b7679a9c4d5f4e2b86ec4581a792aa9d54b94a6b924aad5d5a7
+DIST MoreWaita-50.tar.gz 11074341 BLAKE2B 21c6b74592d84708c09834812733aa7575446a2638615d34dabea0b0203bbc9ce8da099dea245b5736daa965a18ba48d5913d34be21db81fd1447e26b977bd88 SHA512 a606a0ed6c07be1e897660698b6656fea8f8a3308a5f91d8adef0cfcab2b6b4ebddcb3c15522e3ed72ae957b4ed812a4ce4d519f74cefe0f0c007a5956247ef1
diff --git a/x11-themes/MoreWaita/MoreWaita-49.ebuild b/x11-themes/MoreWaita/MoreWaita-50.ebuild
similarity index 68%
rename from x11-themes/MoreWaita/MoreWaita-49.ebuild
rename to x11-themes/MoreWaita/MoreWaita-50.ebuild
index 28a00acee1..0f4528e286 100644
--- a/x11-themes/MoreWaita/MoreWaita-49.ebuild
+++ b/x11-themes/MoreWaita/MoreWaita-50.ebuild
@@ -21,3 +21,12 @@ fi
 # this ebuild does not install binaries
 RESTRICT="binchecks strip"
 RDEPEND="x11-themes/adwaita-icon-theme"
+
+src_prepare() {
+	default
+
+	einfo "Fixing invalid Meson identifiers starting with digits..."
+	find . -name "meson.build" -exec sed -i 's/16x16_places_iconsdir/iconsdir_16x_places/g' {} + || die
+	find . -name "meson.build" -exec sed -i 's/16x16_iconsdir/iconsdir_16x/g' {} + || die
+
+}
diff --git a/x11-themes/MoreWaita/MoreWaita-9999.ebuild b/x11-themes/MoreWaita/MoreWaita-9999.ebuild
index 28a00acee1..0f4528e286 100644
--- a/x11-themes/MoreWaita/MoreWaita-9999.ebuild
+++ b/x11-themes/MoreWaita/MoreWaita-9999.ebuild
@@ -21,3 +21,12 @@ fi
 # this ebuild does not install binaries
 RESTRICT="binchecks strip"
 RDEPEND="x11-themes/adwaita-icon-theme"
+
+src_prepare() {
+	default
+
+	einfo "Fixing invalid Meson identifiers starting with digits..."
+	find . -name "meson.build" -exec sed -i 's/16x16_places_iconsdir/iconsdir_16x_places/g' {} + || die
+	find . -name "meson.build" -exec sed -i 's/16x16_iconsdir/iconsdir_16x/g' {} + || die
+
+}