diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 10d6fedf0e0..ad87949d4e9 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -1,9 +1,7 @@
 <?php
-use Splash\Tests\WsObjects\O00ObjectBaseTest;
-
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Xavier Dutoit        <doli@sydesy.com>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2017 Regis Houssin      	<regis.houssin@inodbox.com>
  * Copyright (C) 2006 	   Jean Heimburger    	<jean@tiaris.info>
  *
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 408f4b2a1a8..e0af0718283 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -430,7 +430,7 @@ else
 		{
 			$choice .= '<br>';
 			//print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
-			$choice .= '<div class="center"><div class="ok">'.$langs->trans("InstallChoiceSuggested").'</div></div>';
+			$choice .= '<div class="center"><div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div></div>';
 			// <img src="../theme/eldy/img/tick.png" alt="Ok"> ';
 		}
 
@@ -535,7 +535,7 @@ else
                 $choice .= '<br>';
                 //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
                 $choice .= '<div class="center">';
-                $choice .= '<div class="ok">'.$langs->trans("InstallChoiceSuggested").'</div>';
+                $choice .= '<div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div>';
                 if ($count < count($migarray))	// There are other choices after
                 {
                     print $langs->trans("MigrateIsDoneStepByStep", DOL_VERSION);
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index f363789c129..e469a3bbb80 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -361,7 +361,7 @@ a.button:link,a.button:visited,a.button:active {
     background: #ddd;
     color: #fff;
     /* border: 1px solid #e0e0e0; */
-    padding: 0.3em 0.7em;
+    padding: 0.5em 0.7em;
     margin: 0 0.5em;
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
@@ -374,6 +374,13 @@ a.button:hover {
     text-decoration:none;
 }
 
+.suggestedchoice {
+	color: rgba(70, 3, 62, 0.6) !important;
+    /* background-color: rgba(70, 3, 62, 0.3); */
+    padding: 2px 4px;
+    border-radius: 4px;
+    white-space: nowrap;
+}
 .choiceselected {
 	background-color: #f4f6f4;
 	background-repeat: repeat-x;
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index b21429a4d1b..7546790b151 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -495,8 +495,8 @@ UPDATE llx_accounting_bookkeeping set date_creation = tms where date_creation IS
 UPDATE llx_facturedet SET situation_percent = 100 WHERE situation_percent IS NULL AND fk_prev_id IS NULL;
 
 -- Test inconsistency of data into situation invoices: If it differs, it may be the total_ht that is wrong and situation_percent that is good.
--- select f.rowid, f.type, qty, subprice, situation_percent, total_ht, total_ttc, total_tva, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, (situation_percent  / 100 * subprice * qty * (1 - (fd.remise_percent / 100)))
--- from llx_facturedet as fd, llx_facture as f where fd.fk_facture = f.rowid AND (total_ht - situation_percent  / 100 * subprice * qty * (1 - (fd.remise_percent / 100))) > 0.01 and f.type = 5;
+-- select f.rowid, f.type, qty, subprice, situation_percent, fd.total_ht, fd.total_ttc, fd.total_tva, fd.multicurrency_total_ht, fd.multicurrency_total_tva, fd.multicurrency_total_ttc, (situation_percent  / 100 * subprice * qty * (1 - (fd.remise_percent / 100)))
+-- from llx_facturedet as fd, llx_facture as f where fd.fk_facture = f.rowid AND (fd.total_ht - situation_percent  / 100 * subprice * qty * (1 - (fd.remise_percent / 100))) > 0.01 and f.type = 5;
 
 
 -- Note to make all deposit as payed when there is already a discount generated from it.
diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
index cbb22c94f90..902bcfc81d4 100644
--- a/htdocs/takepos/admin/other.php
+++ b/htdocs/takepos/admin/other.php
@@ -111,7 +111,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_prepare_head();
-dol_fiche_head($head, 'other', 'TakePOS', -1);
+dol_fiche_head($head, 'other', 'TakePOS', -1, 'cash-register');
 print '<br>';
 
 
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 83b31569a7b..2f54d79d603 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -82,7 +82,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_prepare_head();
-dol_fiche_head($head, 'receipt', 'TakePOS', -1);
+dol_fiche_head($head, 'receipt', 'TakePOS', -1, 'cash-register');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'?terminal='.(empty($terminal) ? 1 : $terminal).'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 85406c46faa..03607409ea7 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -133,7 +133,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_prepare_head();
-dol_fiche_head($head, 'setup', 'TakePOS', -1);
+dol_fiche_head($head, 'setup', 'TakePOS', -1, 'cash-register');
 
 // Numbering modules
 $now = dol_now();
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 46d168ddd24..ec3908361fc 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -123,7 +123,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_prepare_head();
-dol_fiche_head($head, 'terminal'.$terminal, 'TakePOS', -1);
+dol_fiche_head($head, 'terminal'.$terminal, 'TakePOS', -1, 'cash-register');
 print '<br>';
 
 
diff --git a/htdocs/theme/dolibarr_256x256_color.png b/htdocs/theme/dolibarr_256x256_color.png
new file mode 100644
index 00000000000..417387d6a27
Binary files /dev/null and b/htdocs/theme/dolibarr_256x256_color.png differ
diff --git a/htdocs/theme/dolibarr_logo.jpg b/htdocs/theme/dolibarr_logo.jpg
new file mode 100644
index 00000000000..a4a0611067d
Binary files /dev/null and b/htdocs/theme/dolibarr_logo.jpg differ
diff --git a/htdocs/theme/dolibarr_logo.png b/htdocs/theme/dolibarr_logo.png
old mode 100644
new mode 100755
index c15f03c821b..9a0781ce2ea
Binary files a/htdocs/theme/dolibarr_logo.png and b/htdocs/theme/dolibarr_logo.png differ
diff --git a/htdocs/theme/dolibarr_logo.svg b/htdocs/theme/dolibarr_logo.svg
index 44f6c07ece5..9c9259d0b33 100644
--- a/htdocs/theme/dolibarr_logo.svg
+++ b/htdocs/theme/dolibarr_logo.svg
@@ -23,94 +23,6 @@
      id="title3072">Logo Dolibarr ERP-CRM</title>
   <defs
      id="defs3452">
-    <linearGradient
-       id="linearGradient888">
-      <stop
-         style="stop-color:#373d5f;stop-opacity:1"
-         offset="0"
-         id="stop884" />
-      <stop
-         style="stop-color:#373d5a;stop-opacity:1"
-         offset="1"
-         id="stop886" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5378">
-      <stop
-         id="stop5374"
-         offset="0"
-         style="stop-color:#373d5f;stop-opacity:1" />
-      <stop
-         id="stop5376"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5372">
-      <stop
-         id="stop5368"
-         offset="0"
-         style="stop-color:#373d5f;stop-opacity:1" />
-      <stop
-         id="stop5370"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5366">
-      <stop
-         id="stop5362"
-         offset="0"
-         style="stop-color:#373d5f;stop-opacity:1" />
-      <stop
-         id="stop5364"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5360">
-      <stop
-         id="stop5356"
-         offset="0"
-         style="stop-color:#373d5f;stop-opacity:1" />
-      <stop
-         id="stop5358"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4730">
-      <stop
-         id="stop4726"
-         offset="0"
-         style="stop-color:#373d5f;stop-opacity:1" />
-      <stop
-         id="stop4728"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="5360">
-      <stop
-         id="stop4720"
-         offset="0"
-         style="stop-color:#373d5f;stop-opacity:1" />
-      <stop
-         id="stop4722"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4718">
-      <stop
-         id="stop4714"
-         offset="0"
-         style="stop-color:#373d55;stop-opacity:1" />
-      <stop
-         id="stop4716"
-         offset="1"
-         style="stop-color:#373d5a;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        id="linearGradient3734-3-6">
       <stop
@@ -122,23 +34,6 @@
          offset="1"
          id="stop3738" />
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter3775"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="11.473048"
-         id="feGaussianBlur3777" />
-    </filter>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath922">
-      <g
-         style="fill:url(#linearGradient884);fill-opacity:1"
-         inkscape:label="Clip"
-         id="use924" />
-    </clipPath>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3734-3-6"
@@ -148,92 +43,6 @@
        y1="310.53391"
        x2="742.98004"
        y2="310.53391" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient888"
-       id="linearGradient4650"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143"
-       gradientTransform="translate(0,-0.08891)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4718"
-       id="linearGradient4652"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143"
-       gradientTransform="translate(0,-1.60543)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4730"
-       id="linearGradient4654"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5360"
-       id="linearGradient4658"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143"
-       gradientTransform="translate(0,-1.0682839)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5366"
-       id="linearGradient4660"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5372"
-       id="linearGradient4662"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5378"
-       id="linearGradient4664"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath880">
-      <g
-         inkscape:label="Clip"
-         id="use882">
-        <text
-           transform="matrix(0.35661275,0,0,0.39656343,-125.67134,110.19296)"
-           id="text889"
-           y="887.85065"
-           x="537.1402"
-           style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';opacity:0.17204303;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3775)"
-           xml:space="preserve"><tspan
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:518.16009521px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             y="887.85065"
-             x="537.1402"
-             id="tspan887"
-             sodipodi:role="line">Dolibarr</tspan></text>
-      </g>
-    </clipPath>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3734-3-6"
@@ -243,45 +52,6 @@
        y1="310.53391"
        x2="742.98004"
        y2="310.53391" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath923">
-      <g
-         inkscape:label="Clip"
-         id="use925">
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';opacity:0.17204303;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3775)"
-           x="537.1402"
-           y="887.85065"
-           id="text932"
-           transform="matrix(0.35661275,0,0,0.39656343,-121.4287,154.03358)"><tspan
-             sodipodi:role="line"
-             id="tspan930"
-             x="537.1402"
-             y="887.85065"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:518.16009521px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none">Dolibarr</tspan></text>
-      </g>
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3734-3-6"
-       id="linearGradient884"
-       gradientUnits="userSpaceOnUse"
-       x1="75.697441"
-       y1="310.53391"
-       x2="742.98004"
-       y2="310.53391" />
-    <linearGradient
-       gradientTransform="matrix(1,0,0,0.74259216,53.441098,97.405596)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient888"
-       id="linearGradient4654-3"
-       gradientUnits="userSpaceOnUse"
-       x1="385.41022"
-       y1="210.12474"
-       x2="386.59824"
-       y2="386.90143" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -290,9 +60,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6568544"
-     inkscape:cx="318.01609"
-     inkscape:cy="106.45631"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="391.6782"
+     inkscape:cy="-50.366015"
      inkscape:current-layer="g4648"
      inkscape:document-units="px"
      showgrid="false"
@@ -369,48 +139,48 @@
           <path
              sodipodi:nodetypes="cccccscsssccsssc"
              d="m 112.32913,280.29476 v 98.02589 l -36.631688,-0.40123 v 0.40123 -137.35672 h 47.729468 c 20.93239,0 37.32341,5.28424 49.17307,15.85272 14.07523,12.64204 21.11285,29.7991 21.11285,51.47117 0,20.73563 -6.01506,37.65857 -18.04517,50.76884 -12.03011,13.11027 -27.20637,19.35291 -46.1538,19.35291 -2.22557,0 -6.23968,-0.0713 -11.22982,-0.0888 v -40.23379 l 10.08954,-0.0542 c 21.35314,-0.11469 27.8053,-9.87885 27.8053,-29.74492 0,-18.66206 -10.49627,-27.99309 -31.48881,-27.99309 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4650);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8463"
              inkscape:connector-curvature="0" />
           <path
              d="m 251.18669,274.26322 q 19.12787,0 32.75197,15.35106 13.71432,15.25071 13.71432,36.62179 0,21.67206 -13.89478,36.92279 -13.80455,15.25071 -33.38356,15.25071 -19.57899,0 -33.47377,-15.25071 -13.89479,-15.35105 -13.89479,-36.92279 0,-21.97308 13.89479,-36.9228 13.89478,-15.05005 34.28582,-15.05005 z m -0.90227,37.02313 q -5.41355,0 -9.20303,4.41468 -3.78949,4.31435 -3.78949,10.63537 0,6.22068 3.78949,10.63537 3.87971,4.41468 9.20303,4.41468 5.41356,0 9.20304,-4.41468 3.8797,-4.41469 3.8797,-10.63537 0,-6.32102 -3.78947,-10.63537 -3.78949,-4.41468 -9.29327,-4.41468 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4652);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8465"
              inkscape:connector-curvature="0" />
           <path
              sodipodi:nodetypes="ccccc"
              d="M 345.47268,241.05287 V 378.40956 H 311.72822 V 241.05287 Z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4654);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8467"
              inkscape:connector-curvature="0" />
           <path
              sodipodi:nodetypes="csscscsccscsssccscc"
              d="m 450.676,239.98458 v 81.97261 c 0,13.31093 4.30076,19.9664 12.90229,19.9664 3.66918,0 6.76693,-1.37123 9.29326,-4.11368 2.58647,-2.80935 3.87971,-6.18725 3.87971,-10.1337 0,-4.08023 -1.20301,-7.49158 -3.60903,-10.23403 -2.40603,-2.80935 -5.3534,-4.21402 -8.84213,-4.21402 -2.46617,0 -8.23123,-0.013 -8.23123,-0.013 l -0.25,-38.08747 c 0,0 6.97747,-0.22701 9.02258,-0.22701 12.69177,0 23.54895,5.08358 32.57153,15.25073 9.08273,10.16714 13.6241,22.40785 13.6241,36.72212 0,14.64872 -5.14562,26.5166 -13.80455,37.02313 -8.57803,10.40836 -22.98621,14.59993 -33.92491,14.51154 -6.73664,-0.0544 -13.32335,-1.10024 -19.75947,-4.37784 -6.37595,-3.27757 -11.63912,-7.69225 -15.78951,-13.24404 -7.21807,-9.63203 -10.8271,-22.10686 -10.8271,-37.42447 v -83.37728 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4658);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8471"
              inkscape:connector-curvature="0" />
           <path
              sodipodi:nodetypes="ccssscscsccscscscscc"
              d="m 575.66649,342.98354 -0.15625,35.42602 c 0,0 -5.0745,0 -7.36022,0 -13.53387,0 -24.8121,-3.24403 -33.83468,-13.14362 -9.02259,-9.89959 -13.53388,-22.30753 -13.53388,-37.2238 0,-14.51494 4.54137,-26.82254 13.6241,-36.92279 9.14289,-10.10026 20.24066,-15.15039 33.29333,-15.15039 14.55643,0 26.01511,4.74913 34.37604,14.24739 8.42108,9.43136 12.63162,22.34096 12.63162,38.72879 l -0.0625,49.46442 h -33.80696 l 0.125,-46.75541 c 0.0141,-5.28421 -1.17293,-9.49824 -3.5188,-12.64203 -2.28573,-3.14379 -5.38348,-4.71569 -9.29327,-4.71569 -3.54889,0 -6.61657,1.43811 -9.20304,4.31434 -2.58647,2.87623 -3.87971,6.28758 -3.87971,10.23405 0,4.14712 1.17294,7.55846 3.51881,10.23403 2.34587,2.67556 5.32333,4.01334 8.93236,4.01334 2.94737,0 8.14805,-0.10867 8.14805,-0.10867 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4660);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8473"
              inkscape:connector-curvature="0" />
           <path
              sodipodi:nodetypes="ccssccscsc"
              d="m 683.66305,275.87667 0.004,38.91662 c 0,0 -4.41872,0.10517 -6.34353,0.10517 -6.13535,0 -9.20303,5.21735 -9.20303,15.65204 v 47.85906 h -33.74447 v -55.08308 c 0,-14.44805 3.54888,-25.95298 10.64665,-34.51479 7.09777,-8.62869 16.57148,-12.94304 28.42114,-12.94304 2.64662,0 10.21945,0.008 10.21945,0.008 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4662);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8475"
              inkscape:connector-curvature="0" />
           <path
              sodipodi:nodetypes="ccssccscscc"
              d="m 742.97999,275.87857 -0.0312,38.94597 c 0,0 -4.51247,0.0739 -6.43728,0.0739 -6.13537,0 -9.20305,5.21735 -9.20305,15.65204 v 47.85906 h -33.74445 v -55.08308 c 0,-14.44805 3.54888,-25.95298 10.64664,-34.51479 7.09777,-8.62869 16.57149,-12.94304 28.42114,-12.94304 2.64663,0 10.34825,0.01 10.34825,0.01 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4664);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7072947;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8477"
              inkscape:connector-curvature="0" />
           <path
              sodipodi:nodetypes="ccccc"
              d="m 398.91378,276.40957 v 102 h -33.74446 v -102 z"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:url(#linearGradient4654-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.47124052;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#263c5c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.47124052;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
              id="path8467-5"
              inkscape:connector-curvature="0" />
         </g>
@@ -418,18 +188,18 @@
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#007179;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#007b8c;fill-opacity:1;fill-rule:nonzero;stroke:none;"
        x="643.31146"
        y="229.77211"
        id="text5484"
        transform="scale(0.88533213,1.1295196)"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42.95219803px;line-height:100%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#007179;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42.95219803px;line-height:100%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#007b8c;fill-opacity:1;fill-rule:nonzero;stroke:none;"
          sodipodi:role="line"
          id="tspan5486"
          x="643.31146"
          y="229.77211">ERP/CRM</tspan></text>
     <ellipse
-       style="fill:#007179;fill-opacity:1;stroke:none;stroke-width:1.02999127;stroke-opacity:1"
+       style="fill:#007b8c;fill-opacity:1;stroke:none;stroke-width:1.02999127;stroke-opacity:1"
        id="path957"
        cx="381.94193"
        cy="247.58162"
diff --git a/htdocs/theme/dolibarr_logo_256x256.png b/htdocs/theme/dolibarr_logo_256x256.png
deleted file mode 100644
index 3c3c61008ad..00000000000
Binary files a/htdocs/theme/dolibarr_logo_256x256.png and /dev/null differ
diff --git a/htdocs/theme/dolibarr_logo_squarred.png b/htdocs/theme/dolibarr_logo_squarred.png
deleted file mode 100644
index bbe16cbc6db..00000000000
Binary files a/htdocs/theme/dolibarr_logo_squarred.png and /dev/null differ
diff --git a/htdocs/theme/dolibarr_logo_squarred_alpha.png b/htdocs/theme/dolibarr_logo_squarred_alpha.png
deleted file mode 100644
index f972c98bd04..00000000000
Binary files a/htdocs/theme/dolibarr_logo_squarred_alpha.png and /dev/null differ
diff --git a/htdocs/theme/dolibarr_preferred_partner.png b/htdocs/theme/dolibarr_preferred_partner.png
new file mode 100755
index 00000000000..06e26cab9a2
Binary files /dev/null and b/htdocs/theme/dolibarr_preferred_partner.png differ
diff --git a/htdocs/theme/dolibarr_preferred_partner_int.png b/htdocs/theme/dolibarr_preferred_partner_int.png
deleted file mode 100644
index 6c705690327..00000000000
Binary files a/htdocs/theme/dolibarr_preferred_partner_int.png and /dev/null differ
diff --git a/htdocs/theme/dolistore_logo.jpg b/htdocs/theme/dolistore_logo.jpg
new file mode 100644
index 00000000000..b79280d819f
Binary files /dev/null and b/htdocs/theme/dolistore_logo.jpg differ
diff --git a/htdocs/theme/dolistore_logo.png b/htdocs/theme/dolistore_logo.png
index adcb0147395..747863108ce 100644
Binary files a/htdocs/theme/dolistore_logo.png and b/htdocs/theme/dolistore_logo.png differ
diff --git a/htdocs/theme/dolistore_logo.svg b/htdocs/theme/dolistore_logo.svg
new file mode 100755
index 00000000000..844010e19b5
--- /dev/null
+++ b/htdocs/theme/dolistore_logo.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="260"
+   height="70"
+   id="svg3450"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="dolistore_logo.svg"
+   inkscape:export-filename="/home/ldestailleur/git/dolibarr-foundation/logo-cliparts/dolistore_logo.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192">
+  <title
+     id="title3072">Logo Dolibarr ERP-CRM</title>
+  <defs
+     id="defs3452">
+    <linearGradient
+       id="linearGradient3734">
+      <stop
+         style="stop-color:#a1590c;stop-opacity:1;"
+         offset="0"
+         id="stop3736" />
+      <stop
+         style="stop-color:#d3a768;stop-opacity:1;"
+         offset="1"
+         id="stop3738" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="43.791163"
+     inkscape:cy="30.424404"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1023"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     showborder="true"
+     borderlayer="false" />
+  <metadata
+     id="metadata3455">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Logo Dolibarr ERP-CRM</dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Laurent Destailleur</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Laurent Destailleur</dc:title>
+          </cc:Agent>
+        </dc:rights>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline"
+     transform="translate(0,-530)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#525252;fill-opacity:1;stroke:none"
+       x="188.29013"
+       y="440.52631"
+       id="text3763"
+       transform="scale(0.74258923,1.3466395)"><tspan
+         sodipodi:role="line"
+         id="tspan3765"
+         x="188.29013"
+         y="440.52631"
+         style="font-size:58.11785507px;line-height:1.25;font-family:sans-serif">Store</tspan></text>
+    <path
+       sodipodi:nodetypes="cccccscsssccsssc"
+       d="m 24.436019,555.72292 v 38.45934 l -14.106106,-0.15741 v 0.15741 -53.89033 h 18.379631 c 8.060629,0 14.372471,2.07321 18.93553,6.21963 5.420081,4.95996 8.130122,11.69133 8.130122,20.19412 0,8.13538 -2.316275,14.77491 -6.948822,19.91857 -4.632547,5.14366 -10.476609,7.5929 -17.772872,7.5929 -0.857021,0 -2.402771,-0.028 -4.324371,-0.0348 v -15.78527 l 3.885273,-0.0213 c 8.222652,-0.045 10.707244,-3.87586 10.707244,-11.67008 0,-7.32185 -4.041895,-10.98277 -12.125687,-10.98277 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.66361171;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+       id="path8463"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 77.907188,553.35652 q 7.365748,0 12.612105,6.02282 5.281101,5.98343 5.281101,14.36813 0,8.50278 -5.350592,14.48624 -5.315846,5.98344 -12.855317,5.98344 -7.539464,0 -12.890055,-5.98344 -5.350596,-6.02281 -5.350596,-14.48624 0,-8.62088 5.350596,-14.48624 5.350591,-5.90471 13.202758,-5.90471 z m -0.347444,14.5256 q -2.084646,0 -3.543897,1.73205 -1.459254,1.69269 -1.459254,4.17266 0,2.44062 1.459254,4.17267 1.493996,1.73205 3.543897,1.73205 2.084649,0 3.5439,-1.73205 1.493991,-1.73205 1.493991,-4.17267 0,-2.47997 -1.459246,-4.17266 -1.459254,-1.73205 -3.578645,-1.73205 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.66361171;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+       id="path8465"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       d="m 114.21477,540.32682 v 53.89033 h -12.99429 v -53.89033 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.66361171;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+       id="path8467"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       d="m 134.79383,554.19861 v 40.01854 h -12.9943 v -40.01854 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:194.85823059px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.57185936;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.18431373"
+       id="path8467-5"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       style="display:inline;fill:#a05a2c;fill-opacity:1;stroke:none;stroke-width:0.40034935;stroke-opacity:1"
+       id="path957"
+       cx="128.25832"
+       cy="542.88831"
+       rx="6.7222133"
+       ry="7.1090221" />
+  </g>
+</svg>
diff --git a/htdocs/theme/eldy/thumb.png b/htdocs/theme/eldy/thumb.png
index 47ddbfe36d1..6d385ae4c03 100644
Binary files a/htdocs/theme/eldy/thumb.png and b/htdocs/theme/eldy/thumb.png differ