diff --git a/htdocs/index.php b/htdocs/index.php
index ae63fdb438b79e151e40ca0c51dc5fbd5620b1ad..7b56062d454ecf0d1110519e75c17d6302e2b314 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -46,8 +46,8 @@ if (! isset($_GET["mainmenu"])) $_GET["mainmenu"]="home";
  * View
  */
 
-// Smartphone (for dev only)
-if ($conf->global->MAIN_FEATURES_LEVEL == 2 && class_exists('Smartphone'))
+// Smartphone
+if (class_exists('Smartphone'))
 {
 	// Template directory
 	$smartphone->getTemplateDir();
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6353cf2ecf50357a2b96a785983197661b4e4eaa..544b9b1600c8991cf43304a50ac5def64ee238f3 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -267,8 +267,8 @@ if (sizeof($conf->need_smarty) > 0)
 	}
 }
 
-// Init Smartphone
-if (isset($conf->browser->phone))
+// Init Smartphone (for dev only)
+if ($conf->global->MAIN_FEATURES_LEVEL == 2 && isset($conf->browser->phone))
 {
 	include_once(DOL_DOCUMENT_ROOT."/core/class/smartphone.class.php");
 
@@ -663,22 +663,18 @@ if (! empty($_GET["theme"]))
 if (empty($user->societe_id))    // If internal user or not defined
 {
 	$conf->top_menu=$conf->global->MAIN_MENU_BARRETOP;
-	//$conf->left_menu=$conf->global->MAIN_MENU_BARRELEFT;
 	$conf->smart_menu=$conf->global->MAIN_MENU_SMARTPHONE;
 	// For backward compatibility
     if ($conf->top_menu == 'eldy.php') $conf->top_menu='eldy_backoffice.php';
-	//if ($conf->left_menu == 'eldy.php') $conf->left_menu='eldy_backoffice.php';
 	if ($conf->top_menu == 'rodolphe.php') $conf->top_menu='eldy_backoffice.php';
-	//if ($conf->left_menu == 'rodolphe.php') $conf->left_menu='eldy_backoffice.php';
 }
 else                        // If external user
 {
 	$conf->top_menu=$conf->global->MAIN_MENUFRONT_BARRETOP;
-	//$conf->left_menu=$conf->global->MAIN_MENUFRONT_BARRELEFT;
 	$conf->smart_menu=$conf->global->MAIN_MENUFRONT_SMARTPHONE;
 	// For backward compatibility
+    if ($conf->top_menu == 'eldy.php') $conf->top_menu='eldy_frontoffice.php';
 	if ($conf->top_menu == 'rodolphe.php') $conf->top_menu='eldy_frontoffice.php';
-	//if ($conf->left_menu == 'rodolphe.php') $conf->left_menu='eldy_frontoffice.php';
 }
 
 if (! defined('NOLOGIN'))
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 997d7d346202ece4e31eecaea8b154f8eadd91c1..d8786494e7ee6feca2a1dc239b6895ed985e5d38 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -194,7 +194,7 @@ define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix);
 // Detection browser
 if (isset($_SERVER["HTTP_USER_AGENT"]))
 {
-	// If phone/smartphone, we set osname.
+	// If phone/smartphone, we set phone os name.
 	if (preg_match('/android/i',$_SERVER["HTTP_USER_AGENT"]))			$conf->browser->phone='android';
 	elseif (preg_match('/blackberry/i',$_SERVER["HTTP_USER_AGENT"]))	$conf->browser->phone='blackberry';
 	elseif (preg_match('/iphone/i',$_SERVER["HTTP_USER_AGENT"]))		$conf->browser->phone='iphone';
@@ -282,7 +282,7 @@ if (! defined('NOREQUIREDB'))
 		// Add real path in session name
 		$realpath='';
 		if ( preg_match('/^([^.]+)\/htdocs\//i', realpath($_SERVER["SCRIPT_FILENAME"]), $regs))	$realpath = isset($regs[1])?$regs[1]:'';
-		
+
 		$entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].$realpath);
 		if (! empty($_COOKIE[$entityCookieName]) && ! empty($conf->file->cookie_cryptkey)) 						// Just for view specific login page
 		{
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 50682f306ec494e9315b1e7ff0ed3b492b369e89..35f63f5d7d7ad98b3b638e89c854989de00083b5 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -36,7 +36,7 @@ if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
 
-require_once("../../master.inc.php");
+require_once("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
 
 // Define css type
@@ -464,7 +464,7 @@ img.printer {
 /* ============================================================================== */
 
 <?php if ((! empty($_GET["optioncss"]) && $_GET["optioncss"] == 'print')
-|| (! empty($conf->browser->phone) && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?>
+|| (! empty($conf->browser->phone) && class_exists('Smartphone') && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?>
 .vmenu {
 	display: none;
 }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 45e8e8182ebe92c072522f76e8cf42d5b0db8814..d4e28d78ead899ae99ca2c2488f12bc14bef9853 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -36,7 +36,7 @@ if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
 
-require_once("../../master.inc.php");
+require_once("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
 
 // Define css type
@@ -482,7 +482,7 @@ img.printer {
 /* ============================================================================== */
 
 <?php if ((! empty($_GET["optioncss"]) && $_GET["optioncss"] == 'print')
-|| (! empty($conf->browser->phone) && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?>
+|| (! empty($conf->browser->phone) && class_exists('Smartphone') && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?>
 .vmenu {
     display: none;
 }
diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php
index 8d1cb577d84b959958876189fc1540967a38c8de..1d190d1e038ff163b1978c9a6ba6335206297d3f 100644
--- a/htdocs/theme/freelug/style.css.php
+++ b/htdocs/theme/freelug/style.css.php
@@ -35,7 +35,7 @@ if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
 
-require_once("../../master.inc.php");
+require_once("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
 
 // Define css type
@@ -395,7 +395,7 @@ img.printer
 /* ============================================================================== */
 
 <?php if ((! empty($_GET["optioncss"]) && $_GET["optioncss"] == 'print')
-|| (! empty($conf->browser->phone) && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?>
+|| (! empty($conf->browser->phone) && class_exists('Smartphone') && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?>
 .vmenu {
     display: none;
 }
diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php
index d5e5d35ba1334bd144d49c7944273d7ced58a124..2a722a0d2576071217d011f6f2b641307a0ef07a 100644
--- a/htdocs/theme/yellow/style.css.php
+++ b/htdocs/theme/yellow/style.css.php
@@ -35,7 +35,7 @@ if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
 
-require_once("../../master.inc.php");
+require_once("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
 
 // Define css type
@@ -375,7 +375,7 @@ img.printer
 /* ============================================================================== */
 
 <?php if ((! empty($_GET["optioncss"]) && $_GET["optioncss"] == 'print')
-|| (! empty($conf->browser->phone) && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?>
+|| (! empty($conf->browser->phone) && class_exists('Smartphone') && empty($conf->global->MAIN_SEARCHFORM_WITH_SMARTHPONE) && empty($conf->global->BOOKMARKS_SHOW_WITH_SMARTHPONE))) { ?>
 .vmenu {
     display: none;
 }