diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Query.php b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Query.php
index a2af6fc1d6..feb5006c59 100644
--- a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Query.php
+++ b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Query.php
@@ -160,7 +160,7 @@ class Query implements ControllerProviderInterface
         $explain .= '<br><div>' . $result->getDuration() . ' s</div>dans index ' . $result->getIndexes();
         $explain .= "</div>";
 
-        $infoResult = '<a href="#" class="infoDialog" infos="' . str_replace('"', '&quot;', $explain) . '">' .$app->trans('%total% reponses', ['%total%' => '<span>'.$result->getTotal().'</span>']) . '</a><div id="docInfo">' . $app->trans('%number% documents<br/>selectionnes', ['%number%' => '<span id="nbrecsel"></span>']).'</div>';
+        $infoResult = '<div id="docInfo">' . $app->trans('%number% documents<br/>selectionnes', ['%number%' => '<span id="nbrecsel"></span>']).'</div><a href="#" class="infoDialog" infos="' . str_replace('"', '&quot;', $explain) . '">' .$app->trans('%total% reponses', ['%total%' => '<span>'.$result->getTotal().'</span>']) . '</a>';
 
         $json['infos'] = $infoResult;
         $json['navigation'] = $string;
diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig
index e473fecfe8..47fe876cce 100644
--- a/templates/web/common/menubar.html.twig
+++ b/templates/web/common/menubar.html.twig
@@ -101,19 +101,19 @@
       </ol>
 
     </div>
-    <div class="PNB" style="left:auto;overflow:hidden;">
+    <div class="PNB right" style="left:auto;overflow:hidden;">
       <ol>
 
     {% if app['authentication'].isAuthenticated()  and module == "prod" %}
         <li id="notification_trigger">
           <a href="#" style="font-weight:bold;text-decoration:none;">
             <span>
-              {{ 'Notifications' | trans }}
               <button class="counter btn btn-danger" style="visibility:{% if app['events-manager'].get_unread_notifications_number > 0 %}visible{% else %}hidden{% endif %};">
                   {% if app['events-manager'].get_unread_notifications_number > 0 %}
                     {{app['events-manager'].get_unread_notifications_number}}
                   {% endif %}
               </button>
+              {{ 'Notifications' | trans }}
             </span>
           </a>
         </li>
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 299e63352b..4b5d79800f 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -194,13 +194,13 @@
                                 <img class="proposals_on" src="/skins/icons/proposition_on32.png" title="{{ 'phraseanet:: propositions' | trans }}"/>
                             </a>
                         </li>
-                        <li>
+                        <li class="thesaurus">
                             <a href="#thesaurus_tab" class="WZtabs">
                                 <img src="/skins/icons/thesaurus_32.png" title="{{ 'phraseanet:: thesaurus' | trans }}"/>
                             </a>
                         </li>
                         {% endif %}
-                        <li class="ui-tabs-selected ui-corner-top">
+                        <li class="ui-tabs-selected ui-corner-top baskets">
                             <a href="#baskets" class="WZbasketTab">
                                 <div id="basket_menu_trigger">&#9660;</div>
                             </a>
@@ -215,7 +215,7 @@
                         ondblclick="return(thesau_dblclickThesaurus(event));" onclick="return(thesau_clickThesaurus(event));">
                         <button id="facets-back-btn" style="display:none;">back</button>
                     </div>
-                    <div id="thesaurus_tab" class="PNB" style="top:52px;">
+                    <div id="thesaurus_tab" class="PNB" style="top:66px;">
                         <div id="THPD_tabs">
                             <ul>
                                 <li class="th_tab"><a href="#THPD_T"><span>{{ 'prod::thesaurusTab:thesaurus' | trans }}</span></a></li>
@@ -239,11 +239,12 @@
                                             <div class="input-append">
                                                 <input type="text" name="search_value" class="input-medium" onkeyup="T_Gfilter_delayed(this.value, 300);" />
                                                 <input type="submit" class="th_ok btn" value="" />
+                                                <input type="button" class="th_clear"/>
                                                 <input type="button" class="th_cancel btn" value="{{ 'boutton::annuler' | trans }}" onclick="thesauCancelWizard();return(false);"/>
                                              </div>
                                         </form>
                                     </div>
-                                    <div id='THPD_T_treeBox' class="searchZone" style="position:absolute; top:45px; bottom:0px; left:0px; width:100%; overflow:auto">
+                                    <div id='THPD_T_treeBox' class="searchZone" style="position:absolute; top:45px; bottom:0px; left:0px; width:100%;">
                                         <div onclick="Xclick(event);return(false);" ondblclick="TXdblClick(event);">
                                             <ul class="treeview" id="THPD_T_tree">
                                                 {% for base in search_datas['bases'] %}
@@ -329,7 +330,7 @@
         </div>
 
         <div class="PNB" id="rightFrame" style="left:auto; width:{{ w2 ~ '%' }}">
-            <div id="headBlock" class="PNB" style="height: 90px; bottom: auto;">
+            <div id="headBlock" class="PNB">
                 <div class="searchFormWrapper">
                     <form id="searchForm" method="POST" action="{{ path('prod_query') }}" name="phrasea_query" class="phrasea_query">
                         <input id="SENT_query" name="qry" type="hidden" value="{{app['settings'].getUserSetting(app['authentication'].getUser(), 'start_page_query')}}">
diff --git a/www/skins/icons/icon_clear_search.png b/www/skins/icons/icon_clear_search.png
new file mode 100644
index 0000000000..9ae5b97d14
Binary files /dev/null and b/www/skins/icons/icon_clear_search.png differ
diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css
index 56f2e4081b..c1db99825f 100644
--- a/www/skins/prod/000000/prodcolor.css
+++ b/www/skins/prod/000000/prodcolor.css
@@ -2,20 +2,18 @@
 
 ::-webkit-scrollbar-track
 {
-    border-radius: 7px;
-    background-color: #000;
+    border-radius: 0;
+    background-color: #080808;
 }
 
 ::-webkit-scrollbar {
-    width: 14px;
+    width: 6px;
+    border-radius: 0;
 }
 ::-webkit-scrollbar-thumb {
-    height: 6px;
-    border: 4px solid rgba(0, 0, 0, 0);
-    background-clip: padding-box;
-    -webkit-border-radius: 7px;
-    background-color: #555;
-    -webkit-box-shadow: inset -1px -1px 0px rgba(0, 0, 0, 0.05), inset 1px 1px 0px rgba(0, 0, 0, 0.05);
+    border-radius: 0;
+    width: 3px;
+    background-color: #3b3b3b;
 }
 ::-webkit-scrollbar-button {
     width: 0;
@@ -135,11 +133,11 @@ body {
 }
 
 #rightFrame {
-    min-width: 660px;
+    min-width: 900px !important;
 }
 
 .PNB .ui-corner-top {
-    top: 100px;
+    top: 77px;
 }
 
 
@@ -226,12 +224,12 @@ span.ww_winTitle {
 #idFrameC #retractableButton {
     cursor: pointer;
     width: 70px;
-    height: 70px;
+    height: 85px;
     float: right;
     text-align: center;
     line-height: 70px;
     margin-bottom: -20px;
-    background: url("/skins/icons/workzoneEscamote.png") 30px 30px no-repeat;
+    background: url("/skins/icons/workzoneEscamote.png") 30px 36px no-repeat;
 }
 
 #idFrameC.closed #retractableButton {
@@ -287,24 +285,32 @@ span.ww_winTitle {
 
 #idFrameC .ui-tabs .ui-tabs-nav li {
     width: auto;
-    height: 73px;
+    height: 85px;
     display: inline-block;
     background-color: #3b3b3b;
     z-index: 10;
 }
 
-#idFrameC .ui-tabs #thesaurus_tab .ui-state-active,
-#idFrameC .ui-tabs #thesaurus_tab .ui-state-active a {
-    border-bottom: 1px solid #884c92;
+#idFrameC .ui-tabs .ui-tabs-nav li.proposals_WZ.ui-state-active a {
+    border-bottom: 3px solid #4c5d84;
 }
 
+#idFrameC .ui-tabs .ui-tabs-nav li.thesaurus.ui-state-active a {
+    border-bottom: 3px solid #884c92;
+}
+
+#idFrameC .ui-tabs .ui-tabs-nav li.baskets.ui-state-active a {
+    border-bottom: 3px solid #076882;
+}
+
+
 #idFrameC .ui-tabs #thesaurus_tab li a {
     color: #FFF;
 }
 
 #idFrameC .ui-tabs #thesaurus_tab li.th_tab a {
-    height: 39px;
-    line-height: 39px;
+    height: 43px;
+    line-height: 43px;
     vertical-align: middle;
     margin: 0;
     padding: 0 20px;
@@ -312,8 +318,12 @@ span.ww_winTitle {
     text-decoration: none;
 }
 
+#idFrameC .ui-tabs #thesaurus_tab li.th_tab .ui-state-active {
+    border-bottom: 1px solid #884c92;
+}
+
 #idFrameC .ui-tabs #thesaurus_tab li.th_tab {
-    height: 39px;
+    height: 43px;
     margin: 0;
 }
 
@@ -334,7 +344,7 @@ span.ww_winTitle {
     border-radius: 0;
     height: 50px;
     padding: 0 2.5%;
-    background: #d4d4d4;
+    background: #ededed;
     border: none;
     float: left;
     margin: 0;
@@ -356,6 +366,24 @@ span.ww_winTitle {
     -moz-appearance: none;
 }
 
+
+#THPD_WIZARDS .gform .input-append .th_clear {
+    position: relative;
+    z-index: 1000;
+    float: right;
+    margin: -50px 15% 0 0;
+    display: block !important;
+    width: 30px;
+    line-height: 50px;
+    padding: 0;
+    border-radius: 0;
+    background: url('/skins/icons/icon_clear_search.png') 50% no-repeat;
+    border: none;
+    outline: none;
+    box-shadow: none;
+    -webkit-appearance: none;
+}
+
 .treeview li {
     background-image: none;
 }
@@ -371,7 +399,7 @@ span.ww_winTitle {
 }
 
 .treeview>li.expandable>.hitarea {
-    height: 50px;
+    height: 54px;
     border-left: 5px #884c93 solid;
 }
 
@@ -408,6 +436,31 @@ span.ww_winTitle {
     color: #a6a6a6;
 }
 
+#THPD_T_treeBox {
+    overflow-x: hidden;
+    overflow-y: hidden;
+}
+
+#THPD_T_treeBox>div {
+    width: 105%;
+    display: inline-block;
+}
+
+#THPD_T_treeBox:hover {
+    overflow-y: auto;
+}
+
+#THPD_T_treeBox::-webkit-scrollbar-track
+{
+    border-radius: 0;
+    background-color: #1f1f1f;
+}
+
+#THPD_T_treeBox::-webkit-scrollbar {
+    width: 6px;
+    background-color: #474747;
+}    
+
 #THPD_tabs .treeview LI.selected SPAN {
     background-color: #884c92 !important;
     color: #fff !important;
@@ -437,7 +490,8 @@ span.ww_winTitle {
 
 #idFrameC .ui-tabs .ui-tabs-nav li.ui-state-active a {
     background-color: #333;
-    border-bottom: 3px solid #076882;
+    border-bottom: 1px solid #884c92;
+    height: 82px;
 }
 
 #idFrameC ul.icon-menu {
@@ -448,22 +502,22 @@ span.ww_winTitle {
     display: block;
     background-image: url("/skins/icons/workzone32.png");
     background-repeat: no-repeat;
-    background-position: 9px 16px;
+    background-position: 9px 21px;
     width: 70px;
-    height: 70px;
+    height: 82px;
 }
 
 #idFrameC .icon-menu .WZtabs {
     display: block;
     width: 70px;
-    height: 70px;
-    line-height: 70px;
+    height: 82px;
+    line-height: 82px;
     vertical-align: middle;
     text-align: center;
 }
 
 #basket_menu_trigger {
-    padding: 27px 7px 0 0;
+    padding: 32px 7px 0 0;
     float: right;
     font-size: 9px;
     cursor: pointer;
@@ -589,10 +643,14 @@ span.ww_winTitle {
     height: 44px;
     line-height: 44px;
     background-color: #3b3b3b;
-    border-top: 1px solid #000;
+    border-bottom: 1px solid #000;
     border-radius: 0;
 }
 
+.ui-accordion>div {
+    border-top: 1px solid #000;
+}
+
 .ui-accordion .ui-accordion-header.unread {
     background-image: url('../../icons/bask_new_back.png');
 }
@@ -689,7 +747,7 @@ span.ww_winTitle {
 /******* FORMULAIRE DE RECHERCHE **********************************************/
 
 .searchFormWrapper {
-    margin: 25px 0 0 5px;
+    margin: 30px 0 0 5px;
     line-height: 30px;
 }
 
@@ -720,6 +778,7 @@ span.ww_winTitle {
 #searchForm .input-append button.btn {
     height: 30px;
     width: 15%;
+    border-left: 1px solid #242424;
 }
 
 /******* PRESENTATION DE MINIATURES *******************************************/
@@ -815,11 +874,18 @@ div.diapo {
     margin: 8px 5px;
 }
 
-#answers {
+#idFrameT #answers {
     background-color: #111111;
     border: 1px solid #111111;
     top: 55px;
     bottom: 0;
+    margin-right: 8px;
+    overflow-y: hidden;
+    padding-left: 10px;
+}
+
+#idFrameT #answers:hover {
+    overflow-y: auto;
 }
 
 #answers_status{
@@ -859,16 +925,16 @@ div.diapo {
     background: #0c4554;
     color: #fff;
     padding: 0 25px;
-    border-right: 1px solid #000;
     font-size: 11px;
-    text-transform: capitalize;
+    padding-top: 24px;
+    margin-right: 10px;
 }
 
 #answers_status .infos .infoDialog span {
-    margin-top: 13px;
-    font-size: 20px;
-    display: block;
-    margin-bottom: 3px;
+  font-size: 22px;
+  margin-bottom: 3px;
+  float: left;
+  margin-right: 10px;
 }
 
 #answers_status #docInfo {
@@ -881,14 +947,17 @@ div.diapo {
     min-width: 105px;
     font-size: 11px;
     line-height: 12px;
+    border-right: 1px solid #000;
 }
 
 
 #answers_status .infos #nbrecsel {
-    font-size: 35px;
+    font-size: 22px;
     margin-top: 7px;
     float: left;
-    margin-right: 15px;
+    margin-right: 10px;
+    display: block;
+    height: 40px;
 }
 
 
@@ -960,7 +1029,7 @@ div.diapo {
 }
 
 #idFrameT .tools:first-child .btn-group {
-    border-left: 1px solid #000;
+    border-left: 1px solid #474747;
 }
 
 #idFrameT .tools .btn-group {
@@ -1048,9 +1117,15 @@ div.diapo {
   float: right;
   line-height: 45px;
   padding-right: 30px;
+  padding-left: 21px;
   margin-right: 21px;
   color: #949494;
   background: url('../../icons/icone_settings.png') right 15px no-repeat;
+  border-left: 1px solid #474747;
+}
+
+#idFrameT .tools #settings:hover {
+    background-color: #393939;
 }
 
 .dropdown-menu .divider {
@@ -1147,11 +1222,14 @@ div.diapo {
     left: 10px;
     right: 10px;
     margin-top: 21px;
+    border-top: 1px solid #303030;
+    border-radius: 0;
+    height: 43px;
 }
 
 #idFrameC .ui-tabs .ui-tabs-panel,#idFrameE .ui-tabs .ui-tabs-panel {
     position: absolute;
-    top: 51px;
+    top: 56px;
     left: 0px;
     bottom: 0px;
     right: 0px;
@@ -1241,10 +1319,6 @@ div.diapo {
     position: absolute; bottom: 0px;
 }
 
-#answers {
-    padding: 20px 0 20px 20px;
-}
-
 #answers .list {
     position: relative;
     float: left;
@@ -1254,7 +1328,6 @@ div.diapo {
     border: 3px solid #404040;
 }
 
-
 .ui-accordion .ui-accordion-content {
     background-color: #212121;
     margin-top: 0;
@@ -1347,7 +1420,7 @@ form.phrasea_query input.query {
     padding-left: 30px;
     font-size: 16px;
     margin: 0;
-    width: 60%;
+    width: 70%;
 }
 
 #basket-rename-box .btn, #reorder_box .btn {
@@ -1867,7 +1940,7 @@ input.btn-mini {
     position: relative;
     *position: static;
     top: -2px;
-    margin: 0 2px;
+    margin: 11px 15px 0 0;
     padding: 1px 4px;
     background: none repeat scroll 0 0 red;
     background-color: #DA4F49;
@@ -1884,6 +1957,7 @@ input.btn-mini {
     text-align: center;
     color: #FFFFFF;
     text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    float: left;
 }
 
 /******* GUI ******************************************************************/
@@ -2076,7 +2150,8 @@ H4 {
     font-weight: bold;
     height: 30px;
     padding-top: 7px;
-    border-left: 4px solid #076882;
+    border-left: 4px solid #4c5d84;
+    margin-left: 0;
 }
 
 #proposals .fancytree-expander {
@@ -3128,6 +3203,14 @@ DIV.thesaurus U.w {
     line-height: 40px;
 }
 
+#mainMenu .PNB.right li {
+    border-left: 1px solid #292929;
+}
+
+#mainMenu .PNB.right li span {
+    padding: 0 15px;
+}
+
 #mainMenu, .publi_group {
     background-color: #3b3b3b;
 }
@@ -3423,7 +3506,14 @@ dans l'onglet thesaurus : arbres, menus contextuels
 }
 
 #THPD_tabs .treeview UL {
-    background-color: transparent;
+    background-color: #292929;
+    margin-left: -16px;
+    padding-left: 16px;
+}
+
+#THPD_tabs .treeview ul li {
+    padding-top: 5px;
+    padding-bottom: 5px; 
 }
 
 #THPD_tabs .treeview SPAN {
@@ -4717,7 +4807,7 @@ ui-dialog-titlebar {
 
 #paginate {
     float: right;
-    margin: 0 65px 30px 0;
+    margin: 0 65px 15px 0;
 }
 
 #paginate #tool_navigate {
diff --git a/www/skins/prod/jquery.main-prod.js b/www/skins/prod/jquery.main-prod.js
index f2de6131c1..be51064b40 100644
--- a/www/skins/prod/jquery.main-prod.js
+++ b/www/skins/prod/jquery.main-prod.js
@@ -1199,7 +1199,7 @@ $(document).ready(function () {
         }
 
         $('#idFrameC').attr('data-status', 'open');
-        $('.WZbasketTab').css('background-position', '9px 16px');
+        $('.WZbasketTab').css('background-position', '9px 21px');
         $('#idFrameC').removeClass('closed');
     });
 
@@ -3013,4 +3013,12 @@ function set_up_feed_box(data) {
     });
 
     return;
-}
\ No newline at end of file
+}
+
+
+//clear search
+$(document).ready(function () {
+    $('.th_clear').on('click', function(){
+        $('#thesaurus_tab .input-medium').val('');
+    });
+});
\ No newline at end of file