diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 06a29dfb6c0bd85ed820c6c86f260bc79fd9f602..48cdb1dd62b37e840fcb9f16c16e90f145c08ada 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -437,7 +437,7 @@
#endif
#if DISABLED(NEWPANEL)
- // Buttons are attached to a shift register
+ // Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
index d05ae7158799ec6bbcbb663c2efee3ac9438cb8a..4cd5999604e81e338f3f14149583755ca919f555 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
@@ -115,32 +115,38 @@
#define PS_ON_PIN 12
#define CASE_LIGHT_PIN 2
-//
-// LCD / Controller
-//
-#define BEEPER_PIN 64
-
-#define LCD_PINS_RS 14
-#define LCD_PINS_ENABLE 15
-#define LCD_PINS_D4 30
-#define LCD_PINS_D5 31
-#define LCD_PINS_D6 32
-#define LCD_PINS_D7 33
-
-// Buttons are directly attached using keypad
-#define BTN_EN1 61
-#define BTN_EN2 59
-#define BTN_ENC 43
-
-// Buttons that are attached using shift register of reprapworld keypad v1.1
-#define SHIFT_CLK 63
-#define SHIFT_LD 42
-#define SHIFT_OUT 17
-#define SHIFT_EN 17
-
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 3 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 16 // Pullup!
#define SPINDLE_DIR_PIN 11
+
+//
+// LCD / Controller
+//
+#define BEEPER_PIN 64
+
+#if HAS_SPI_LCD
+
+ #define LCD_PINS_RS 14
+ #define LCD_PINS_ENABLE 15
+ #define LCD_PINS_D4 30
+ #define LCD_PINS_D5 31
+ #define LCD_PINS_D6 32
+ #define LCD_PINS_D7 33
+
+ #if ENABLED(NEWPANEL)
+ // Buttons are directly attached using keypad
+ #define BTN_EN1 61
+ #define BTN_EN2 59
+ #define BTN_ENC 43
+ #else
+ // Buttons attached to shift register of reprapworld keypad v1.1
+ #define SHIFT_CLK 63
+ #define SHIFT_LD 42
+ #define SHIFT_OUT 17
+ #define SHIFT_EN 17
+ #endif
+
+#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index fb25fd0ffe854146fed984a839968627c6583d43..1094e0687e01c5c7a6a5a43c0b61764e937c0791 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -219,7 +219,7 @@
// No Beeper added
#define BEEPER_PIN 33
- // buttons are attached to a shift register
+ // Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index f820158cf291ce0eebbe5c7ad503a93a056f00ed..1ed9e32d24e15956eb4326299fffc38d83af1da6 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -477,7 +477,7 @@
#endif
#if DISABLED(NEWPANEL)
- // Buttons are attached to a shift register
+ // Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index a67de0ecd06b01f2a10bf29bc7f6bf0f52cc9de4..b639d0b25a85283e75522157e543c31614f36d0c 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -337,7 +337,7 @@
#endif
#if DISABLED(NEWPANEL)
- // Buttons are attached to a shift register
+ // Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER.h b/Marlin/src/pins/ramps/pins_ULTIMAKER.h
index 1fbef17bba1286df3df27a9a3270a337ffce564f..b2594acebced8d621a4e1298bc6fdbfdcdb9e107 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAKER.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAKER.h
@@ -129,7 +129,7 @@
#define LCD_PINS_D6 5
#define LCD_PINS_D7 6
- // buttons are directly attached
+ // Buttons directly attached
#define BTN_EN1 40
#define BTN_EN2 42
#define BTN_ENC 19
@@ -138,7 +138,7 @@
#else // !NEWPANEL - Old style panel with shift register
- // buttons are attached to a shift register
+ // Buttons attached to a shift register
#define SHIFT_CLK 38
#define SHIFT_LD 42
#define SHIFT_OUT 40
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
index 65e0416612ab761d294d08460b23b41bbc34e8ba..dd9aaf1292ab81c12303751aa38a04a6bbae7de5 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
@@ -187,7 +187,7 @@
#define LCD_PINS_D6 5
#define LCD_PINS_D7 6
- // buttons are directly attached
+ // Buttons directly attached
#define BTN_EN1 40
#define BTN_EN2 42
#define BTN_ENC 19
@@ -196,7 +196,7 @@
#else // !NEWPANEL - Old style panel with shift register
- // buttons are attached to a shift register
+ // Buttons attached to a shift register
#define SHIFT_CLK 38
#define SHIFT_LD 42
#define SHIFT_OUT 40
diff --git a/Marlin/src/pins/stm32/pins_BEAST.h b/Marlin/src/pins/stm32/pins_BEAST.h
index 5654596913898a09242ba6e4d0efbc9f6a6da12b..7b1f61d918f05d63a83f98bc235735b08f9ae1c1 100644
--- a/Marlin/src/pins/stm32/pins_BEAST.h
+++ b/Marlin/src/pins/stm32/pins_BEAST.h
@@ -142,7 +142,7 @@
#define LCD_PINS_D7 PB15
#if DISABLED(NEWPANEL)
#define BEEPER_PIN 33
- // Buttons are attached to a shift register
+ // Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42
@@ -254,7 +254,7 @@
// Beeper on AUX-4
#define BEEPER_PIN 33
- // buttons are directly attached to AUX-2
+ // Buttons directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64
#define BTN_EN2 59
diff --git a/Marlin/src/pins/stm32/pins_CHITU3D.h b/Marlin/src/pins/stm32/pins_CHITU3D.h
index dd9456308fbac7126ad53b6fc86901df427fa490..48b57b35020b463d8450af63983f86b2e5ce838c 100644
--- a/Marlin/src/pins/stm32/pins_CHITU3D.h
+++ b/Marlin/src/pins/stm32/pins_CHITU3D.h
@@ -141,12 +141,12 @@
#define LCD_PINS_D7 PB15
#if DISABLED(NEWPANEL)
#define BEEPER_PIN 33
- // Buttons are attached to a shift register
+ // Buttons attached to a shift register
// Not wired yet
- //#define SHIFT_CLK 38
- //#define SHIFT_LD 42
- //#define SHIFT_OUT 40
- //#define SHIFT_EN 17
+ //#define SHIFT_CLK 38
+ //#define SHIFT_LD 42
+ //#define SHIFT_OUT 40
+ //#define SHIFT_EN 17
#endif
#endif
@@ -252,7 +252,7 @@
// Beeper on AUX-4
#define BEEPER_PIN 33
- // buttons are directly attached to AUX-2
+ // Buttons directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64
#define BTN_EN2 59
diff --git a/Marlin/src/pins/stm32/pins_STM32F1R.h b/Marlin/src/pins/stm32/pins_STM32F1R.h
index 987f6eda18e426b92ea0477359f9e6f9354781fd..ccafcad1f7b4cfdfa2c6f8cc9941c023f1483481 100644
--- a/Marlin/src/pins/stm32/pins_STM32F1R.h
+++ b/Marlin/src/pins/stm32/pins_STM32F1R.h
@@ -119,7 +119,7 @@
#define LCD_PINS_D7 PB15
#if DISABLED(NEWPANEL)
#define BEEPER_PIN 33
- // Buttons are attached to a shift register
+ // Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42
@@ -230,7 +230,7 @@
// Beeper on AUX-4
#define BEEPER_PIN 33
- // buttons are directly attached to AUX-2
+ // Buttons directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64
#define BTN_EN2 59
diff --git a/Marlin/src/pins/stm32/pins_STM3R_MINI.h b/Marlin/src/pins/stm32/pins_STM3R_MINI.h
index fc7bc09b617a3685db765ffd6b88cabf3da27413..9192ae453e678f0a4404c8a3bd44efc8eb27044e 100644
--- a/Marlin/src/pins/stm32/pins_STM3R_MINI.h
+++ b/Marlin/src/pins/stm32/pins_STM3R_MINI.h
@@ -134,7 +134,7 @@
#define LCD_PINS_D7 PB15
#if DISABLED(NEWPANEL)
#define BEEPER_PIN 33
- // Buttons are attached to a shift register
+ // Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42
@@ -254,7 +254,7 @@
// Beeper on AUX-4
#define BEEPER_PIN 33
- // buttons are directly attached to AUX-2
+ // Buttons directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64
#define BTN_EN2 59