diff --git a/configure.ac b/configure.ac
index 2abd123c5..1ceb93bdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -351,7 +351,6 @@ data/icons/status/ca/Makefile
 data/icons/status/channel/Makefile
 data/icons/status/info/Makefile
 data/icons/status/markers/Makefile
-data/icons/status/progress/Makefile
 data/icons/status/various/Makefile
 data/icons/various/Makefile
 data/inetradio/Makefile
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
index e781d565a..58ed9d8e2 100644
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -5,6 +5,7 @@ install_DATA = \
 	ubuntu-l-webfont.ttf \
 	ubuntu-r-webfont.ttf \
 	ubuntumono-b-webfont.ttf \
+	ubuntumono-r-webfont.ttf \
 	Roboto-Regular.ttf \
 	micron_bold.ttf \
 	micron.ttf \
diff --git a/data/fonts/ubuntumono-r-webfont.ttf b/data/fonts/ubuntumono-r-webfont.ttf
new file mode 100644
index 000000000..f3d77f549
Binary files /dev/null and b/data/fonts/ubuntumono-r-webfont.ttf differ
diff --git a/data/icons/filetypes/folder.png b/data/icons/filetypes/folder.png
index 817e56fd0..5cbb06975 100644
Binary files a/data/icons/filetypes/folder.png and b/data/icons/filetypes/folder.png differ
diff --git a/data/icons/headers/icon_ytplay.png b/data/icons/headers/icon_ytplay.png
index e3da39a11..d5cec79e3 100644
Binary files a/data/icons/headers/icon_ytplay.png and b/data/icons/headers/icon_ytplay.png differ
diff --git a/data/icons/status/Makefile.am b/data/icons/status/Makefile.am
index 82ae80b82..5489bd956 100644
--- a/data/icons/status/Makefile.am
+++ b/data/icons/status/Makefile.am
@@ -3,5 +3,4 @@ SUBDIRS = \
 	channel \
 	info \
 	markers \
-	progress \
 	various
diff --git a/data/icons/status/progress/Makefile.am b/data/icons/status/progress/Makefile.am
deleted file mode 100644
index 7cbe2b5f1..000000000
--- a/data/icons/status/progress/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-installdir = $(ICONSDIR)
-
-install_DATA = \
-	progressbar.png \
-	progressbar_inactive_passive.png \
-	progressbar_passive.png \
-	volumebar.png \
-	volumebar_passive.png
diff --git a/data/icons/status/progress/progressbar.png b/data/icons/status/progress/progressbar.png
deleted file mode 100644
index 6cace64c5..000000000
Binary files a/data/icons/status/progress/progressbar.png and /dev/null differ
diff --git a/data/icons/status/progress/progressbar_inactive_passive.png b/data/icons/status/progress/progressbar_inactive_passive.png
deleted file mode 100644
index c3db36e7d..000000000
Binary files a/data/icons/status/progress/progressbar_inactive_passive.png and /dev/null differ
diff --git a/data/icons/status/progress/progressbar_passive.png b/data/icons/status/progress/progressbar_passive.png
deleted file mode 100644
index 4d6986914..000000000
Binary files a/data/icons/status/progress/progressbar_passive.png and /dev/null differ
diff --git a/data/icons/status/progress/volumebar.png b/data/icons/status/progress/volumebar.png
deleted file mode 100644
index 6cace64c5..000000000
Binary files a/data/icons/status/progress/volumebar.png and /dev/null differ
diff --git a/data/icons/status/progress/volumebar_passive.png b/data/icons/status/progress/volumebar_passive.png
deleted file mode 100644
index 4d6986914..000000000
Binary files a/data/icons/status/progress/volumebar_passive.png and /dev/null differ
diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 75e65bb41..ba4cc593b 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1762,7 +1762,6 @@ miscsettings.progressbar_design_1 vertikale Balken
 miscsettings.progressbar_design_2 horizontale Balken
 miscsettings.progressbar_design_3 Farbverlauf
 miscsettings.progressbar_design_4 monochrom
-miscsettings.progressbar_design_5 grafisch
 miscsettings.progressbar_design_long Design
 miscsettings.progressbar_gradient 3D-Effekt
 miscsettings.progressbar_infobar_position Position
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 9c7e42287..636cc9c71 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1762,7 +1762,6 @@ miscsettings.progressbar_design_1 colored vertical lines
 miscsettings.progressbar_design_2 colored horizontal lines
 miscsettings.progressbar_design_3 colored bar
 miscsettings.progressbar_design_4 monochrome
-miscsettings.progressbar_design_5 graphical
 miscsettings.progressbar_design_long Design
 miscsettings.progressbar_gradient 3D effect
 miscsettings.progressbar_infobar_position Position
diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp
index b1b2bac3b..ccdb205bb 100644
--- a/src/driver/streamts.cpp
+++ b/src/driver/streamts.cpp
@@ -564,10 +564,7 @@ void CStreamManager::run()
 	int poll_timeout = -1;
 
 	printf("Starting STREAM thread keeper, tid %ld\n", syscall(__NR_gettid));
-/* merge conflict */
-#if 0
 	set_threadname("n:streammanager");
-#endif
 
 	while (running) {
 		mutex.lock();
diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp
index 514844438..3b14f7a07 100644
--- a/src/eitd/sectionsd.cpp
+++ b/src/eitd/sectionsd.cpp
@@ -1437,8 +1437,8 @@ void CTimeThread::run()
 	time_t dvb_time = 0;
 	bool retry = false; /* if time seems fishy, set to true and try again */
 	xprintf("%s::run:: starting, pid %d (%lu)\n", name.c_str(), getpid(), pthread_self());
-	threadName = "sd:" + name;
-	set_threadname(threadName.c_str());
+	const char *tn = ("sd:" + name).c_str();
+	set_threadname(tn);
 	addFilters();
 	DMX::start();
 
@@ -1574,8 +1574,8 @@ int CSectionThread::Sleep()
 void CSectionThread::run()
 {
 	xprintf("%s::run:: starting, pid %d (%lu)\n", name.c_str(), getpid(), pthread_self());
-	threadName = "sd:" + name;
-	set_threadname(threadName.c_str());
+	const char *tn = ("sd:" + name).c_str();
+	set_threadname(tn);
 	if (sections_debug)
 		dump_sched_info(name);
 
diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index 2aebefa9b..859f02eed 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -264,7 +264,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
 	m_fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
 
 	int iw, ih;
-	m_frameBuffer->getIconSize(NEUTRINO_ICON_AUDIO, &iw, &ih); //NI
+	m_frameBuffer->getIconSize(NEUTRINO_ICON_AUDIO, &iw, &ih);
 	m_theight = std::max(m_theight, ih+4);
 
 	m_title_height = m_fheight*2 + 20 + m_sheight + 4;
@@ -1573,7 +1573,7 @@ void CAudioPlayerGui::paintHead()
 	if (!m_show_playlist || m_screensaver)
 		return;
 
-	CComponentsHeaderLocalized header(m_x, m_y + m_title_height, m_width, m_theight, LOCALE_AUDIOPLAYER_HEAD, NEUTRINO_ICON_AUDIO); //NI
+	CComponentsHeaderLocalized header(m_x, m_y + m_title_height, m_width, m_theight, LOCALE_AUDIOPLAYER_HEAD, NEUTRINO_ICON_AUDIO);
 	header.setCorner(RADIUS_MID, CORNER_TOP);
 
 	if (m_inetmode)
diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index 960a3f0bf..b48579fe4 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -418,7 +418,7 @@ int CBouquetList::show(bool bShowChannelList)
 
 	for (unsigned int count = 0; count < sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0]); count++)
 	{
-		int w_text = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getRenderWidth(g_Locale->getText(CBouquetListButtons[count].locale));
+		int w_text = g_Font[SNeutrinoSettings::FONT_TYPE_BUTTON_TEXT]->getRenderWidth(g_Locale->getText(CBouquetListButtons[count].locale));
 		w_max_text = std::max(w_max_text, w_text);
 		frameBuffer->getIconSize(CBouquetListButtons[count].button, &icol_w, &icol_h);
 		w_max_icon = std::max(w_max_icon, icol_w);
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index f9cadd119..ac89f1e68 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -2101,8 +2101,6 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
 			if (g_settings.theme.progressbar_design_channellist != CProgressBar::PB_OFF)
 			{
 				pb.setValues(0, pb_width);
-				if (g_settings.theme.progressbar_design == CProgressBar::PB_GRAPHIC) //NI graphic
-					pb.setGraphic("progressbar_inactive");
 				pb.paint();
 			}
 			//name
diff --git a/src/gui/components/cc_item_progressbar.cpp b/src/gui/components/cc_item_progressbar.cpp
index b40546e45..045889db2 100644
--- a/src/gui/components/cc_item_progressbar.cpp
+++ b/src/gui/components/cc_item_progressbar.cpp
@@ -39,9 +39,7 @@
 #define GREEN  0x00FF00
 #define YELLOW 0xFFFF00
 
-//NI graphic
-#include <sstream>
-#include <unistd.h>
+//NI starbar
 #include <gui/pictureviewer.h>
 extern CPictureViewer * g_PicViewer;
 
@@ -86,8 +84,6 @@ CProgressBar::CProgressBar(	const int x_pos,
 	pb_value		= 0;
 	pb_max_value		= 0;
 
-	graphic_file	= "progressbar"; //NI graphic
-
 	// init start positions x/y active bar
 	pb_x 			= x + fr_thickness;
 	pb_y 			= y + fr_thickness;
@@ -480,10 +476,6 @@ void CProgressBar::paintProgress(bool do_save_bg)
 				paintStarBar();
 				is_painted = true;
 			}
-			else if(*pb_design == PB_GRAPHIC) {
-				paintGraphic();
-				is_painted = true;
-			}
 			else {
 			CProgressBarCache *pbc = CProgressBarCache::pbcLookup(pb_height, pb_max_width, pb_active_col, pb_passive_col, *pb_design, pb_invert, *pb_gradient, pb_red, pb_yellow, pb_green);
 			if (pbc)
@@ -505,31 +497,6 @@ void CProgressBar::paintProgress(bool do_save_bg)
 	}
 }
 
-
-//NI graphic
-void CProgressBar::paintGraphic()
-{
-	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);
-
-	if (pb_last_width == -1 ) {
-		if (pb_active_width <= pb_max_width && pb_passive_width > 0)
-			g_PicViewer->DisplayImage(pb_passive_graphic, pb_start_x_passive, pb_y, pb_passive_width, pb_height); // passive bar
-	}
-
-	if (pb_active_width > pb_last_width) {
-		// we have to paint the passive graphic in all cases to satisfy the CProgresswindow
-		if (pb_passive_width > 0)
-			g_PicViewer->DisplayImage(pb_passive_graphic, pb_start_x_passive, pb_y, pb_passive_width, pb_height); // passive bar
-		if (pb_active_width > 0)
-			g_PicViewer->DisplayImage(pb_active_graphic, pb_x, pb_y, pb_active_width, pb_height); // active bar
-	}
-	else if (pb_active_width <= pb_max_width && pb_passive_width > 0)
-		g_PicViewer->DisplayImage(pb_passive_graphic, pb_start_x_passive, pb_y, pb_passive_width, pb_height); // passive bar
-}
-
 //NI starbar
 void CProgressBar::paintStarBar()
 {
diff --git a/src/gui/components/cc_item_progressbar.h b/src/gui/components/cc_item_progressbar.h
index 6ea067c04..f0c2c7fd2 100644
--- a/src/gui/components/cc_item_progressbar.h
+++ b/src/gui/components/cc_item_progressbar.h
@@ -79,8 +79,6 @@ class CProgressBar : public CComponentsItem
 		///to evaluate values, these will be convert to the graph
 		int pb_value, pb_max_value;
 
-		std::string graphic_file; //NI graphic
-
 		int *pb_design, *pb_gradient;
 		int pb_type;
 
@@ -88,7 +86,6 @@ class CProgressBar : public CComponentsItem
 
 		///paints graph
 		void paintProgress(bool do_save_bg = CC_SAVE_SCREEN_NO);
-		void paintGraphic(); //NI graphic
 		void paintStarBar(); //NI starbar
 
 	public:
@@ -135,9 +132,6 @@ class CProgressBar : public CComponentsItem
 					const int w, const int h,
 					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) { graphic_file = graphic; }
-
 		///force update on next paint
 		void reset() { pb_last_width = -1; }
 		void paint(bool do_save_bg = CC_SAVE_SCREEN_NO);
@@ -148,8 +142,7 @@ class CProgressBar : public CComponentsItem
 			PB_MATRIX,	/*  0 */
 			PB_LINES_V,	/*  1 */
 			PB_LINES_H,	/*  2 */
-			PB_COLOR,	/*  3 */
-			PB_GRAPHIC	/*  4 */ //NI graphic
+			PB_COLOR	/*  3 */
 		};
 
 		enum pb_type_t {
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index 3bfe6f4fd..dafdbb1fb 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -1383,6 +1383,8 @@ void EpgPlus::hide()
 	if (this->header->head)
 	{
 		this->header->head->kill();
+		delete this->header->head;
+		this->header->head = NULL;
 	}
 	this->frameBuffer->paintBackgroundBoxRel(this->usableScreenX - DETAILSLINE_WIDTH, this->usableScreenY, DETAILSLINE_WIDTH + this->usableScreenWidth, this->usableScreenHeight);
 }
diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index e7100f583..7f5a72e73 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -1232,7 +1232,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 					showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
 					timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
 				}
-				else
+				else if (imdb_active && imdb->gotPoster())
 				{
 					imdb_active = false;
 					CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_IMDB_INFO_SAVE);
@@ -1625,7 +1625,17 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
 	}
 	bool tmdb = g_settings.tmdb_enabled;
 	bool fscr = (has_follow_screenings && !call_fromfollowlist);
-	EpgButtons[mp_info ? 2 : (fscr ? 0 : 1)][1].locale = imdb_active ? LOCALE_IMDB_INFO_SAVE : LOCALE_IMDB_INFO; //NI
+	//NI
+	if (imdb_active)
+	{
+		EpgButtons[mp_info ? 2 : (fscr ? 0 : 1)][1].button = (imdb->gotPoster()) ? NEUTRINO_ICON_BUTTON_GREEN : NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
+		EpgButtons[mp_info ? 2 : (fscr ? 0 : 1)][1].locale = LOCALE_IMDB_INFO_SAVE;
+	}
+	else
+	{
+		EpgButtons[mp_info ? 2 : (fscr ? 0 : 1)][1].button = NEUTRINO_ICON_BUTTON_GREEN;
+		EpgButtons[mp_info ? 2 : (fscr ? 0 : 1)][1].locale = LOCALE_IMDB_INFO;
+	}
 	if (mp_info)
 		::paintButtons(x, y, w, tmdb ? 3 : 2, EpgButtons[2], w, h); //NI
 	else
diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp
index b0f47b03a..d3a0050f4 100644
--- a/src/gui/filebrowser.cpp
+++ b/src/gui/filebrowser.cpp
@@ -1472,7 +1472,7 @@ void CFileBrowser::paint()
 		paintItem(count);
 
 	//scrollbar
-	int total_pages = ((filelist.size() - 1) / listmaxshow) + 1;
+	int total_pages = filelist.size() == 0 ? 1 : ((filelist.size() - 1) / listmaxshow) + 1;
 	int current_page = (selected / listmaxshow);
 
 	paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page);
diff --git a/src/gui/followscreenings.cpp b/src/gui/followscreenings.cpp
index 99446da95..a1dcc7fbd 100644
--- a/src/gui/followscreenings.cpp
+++ b/src/gui/followscreenings.cpp
@@ -69,7 +69,7 @@ CChannelEventList *CFollowScreenings::getFollowScreenings(void)
 				continue;
 			followlist.push_back(*e);
 
-			if (followlist.size() == 1 && !g_settings.timer_followscreenings)
+			if (followlist.size() == 1 && g_settings.timer_followscreenings == FOLLOWSCREENINGS_OFF)
 				break;
 		}
 	}
@@ -92,7 +92,7 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK
 					if (i->eventType == CTimerd::TIMER_RECORD) {
 						if (channel_id == i->channel_id && e->startTime == i->epg_starttime) {
 							Timer.removeTimerEvent(i->eventID);
-							if (!forwarders.empty() && (followlist.size() > 1 || g_settings.timer_followscreenings == 2 /*always*/)) //NI
+							if (!forwarders.empty() && (followlist.size() > 1 || g_settings.timer_followscreenings == FOLLOWSCREENINGS_ALWAYS)) //NI
 								forwarders[ix]->iconName_Info_right = "";
 #if 0
 							else
@@ -115,9 +115,9 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK
 								  e->startTime, e->startTime - (ANNOUNCETIME + 120 ), apids, true, e->startTime - (ANNOUNCETIME + 120) > time(NULL), recDir, true, ch->bUseCI) == -1) { //NI
 					//FIXME -- no error handling, but this shouldn't happen ...
 				} else {
-					if (!forwarders.empty() && (followlist.size() > 1 || g_settings.timer_followscreenings == 2 /*always*/)) //NI
+					if (!forwarders.empty() && (followlist.size() > 1 || g_settings.timer_followscreenings == FOLLOWSCREENINGS_ALWAYS)) //NI
 						forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_REC;
-					else if (g_settings.timer_followscreenings != 2 /*always*/) //NI
+					else if (g_settings.timer_followscreenings != FOLLOWSCREENINGS_ALWAYS) //NI
 						ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG,
 							CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO);
 					return menu_return::RETURN_REPAINT;
@@ -158,12 +158,12 @@ void CFollowScreenings::show()
 
 	getFollowScreenings();
 
-	if (followlist.size() == 1 && g_settings.timer_followscreenings < 2 /*always*/) //NI
+	if (followlist.size() == 1 && g_settings.timer_followscreenings != FOLLOWSCREENINGS_ALWAYS) //NI
 	{
 		snprintf(actionstr, sizeof(actionstr), "%lu", followlist.front().startTime);
 		exec(NULL, actionstr);
 	}
-	else if (followlist.size() > 1)
+	else if (followlist.size() > 1 || g_settings.timer_followscreenings == FOLLOWSCREENINGS_ALWAYS) //NI
 	{
 		CMenuWidget m(LOCALE_EPGVIEWER_SELECT_SCREENING, NEUTRINO_ICON_SETTINGS);
 		const char *icon = NEUTRINO_ICON_BUTTON_RED;
diff --git a/src/gui/followscreenings.h b/src/gui/followscreenings.h
index 53e362e3e..f23cb9f4e 100644
--- a/src/gui/followscreenings.h
+++ b/src/gui/followscreenings.h
@@ -59,6 +59,13 @@ class CFollowScreenings : public CMenuTarget
 		std::vector<CMenuForwarder *> forwarders;
 		void updateRightIcon(int i, time_t start, unsigned int duration);
 	public:
+		enum
+		{
+			FOLLOWSCREENINGS_OFF	= 0,
+			FOLLOWSCREENINGS_ON	= 1,
+			FOLLOWSCREENINGS_ALWAYS	= 2 //NI
+		};
+
                 CFollowScreenings(const t_channel_id Channel_id, time_t Starttime, time_t Stoptime, const std::string &Title, uint64_t EpgID=0,
 			unsigned char Apids=TIMERD_APIDS_STD, bool Safety=false, std::string RecDir="", CChannelEventList *Evtlist=NULL) : CMenuTarget () {
 			this->channel_id = Channel_id;
diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp
index 94f9d7b01..44a59ccc7 100644
--- a/src/gui/hdd_menu.cpp
+++ b/src/gui/hdd_menu.cpp
@@ -95,12 +95,12 @@ const CMenuOptionChooser::keyval HDD_SLEEP_OPTIONS[HDD_SLEEP_OPTION_COUNT] =
 };
 
 devtool_s CHDDMenuHandler::devtools[] = {
-	{ "ext4",  "/sbin/fsck.ext4",  "-C 1 -f -y", "/sbin/mkfs.ext4",  "-T largefile -m0", false, false },
-	{ "ext3",  "/sbin/fsck.ext3",  "-C 1 -f -y", "/sbin/mkfs.ext3",  "-T largefile -m0", false, false },
-	{ "ext2",  "/sbin/fsck.ext2",  "-C 1 -f -y", "/sbin/mkfs.ext2",  "-T largefile -m0", false, false },
-	{ "vfat",  "/sbin/fsck.vfat",  "-a",         "/sbin/mkfs.vfat",  "",                 false, false },
-	{ "exfat", "/sbin/fsck.exfat", "",           "/sbin/mkfs.exfat", "",                 false, false },
-	{ "xfs",   "/sbin/xfs_repair", "",           "/sbin/mkfs.xfs",   "-f",               false, false },
+	{ "ext4",  "/sbin/fsck.ext4",  "-C 1 -f -y", "/sbin/mkfs.ext4",  "-m 0", false, false },
+	{ "ext3",  "/sbin/fsck.ext3",  "-C 1 -f -y", "/sbin/mkfs.ext3",  "-m 0", false, false },
+	{ "ext2",  "/sbin/fsck.ext2",  "-C 1 -f -y", "/sbin/mkfs.ext2",  "-m 0", false, false },
+	{ "vfat",  "/sbin/fsck.vfat",  "-a",         "/sbin/mkfs.vfat",  "",    false, false },
+	{ "exfat", "/sbin/fsck.exfat", "",           "/sbin/mkfs.exfat", "",    false, false },
+	{ "xfs",   "/sbin/xfs_repair", "",           "/sbin/mkfs.xfs",   "-f",  false, false },
 };
 #define FS_MAX (sizeof(CHDDMenuHandler::devtools)/sizeof(devtool_s))
 
diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index f25eb0dbd..0cd5cb983 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -923,7 +923,7 @@ void CInfoViewerBB::paint_ca_bar()
 	if (g_settings.infobar_casystem_frame)
 	{
 		if (ca_bar == NULL)
-			ca_bar = new CComponentsShapeSquare(g_InfoViewer->ChanInfoX + OFFSET_INNER_MID, g_InfoViewer->BoxEndY, ca_width - 2*OFFSET_INNER_MID, bottom_bar_offset - OFFSET_INNER_MID, NULL, CC_SHADOW_ON, COL_INFOBAR_CASYSTEM_PLUS_2, COL_INFOBAR_CASYSTEM_PLUS_0);
+			ca_bar = new CComponentsShapeSquare(g_InfoViewer->ChanInfoX + OFFSET_INNER_MID, g_InfoViewer->BoxEndY, ca_width - 2*OFFSET_INNER_MID, bottom_bar_offset - 10, NULL, CC_SHADOW_ON, COL_INFOBAR_CASYSTEM_PLUS_2, COL_INFOBAR_CASYSTEM_PLUS_0); //NI
 		ca_bar->enableShadow(CC_SHADOW_ON, OFFSET_SHADOW/2, true);
 		ca_bar->setFrameThickness(1); //NI
 		ca_bar->setCorner(RADIUS_SMALL, CORNER_ALL);
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index ddc2208e1..f15cfb601 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1428,7 +1428,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
 				}
 #endif
 				/* in case ffmpeg report incorrect values */
-				if(file_prozent > 96 && (playstate == CMoviePlayerGui::PLAY) && (speed == 1)){
+				if(file_prozent > 89 && (playstate == CMoviePlayerGui::PLAY) && (speed == 1)){
 					if(position_tmp != position){
 						position_tmp = position ;
 						eof2 = 0;
diff --git a/src/gui/osd_progressbar_setup.cpp b/src/gui/osd_progressbar_setup.cpp
index 4f8140b50..a1da1e8ae 100644
--- a/src/gui/osd_progressbar_setup.cpp
+++ b/src/gui/osd_progressbar_setup.cpp
@@ -45,9 +45,8 @@
 #define _LOCALE_PROGRESSBAR_COLOR_HORIZONTAL    LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_2
 #define _LOCALE_PROGRESSBAR_COLOR_FULL          LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_3
 #define _LOCALE_PROGRESSBAR_COLOR_MONO          LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_4
-#define _LOCALE_PROGRESSBAR_COLOR_GRAPHIC       LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_5 //NI
 
-#define PROGRESSBAR_COLOR_OPTION_COUNT 7 //NI
+#define PROGRESSBAR_COLOR_OPTION_COUNT 6
 const CMenuOptionChooser::keyval PROGRESSBAR_COLOR_OPTIONS[PROGRESSBAR_COLOR_OPTION_COUNT] =
 {
 	{ CProgressBar::PB_OFF,         LOCALE_OPTIONS_OFF },
@@ -55,8 +54,7 @@ const CMenuOptionChooser::keyval PROGRESSBAR_COLOR_OPTIONS[PROGRESSBAR_COLOR_OPT
 	{ CProgressBar::PB_MATRIX,      _LOCALE_PROGRESSBAR_COLOR_MATRIX },
 	{ CProgressBar::PB_LINES_V,     _LOCALE_PROGRESSBAR_COLOR_VERTICAL },
 	{ CProgressBar::PB_LINES_H,     _LOCALE_PROGRESSBAR_COLOR_HORIZONTAL },
-	{ CProgressBar::PB_COLOR,       _LOCALE_PROGRESSBAR_COLOR_FULL },
-	{ CProgressBar::PB_GRAPHIC,     _LOCALE_PROGRESSBAR_COLOR_GRAPHIC } //NI
+	{ CProgressBar::PB_COLOR,       _LOCALE_PROGRESSBAR_COLOR_FULL }
 };
 
 #define PROGRESSBAR_TIMESCALE_INVERT_OPTION_COUNT 2
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index d6c76c95b..62b3ad2ae 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -225,7 +225,7 @@ font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] =
 	{LOCALE_FONTSIZE_INFOBAR_INFO       ,  20, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
 	{LOCALE_FONTSIZE_INFOBAR_SMALL      ,  14, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
 	{LOCALE_FONTSIZE_INFOBAR_ECMINFO    ,  15, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, //NI
-	{LOCALE_FONTSIZE_FILEBROWSER_ITEM   ,  17, CNeutrinoFonts::FONT_STYLE_REGULAR, 1}, //NI
+	{LOCALE_FONTSIZE_FILEBROWSER_ITEM   ,  17, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
 	{LOCALE_FONTSIZE_MENU_HINT          ,  16, CNeutrinoFonts::FONT_STYLE_REGULAR, 0},
 	{LOCALE_FONTSIZE_MOVIEBROWSER_HEAD  ,  14, CNeutrinoFonts::FONT_STYLE_REGULAR, 2}, //NI
 	{LOCALE_FONTSIZE_MOVIEBROWSER_LIST  ,  20, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, //NI
@@ -538,9 +538,8 @@ const CMenuOptionChooser::keyval OPTIONS_COL_GRADIENT_DIRECTION_OPTIONS[OPTIONS_
 #define _LOCALE_PROGRESSBAR_COLOR_HORIZONTAL    LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_2
 #define _LOCALE_PROGRESSBAR_COLOR_FULL          LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_3
 #define _LOCALE_PROGRESSBAR_COLOR_MONO          LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_4
-#define _LOCALE_PROGRESSBAR_COLOR_GRAPHIC       LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_5 //NI
 
-#define PROGRESSBAR_COLOR_OPTION_COUNT 7 //NI
+#define PROGRESSBAR_COLOR_OPTION_COUNT 6
 const CMenuOptionChooser::keyval PROGRESSBAR_COLOR_OPTIONS[PROGRESSBAR_COLOR_OPTION_COUNT] =
 {
 	{ CProgressBar::PB_OFF,         LOCALE_OPTIONS_OFF },
@@ -548,8 +547,7 @@ const CMenuOptionChooser::keyval PROGRESSBAR_COLOR_OPTIONS[PROGRESSBAR_COLOR_OPT
 	{ CProgressBar::PB_MATRIX,      _LOCALE_PROGRESSBAR_COLOR_MATRIX },
 	{ CProgressBar::PB_LINES_V,     _LOCALE_PROGRESSBAR_COLOR_VERTICAL },
 	{ CProgressBar::PB_LINES_H,     _LOCALE_PROGRESSBAR_COLOR_HORIZONTAL },
-	{ CProgressBar::PB_COLOR,       _LOCALE_PROGRESSBAR_COLOR_FULL },
-	{ CProgressBar::PB_GRAPHIC,     _LOCALE_PROGRESSBAR_COLOR_GRAPHIC } //NI
+	{ CProgressBar::PB_COLOR,       _LOCALE_PROGRESSBAR_COLOR_FULL }
 };
 
 //NI iconsets
diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp
index 59368fbd1..921aeab9d 100644
--- a/src/gui/record_setup.cpp
+++ b/src/gui/record_setup.cpp
@@ -41,6 +41,7 @@
 
 #include "record_setup.h"
 #include <gui/filebrowser.h>
+#include <gui/followscreenings.h>
 
 #include <gui/widget/icons.h>
 #include <gui/widget/msgbox.h>
@@ -173,12 +174,11 @@ const CMenuOptionChooser::keyval END_OF_RECORDING[END_OF_RECORDING_COUNT] =
 	{1, LOCALE_RECORDINGMENU_END_OF_RECORDING_EPG}
 };
 
-//NI
 const CMenuOptionChooser::keyval timer_followscreenings_options[] =
 {
-	{0, LOCALE_OPTIONS_OFF},
-	{1, LOCALE_OPTIONS_ON},
-	{2, LOCALE_OPTIONS_ALWAYS}
+	{CFollowScreenings::FOLLOWSCREENINGS_OFF	,LOCALE_OPTIONS_OFF	},
+	{CFollowScreenings::FOLLOWSCREENINGS_ON		,LOCALE_OPTIONS_ON	},
+	{CFollowScreenings::FOLLOWSCREENINGS_ALWAYS	,LOCALE_OPTIONS_ALWAYS	} //NI
 };
 size_t timer_followscreenings_options_count = sizeof(timer_followscreenings_options)/sizeof(CMenuOptionChooser::keyval);
 
@@ -358,7 +358,7 @@ void CRecordSetup::showRecordTimerSetup(CMenuWidget *menu_timersettings)
 	menu_timersettings->addItem(GenericMenuSeparatorLine);
 
 	//allow followscreenings
-	CMenuOptionChooser* followscreenings = new CMenuOptionChooser(LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS, &g_settings.timer_followscreenings, timer_followscreenings_options, timer_followscreenings_options_count, true); //NI
+	CMenuOptionChooser* followscreenings = new CMenuOptionChooser(LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS, &g_settings.timer_followscreenings, timer_followscreenings_options, timer_followscreenings_options_count, true);
 	followscreenings->setHint("", LOCALE_MENU_HINT_TIMER_FOLLOWSCREENINGS);
 	menu_timersettings->addItem(followscreenings);
 }
diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp
index 36a407bf3..b155106fd 100644
--- a/src/gui/test_menu.cpp
+++ b/src/gui/test_menu.cpp
@@ -1036,7 +1036,7 @@ void CTestMenu::showRecords()
 			recline->doPaintBg(true);
 			recline->setColorBody(COL_INFOBAR_PLUS_0);
 			recline->enableShadow(CC_SHADOW_ON, w_shadow);
-			recline->setCorner(CORNER_RADIUS_MID);
+			recline->setCorner(RADIUS_MID);
 			recordsbox->addCCItem(recline);
 
 			CComponentsPicture *iconf = new CComponentsPicture(OFFSET_INNER_MID, CC_CENTERED, NEUTRINO_ICON_REC, recline, CC_SHADOW_OFF, COL_RED, COL_INFOBAR_PLUS_0);
diff --git a/src/gui/volumebar.cpp b/src/gui/volumebar.cpp
index e4694a48f..8322aea65 100644
--- a/src/gui/volumebar.cpp
+++ b/src/gui/volumebar.cpp
@@ -51,7 +51,7 @@ CVolumeBar::CVolumeBar()
 void CVolumeBar::initVarVolumeBar()
 {
 	col_body 	= COL_MENUCONTENT_PLUS_0;
-	corner_rad 	= CORNER_RADIUS_MID;
+	corner_rad 	= RADIUS_MID; //NI
 	vb_item_offset 	= OFFSET_INNER_SMALL;
 	height          = CFrameBuffer::getInstance()->scale2Res(g_settings.volume_size);
 
@@ -202,10 +202,6 @@ void CVolumeBar::initVolumeBarScale()
 	vb_pb->setRgb(85, 75, 100);
 	vb_pb->setFrameThickness(0); //NI
 	vb_pb->setProgress(vb_pbx, vb_pby, vb_pbw, vb_pbh, *vb_vol, 100);
-
-	//NI
-	if (g_settings.theme.progressbar_design == CProgressBar::PB_GRAPHIC)
-		vb_pb->setGraphic("volumebar");
 }
 
 //set digit text with current volume value
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 30160ed64..068bd8475 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -82,7 +82,7 @@ CMenuItem::CMenuItem(bool Active, neutrino_msg_t DirectKey, const char * const I
 
 	x		= -1;
 	used		= false;
-	icon_frame_w	= 10;
+	icon_frame_w	= OFFSET_INNER_MID;
 	hint		= NONEXISTANT_LOCALE;
 	name		= NONEXISTANT_LOCALE;
 	nameString	= "";
@@ -267,7 +267,7 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char * right_text
 			stringstartposOption = name_start_x;
 		if (right_bgcol) {
 			if (!*right_text)
-				stringstartposOption -= 60;
+				stringstartposOption -= CFrameBuffer::getInstance()->scale2Res(60);
 			fb_pixel_t right_frame_col, right_bg_col;
 			if (active) {
 				right_bg_col = right_bgcol;
@@ -288,7 +288,7 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char * right_text
 		}
 	}
 	if (desc_text && *desc_text)
-		g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]->RenderString(name_start_x + 10, y+ item_height, _dx- 10 - (name_start_x - x), desc_text, item_color);
+		g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]->RenderString(name_start_x + OFFSET_INNER_MID, y+ item_height, _dx- OFFSET_INNER_MID - (name_start_x - x), desc_text, item_color);
 }
 
 void CMenuItem::prepareItem(const bool select_mode, const int &item_height)
@@ -314,7 +314,7 @@ void CMenuItem::paintItemSlider( const bool select_mode, const int &item_height,
 	}
 	int stringwidth2 = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(left_text);
 
-	int maxspace = dx - stringwidth - icon_frame_w - stringwidth2 - 10;
+	int maxspace = dx - stringwidth - icon_frame_w - stringwidth2 - OFFSET_INNER_MID;
 	if(maxspace < slider_lenght)
 		return ;
 
@@ -397,7 +397,7 @@ void CMenuItem::paintItemButton(const bool select_mode, int item_height, const c
 
 		if (icon_w>0 && icon_h>0)
 		{
-			frameBuffer->paintIcon(iconName_Info_right, dx + icon_start_x - (icon_w + 20), y+ ((item_height/2- icon_h/2)) );
+			frameBuffer->paintIcon(iconName_Info_right, dx + icon_start_x - (icon_w + 2*OFFSET_INNER_MID), y+ ((item_height/2- icon_h/2)) );
 		}
 	}
 }
@@ -1153,14 +1153,13 @@ void CMenuWidget::calcSize()
 	}
 	hint_height = 0;
 	if(g_settings.show_menu_hints && has_hints) {
-		hint_height = frameBuffer->scale2Res(60); //TODO: rework calculation of hint_height
-		int fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]->getHeight();
-		int h_tmp = OFFSET_INNER_LARGE + 2*fheight;
+		int lines = 2;
+		int text_height = 2*OFFSET_INNER_MID + lines*g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]->getHeight();
 		/* assuming all hint icons has the same size ! */
-		int iw, ih;
-		frameBuffer->getIconSize(NEUTRINO_ICON_HINT_TVMODE, &iw, &ih);
-		h_tmp = std::max(h_tmp, ih+OFFSET_INNER_MID);
-		hint_height = std::max(h_tmp, hint_height);
+		int icon_width, icon_height;
+		frameBuffer->getIconSize(NEUTRINO_ICON_HINT_TVMODE, &icon_width, &icon_height);
+		icon_height += 2*OFFSET_INNER_MID;
+		hint_height = std::max(icon_height, text_height);
 	}
 	/* set the max height to 9/10 of usable screen height
 	   debatable, if the callers need a possibility to set this */
@@ -1228,7 +1227,7 @@ void CMenuWidget::calcSize()
 	 * + center_offset for symmetry
 	 * + 20 for setMenuPos calculates 10 pixels border left and right */
 	int center_offset = (g_settings.menu_pos == MENU_POS_CENTER) ? DETAILSLINE_WIDTH : 0;
-	int max_possible = (int)frameBuffer->getScreenWidth() - DETAILSLINE_WIDTH - center_offset - 20;
+	int max_possible = (int)frameBuffer->getScreenWidth() - DETAILSLINE_WIDTH - center_offset - 2*OFFSET_INNER_MID;
 	if (full_width > max_possible)
 	{
 		width = max_possible - sb_width - OFFSET_SHADOW;
@@ -1272,7 +1271,7 @@ void CMenuWidget::paint()
 	if (header == NULL){
 		header = new CComponentsHeader(x, y, width + sb_width, hheight, getName(), iconfile);
 		header->enableShadow(CC_SHADOW_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT);
-		header->setOffset(10);
+		header->setOffset(OFFSET_INNER_MID);
 	}
 	header->setCaption(getName());
 	header->setColorAll(COL_FRAME_PLUS_0, COL_MENUHEAD_PLUS_0, COL_SHADOW_PLUS_0);
@@ -1312,25 +1311,25 @@ void CMenuWidget::setMenuPos(const int& menu_width)
 			break;
 			
 		case MENU_POS_TOP_LEFT: 
-			y = offy + scr_y + 10;
-			x = offx + scr_x + 10;
+			y = offy + scr_y + OFFSET_INNER_MID;
+			x = offx + scr_x + OFFSET_INNER_MID;
 			x += g_settings.show_menu_hints_line ? DETAILSLINE_WIDTH : 0; //NI
 			break;
 			
 		case MENU_POS_TOP_RIGHT: 
-			y = offy + scr_y + 10;
-			x = /*offx +*/ scr_x + scr_w - menu_width - 10;
+			y = offy + scr_y + OFFSET_INNER_MID;
+			x = /*offx +*/ scr_x + scr_w - menu_width - OFFSET_INNER_MID;
 			break;
 			
 		case MENU_POS_BOTTOM_LEFT: 
-			y = /*offy +*/ scr_y + scr_h - real_h - 10;
-			x = offx + scr_x + 10;
+			y = /*offy +*/ scr_y + scr_h - real_h - OFFSET_INNER_MID;
+			x = offx + scr_x + OFFSET_INNER_MID;
 			x += g_settings.show_menu_hints_line ? DETAILSLINE_WIDTH : 0; //NI
 			break;
 			
 		case MENU_POS_BOTTOM_RIGHT: 
-			y = /*offy +*/ scr_y + scr_h - real_h - 10;
-			x = /*offx +*/ scr_x + scr_w - menu_width - 10;
+			y = /*offy +*/ scr_y + scr_h - real_h - OFFSET_INNER_MID;
+			x = /*offx +*/ scr_x + scr_w - menu_width - OFFSET_INNER_MID;
 			break;
 	}
 	if (x_old != x || y_old != y)
@@ -1727,11 +1726,11 @@ int CMenuOptionNumberChooser::getWidth(void)
 		width += g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(format) - g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth("0");
 	}
 
-	width += 10; /* min 10 pixels between option name and value. enough? */
+	width += OFFSET_INNER_MID; /* min 10 pixels between option name and value. enough? */
 
 	const char *desc_text = getDescription();
 	if (*desc_text)
-		width = std::max(width, 10 + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(desc_text));
+		width = std::max(width, OFFSET_INNER_MID + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(desc_text));
 	return width;
 }
 
@@ -2053,10 +2052,10 @@ int CMenuOptionChooser::getWidth(void)
 			width = tw + ow;
 	}
 
-	width += 10; /* min 10 pixels between option name and value. enough? */
+	width += OFFSET_INNER_MID; /* min 10 pixels between option name and value. enough? */
 	const char *desc_text = getDescription();
 	if (*desc_text)
-		width = std::max(width, 10 + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(desc_text));
+		width = std::max(width, OFFSET_INNER_MID + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(desc_text));
 	return width;
 }
 
@@ -2246,13 +2245,13 @@ int CMenuForwarder::getWidth(void)
 		bgcol = jumpTarget->getColor();
 
 	if (!option_name.empty())
-		tw += 10 + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(option_name);
+		tw += OFFSET_INNER_MID + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(option_name);
 	else if (bgcol)
-		tw += 10 + 60;
+		tw += OFFSET_INNER_MID + CFrameBuffer::getInstance()->scale2Res(60);
 
 	const char *desc_text = getDescription();
 	if (*desc_text)
-		tw = std::max(tw, 10 + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(desc_text));
+		tw = std::max(tw, OFFSET_INNER_MID + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(desc_text));
 	return tw;
 }
 
@@ -2311,7 +2310,7 @@ CMenuSeparator::CMenuSeparator(const int Type, const std::string &Text, bool IsS
 int CMenuSeparator::getHeight(void)
 {
 	if (nameString.empty() && name == NONEXISTANT_LOCALE)
-		return 10;
+		return OFFSET_INNER_MID;
 	return  g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
 }
 
@@ -2319,7 +2318,7 @@ int CMenuSeparator::getWidth(void)
 {
 	int w = 0;
 	if (type & LINE)
-		w = 30; /* 15 pixel left and right */
+		w = 2*OFFSET_INNER_MID; /* offset left and right */
 	const char *l_name = getName();
 	if ((type & STRING) && *l_name)
 		w += g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(l_name);
@@ -2346,7 +2345,7 @@ int CMenuSeparator::paint(bool selected)
 	if ((type & LINE))
 	{
 		int grad = g_settings.theme.menu_Separator_gradient_enable ? CC_COLGRAD_COL_DARK_LIGHT_DARK : CC_COLGRAD_OFF;
-		paintBoxRel(x+10, y+(height>>1), dx-20, 1, COL_MENUCONTENT_PLUS_1, 0, CORNER_NONE, grad, COL_MENUCONTENT_PLUS_0, CFrameBuffer::gradientHorizontal, CColorGradient::light); //NI
+		paintBoxRel(x+OFFSET_INNER_MID, y+(height>>1), dx-2*OFFSET_INNER_MID, 1, COL_MENUCONTENT_PLUS_1, 0, CORNER_NONE, grad, COL_MENUCONTENT_PLUS_0, CFrameBuffer::gradientHorizontal, CColorGradient::light); //NI
 	}
 	if ((type & STRING))
 	{
@@ -2354,17 +2353,19 @@ int CMenuSeparator::paint(bool selected)
 	
 		if (*l_name)
 		{
-			int stringwidth = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(l_name); // UTF-8
+			int stringwidth = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(l_name);
+			int iconwidth, iconheight;
+			CFrameBuffer::getInstance()->getIconSize(NEUTRINO_ICON_BUTTON_HOME, &iconwidth, &iconheight);
 
 			/* if no alignment is specified, align centered */
 			if (type & ALIGN_LEFT)
-				name_start_x = x + (!(type & SUB_HEAD) ? name_start_x : 20 + 24 /*std icon_width is 24px - this should be determinated from NEUTRINO_ICON_BUTTON_HOME or so*/);
+				name_start_x = x + (!(type & SUB_HEAD) ? name_start_x : 2*OFFSET_INNER_MID + iconwidth);
 			else if (type & ALIGN_RIGHT)
-				name_start_x = x + dx - stringwidth - 20;
+				name_start_x = x + dx - stringwidth - 2*OFFSET_INNER_MID;
 			else /* ALIGN_CENTER */
 				name_start_x = x + (dx >> 1) - (stringwidth >> 1);
 			
- 			frameBuffer->paintBoxRel(name_start_x-5, y, stringwidth+10, height, item_bgcolor);
+			frameBuffer->paintBoxRel(name_start_x-OFFSET_INNER_SMALL, y, stringwidth+2*OFFSET_INNER_SMALL, height, item_bgcolor);
 			
 			if ((type & LINE)) //NI - use COL_MENUHEAD_TEXT for CMenuSeparators defined with LINE and STRING
 				item_color = COL_MENUHEAD_TEXT;
@@ -2494,7 +2495,7 @@ int CMenuProgressbar::getWidth(void)
 {
 	int width = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(getName());
 	if (width)
-		width += 10;
+		width += OFFSET_INNER_MID;
 	return width + scale.getWidth();
 }
 
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 1393ac455..2890c8688 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -76,6 +76,7 @@
 #include "gui/eventlist.h"
 #include "gui/favorites.h"
 #include "gui/filebrowser.h"
+#include "gui/followscreenings.h"
 #include "gui/hdd_menu.h"
 #include "gui/infoviewer.h"
 #include "gui/mediaplayer.h"
@@ -393,7 +394,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 		g_settings.easymenu = 1;
 		g_settings.softupdate_autocheck = 1;
 	}
-	dprintf(DEBUG_NORMAL, "g_settings.easymenu %d\n", g_settings.easymenu);
+	//NI dprintf(DEBUG_NORMAL, "g_settings.easymenu %d\n", g_settings.easymenu);
 
 	// video
 #if HAVE_TRIPLEDRAGON
@@ -556,7 +557,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 			g_settings.timer_remotebox_ip.push_back(timer_rb);
 		}
 	}
-	g_settings.timer_followscreenings = configfile.getInt32( "timer_followscreenings", 1 );
+	g_settings.timer_followscreenings = configfile.getInt32( "timer_followscreenings", CFollowScreenings::FOLLOWSCREENINGS_ON );
 
 	g_settings.infobar_sat_display   = configfile.getBool("infobar_sat_display"  , true );
 	g_settings.infobar_show_channeldesc   = configfile.getBool("infobar_show_channeldesc"  , false );
@@ -938,7 +939,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 
 	//Filebrowser
 	g_settings.filebrowser_showrights =  configfile.getInt32("filebrowser_showrights", 1);
-	g_settings.filebrowser_sortmethod = configfile.getInt32("filebrowser_sortmethod", 1); //NI
+	g_settings.filebrowser_sortmethod = configfile.getInt32("filebrowser_sortmethod", 1);
 	if ((g_settings.filebrowser_sortmethod < 0) || (g_settings.filebrowser_sortmethod >= FILEBROWSER_NUMBER_OF_SORT_VARIANTS))
 		g_settings.filebrowser_sortmethod = 0;
 	g_settings.filebrowser_denydirectoryleave = configfile.getBool("filebrowser_denydirectoryleave", false);
@@ -1171,6 +1172,23 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
 		if (g_settings.movieplayer_bisection_jump == 1)
 			g_settings.movieplayer_bisection_jump = 5;
 	}
+	//NI
+	if (g_settings.version_pseudo < "20170606000000")
+	{
+		//remove CProgressBar::PB_GRAPHIC
+		if (g_settings.theme.progressbar_design == 4 /*CProgressBar::PB_GRAPHIC*/)
+		{
+			g_settings.theme.progressbar_design = CProgressBar::PB_MONO;
+			g_settings.theme.progressbar_gradient = 1;
+		}
+	}
+	//NI
+	if (g_settings.version_pseudo < "20170606215500")
+	{
+		//align fontsize.filebrowser_item to new default
+		if (configfile.getInt32("fontsize.filebrowser_item", 16) == 16)
+			configfile.setInt32("fontsize.filebrowser_item", 17);
+	}
 
 	g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
 	configfile.setString("version_pseudo", g_settings.version_pseudo);
diff --git a/src/system/locals.h b/src/system/locals.h
index 2b29b273f..590eb8b0d 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1789,7 +1789,6 @@ typedef enum
 	LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_2,
 	LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_3,
 	LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_4,
-	LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_5,
 	LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_LONG,
 	LOCALE_MISCSETTINGS_PROGRESSBAR_GRADIENT,
 	LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index e2132e314..6026eb803 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1789,7 +1789,6 @@ const char * locale_real_names[] =
 	"miscsettings.progressbar_design_2",
 	"miscsettings.progressbar_design_3",
 	"miscsettings.progressbar_design_4",
-	"miscsettings.progressbar_design_5",
 	"miscsettings.progressbar_design_long",
 	"miscsettings.progressbar_gradient",
 	"miscsettings.progressbar_infobar_position",
diff --git a/src/system/settings.h b/src/system/settings.h
index 7fd66bad6..150fda705 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -989,10 +989,10 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
 #define CORNER_RADIUS_MIN	CFrameBuffer::getInstance()->scale2Res(3)
 #define CORNER_RADIUS_NONE	0
 
-#define RADIUS_LARGE	(g_settings.rounded_corners ? CORNER_RADIUS_LARGE : 0)
-#define RADIUS_MID	(g_settings.rounded_corners ? CORNER_RADIUS_MID : 0)
-#define RADIUS_SMALL	(g_settings.rounded_corners ? CORNER_RADIUS_SMALL : 0)
-#define RADIUS_MIN	(g_settings.rounded_corners ? CORNER_RADIUS_MIN : 0)
+#define RADIUS_LARGE	(g_settings.rounded_corners ? CORNER_RADIUS_LARGE : CORNER_RADIUS_NONE)
+#define RADIUS_MID	(g_settings.rounded_corners ? CORNER_RADIUS_MID   : CORNER_RADIUS_NONE)
+#define RADIUS_SMALL	(g_settings.rounded_corners ? CORNER_RADIUS_SMALL : CORNER_RADIUS_NONE)
+#define RADIUS_MIN	(g_settings.rounded_corners ? CORNER_RADIUS_MIN   : CORNER_RADIUS_NONE)
 #define RADIUS_NONE	0
 
 // offsets
diff --git a/version_pseudo.h b/version_pseudo.h
index 3cd859b22..8e3fea959 100644
--- a/version_pseudo.h
+++ b/version_pseudo.h
@@ -1 +1 @@
-#define NEUTRINO_VERSION_PSEUDO "20170516150000"
+#define NEUTRINO_VERSION_PSEUDO "20170606215500"