diff --git a/acinclude.m4 b/acinclude.m4
index 90fd9afec..5cc78ebbc 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -298,6 +298,12 @@ TUXBOX_APPS_DIRECTORY_ONE(iconsdir, ICONSDIR, datadir, /share, /tuxbox/neutrino/
 TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var, ICONSDIR_VAR, localstatedir, /var, /tuxbox/icons,
 	[--with-iconsdir_var=PATH], [where to find icons in /var])
 
+TUXBOX_APPS_DIRECTORY_ONE(lcd4liconsdir, LCD4L_ICONSDIR, datadir, /share, /tuxbox/neutrino/lcd/icons,
+	[--with-lcd4liconsdir=PATH], [where to find lcd4linux icons])
+
+TUXBOX_APPS_DIRECTORY_ONE(lcd4liconsdir_var, LCD4L_ICONSDIR_VAR, localstatedir, /var, /tuxbox/lcd/icons,
+	[--with-lcd4liconsdir_var=PATH], [where to find lcd4linux icons in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(private_httpddir, PRIVATE_HTTPDDIR, datadir, /share, /tuxbox/neutrino/httpd,
 	[--with-private_httpddir=PATH], [where to find private httpd files])
 
@@ -333,6 +339,8 @@ AC_SUBST(THEMESDIR)
 AC_SUBST(THEMESDIR_VAR)
 AC_SUBST(ICONSDIR)
 AC_SUBST(ICONSDIR_VAR)
+AC_SUBST(LCD4L_ICONSDIR)
+AC_SUBST(LCD4L_ICONSDIR_VAR)
 AC_SUBST(PRIVATE_HTTPDDIR)
 AC_SUBST(PUBLIC_HTTPDDIR)
 AC_SUBST(HOSTED_HTTPDDIR)
diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am
index 151af476f..e4359173a 100644
--- a/data/y-web/Makefile.am
+++ b/data/y-web/Makefile.am
@@ -122,6 +122,8 @@ install-data-hook:
 			-e 's|%(WEBRADIODIR_VAR)|$(WEBRADIODIR_VAR)|g' \
 			-e 's|%(LOGODIR)|$(LOGODIR)|g' \
 			-e 's|%(LOGODIR_VAR)|$(LOGODIR_VAR)|g' \
+			-e 's|%(LCD4L_ICONSDIR)|$(LCD4L_ICONSDIR)|g' \
+			-e 's|%(LCD4L_ICONSDIR_VAR)|$(LCD4L_ICONSDIR_VAR)|g' \
 			-e 's|%(PRIVATE_HTTPDDIR)|$(PRIVATE_HTTPDDIR)|g' \
 			-e 's|%(PUBLIC_HTTPDDIR)|$(PUBLIC_HTTPDDIR)|g' \
 			-e 's|%(HOSTED_HTTPDDIR)|$(HOSTED_HTTPDDIR)|g' \
diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp
index 63a0e0aea..e3420e67f 100644
--- a/src/gui/lcd4l_setup.cpp
+++ b/src/gui/lcd4l_setup.cpp
@@ -186,7 +186,7 @@ int CLCD4lSetup::show()
 	const char *flag_lcd4l_clock_a = FLAGDIR "/.lcd-clock_a";
 	int fake_lcd4l_clock_a = file_exists(flag_lcd4l_clock_a);
 	CTouchFileNotifier * lcd_clock_a = new CTouchFileNotifier(flag_lcd4l_clock_a);
-	mc = new CMenuOptionChooser(LOCALE_LCD4L_CLOCK_A, &fake_lcd4l_clock_a, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, ((file_exists(DATADIR "/lcd/icons/clock/analog")) || (file_exists("/var/tuxbox/lcd/icons/clock/analog"))), lcd_clock_a, CRCInput::convertDigitToKey(shortcut++));
+	mc = new CMenuOptionChooser(LOCALE_LCD4L_CLOCK_A, &fake_lcd4l_clock_a, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, ((file_exists(LCD4L_ICONSDIR "/clock/analog")) || (file_exists(LCD4L_ICONSDIR_VAR "/clock/analog"))), lcd_clock_a, CRCInput::convertDigitToKey(shortcut++));
 	mc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_CLOCK_A);
 	lcd4lSetup->addItem(mc);
 
diff --git a/src/nhttpd/yhttpd_mods/mod_yparser.cpp b/src/nhttpd/yhttpd_mods/mod_yparser.cpp
index 75649e6d2..bfc5bd900 100644
--- a/src/nhttpd/yhttpd_mods/mod_yparser.cpp
+++ b/src/nhttpd/yhttpd_mods/mod_yparser.cpp
@@ -472,6 +472,8 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) {
 			else if (ycmd_name.compare("WEBTVDIR_VAR"))	yresult = WEBTVDIR_VAR;
 			else if (ycmd_name.compare("LOGODIR"))		yresult = LOGODIR;
 			else if (ycmd_name.compare("LOGODIR_VAR"))	yresult = LOGODIR_VAR;
+			else if (ycmd_name.compare("LCD4L_ICONSDIR"))		yresult = LCD4L_ICONSDIR;
+			else if (ycmd_name.compare("LCD4L_ICONSDIR_VAR"))	yresult = LCD4L_ICONSDIR_VAR;
 			else if (ycmd_name.compare("PRIVATE_HTTPDDIR"))	yresult = PRIVATE_HTTPDDIR;
 			else if (ycmd_name.compare("PUBLIC_HTTPDDIR"))	yresult = PUBLIC_HTTPDDIR;
 			else if (ycmd_name.compare("HOSTED_HTTPDDIR"))	yresult = HOSTED_HTTPDDIR;