diff --git a/configure.ac b/configure.ac
index beb0a3b85..244e3bc9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(NI-Neutrino,3.30.0)
+AC_INIT(NI-Neutrino,3.40.0)
 AM_INIT_AUTOMAKE([1.0.1 nostdinc])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 250e388da..8e1c8f0d6 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1351,8 +1351,8 @@ menu.hint_misc_onlineservices Konfigurieren und steuern von Online-Diensten wie
 menu.hint_misc_zapit Verwaltung der Start-Kanäle für den TV/Radio-Modus
 menu.hint_movie Wiedergabe von Filmen
 menu.hint_moviebrowser_fonts Ändern Sie die Schriftgrößen im Moviebrowser (Meine Aufnahmen)
-menu.hint_moviebrowser_setup Legen Sie Auswahl- und Anzeigeoptionen des MovieBrowsers fest
-menu.hint_movieplayer_bisection_jump Für das Vor- und Zurückspringen mit Seite hoch/runter wird ein bisektionaler Modus verwendet
+menu.hint_moviebrowser_setup Legen Sie Auswahl- und Anzeigeoptionen des Moviebrowsers fest
+menu.hint_movieplayer_bisection_jump Startwert für den bisektionalen Modus, um mit Seite hoch/runter vor- bzw. zurückzuspringen
 menu.hint_movieplayer_plugin Wählen Sie ein Plugin, das mit einer Schnellstart-Taste im Movieplayer-Modus gestartet wird
 menu.hint_net_broadcast Ändern Sie die Broadcast-Adresse.\nWenn Sie unsicher sind, verwenden Sie zuletzt .255
 menu.hint_net_dhcp Verwenden Sie einen DHCP-Server für die automatische Vergabe einer IP-Adresse im Netzwerk
diff --git a/data/locale/english.locale b/data/locale/english.locale
index f2848a9a0..04f6b5eee 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1352,7 +1352,7 @@ menu.hint_misc_zapit Initial TV/Radio channels
 menu.hint_movie Play movies
 menu.hint_moviebrowser_fonts Change moviebrowser (My recordings) font sizes
 menu.hint_moviebrowser_setup Set selection and display options.
-menu.hint_movieplayer_bisection_jump Use bisectional mode to jump forward/backward with page up/down
+menu.hint_movieplayer_bisection_jump Start value for bisectional mode to jump forward/backward with page up/down
 menu.hint_movieplayer_plugin Choose a plugin that's executed with the one touch key in movieplayer mode
 menu.hint_net_broadcast Enter broadcast address\nif unsure, use IP address with last .255
 menu.hint_net_dhcp Use DHCP server to auto-configure
diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp
index 4027eebe5..0926595c4 100644
--- a/src/gui/keybind_setup.cpp
+++ b/src/gui/keybind_setup.cpp
@@ -516,9 +516,10 @@ void CKeybindSetup::showKeyBindMovieplayerSetup(CMenuWidget *bindSettings_mplaye
 	bindSettings_mplayer->addItem(GenericMenuSeparatorLine); //NI
 
 	//NI - bisectional jumps
-	CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_MOVIEPLAYER_BISECTION_JUMP, &g_settings.movieplayer_bisection_jump, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
-	mc->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_BISECTION_JUMP);
-	bindSettings_mplayer->addItem(mc);
+	CMenuOptionNumberChooser* nc = new CMenuOptionNumberChooser(LOCALE_MOVIEPLAYER_BISECTION_JUMP, &g_settings.movieplayer_bisection_jump, true, 0, 10, this, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF);
+	nc->setNumberFormat(std::string("%d ") + g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE));
+	nc->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_BISECTION_JUMP);
+	bindSettings_mplayer->addItem(nc);
 }
 
 void CKeybindSetup::showKeyBindMoviebrowserSetup(CMenuWidget *bindSettings_mbrowser)
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 7f806bdaa..15611c12a 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1353,8 +1353,9 @@ void CMoviePlayerGui::PlayFileLoop(void)
 	neutrino_msg_t lastmsg = 0; //NI
 
 	//NI - bisectional jumps
-	int bisection_jump = 300;
+	int bisection_jump = g_settings.movieplayer_bisection_jump * 60;
 	int bisection_loop = -1;
+	int bisection_loop_max = 5;
 
 	while (playstate >= CMoviePlayerGui::PLAY)
 	{
@@ -1374,7 +1375,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
 		//NI - bisectional jumps
 		if (bisection_loop > -1)
 			bisection_loop++;
-		if (bisection_loop > 10)
+		if (bisection_loop > bisection_loop_max)
 			bisection_loop = -1;
 
 		if ((playstate >= CMoviePlayerGui::PLAY) && (timeshift != TSHIFT_MODE_OFF || (playstate != CMoviePlayerGui::PAUSE))) {
@@ -1635,10 +1636,10 @@ void CMoviePlayerGui::PlayFileLoop(void)
 
 			if (g_settings.movieplayer_bisection_jump)
 			{
-				if ((lastmsg == CRCInput::RC_page_up || lastmsg == CRCInput::RC_page_down) && (bisection_loop > -1 && bisection_loop <= 10))
+				if ((lastmsg == CRCInput::RC_page_up || lastmsg == CRCInput::RC_page_down) && (bisection_loop > -1 && bisection_loop <= bisection_loop_max))
 					bisection_jump /= 2;
 				else
-					bisection_jump = 300;
+					bisection_jump = g_settings.movieplayer_bisection_jump * 60;
 
 				bisection_loop = 0;
 				jump = bisection_jump;
diff --git a/src/gui/widget/buttons.cpp b/src/gui/widget/buttons.cpp
index e0095b45e..9c5a7995e 100644
--- a/src/gui/widget/buttons.cpp
+++ b/src/gui/widget/buttons.cpp
@@ -103,8 +103,8 @@ int paintButtons(	const button_label_ext * const content,
 	int w_footer = footerwidth;
 	int h_footer = 0;
 	
-	int w_space 	= 10; //minimal space between buttons
-	int h_space	= 4; //minimal space between caption and/or icon and border
+	int w_space 	= OFFSET_INNER_MID; //minimal space between buttons
+	int h_space	= OFFSET_INNER_SMALL; //minimal space between caption and/or icon and border
 	int x_icon 	= x_footer + w_space;
 	int x_caption 	= 0;
 	
@@ -312,8 +312,8 @@ int paintButtons(       const int &x,
 	int w_footer = footerwidth;
 	int h_footer = 0;
 
-	int w_space     = 10; //minimal space between buttons
-	int h_space     = 4; //minimal space between caption and/or icon and border
+	int w_space     = OFFSET_INNER_MID; //minimal space between buttons
+	int h_space     = OFFSET_INNER_SMALL; //minimal space between caption and/or icon and border
 	int x_icon      = x_footer + w_space;
 	int x_caption   = 0;
 
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 42d4f51c0..b31134976 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -906,7 +906,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 
 	//Movie-Player
 	g_settings.movieplayer_repeat_on = configfile.getInt32("movieplayer_repeat_on", CMoviePlayerGui::REPEAT_OFF);
-	g_settings.movieplayer_bisection_jump = configfile.getInt32("movieplayer_bisection_jump", 1); //NI
+	g_settings.movieplayer_bisection_jump = configfile.getInt32("movieplayer_bisection_jump", 5); //NI
 	g_settings.youtube_dev_id = configfile.getString("youtube_dev_id","AIzaSyBLdZe7M3rpNMZqSj-3IEvjbb2hATWJIdM"); //NI
 	g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1);
 	g_settings.youtube_enabled = check_youtube_dev_id();
@@ -1143,6 +1143,12 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
 		configfile.deleteKey("screen_width");
 		configfile.deleteKey("screen_height");
 	}
+	//NI
+	if (g_settings.version_pseudo < "20170516150000")
+	{
+		if (g_settings.movieplayer_bisection_jump == 1)
+			g_settings.movieplayer_bisection_jump = 5;
+	}
 
 	g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
 	configfile.setString("version_pseudo", g_settings.version_pseudo);
diff --git a/version_pseudo.h b/version_pseudo.h
index f72f31607..3cd859b22 100644
--- a/version_pseudo.h
+++ b/version_pseudo.h
@@ -1 +1 @@
-#define NEUTRINO_VERSION_PSEUDO "20170209181002"
+#define NEUTRINO_VERSION_PSEUDO "20170516150000"