diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp
index b6859b902..f3990051a 100644
--- a/src/gui/miscsettings_menu.cpp
+++ b/src/gui/miscsettings_menu.cpp
@@ -40,11 +40,10 @@
 #include <gui/weather_norway_locations.h>
 #include <gui/cec_setup.h>
 #include <gui/filebrowser.h>
+
 #include <gui/keybind_setup.h>
-#ifdef ENABLE_LCD4LINUX
-#include <gui/lcd4l_setup.h>
-#endif
 #include <gui/plugins.h>
+
 #include <gui/sleeptimer.h>
 #include <gui/zapit_setup.h>
 
@@ -330,13 +329,6 @@ int CMiscMenue::showMiscSettingsMenu()
 	mf->setHint("", LOCALE_MENU_HINT_MISC_ZAPIT);
 	misc_menue.addItem(mf);
 
-#ifdef ENABLE_LCD4LINUX
-	// LCD4Linux Setup
-	CLCD4lSetup lcd4lSetup;
-	mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, !find_executable("lcd4linux").empty(), NULL, &lcd4lSetup, NULL, CRCInput::convertDigitToKey(shortcut++));
-	mf->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SUPPORT);
-	misc_menue.addItem(mf);
-#endif
 
 	// onlineservices
 	mf = new CMenuForwarder(LOCALE_MISCSETTINGS_ONLINESERVICES, true, NULL, this, "onlineservices", CRCInput::convertDigitToKey(shortcut++));
diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp
index 98fdefe38..824b9d8ac 100644
--- a/src/gui/vfd_setup.cpp
+++ b/src/gui/vfd_setup.cpp
@@ -33,10 +33,6 @@
 #include <config.h>
 #endif
 
-#ifdef ENABLE_GRAPHLCD
-#include <gui/glcdsetup.h>
-#endif
-
 #include "vfd_setup.h"
 
 #include <global.h>
@@ -46,9 +42,16 @@
 
 #include <gui/widget/icons.h>
 
+#ifdef ENABLE_GRAPHLCD
+#include <gui/glcdsetup.h>
+#endif
+
+#ifdef ENABLE_LCD4LINUX
+#include "gui/lcd4l_setup.h"
+#endif
+
 #include <driver/display.h>
 #include <driver/screen_max.h>
-#include <driver/display.h>
 
 #include <system/debug.h>
 #include <system/helpers.h>
@@ -205,10 +208,16 @@ int CVfdSetup::showSetup()
 		vfds->addItem(led_num);
 	}
 
+#ifdef ENABLE_LCD4LINUX
+	mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, !find_executable("lcd4linux").empty(), NULL, CLCD4lSetup::getInstance(), NULL, CRCInput::RC_blue);
+	mf->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SUPPORT);
+	vfds->addItem(mf);
+#endif
+
 	CMenuItem* glcd_setup = NULL;
 #ifdef ENABLE_GRAPHLCD
 	GLCD_Menu glcdMenu;
-	glcd_setup = new CMenuForwarder(LOCALE_GLCD_HEAD, true, NULL, &glcdMenu, NULL, CRCInput::RC_blue);
+	glcd_setup = new CMenuForwarder(LOCALE_GLCD_HEAD, true, NULL, &glcdMenu, NULL);
 	vfds->addItem(glcd_setup);
 #endif