diff --git a/share/bootloaders/grub-pc/config.cfg b/share/bootloaders/grub-pc/config.cfg
index f423aec99..1061be0f7 100644
--- a/share/bootloaders/grub-pc/config.cfg
+++ b/share/bootloaders/grub-pc/config.cfg
@@ -1,10 +1,24 @@
 set default=0
 
-loadfont $prefix/dejavu-bold-16.pf2
-loadfont $prefix/dejavu-bold-14.pf2
-loadfont $prefix/unicode.pf2
-set gfxmode=auto
-insmod all_video
+if [ x$feature_default_font_path = xy ] ; then
+    font=unicode
+else
+    font=$prefix/unicode.pf2
+fi
+
+# Copied from the netinst image
+if loadfont $font ; then
+    set gfxmode=800x600
+    set gfxpayload=keep
+    insmod efi_gop
+    insmod efi_uga
+    insmod video_bochs
+    insmod video_cirrus
+else
+    set gfxmode=auto
+    insmod all_video
+fi
+
 insmod gfxterm
 insmod png
 
diff --git a/share/bootloaders/grub-pc/dejavu-bold-14.pf2 b/share/bootloaders/grub-pc/dejavu-bold-14.pf2
deleted file mode 100644
index 9b093b207..000000000
Binary files a/share/bootloaders/grub-pc/dejavu-bold-14.pf2 and /dev/null differ
diff --git a/share/bootloaders/grub-pc/dejavu-bold-16.pf2 b/share/bootloaders/grub-pc/dejavu-bold-16.pf2
deleted file mode 100644
index 11e7f7ab7..000000000
Binary files a/share/bootloaders/grub-pc/dejavu-bold-16.pf2 and /dev/null differ
diff --git a/share/bootloaders/grub-pc/live-theme/theme.txt b/share/bootloaders/grub-pc/live-theme/theme.txt
index 4ceef4b2a..a09771144 100644
--- a/share/bootloaders/grub-pc/live-theme/theme.txt
+++ b/share/bootloaders/grub-pc/live-theme/theme.txt
@@ -1,6 +1,6 @@
 desktop-image: "../splash.png"
 title-color: "#ffffff"
-title-font: "DejaVu Sans Bold 16"
+title-font: "Unifont Regular 16"
 title-text: "Live Boot Menu with GRUB"
 message-font: "Unifont Regular 16"
 terminal-font: "Unifont Regular 16"
@@ -14,7 +14,7 @@ terminal-font: "Unifont Regular 16"
         text = "@KEYMAP_SHORT@"
         align = "center"
         color = "#ffffff"
-	font = "DejaVu Sans Bold 14"
+	font = "Unifont Regular 16"
 }
 
 #boot menu
@@ -24,9 +24,9 @@ terminal-font: "Unifont Regular 16"
         top = 52%
         height = 48%-80
         item_color = "#a8a8a8"
-	item_font = "DejaVu Sans Bold 14"
+	item_font = "Unifont Regular 16"
         selected_item_color= "#ffffff"
-	selected_item_font = "DejaVu Sans Bold 14"
+	selected_item_font = "Unifont Regular 16"
         item_height = 16
         item_padding = 0
         item_spacing = 4
@@ -42,7 +42,7 @@ terminal-font: "Unifont Regular 16"
         top = 100%-80
         height = 16
         width = 70%
-        font = "DejaVu Sans Regular 14"
+        font = "Unifont Regular 16"
         text_color = "#000000"
         fg_color = "#ffffff"
         bg_color = "#a8a8a8"