diff --git a/data/iso-codes/Makefile.am b/data/iso-codes/Makefile.am
index e5ddfc030..3a4cc9aad 100644
--- a/data/iso-codes/Makefile.am
+++ b/data/iso-codes/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/iso-codes
+installdir = $(DATADIR)/iso-codes
 
 install_DATA = \
 	iso-639.tab
diff --git a/data/y-web/Y_Info_Help.yhtm b/data/y-web/Y_Info_Help.yhtm
index d9cecd04d..17e9bf5a3 100644
--- a/data/y-web/Y_Info_Help.yhtm
+++ b/data/y-web/Y_Info_Help.yhtm
@@ -7,10 +7,10 @@
 	{=var-set:help_url=Help-Info-Hilfe=}{=var-set:menu={=L:info.help=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<ul>
-		<li><a href="http://wiki.tuxbox.org/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki Help</a></li>
+		<li><a href="http://wiki.tuxbox.org/wiki/Neutrino-HD" class="exlink" title="User guide for Neutrino" target="_blank">Tuxbox-Wiki Neutrino Help</a></li>
+		<li><a href="http://wiki.tuxbox.org/wiki/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki yWeb Help</a></li>
 		<li><a href="http://forum.tuxbox.org/forum" class="exlink" title="Tuxbox Dicussion Forum" target="_blank">Tuxbox Forum</a></li>
-		<li><a href="http://www.cstworld.net" class="exlink" title="CST User Forum" target="_blank">CST User Forum</a></li>
-		<li><a href="https://dbox2world.net/board/329-development/" class="exlink" title="CST Dev Forum" target="_blank">CST Developer Forum</a></li>
+		<li><a href="http://tuxbox-neutrino.org" class="exlink" title="Tuxbox-Neutrino developers" target="_blank">Sources</a></li>
 	</ul>
 	</div>
 </div>
diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp
index ec9cd854e..73142b895 100644
--- a/src/gui/widget/hintbox.cpp
+++ b/src/gui/widget/hintbox.cpp
@@ -265,6 +265,9 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
 	/* set required font and line height */
 	Font* item_font = !font_text ? hb_font : font_text;
 
+	/* set picon */
+	string picon = Picon;
+
 	/* pre define required info height depends of lines and minimal needed height*/
 	int line_breaks = CTextBox::getLines(Text);
 	int h_font = item_font->getHeight();
@@ -276,7 +279,7 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
 
 	int txt_mode = text_mode;
 	/* remove CENTER mode if picon defined */
-	if (!Picon.empty() && (txt_mode & CTextBox::CENTER)){
+	if (!picon.empty() && (txt_mode & CTextBox::CENTER)){
 		txt_mode &= ~CTextBox::CENTER;
 	}
 
@@ -313,7 +316,7 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
 								color_text);
 
 	/* define picon and disable bg */
-	info_box->setPicture(Picon);
+	info_box->setPicture(picon);
 	info_box->doPaintBg(false);
 
 	/* recalculate new hintbox dimensions and position*/
diff --git a/src/system/localize.cpp b/src/system/localize.cpp
index ec0b9db5f..38c083611 100644
--- a/src/system/localize.cpp
+++ b/src/system/localize.cpp
@@ -48,8 +48,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#define ISO_639_TAB DATADIR "/iso-codes/iso-639.tab"
 //static const char * iso639filename = "/usr/share/iso-codes/iso-639.tab";
-static const char * iso639filename = "/share/iso-codes/iso-639.tab";
+//static const char * iso639filename = "/share/iso-codes/iso-639.tab";
+static const char * iso639filename = ISO_639_TAB;
 
 #define DEFAULT_LOCALE "english"