diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 0a52301e608..dee4edc3298 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -690,8 +690,6 @@ class Conf
 			$this->global->AGENDA_DEFAULT_FILTER_TYPE = '0'; // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
 		}
 
-		if (!isset($this->global->MAIN_USE_OLD_TITLE_BUTTON)) $this->global->MAIN_USE_OLD_TITLE_BUTTON = 0;
-
 		if (!isset($this->global->MAIN_JS_GRAPH)) $this->global->MAIN_JS_GRAPH = 'chart'; // Use chart.js library
 
 		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) $this->global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 89e76156448..5f31b07214c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4523,15 +4523,17 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
 	}
 	if ($page > 0)
 	{
-		print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
+		print '<li class="pagination paginationpage"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
 	}
 	if ($betweenarrows)
 	{
+		print '<!--<div class="betweenarrows nowraponall inline-block">-->';
 		print $betweenarrows;
+		print '<!--</div>-->';
 	}
 	if ($nextpage > 0)
 	{
-		print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
+		print '<li class="pagination paginationpage"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
 	}
 	if ($afterarrows)
 	{
@@ -8623,11 +8625,8 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
     }
 
     $class = 'btnTitle';
+    if ($iconClass == 'fa fa-plus-circle') $class .= ' btnTitlePlus';
 
-    // hidden conf keep during button transition TODO: remove this block
-    if (!empty($conf->global->MAIN_USE_OLD_TITLE_BUTTON)) {
-        $class = 'butActionNew';
-    }
     if (!empty($params['morecss'])) $class .= ' '.$params['morecss'];
 
     $attr = array(
@@ -8642,11 +8641,6 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
     if ($status <= 0) {
         $attr['class'] .= ' refused';
 
-        // hidden conf keep during button transition TODO: remove this block
-        if (!empty($conf->global->MAIN_USE_OLD_TITLE_BUTTON)) {
-            $attr['class'] = 'butActionNewRefused';
-        }
-
         $attr['href'] = '';
 
         if ($status == -1) { // disable
@@ -8698,18 +8692,12 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 
     $tag = (empty($attr['href']) ? 'span' : 'a');
 
-    $button = '<'.$tag.' '.$compiledAttributes.' >';
+    $button = '';
+    $button .= '<'.$tag.' '.$compiledAttributes.' >';
     $button .= '<span class="'.$iconClass.' valignmiddle btnTitle-icon"></span>';
     $button .= '<span class="valignmiddle text-plus-circle btnTitle-label'.(empty($params['forcenohideoftext']) ? ' hideonsmartphone' : '').'">'.$label.'</span>';
     $button .= '</'.$tag.'>';
 
-    // hidden conf keep during button transition TODO: remove this block
-    if (!empty($conf->global->MAIN_USE_OLD_TITLE_BUTTON)) {
-        $button = '<'.$tag.' '.$compiledAttributes.' ><span class="text-plus-circle">'.$label.'</span>';
-        $button .= '<span class="'.$iconClass.' valignmiddle"></span>';
-        $button .= '</'.$tag.'>';
-    }
-
     return $button;
 }