diff --git a/radio/src/fonts/extra_16px.png b/radio/src/fonts/extra_16px.png
index 8c40ecca6..ae21c8403 100644
Binary files a/radio/src/fonts/extra_16px.png and b/radio/src/fonts/extra_16px.png differ
diff --git a/radio/src/fonts/extra_17px.png b/radio/src/fonts/extra_17px.png
index d4ad17eab..ae21c8403 100644
Binary files a/radio/src/fonts/extra_17px.png and b/radio/src/fonts/extra_17px.png differ
diff --git a/radio/src/gui/colorlcd/model_inputs.cpp b/radio/src/gui/colorlcd/model_inputs.cpp
index 73e7c8718..143b3cf30 100644
--- a/radio/src/gui/colorlcd/model_inputs.cpp
+++ b/radio/src/gui/colorlcd/model_inputs.cpp
@@ -335,7 +335,7 @@ class InputLineButton : public CommonInputOrMixButton {
     {
       const ExpoData & line = g_model.expoData[index];
       if (line.swtch || line.curve.value != 0 || line.flightModes) {
-        setHeight(height() + PAGE_LINE_HEIGHT);
+        setHeight(height() + PAGE_LINE_HEIGHT + FIELD_PADDING_TOP);
       }
     }
 
@@ -353,13 +353,13 @@ class InputLineButton : public CommonInputOrMixButton {
       drawSource(dc, 60, FIELD_PADDING_TOP, line.srcRaw);
 
       if (line.name[0]) {
-        dc->drawMask(146, 2 + FIELD_PADDING_TOP, mixerSetupLabelIcon, DEFAULT_COLOR);
+        dc->drawMask(146, FIELD_PADDING_TOP, mixerSetupLabelIcon, DEFAULT_COLOR);
         dc->drawSizedText(166, FIELD_PADDING_TOP, line.name, sizeof(line.name));
       }
 
       // second line ...
       if (line.swtch) {
-        dc->drawMask(3, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP + 2, mixerSetupSwitchIcon, DEFAULT_COLOR);
+        dc->drawMask(3, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, mixerSetupSwitchIcon, DEFAULT_COLOR);
         drawSwitch(dc, 21, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, line.swtch);
       }
 
diff --git a/radio/src/gui/colorlcd/model_mixes.cpp b/radio/src/gui/colorlcd/model_mixes.cpp
index 7bbb7a650..08dc1d107 100644
--- a/radio/src/gui/colorlcd/model_mixes.cpp
+++ b/radio/src/gui/colorlcd/model_mixes.cpp
@@ -233,7 +233,7 @@ class MixLineButton : public CommonInputOrMixButton {
     {
       const MixData & mix = g_model.mixData[index];
       if (mix.swtch || mix.curve.value != 0 || mix.flightModes) {
-        setHeight(height() + PAGE_LINE_HEIGHT);
+        setHeight(height() + PAGE_LINE_HEIGHT + FIELD_PADDING_TOP);
       }
     }
 
@@ -251,13 +251,13 @@ class MixLineButton : public CommonInputOrMixButton {
       drawSource(dc, 60, FIELD_PADDING_TOP, line.srcRaw);
 
       if (line.name[0]) {
-        dc->drawMask(146, 2 + FIELD_PADDING_TOP, mixerSetupLabelIcon, DEFAULT_COLOR);
+        dc->drawMask(146, FIELD_PADDING_TOP, mixerSetupLabelIcon, DEFAULT_COLOR);
         dc->drawSizedText(166, FIELD_PADDING_TOP, line.name, sizeof(line.name));
       }
 
       // second line ...
       if (line.swtch) {
-        dc->drawMask(3, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP + 2, mixerSetupSwitchIcon, DEFAULT_COLOR);
+        dc->drawMask(3, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, mixerSetupSwitchIcon, DEFAULT_COLOR);
         drawSwitch(dc, 21, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, line.swtch);
       }
 
@@ -521,4 +521,4 @@ bool swapMixes(uint8_t &idx, uint8_t up)
 
   idx = tgt_idx;
   return true;
-}
\ No newline at end of file
+}
diff --git a/radio/src/gui/colorlcd/model_outputs.cpp b/radio/src/gui/colorlcd/model_outputs.cpp
index 47a735b17..aa381ad59 100644
--- a/radio/src/gui/colorlcd/model_outputs.cpp
+++ b/radio/src/gui/colorlcd/model_outputs.cpp
@@ -114,7 +114,7 @@ class OutputLineButton : public Button {
       output(output)
     {
       if (output->revert || output->curve || output->name[0]) {
-        setHeight(height() + PAGE_LINE_HEIGHT);
+        setHeight(height() + PAGE_LINE_HEIGHT + FIELD_PADDING_TOP);
       }
     }
 
@@ -125,7 +125,7 @@ class OutputLineButton : public Button {
       dc->drawNumber(68, FIELD_PADDING_TOP, output->max + 1000, PREC1);
       dc->drawNumber(132, FIELD_PADDING_TOP, output->offset, PREC1);
       dc->drawNumber(226, FIELD_PADDING_TOP, PPM_CENTER + output->ppmCenter, RIGHT);
-      dc->drawText(228, FIELD_PADDING_TOP, output->symetrical ? "=" : "\206");
+      dc->drawText(228, FIELD_PADDING_TOP, output->symetrical ? "=" : "\210");
 
       // second line
       if (output->revert) {
@@ -136,7 +136,7 @@ class OutputLineButton : public Button {
         dc->drawText(88, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, getCurveString(output->curve));
       }
       if (output->name[0]) {
-        dc->drawMask(146, 2 + PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, mixerSetupLabelIcon, DEFAULT_COLOR);
+        dc->drawMask(146, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, mixerSetupLabelIcon, DEFAULT_COLOR);
         dc->drawSizedText(166, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, output->name, sizeof(output->name));
       }