diff --git a/16x16.fnt b/16x16.fnt
index dcf5363..1cee5e5 100644
Binary files a/16x16.fnt and b/16x16.fnt differ
diff --git a/Makefile b/Makefile
index 8b02235..96b3a62 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,8 @@ endif
 ifneq (,$(wildcard $(BINDIR)gfxboot-compile))
 MKBOOTMSG    = $(BINDIR)gfxboot-compile
 else
-MKBOOTMSG    = $(BINDIR)mkbootmsg
+#MKBOOTMSG    = $(BINDIR)mkbootmsg
+MKBOOTMSG    = $(BINDIR)gfxboot-compile
 endif
 KEYMAPCHARS  = $(PRIVBINDIR)keymapchars
 BFLAGS       = -O -v -L ../..
@@ -81,16 +82,17 @@ endif
 	@tar -C install -czf install/bootlogo.tar.gz bootlogo $(INST_EXT)
 
 font:
-	@if [ -z "$(DI_PATH)" ]; then echo "Please set DI_PATH to an unpacked debian-installer source tree" >&2; exit 1; fi
 	cat po/*.po >tmp.txt
-	cat $(DI_PATH)/build/boot/x86/po/*.po >>tmp.txt
-	gfxboot-font -v -l 18 -p /usr/share/fonts/X11/misc \
+	gfxboot-font -v -l 16 \
+	-p /usr/share/fonts/droid:/usr/share/fonts/unifont \
+	-a 0x2022-0x2023 \
 	-c ISO-8859-15 -c ISO-8859-2 -c koi8-r \
 	`$(KEYMAPCHARS) keytables.inc` \
 	-t tmp.txt \
 	-t install/log -t boot/log \
 	-t langlist -t langnames.inc \
-	-f unifont:prop=2:space_width=4 \
+	-f "DroidSans":size=13 \
+	-f unifont:prop=2:space_width=4:size=16 \
 	16x16.fnt >16x16.fnt.log
 	rm -f tmp.txt
 
diff --git a/common.inc b/common.inc
index f4f01f0..a786ea2 100644
--- a/common.inc
+++ b/common.inc
@@ -1003,7 +1003,7 @@
 
   /menu.text.xofs      10 def
   /menu.text.yofs       2 def
-  /menu.item.height    fontheight dup 3 div add def
+  /menu.item.height    fontheight dup 12 div add def
   /menu.bar.height     fontheight menu.text.yofs dup add add def
 
   font.normal setfont
diff --git a/theme_positions.inc b/theme_positions.inc
index b02e94e..5fb9207 100644
--- a/theme_positions.inc
+++ b/theme_positions.inc
@@ -1,4 +1,4 @@
 /timer.position.x 620 def
 /timer.position.y { panel.text.y } def
-/menu.position.x 180 def
+/menu.position.x 187 def
 /menu.position.y 140 def
diff --git a/xmenu.inc b/xmenu.inc
index 1e01741..efad3e3 100644
--- a/xmenu.inc
+++ b/xmenu.inc
@@ -8,7 +8,7 @@
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 % Some global vars.
 %
-/xmenu.vspace.default	{ xmenu .xm_list get length 15 ge { 2 } { 4 } ifelse } def
+/xmenu.vspace.default	{ xmenu .xm_list get length 15 ge { 2 } { 2 } ifelse } def
 /xmenu.hspace		12 def
 /xmenu.light		white def
 /xmenu.dark		black def
@@ -19,9 +19,9 @@
 /xmenu.selected.bg	0x6c6c6c newcolor
 
 small_layout {
-  /xmenu.maxlines	21 def
+  /xmenu.maxlines	19 def
 } {
-  /xmenu.maxlines	27 def
+  /xmenu.maxlines	19 def
 } ifelse
 
 % xmenu layout