diff --git a/configure.ac b/configure.ac
index 16658b2ea..130a35856 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,12 +171,9 @@ if test "$BOXTYPE" = "coolstream" ||
 fi
 
 AC_ARG_ENABLE(lcd4linux,
-	AS_HELP_STRING([--enable-lcd4linux], [enable Lcd4Linux support]),
-	,[enable_lcd4linux=no])
+	AS_HELP_STRING([--enable-lcd4linux], [enable LCD4Linux support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_LCD4LINUX, 1, [enable LCD4Linux support]))
 AM_CONDITIONAL(ENABLE_LCD4LINUX, test "$enable_lcd4linux" = "yes")
-if test "$enable_lcd4linux" = "yes"; then
-	AC_DEFINE(ENABLE_LCD4LINUX, 1, [include Lcd4Linux support])
-fi
 
 AC_ARG_ENABLE(graphlcd,
 	AS_HELP_STRING([--enable-graphlcd], [enable GraphLCD support @<:@default=no@:>@]),
diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp
index de9a62d53..b7ec02eac 100644
--- a/src/driver/pictureviewer/pictureviewer.cpp
+++ b/src/driver/pictureviewer/pictureviewer.cpp
@@ -562,7 +562,8 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C
 
 		// add neccessary paths to v_path
 		v_path.clear();
-		if (lcd4l_mode){
+		if (lcd4l_mode)
+		{
 #ifdef ENABLE_LCD4LINUX
 			v_path.push_back(g_settings.lcd4l_logodir);
 #endif
@@ -651,11 +652,13 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C
 
 		for (size_t f = 0; f < v_file.size(); f++)
 		{
-#ifdef ENABLE_LCD4LINUX
 			// process g_settings.lcd4l_logodir
 			if (lcd4l_mode)
+			{
+#ifdef ENABLE_LCD4LINUX
 				v_path.push_back(g_settings.lcd4l_logodir + "/" + v_file[f] + fileType[i]);
 #endif
+			}
 			// process g_settings.logo_hdd_dir
 			v_path.push_back(g_settings.logo_hdd_dir + "/" + v_file[f] + fileType[i]);
 			// process LOGODIR_VAR
diff --git a/src/gui/audioplayer.h b/src/gui/audioplayer.h
index ae9be9db7..039cf1c71 100644
--- a/src/gui/audioplayer.h
+++ b/src/gui/audioplayer.h
@@ -114,7 +114,7 @@ class CAudioPlayerGui : public CMenuTarget
 		bool		m_streamripper_available;
 		bool		m_streamripper_active;
 
-#if ENABLE_GRAPHLCD
+#ifdef ENABLE_GRAPHLCD
 		struct tm *tm_struct;
 		int		glcd_position;
 		std::string	glcd_channel;
diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index b29edc93d..45da27d31 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -597,7 +597,6 @@ int CBouquetList::show(bool bShowChannelList)
 #ifdef ENABLE_GRAPHLCD
 	cGLCD::unlockChannel();
 #endif
-
 #ifdef ENABLE_LCD4LINUX
 	LCD4l->RemoveFile("/tmp/lcd/menu");
 #endif
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index aca47f4d6..a544f318d 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -72,7 +72,6 @@
 #include <hardware/video.h>
 
 #ifdef ENABLE_LCD4LINUX
-// lcd4l-support
 #include "driver/lcd4l.h"
 extern CLCD4l *LCD4l;
 #endif
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index f4d4bea19..b97509c5b 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -368,9 +368,6 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	CGLCDThemes::getInstance()->getTheme(configfile);
 #endif
 
-	// internet radio
-	g_settings.inetradio_autostart = configfile.getInt32("inetradio_autostart" , 0);
-
 #ifdef ENABLE_LCD4LINUX
 	g_settings.lcd4l_support = configfile.getInt32("lcd4l_support" , 0);
 	g_settings.lcd4l_logodir = configfile.getString("lcd4l_logodir", LOGODIR);
@@ -381,6 +378,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.lcd4l_brightness_standby = configfile.getInt32("lcd4l_brightness_standby", 3);
 	g_settings.lcd4l_convert = configfile.getInt32("lcd4l_convert", 1);
 #endif
+	// internet radio
+	g_settings.inetradio_autostart = configfile.getInt32("inetradio_autostart" , 0);
 	g_settings.show_menu_hints_line = configfile.getBool("show_menu_hints_line", false);
 	g_settings.mode_icons = configfile.getInt32( "mode_icons", 0);
 	g_settings.mode_icons_background = configfile.getInt32( "mode_icons_background", 0);
@@ -1396,9 +1395,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setString( "glcd_theme_name", g_settings.glcd_theme_name );
 #endif
 
-	//internet radio
-	configfile.setInt32("inetradio_autostart" , g_settings.inetradio_autostart);
-#ifdef ENABLE_LCD4LINUX	
+#ifdef ENABLE_LCD4LINUX
 	configfile.setInt32("lcd4l_support" , g_settings.lcd4l_support);
 	configfile.setString("lcd4l_logodir" , g_settings.lcd4l_logodir);
 	configfile.setInt32("lcd4l_display_type" , g_settings.lcd4l_display_type);
@@ -1408,6 +1405,8 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setInt32("lcd4l_brightness_standby", g_settings.lcd4l_brightness_standby);
 	configfile.setInt32("lcd4l_convert" , g_settings.lcd4l_convert);
 #endif
+	//internet radio
+	configfile.setInt32("inetradio_autostart" , g_settings.inetradio_autostart);
 	configfile.setBool("show_menu_hints_line" , g_settings.show_menu_hints_line);
 	configfile.setInt32("mode_icons", g_settings.mode_icons );
 	configfile.setInt32("mode_icons_background", g_settings.mode_icons_background);
@@ -2980,7 +2979,9 @@ TIMER_START();
 	if(g_settings.lcd4l_support)
 		LCD4l->StartLCD4l();
 #endif
+
 	CZapit::getInstance()->SetScanSDT(g_settings.enable_sdt);
+
 	cSysLoad::getInstance();
 	cHddStat::getInstance();
 
@@ -5127,12 +5128,11 @@ void CNeutrinoApp::stopDaemonsForFlash()
 /**************************************************************************************
 *          Main programm - no function here                                           *
 **************************************************************************************/
-
 #ifdef ENABLE_LCD4LINUX
 void stop_lcd4l_support()
 {
-	if (LCD4l) {
-		if (g_settings.lcd4l_support) {
+	if(LCD4l) {
+		if(g_settings.lcd4l_support) {
 			LCD4l->StopLCD4l();
 		}
 		delete LCD4l;
diff --git a/src/system/flashtool.cpp b/src/system/flashtool.cpp
index cbbe16ebb..c6b5b9e2b 100644
--- a/src/system/flashtool.cpp
+++ b/src/system/flashtool.cpp
@@ -341,6 +341,17 @@ bool CFlashTool::getInfo()
 	return true;
 }
 
+
+void CFlashTool::stopDaemons()
+{
+#ifdef ENABLE_LCD4LINUX
+	if (g_settings.lcd4l_support)
+		LCD4l->StopLCD4l();
+#endif
+
+	CNeutrinoApp::getInstance()->stopDaemonsForFlash();
+}
+
 bool CFlashTool::erase(int globalProgressEnd)
 {
 	erase_info_t lerase;
diff --git a/src/system/flashtool.h b/src/system/flashtool.h
index 7fb6bd2dc..7f423a9db 100644
--- a/src/system/flashtool.h
+++ b/src/system/flashtool.h
@@ -53,6 +53,7 @@ class CFlashTool
 
 		bool getInfo();
 		bool erase(int globalProgressEnd=-1);
+		void stopDaemons();
 
 	public:
 		CFlashTool();
diff --git a/src/system/settings.h b/src/system/settings.h
index fb85e4d12..7cd50685e 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -931,6 +931,7 @@ struct SNeutrinoSettings
 	int glcd_scroll_speed;
 	int glcd_selected_config;
 #endif
+
 #ifdef ENABLE_LCD4LINUX
 	// lcd4linux
 	int lcd4l_support;
@@ -942,6 +943,7 @@ struct SNeutrinoSettings
 	int lcd4l_skin_radio;
 	int lcd4l_convert;
 #endif
+
 	// lcdd
 	enum LCD_SETTINGS {
 		LCD_BRIGHTNESS         = 0,