diff --git a/radio/src/fonts/horus/font_dblsize.png b/radio/src/fonts/horus/font_dblsize.png
index cfbf91076..af2a0ab70 100644
Binary files a/radio/src/fonts/horus/font_dblsize.png and b/radio/src/fonts/horus/font_dblsize.png differ
diff --git a/radio/src/fonts/horus/font_midsize.png b/radio/src/fonts/horus/font_midsize.png
index 366be3383..8e81f8f72 100644
Binary files a/radio/src/fonts/horus/font_midsize.png and b/radio/src/fonts/horus/font_midsize.png differ
diff --git a/radio/src/fonts/horus/font_smlsize.png b/radio/src/fonts/horus/font_smlsize.png
index abb0b53ef..51ad50fc6 100644
Binary files a/radio/src/fonts/horus/font_smlsize.png and b/radio/src/fonts/horus/font_smlsize.png differ
diff --git a/radio/src/fonts/horus/font_stdsize.png b/radio/src/fonts/horus/font_stdsize.png
index 5f8debe23..8a117ac29 100644
Binary files a/radio/src/fonts/horus/font_stdsize.png and b/radio/src/fonts/horus/font_stdsize.png differ
diff --git a/radio/src/fonts/horus/font_stdsizebold.png b/radio/src/fonts/horus/font_stdsizebold.png
index 4916e646a..b5f61a5c0 100644
Binary files a/radio/src/fonts/horus/font_stdsizebold.png and b/radio/src/fonts/horus/font_stdsizebold.png differ
diff --git a/radio/src/fonts/horus/font_tinsize.png b/radio/src/fonts/horus/font_tinsize.png
index e639066af..f47980a7d 100644
Binary files a/radio/src/fonts/horus/font_tinsize.png and b/radio/src/fonts/horus/font_tinsize.png differ
diff --git a/radio/src/fonts/horus/font_xxlsize.png b/radio/src/fonts/horus/font_xxlsize.png
index 15ec5697d..9e66c58cd 100644
Binary files a/radio/src/fonts/horus/font_xxlsize.png and b/radio/src/fonts/horus/font_xxlsize.png differ
diff --git a/radio/src/gui/horus/gui.h b/radio/src/gui/horus/gui.h
index a741afd6d..c2a5d7b5d 100644
--- a/radio/src/gui/horus/gui.h
+++ b/radio/src/gui/horus/gui.h
@@ -28,7 +28,7 @@
 #define MENU_TITLE_TOP                 48
 #define MENU_TITLE_HEIGHT              21
 #define MENU_BODY_TOP                  (MENU_TITLE_TOP+MENU_TITLE_HEIGHT)
-#define MENU_CONTENT_TOP               (MENU_BODY_TOP+3)
+#define MENU_CONTENT_TOP               (MENU_BODY_TOP+1)
 #define MENU_FOOTER_HEIGHT             21
 #define MENU_FOOTER_TOP                (LCD_H-MENU_FOOTER_HEIGHT)
 #define MENU_BODY_HEIGHT               (MENU_FOOTER_TOP-MENU_BODY_TOP)
@@ -43,7 +43,7 @@
 
 #define INVERT_HORZ_MARGIN             3
 #define INVERT_VERT_MARGIN             1
-#define INVERT_LINE_HEIGHT             18
+#define INVERT_LINE_HEIGHT             20
 
 #define CURVE_SIDE_WIDTH               100
 #define CURVE_CENTER_X                 (LCD_W-CURVE_SIDE_WIDTH-7)
diff --git a/radio/src/gui/horus/menu_model.cpp b/radio/src/gui/horus/menu_model.cpp
index f7f122487..3a2678a6a 100644
--- a/radio/src/gui/horus/menu_model.cpp
+++ b/radio/src/gui/horus/menu_model.cpp
@@ -132,7 +132,7 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, evt_t event, uint
       lcdDrawSizedText(x, y, name, size, flags);
       coord_t left = (editNameCursorPos == 0 ? 0 : getTextWidth(name, editNameCursorPos, flags));
       char s[] = { (flags & ZCHAR) ? idx2char(name[editNameCursorPos]) : name[editNameCursorPos], '\0' };
-      lcdDrawSolidFilledRect(x+left-1, y-INVERT_VERT_MARGIN, getTextWidth(s, 1)+1, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR);
+      lcdDrawSolidFilledRect(x+left-1, y, getTextWidth(s, 1)+1, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR);
       lcdDrawText(x+left, y, s, TEXT_INVERTED_COLOR);
     }
     else {
diff --git a/radio/src/gui/horus/popups.cpp b/radio/src/gui/horus/popups.cpp
index 5d8a9ad0f..cc44d7a7d 100644
--- a/radio/src/gui/horus/popups.cpp
+++ b/radio/src/gui/horus/popups.cpp
@@ -157,10 +157,10 @@ const char * displayPopupMenu(evt_t event)
   for (uint8_t i=0; i<display_count; i++) {
     if (i == s_menu_item) {
       lcdDrawSolidFilledRect(MENU_X+1, i*(FH+1) + y + 1, MENU_W-2, FH+1, TEXT_INVERTED_BGCOLOR);
-      lcdDrawText(MENU_X+6, i*(FH+1) + y + 4, popupMenuItems[i+(popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)], TEXT_INVERTED_COLOR);
+      lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, popupMenuItems[i+(popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)], TEXT_INVERTED_COLOR);
     }
     else {
-      lcdDrawText(MENU_X+6, i*(FH+1) + y + 4, popupMenuItems[i+(popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)], 0);
+      lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, popupMenuItems[i+(popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)], 0);
     }
   }
 
diff --git a/radio/util/font2png.py b/radio/util/font2png.py
index 180bc7616..deae616e7 100755
--- a/radio/util/font2png.py
+++ b/radio/util/font2png.py
@@ -68,7 +68,7 @@ def createFontBitmap(filename, fontname, fontsize, fontbold, foreground, backgro
 
     width = getFontWidth()
     top, bottom = getFontTopBottom()
-    image = QtGui.QImage(width, fontsize + 2, QtGui.QImage.Format_RGB32)
+    image = QtGui.QImage(width, fontsize + 4, QtGui.QImage.Format_RGB32)
     image.fill(background)
     painter = QtGui.QPainter()
     painter.begin(image)
@@ -90,7 +90,7 @@ def createFontBitmap(filename, fontname, fontsize, fontbold, foreground, backgro
             if fontsize >= 24:
                 painter.drawText(width - rect.left() + 1, fontsize - 2, c)  # fontsize-bottom+1 -17 / 7
             else:
-                painter.drawText(width + 1, fontsize - 1, c)  # fontsize-bottom+1 -17 / 7
+                painter.drawText(width + 1, fontsize, c)  # fontsize-bottom+1 -17 / 7
         width += getCharWidth(c)
 
     coords.append(width)