diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
index b50ab79d1..637e64198 100644
--- a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -450,6 +450,15 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
 			yresult += "</a>\n";
 		}
 
+		if (!channel->getUrl().empty())
+		{
+			yresult += "<img src=\"/images/webtv.png\" alt=\"WebTV\" title=\"WebTV\" />\n";
+		}
+
+		if (channel->scrambled)
+		{
+			yresult += "<img src=\"/images/key.png\" alt=\"Scrambled\" title=\"Scrambled\" />\n";
+		}
 		if (event.eventID)
 		{
 			yresult += string_printf("<a href=\"javascript:do_epg('"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"','"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"')\">"
diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt
index 5e1a41265..f2f7e0cd8 100644
--- a/src/nhttpd/web/Y_Version.txt
+++ b/src/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.9.0.35
+version=2.9.0.36
 date=14.03.2016
 type=Release
 info=Port CST
diff --git a/src/nhttpd/web/images/Makefile.am b/src/nhttpd/web/images/Makefile.am
index b5b1af3aa..f8a8e47be 100644
--- a/src/nhttpd/web/images/Makefile.am
+++ b/src/nhttpd/web/images/Makefile.am
@@ -34,6 +34,7 @@ install_DATA =	accept.png \
 		hidden.png \
 		info.png \
 		inlink.gif \
+		key.png \
 		live.png \
 		live_popup.png \
 		livelock.png \
@@ -82,6 +83,7 @@ install_DATA =	accept.png \
 		volumeunmute.png \
 		volumeup.png \
 		wait.gif \
+		webtv.png \
 		wget.png \
 		x_red.png \
 		zap.png
diff --git a/src/nhttpd/web/images/key.png b/src/nhttpd/web/images/key.png
new file mode 100644
index 000000000..4ec1a9281
Binary files /dev/null and b/src/nhttpd/web/images/key.png differ
diff --git a/src/nhttpd/web/images/webtv.png b/src/nhttpd/web/images/webtv.png
new file mode 100644
index 000000000..699149f84
Binary files /dev/null and b/src/nhttpd/web/images/webtv.png differ