diff --git a/src/gui/components/cc_item_progressbar.cpp b/src/gui/components/cc_item_progressbar.cpp
index b4bdabe73..037d5754c 100644
--- a/src/gui/components/cc_item_progressbar.cpp
+++ b/src/gui/components/cc_item_progressbar.cpp
@@ -508,23 +508,8 @@ void CProgressBar::paintProgress(bool do_save_bg)
 //NI graphic
 void CProgressBar::paintGraphic()
 {
-	std::ostringstream buf;
-
-	buf.str("");
-	buf << ICONSDIR_VAR << "/" << graphic_file << ".png";
-	if (access(buf.str().c_str(), F_OK) != 0) {
-		buf.str("");
-		buf << ICONSDIR << "/" << graphic_file << ".png";
-	}
-	std::string pb_active_graphic(buf.str());
-
-	buf.str("");
-	buf << ICONSDIR_VAR << "/" << graphic_file << "_passive.png";
-	if (access(buf.str().c_str(), F_OK) != 0) {
-		buf.str("");
-		buf << ICONSDIR << "/" << graphic_file << "_passive.png";
-	}
-	std::string pb_passive_graphic(buf.str());
+	std::string pb_active_graphic(frameBuffer->getIconPath(graphic_file));
+	std::string pb_passive_graphic(frameBuffer->getIconPath(graphic_file + "_passive"));
 
 	//printf("**** %04d::%04d: pb_last_width: %d, pb_active_width: %d, pb_max_width %d\n", pb_x, pb_y, pb_last_width, pb_active_width, pb_max_width);
 
@@ -547,24 +532,8 @@ void CProgressBar::paintGraphic()
 //NI starbar
 void CProgressBar::paintStarBar()
 {
-	std::ostringstream buf;
-	graphic_file = "stars";
-
-	buf.str("");
-	buf << ICONSDIR_VAR << "/" << graphic_file << ".png";
-	if (access(buf.str().c_str(), F_OK) != 0) {
-		buf.str("");
-		buf << ICONSDIR << "/" << graphic_file << ".png";
-	}
-	std::string pb_active_graphic(buf.str());
-
-	buf.str("");
-	buf << ICONSDIR_VAR << "/" << graphic_file << "_bg.png";
-	if (access(buf.str().c_str(), F_OK) != 0) {
-		buf.str("");
-		buf << ICONSDIR << "/" << graphic_file << "_bg.png";
-	}
-	std::string pb_passive_graphic(buf.str());
+	std::string pb_active_graphic(frameBuffer->getIconPath(NEUTRINO_ICON_STARS));
+	std::string pb_passive_graphic(frameBuffer->getIconPath(NEUTRINO_ICON_STARS_BG));
 
 	int stars_w = 0, stars_h = 0;
 	g_PicViewer->getSize(pb_passive_graphic.c_str(), &stars_w, &stars_h);
diff --git a/src/gui/components/cc_item_progressbar.h b/src/gui/components/cc_item_progressbar.h
index 02d351c26..6ea067c04 100644
--- a/src/gui/components/cc_item_progressbar.h
+++ b/src/gui/components/cc_item_progressbar.h
@@ -136,7 +136,7 @@ class CProgressBar : public CComponentsItem
 					const int val, const int max_val){x=x_pos; y=y_pos; width=w; height=h; pb_value=val; pb_max_value=max_val;}
 
 		//NI graphic
-		void setGraphic(std::string graphic = "progressbar"){graphic_file = graphic;};
+		void setGraphic(std::string graphic) { graphic_file = graphic; }
 
 		///force update on next paint
 		void reset() { pb_last_width = -1; }
diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index 3177d3601..38649411d 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -321,7 +321,7 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear)
 			stars *= 10; // recalculate stars value for starbar
 
 		int stars_w = 0, stars_h = 0;
-		g_PicViewer->getSize(imdb->stars_bg.c_str(), &stars_w, &stars_h);
+		frameBuffer->getIconSize(NEUTRINO_ICON_STARS_BG, &stars_w, &stars_h);
 
 		//create starbar item
 		CProgressBar *cc_starbar = new CProgressBar();
@@ -331,8 +331,8 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear)
 
 		if (imdb_active)
 		{
-			int _x = sx+OFFSET_INNER_MID+cover_offset+logo_offset+stars_w+OFFSET_INNER_MID;
-			int _w = ox-OFFSET_INNER_MID-cover_offset-logo_offset-stars_w-OFFSET_INNER_MID;
+			int _x = sx+OFFSET_INNER_MID+cover_offset+logo_offset+cc_starbar->getWidth()+OFFSET_INNER_MID;
+			int _w = ox-OFFSET_INNER_MID-cover_offset-logo_offset-cc_starbar->getWidth()-OFFSET_INNER_MID;
 			g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->RenderString(_x, y+medlineheight, _w, imdb_rating, COL_MENUCONTENT_TEXT, 0, true);
 		}
 	}
@@ -1645,7 +1645,7 @@ int CEpgData::showIMDb(bool splash)
 	//titel
 	std::string title = imdb->getIMDbElement("Title");
 
-	if(((title.find("IMDb: Google Download fehlgeschlagen")) != std::string::npos))
+	if(((title.find(imdb->search_error)) != std::string::npos))
 		return 1;
 
 	// clear epg array
diff --git a/src/gui/imdb.cpp b/src/gui/imdb.cpp
index 606ffefe8..570110c30 100644
--- a/src/gui/imdb.cpp
+++ b/src/gui/imdb.cpp
@@ -42,14 +42,13 @@
 
 CIMDB::CIMDB()
 {
-	surl		= "http://www.google.de/search?q=";
-	soutfile	= "/tmp/google.out";
-	IMDburl		= "http://www.omdbapi.com/?plot=full&r=json&i=";
-	IMDbAPI		= "/tmp/imdb.json";
-	omdbapiKey	= "&apikey=20711f9e";
+	search_url	= "http://www.google.de/search?q=";
+	search_outfile	= "/tmp/google.out";
+	search_error	= "IMDb: Google download failed";
+	imdb_url	= "http://www.omdbapi.com/?plot=full&r=json&i=";
+	imdb_outfile	= "/tmp/imdb.json";
+	omdb_apikey	= "&apikey=20711f9e";
 	posterfile	= "/tmp/imdb.jpg";
-	stars_bg	= ICONSDIR "/stars_bg.png";
-	stars		= ICONSDIR "/stars.png";
 }
 
 CIMDB::~CIMDB()
@@ -203,38 +202,39 @@ std::string CIMDB::parseFile(std::string search1, std::string search2, const cha
 	return(ret);
 }
 
-std::string CIMDB::googleIMDb(std::string searchStr)
+std::string CIMDB::googleIMDb(std::string s)
 {
 	CHTTPTool httpTool;
-	std::string ret		= "IMDb: Google Download fehlgeschlagen";
-	std::string httpString	= "imdb+";
-	char* searchStr_	= (char*) searchStr.c_str();
+	std::string ret = search_error;
+	std::string search_string("");
+	char* search_char = (char*) s.c_str();
 
 	m.clear();
-	unlink(soutfile.c_str());
-	unlink(IMDbAPI.c_str());
+	unlink(search_outfile.c_str());
+	unlink(imdb_outfile.c_str());
 	unlink(posterfile.c_str());
 
-	while (*searchStr_!=0)
+	while (*search_char != 0)
 	{
-		if ( (*searchStr_==' ') )
+		if (*search_char == ' ')
 		{
-			httpString += '+';
-		} else
-		{
-			httpString += *searchStr_;
+			search_string += '+';
 		}
-		searchStr_++;
+		else
+		{
+			search_string += *search_char;
+		}
+		search_char++;
 	}
 
-	std::string url = surl + utf82url(httpString) + "%20site:www.imdb.com";
+	std::string url = search_url + utf82url(search_string) + "%20site:www.imdb.com";
 
-	if (httpTool.downloadFile(url, soutfile.c_str()))
+	if (httpTool.downloadFile(url, search_outfile.c_str()))
 	{
-		ret = parseFile("http://www.imdb.com/title/", ">", soutfile.c_str());
+		ret = parseFile("http://www.imdb.com/title/", ">", search_outfile.c_str());
 
 		if(ret.empty())
-			ret = parseFile("http://www.imdb.de/title/", ">", soutfile.c_str());
+			ret = parseFile("http://www.imdb.de/title/", ">", search_outfile.c_str());
 
 		std::string delimiters = "/&;";
 		size_t next = ret.find_first_of(delimiters, 0);
@@ -250,7 +250,7 @@ void CIMDB::initMap( std::map<std::string, std::string>& my )
 	Json::Reader reader;
 
 	std::ostringstream ss;
-	std::ifstream fh(IMDbAPI.c_str(),std::ifstream::in);
+	std::ifstream fh(imdb_outfile.c_str(),std::ifstream::in);
 	ss << fh.rdbuf();
 	std::string filedata = ss.str();
 
@@ -301,14 +301,14 @@ int CIMDB::getIMDb(const std::string& epgTitle)
 	CHTTPTool httpTool;
 	int ret = 0;
 
-	std::string imdb_ID = googleIMDb(epgTitle);
+	std::string imdb_id = googleIMDb(epgTitle);
 
-	if(((imdb_ID.find("IMDb: ")) != std::string::npos))
+	if(((imdb_id.find(search_error)) != std::string::npos))
 		return ret;
 
-	std::string url = IMDburl + imdb_ID + omdbapiKey;
+	std::string url = imdb_url + imdb_id + omdb_apikey;
 
-	if (httpTool.downloadFile(url, IMDbAPI.c_str()))
+	if (httpTool.downloadFile(url, imdb_outfile.c_str()))
 	{
 		initMap(m);
 
@@ -467,8 +467,8 @@ void CIMDB::StringReplace(std::string &str, const std::string search, const std:
 
 void CIMDB::cleanup()
 {
-	if (access(soutfile.c_str(), F_OK) == 0)
-		unlink(soutfile.c_str());
+	if (access(search_outfile.c_str(), F_OK) == 0)
+		unlink(search_outfile.c_str());
 	if (access(posterfile.c_str(), F_OK) == 0)
 		unlink(posterfile.c_str());
 }
diff --git a/src/gui/imdb.h b/src/gui/imdb.h
index 0e532ac02..c6e5d952d 100644
--- a/src/gui/imdb.h
+++ b/src/gui/imdb.h
@@ -37,12 +37,11 @@ class CIMDB
 		~CIMDB();
 		static CIMDB* getInstance();
 
-		std::string surl;
-		std::string soutfile;
-		std::string IMDbAPI;
+		std::string search_url;
+		std::string search_outfile;
+		std::string search_error;
+		std::string imdb_outfile;
 		std::string posterfile;
-		std::string stars_bg;
-		std::string stars;
 
 		int getIMDb(const std::string& epgTitle);
 		std::string getFilename(CZapitChannel * channel, uint64_t id);
@@ -59,9 +58,9 @@ class CIMDB
 
 	private:
 		int acc;
-		std::string IMDburl;
-		std::string omdbapiKey;
-		std::string googleIMDb(std::string searchStr);
+		std::string imdb_url;
+		std::string omdb_apikey;
+		std::string googleIMDb(std::string s);
 		std::string utf82url(std::string s);
 		std::string parseString(std::string search1, std::string search2, std::string str);
 		std::string parseFile(std::string search1, std::string search2, const char* file, std::string firstline="", int line_offset=0);
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 6c6b313bd..55ec6a6b1 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -2484,9 +2484,7 @@ void CInfoViewer::showAnalogClock(int posx,int posy,int dia)
 	hy = int((dia * 0.6 * sin(hAngleInRad)));
 
 	if (analogclock_buf == NULL) {
-		std::string clock_face = ICONSDIR_VAR "/clock_face.png";
-		if (access(clock_face.c_str(), F_OK) != 0)
-			clock_face = ICONSDIR "/clock_face.png";
+		std::string clock_face = frameBuffer->getIconPath("clock_face");
 		g_PicViewer->DisplayImage(clock_face, posx-dia, posy-dia, 2*dia, 2*dia);
 
 		analogclock_buf = new fb_pixel_t[2*dia * 2*dia];
diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h
index 345a9d041..818f07a1a 100644
--- a/src/gui/widget/icons.h
+++ b/src/gui/widget/icons.h
@@ -183,6 +183,8 @@
 #define NEUTRINO_ICON_PIP		"pip"
 #define NEUTRINO_ICON_STAR_ON		"star-on"
 #define NEUTRINO_ICON_STAR_OFF		"star-off"
+#define NEUTRINO_ICON_STARS_BG		"stars_bg" //NI
+#define NEUTRINO_ICON_STARS		"stars" //NI
 #define NEUTRINO_ICON_TMDB		"tmdb"
 #define NEUTRINO_ICON_IMDB		"imdb"
 #define NEUTRINO_ICON_PICTUREVIEWER	"pictureviewer"