diff --git a/sys-boot/grub-efi-image/Manifest b/sys-boot/grub-efi-image/Manifest
index cdcfba1..6d75245 100644
--- a/sys-boot/grub-efi-image/Manifest
+++ b/sys-boot/grub-efi-image/Manifest
@@ -2,4 +2,4 @@ AUX grub-bootstrap.cfg 26 BLAKE2B 9acd7b63bca7b4ef14c9e676de6b827afecb7f1b4e92b2
 AUX grub-efi-modules 781 BLAKE2B ee58cdb8f4c3e605b9f8d497e8bba038df9fbeaa179da0940df87308902f3c48eb737667773c0a8a95ce46d3bf85e76dac8477aa7207506c6175d6021bd804a1 SHA512 3d82163af9bd84a6e4bd210122fd2608d40e1c09ed81639e45b15e45c140988de90116e48f15c9853515b21c1aae37a46b129631db86a2c90e93e9d9a63df180
 AUX grub-memdisk.cfg.in 210 BLAKE2B 8cfe27ae2a3a0ac2985346d084667ec0fd9e3f6bd4700067c1cfcd5c32e315575416c5c03c4b8a4a2499c23491beddf18b04240842bcb43b5f117afec9f16ba9 SHA512 12e253f257adaba922ebf58380356ed7161c0004b9a3068b5aea99d1489a52545c349dbf9ad3f9377275f8c70ff046ad862b4ebf90d5aa0af0fe6c5063037a04
 AUX sbat.csv.in 258 BLAKE2B dfd196fff3334844c3fb8b944e78a7c502572afa0e84c1a92be2b4b09730656dcc0dc518a291fafa8262f4209466a076c088dcd4e5d8dbcde629a00d97a833a7 SHA512 25541f85b23ed3f9fe53be9c9b293e45ec9ae7523d1f3b3b16a1b84f0fc0295e7d868c796a5119fa1693f0eed7face09cbab5eb0ce9d3ce6589ae1a198829eb7
-EBUILD grub-efi-image-0.ebuild 1836 BLAKE2B fa4d71851610c72469d0ba61db9b7026f29946eccbb47533c0e2b21c90440dfba5a8d00f9076683df6fcabd3819a84b61a689cd96f267f6b785dfcb3c777209a SHA512 7e578829f4cd231f011e7e27a1ce8bf464fb04261aeacc00cd3bbca02dbd8e8935955d59bc0b42589ab0e93ef0fc512196fe56092ac86cf549ace9acd01dc2ec
+EBUILD grub-efi-image-0.ebuild 2008 BLAKE2B 6bbae37af6a1abe7c0f4478af2894dc856b92eaf9f9e0d2c588d7dc8f8c6872bb74ffbafa440754a3bea51143c95dfe16f4d8f670020b543e0c93f715c5c2ed2 SHA512 d8223474022e3844203e0e172d17d9937910b176080583badd4338bd5d728d61a6d14e5df9fd0dc7155d2f18f76707d34b7c3d102543511bc4b5790a12735038
diff --git a/sys-boot/grub-efi-image/grub-efi-image-0.ebuild b/sys-boot/grub-efi-image/grub-efi-image-0.ebuild
index 42a2f6e..0304c2e 100644
--- a/sys-boot/grub-efi-image/grub-efi-image-0.ebuild
+++ b/sys-boot/grub-efi-image/grub-efi-image-0.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 
-IUSE="+grub_platforms_efi-64 grub_platforms_efi-32"
+IUSE="+grub_platforms_efi-64 grub_platforms_efi-32 grub_font_size_24 grub_font_size_32"
 
 DEPEND="
 	sys-boot/grub:2=[fonts]
@@ -21,11 +21,12 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="
 	sys-apps/util-linux
+	media-fonts/dejavu
 "
 
 GRUB_VERSION="2.06-r4"
 EFI_VENDOR="gentoo"
-GRUB_FONT_SIZE="24"
+GRUB_FONT_SIZE="16"
 
 S="${WORKDIR}"
 
@@ -51,13 +52,6 @@ src_compile() {
 	local plateform
 	local efi_name
 
-	grub-mkfont \
-		-s "${GRUB_FONT_SIZE}" \
-		-o "${WORKDIR}/memdisk/fonts/unicode.pf2" \
-		/usr/share/fonts/dejavu/DejaVuSansMono.ttf
-
-	tar -cf "${WORKDIR}/memdisk.tar" -C "${WORKDIR}/memdisk" .
-
 	if use grub_platforms_efi-64; then
 		platform="x86_64-efi"
 		efi_name="x64"
@@ -68,6 +62,20 @@ src_compile() {
 		die "Unsupported platform"
 	fi
 
+	if use grub_font_size_24; then
+		GRUB_FONT_SIZE="24"
+	elif use grub_font_size_32; then
+		GRUB_FONT_SIZE="32"
+	fi
+
+	grub-mkfont \
+		-s "${GRUB_FONT_SIZE}" \
+		-o "${WORKDIR}/memdisk/fonts/unicode.pf2" \
+		/usr/share/fonts/dejavu/DejaVuSansMono.ttf
+
+	tar -cf "${WORKDIR}/memdisk.tar" -C "${WORKDIR}/memdisk" .
+
+
 	grub-mkimage \
 		-O "${platform}" \
 		-o "${WORKDIR}/grub${efi_name}.efi" \