diff --git a/resources/www/thesaurus/styles/main.scss b/resources/www/thesaurus/styles/main.scss
index 8d859c8a13..d50b9d9270 100644
--- a/resources/www/thesaurus/styles/main.scss
+++ b/resources/www/thesaurus/styles/main.scss
@@ -1,3 +1,40 @@
+$blue-tsr: #2196f3;
+$grey-tsr: #aaa;
+
+@mixin blue-btn {
+  color: #fff;
+  background: $blue-tsr;
+  padding: 5px;
+  font-weight: bold;
+  cursor: pointer;
+  transition: all 0.3s;
+  border-color: darken($blue-tsr, 20%);
+  min-width: 120px;
+  margin: 0 10px;
+  position: relative;
+  z-index: 2;
+  &:hover {
+    background: darken($blue-tsr, 20%);
+  }
+}
+
+@mixin grey-btn {
+  color: #000;
+  background: $grey-tsr;
+  padding: 5px;
+  font-weight: bold;
+  cursor: pointer;
+  transition: all 0.3s;
+  border-color: darken($grey-tsr, 20%);
+  min-width: 120px;
+  margin: 0 10px;
+  position: relative;
+  z-index: 2;
+  &:hover {
+    background: darken($grey-tsr, 20%);
+  }
+}
+
 BODY, TD, INPUT {
   FONT-FAMILY: Verdana, Arial, helvetica, sans-serif;
   font-size: 12px;
@@ -8,11 +45,11 @@ FORM {
   margin: 0px;
 }
 
-BODY.dialog {
+.dialog {
   background-color: ButtonFace;
 }
 
-BODY.dialog .x3Dbox {
+.x3Dbox {
   position: relative;
   top: 0px;
   left: 0px;
@@ -24,7 +61,7 @@ BODY.dialog .x3Dbox {
   border-right: 1px solid #ffffff;
 }
 
-BODY.dialog .x3Dbox .title {
+.x3Dbox .title {
   position: absolute;
   top: -9px;
   left: 20px;
@@ -58,7 +95,7 @@ H3, H4 {
   display: inline;
 }
 
-DIV.thbox {
+.thbox {
   BACKGROUND-COLOR: #ffffff;
   border-top: 1px solid #d0d0d0;
   border-left: 1px solid #d0d0d0;
@@ -69,7 +106,7 @@ DIV.thbox {
   z-index: 1;
 }
 
-DIV.thbox .onglet {
+.thbox .onglet {
   position: absolute;
   top: -22px;
   left: 5px;
@@ -87,20 +124,20 @@ DIV.thbox .onglet {
   z-index: 2;
 }
 
-DIV.thbox HR {
+.thbox HR {
   COLOR: #d0d0d0;
   height: 1px;
   margin: 0px;
   padding: 0px;
 }
 
-DIV.glossaire {
+.glossaire {
   position: relative;
   left: 4px;
   white-space: nowrap;
 }
 
-DIV.glossaire U {
+.glossaire U {
   position: relative;
   left: 1px;
   TEXT-DECORATION: none;
@@ -116,30 +153,30 @@ DIV.glossaire U {
   cursor: pointer;
 }
 
-DIV.glossaire U.nots {
+.glossaire U.nots {
   border: 1px solid #F0F0F0;
   BACKGROUND-COLOR: #F0F0F0;
   cursor: default;
 }
 
-DIV.glossaire DIV.S_ {
+.glossaire .S_ {
   cursor: pointer;
   BACKGROUND-COLOR: #99a2d0;
   COLOR: #FFFFFF;
 }
 
-DIV.glossaire DIV.s_ {
+.glossaire .s_ {
   cursor: pointer;
 }
 
-DIV.glossaire DIV.r0_ {
+.glossaire .r0_ {
 }
 
-DIV.glossaire DIV.r1_ {
+.glossaire .r1_ {
   COLOR: #FF4000;
 }
 
-DIV.glossaire DIV.OB {
+.glossaire .OB {
   position: relative;
   top: 0px;
   padding-top: 0px;
@@ -149,11 +186,11 @@ DIV.glossaire DIV.OB {
   border-bottom: 1px solid #cccccc;
 }
 
-DIV.glossaire DIV.ob {
+.glossaire .ob {
   display: none;
 }
 
-DIV.glossaire DIV.hb {
+.glossaire .hb {
   position: relative;
   top: 0px;
   padding-top: 0px;
@@ -163,46 +200,46 @@ DIV.glossaire DIV.hb {
   border-bottom: 1px solid #cccccc;
 }
 
-DIV.glossaire DIV.ctroot {
+.glossaire .ctroot {
   position: relative;
   top: 0px;
   padding: 0px;
   border: none;
 }
 
-DIV.glossaire P.sy {
+.glossaire P.sy {
 }
 
-DIV.glossaire P.ta {
+.glossaire P.ta {
 }
 
-DIV.glossaire P.tc {
+.glossaire P.tc {
 }
 
-DIV.glossaire P.tce {
+.glossaire P.tce {
 }
 
-DIV.tableContainer {
+.tableContainer {
   margin: 2px;
   border: 1px solid #000000;
   background-color: #ffffff;
 }
 
-DIV.tableContainerDragOver {
+.tableContainerDragOver {
   margin: 0px;
   border: 3px solid #99a2d0;
 }
 
-DIV.tableContainer DIV.tbody {
+.tableContainer .tbody {
   position: relative;
   overflow: auto;
 }
 
-DIV.tableContainer TABLE {
+.tableContainer TABLE {
   table-layout: fixed;
 }
 
-DIV.tableContainer THEAD TH {
+.tableContainer THEAD TH {
   background: #e0ece8;
   border-left: 1px solid #ffffff;
   border-right: 1px solid #c0ccc8;
@@ -216,15 +253,15 @@ DIV.tableContainer THEAD TH {
   margin: 0px;
 }
 
-DIV.tableContainer TBODY TR.s_ {
+.tableContainer TBODY TR.s_ {
 }
 
-DIV.tableContainer TBODY TR.S_ {
+.tableContainer TBODY TR.S_ {
   BACKGROUND-COLOR: #99a2d0;
   COLOR: #FFFFFF;
 }
 
-DIV.tableContainer TBODY TD {
+.tableContainer TBODY TD {
   border-left: 1px solid #ffffff;
   border-right: 1px solid #cccccc;
   font-weight: normal;
@@ -235,7 +272,7 @@ DIV.tableContainer TBODY TD {
   margin: 0px;
 }
 
-DIV.menu {
+.menu {
   FONT-FAMILY: Arial, helvetica, sans-serif;
   font-size: 12px;
   border-left: 1px solid #ffffff;
@@ -251,17 +288,18 @@ DIV.menu {
   background-color: #d4d0c8;
 }
 
-DIV.menu IMG {
+.menu IMG {
   padding-right: 2px;
   margin: 0;
   position: relative;
 }
-DIV.menu p {
+
+.menu p {
   padding: 2px;
   position: relative;
 }
 
-DIV.menu A {
+.menu A {
   font-size: 12px;
   display: block;
   position: relative;
@@ -276,7 +314,7 @@ DIV.menu A {
   white-space: nowrap;
 }
 
-DIV.menu A:hover {
+.menu A:hover {
   font-size: 12px;
   display: block;
   position: relative;
@@ -285,7 +323,7 @@ DIV.menu A:hover {
   background-color: #000080;
 }
 
-DIV.menu A.disabled {
+.menu A.disabled {
   font-size: 12px;
   display: block;
   position: relative;
@@ -298,7 +336,7 @@ DIV.menu A.disabled {
   overflow: hidden;
 }
 
-DIV.menu A.disabled:hover {
+.menu A.disabled:hover {
   font-size: 12px;
   display: block;
   position: relative;
@@ -307,7 +345,7 @@ DIV.menu A.disabled:hover {
   background-color: #d4d0c8;
 }
 
-DIV.menu .line {
+.menu .line {
   display: block;
   position: relative;
   height: 0px;
@@ -320,7 +358,7 @@ DIV.menu .line {
 }
 
 #delete_sy {
-  background: #2196f3;
+  background: $blue-tsr;
   color: #fff;
   font-weight: bold;
   padding: 1px 10px;
@@ -329,6 +367,60 @@ DIV.menu .line {
     background: grey;
   }
 }
+
 #DLG_PROPERTIES > #syMenu {
   display: none;
+}
+
+.thesaurus_confirm_bottom_block {
+  margin-top: 20px;
+  text-align: center;
+  #ifrsample & {
+    display: none;
+  }
+}
+
+.thesaurus-page {
+  .validate_btn {
+    @include blue-btn;
+  }
+  .cancel_btn {
+    @include grey-btn;
+  }
+
+  .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+    float: none;
+  }
+  .ui-dialog-buttonset {
+    text-align: center;
+  }
+  .ui-button {
+    &:nth-child(1) {
+      @include grey-btn
+    }
+      &:nth-child(2) {
+      @include blue-btn
+    }
+  }
+}
+.text-center {
+  text-align: center;
+  padding-bottom: 10px;
+}
+.populate_btn {
+  position: absolute;
+  background: $blue-tsr;
+  z-index: 2;
+  right: 50px;
+  top: 50px;
+  font-size: 14px;
+  color: #fff;
+  padding: 7px 10px;
+  font-weight: bold;
+  border: 1px solid  #d0d0d0;
+  cursor: pointer;
+
+  &:hover {
+    background: darken($blue-tsr, 20%);
+  }
 }
\ No newline at end of file
diff --git a/templates/web/thesaurus/accept.html.twig b/templates/web/thesaurus/accept.html.twig
index 962284af95..17d0c0bec7 100644
--- a/templates/web/thesaurus/accept.html.twig
+++ b/templates/web/thesaurus/accept.html.twig
@@ -22,11 +22,6 @@
         <script type="text/javascript" src="/assets/thesaurus/js/thesaurus{% if not app.debug %}.min{% endif %}.js"></script>
         {#<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/thesaurus/xmlhttp.js' }) }}"></script>#}
         <script type="text/javascript">
-            function loaded()
-            {
-                window.name="ACCEPT";
-                self.focus();
-            }
             function ok()
             {
                 as = "";
@@ -96,9 +91,13 @@
                     $('.close-dialog').trigger('click');
                     }
                 }
+
+                function closeModal() {
+                    $('.close-dialog').trigger('click');
+                }
         </script>
     </head>
-    <body id="desktop" onload="loaded();" class="dialog">
+    <body id="desktop" class="dialog">
 
         {% if not cterm_found %}
             <center>
@@ -110,11 +109,9 @@
                 <br/>
                 {{ 'thesaurus:: refresh' | trans }}
                 <br/>
-                <br/>
-                <br/>
-                <br/>
-                <br/>
-                <input style="position:relative; z-index:2; width:100px" type="button" id="cancel_button" value="{{ 'boutton::fermer' | trans }}" onclick="self.close();">
+                <div class="thesaurus_confirm_bottom_block">
+                    <input  type="button" class="cancel_btn" id="cancel_button" value="{{ 'boutton::fermer' | trans }}" onclick="closeModal();">
+                </div>
         {% else %}
             {% if not term_found %}
                 <center>
@@ -126,11 +123,9 @@
                     <br/>
                     {{ 'thesaurus:: refresh' | trans }}
                     <br/>
-                    <br/>
-                    <br/>
-                    <br/>
-                    <br/>
-                    <input style="position:relative; z-index:2; width:100px" type="button" id="cancel_button" value="{{ 'boutton::fermer' | trans }}" onclick="self.close();">
+                    <div class="thesaurus_confirm_bottom_block">
+                        <input type="button" class="cancel_btn" id="cancel_button" value="{{ 'boutton::fermer' | trans }}" onclick="closeModal();">
+                    </div>
             {% else %}
                 {% if acceptable %}
                     <center>
@@ -158,11 +153,10 @@
                         <br/><br/><h4>{{ fullpath_tgt | raw }}</h4><br/><br/>
                         <input type='hidden' name='as' class="as_1" value='TS'>
                     {% endif %}
-                            <br/>
-                            <br/>
-                            <input style="position:relative; z-index:2; width:100px" type="button" id="ok_button" value="{{ 'boutton::valider' | trans }}" onclick="ok();">
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                            <input style="position:relative; z-index:2; width:100px" type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="self.close();">
+                           <div class="thesaurus_confirm_bottom_block">
+                              <input class="cancel_btn"  type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="closeModal();">
+                              <input class="validate_btn" type="button" id="ok_button" value="{{ 'boutton::valider' | trans }}" onclick="ok();">
+                           </div>
                         </form>
                     </center>
                 {% else %}
@@ -172,13 +166,9 @@
                         <br/>
                         {% trans with {'%cfield%' : cfield} %}thesaurus:: A cet emplacement du thesaurus , un candidat du champ %cfield% ne peut etre accepte{% endtrans %}
                         <br/>
-                        <br/>
-                        <br/>
-                        <br/>
-                        <br/>
-                        <br/>
-                        <br/>
-                        <input style="position:relative; z-index:2; width:100px" type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="self.close();">
+                        <div class="thesaurus_confirm_bottom_block">
+                            <input class="validate_btn" type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="closeModal();">
+                        </div>
                 {% endif %}
             {% endif %}
         {% endif %}
diff --git a/templates/web/thesaurus/export-text-dialog.html.twig b/templates/web/thesaurus/export-text-dialog.html.twig
index 5eba09f8db..0cde8b59f8 100644
--- a/templates/web/thesaurus/export-text-dialog.html.twig
+++ b/templates/web/thesaurus/export-text-dialog.html.twig
@@ -114,10 +114,11 @@
                 </tbody>
             </table>
             <br/>
-            <br/>
-            <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" style="width:100px;">
-            &nbsp;&nbsp;&nbsp;
-            <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');" style="width:100px;">
+
+            <div class="thesaurus_confirm_bottom_block">
+                <input type="button" id="cancel_button" class="cancel_btn" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');">
+                <input type="button" id="submit_button" class="validate_btn" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');">
+            </div>
         </form>
     </center>
 </body>
diff --git a/templates/web/thesaurus/export-topics-dialog.html.twig b/templates/web/thesaurus/export-topics-dialog.html.twig
index d902e3ebbf..a59f42f79a 100644
--- a/templates/web/thesaurus/export-topics-dialog.html.twig
+++ b/templates/web/thesaurus/export-topics-dialog.html.twig
@@ -71,7 +71,7 @@
             <input type="hidden" name="dlg" value="{{ dlg }}" >
             <input type="hidden" name="obr" value="{{ obr }}" >
 
-            <div style="padding:10px;">
+            <div style="padding: 5px 15px">
                 <div class="x3Dbox">
                     <span class="title">{{ 'thesaurus:: exporter' | trans }}</span>
                     <div style="white-space:nowrap">
@@ -138,9 +138,10 @@
                     </div>
                 </div>
             </div>
-            <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" style="width:100px;">
-            &nbsp;&nbsp;&nbsp;
-            <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');" style="width:100px;">
+            <div class="thesaurus_confirm_bottom_block">
+                <input type="button" id="cancel_button" class="cancel_btn" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');">
+                <input type="button" id="submit_button" class="validate_btn" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');">
+            </div>
         </form>
     </center>
 </body>
diff --git a/templates/web/thesaurus/export-topics.html.twig b/templates/web/thesaurus/export-topics.html.twig
index a9a5fac9b6..1019269670 100644
--- a/templates/web/thesaurus/export-topics.html.twig
+++ b/templates/web/thesaurus/export-topics.html.twig
@@ -32,12 +32,9 @@
             {% endfor %}
 
             {% if ofm == 'tofiles' %}
-                <center>
-                    <br/>
-                    <br/>
-                    <br/>
-                    <input type="button" value="{{ 'boutton::fermer' | trans }}" onclick="self.close();" style="width:100px;">
-                </center>
+                <div class="thesaurus_confirm_bottom_block">
+                    <input type="button" class="cancel_btn" value="{{ 'boutton::fermer' | trans }}" onclick=" self.close();" style="width:120px;">
+                </div>
             {% endif %}
         </div>
     </body>
diff --git a/templates/web/thesaurus/import-dialog.html.twig b/templates/web/thesaurus/import-dialog.html.twig
index 563b4de8ef..af7ddd1880 100644
--- a/templates/web/thesaurus/import-dialog.html.twig
+++ b/templates/web/thesaurus/import-dialog.html.twig
@@ -31,7 +31,6 @@
             {
                 if(!err)
                 {
-                    reload();
                     $('.close-dialog').trigger('click');
                 }
                 else
@@ -56,7 +55,7 @@
             <input type="file" name="fil" /> (max 16Mo)
             <br/>
 
-            <div style="text-align:center">
+            <div class="text-center">
                 <table>
                     <tr>
                         <td style="text-align:left"><input type="checkbox" disabled="disabled" name="dlk" checked="checked">{{ 'thesaurus:: supprimer les liens des champs tbranch' | trans }}</td>
@@ -66,10 +65,11 @@
                     </tr>
                 </table>
                 <br/>
-                <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" style="width:100px;">
-                &nbsp;&nbsp;&nbsp;
-                <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');" style="width:100px;">
-            </div>
+                <div class="thesaurus_confirm_bottom_block">
+                    <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" >
+                   <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');">
+                </div>
+            </divclass>
         </form>
         <iframe style="display:block; height:50px;" name="IFRIM"></iframe>
     </body>
diff --git a/templates/web/thesaurus/link-field-step1.html.twig b/templates/web/thesaurus/link-field-step1.html.twig
index 74e544eb61..d42ebcbd9e 100644
--- a/templates/web/thesaurus/link-field-step1.html.twig
+++ b/templates/web/thesaurus/link-field-step1.html.twig
@@ -55,25 +55,25 @@
         </script>
     </head>
     <body class="dialog">
-        <center>
-            <form class="link-field-1" action="linkfield2.php" method="post" target="LINKFIELD">
-                <input type="hidden" name="piv" value="{{ piv }}">
-                <input type="hidden" name="bid" value="{{ bid }}">
-                <input type="hidden" name="tid" value="{{ tid }}">
 
-                {% set branch = "<br/><b>" ~ fullBranch ~ "</b><br/>" %}
-                {% trans with {'%branch%' : branch} %}thesaurus:: Lier la branche de thesaurus au champ %branch%{% endtrans %}
+            <form class="link-field-1" action="linkfield2.php" method="post" target="LINKFIELD" style="padding: 5px 15px">
+                    <input type="hidden" name="piv" value="{{ piv }}">
+                    <input type="hidden" name="bid" value="{{ bid }}">
+                    <input type="hidden" name="tid" value="{{ tid }}">
 
-                <div style="width:100%; height:270px; overflow:scroll;" class="x3Dbox">
-                {% for fieldname, checked in fieldnames %}
-                    <input type="checkbox" name="field[]" value="{{ fieldname }}" {% if checked %}checked{% endif %} ck0="{% if checked %}1{% else %}0{% endif %}" onclick="return(ckField());">{{ fieldname }}<br/>
-                {% endfor %}
+                    {% set branch = "<br/><b>" ~ fullBranch ~ "</b><br/>" %}
+                    {% trans with {'%branch%' : branch} %}thesaurus:: Lier la branche de thesaurus au champ %branch%{% endtrans %}
+
+                    <div style="width:100%; height:270px; overflow:scroll;" class="x3Dbox">
+                    {% for fieldname, checked in fieldnames %}
+                        <input type="checkbox" name="field[]" value="{{ fieldname }}" {% if checked %}checked{% endif %} ck0="{% if checked %}1{% else %}0{% endif %}" onclick="return(ckField());">{{ fieldname }}<br/>
+                    {% endfor %}
+                    </div>
+                <div class="thesaurus_confirm_bottom_block">
+                    <input type="button" id="cancel_button"  class="cancel_btn" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');">
+                    <input type="button" id="submit_button" class="validate_btn" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');">
                 </div>
-                <br/>
-                <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');">
-                &nbsp;&nbsp;&nbsp;
-                <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');">
             </form>
-        </center>
+
     </body>
 </html>
diff --git a/templates/web/thesaurus/link-field-step2.html.twig b/templates/web/thesaurus/link-field-step2.html.twig
index 070ddaff1a..a676b439e0 100644
--- a/templates/web/thesaurus/link-field-step2.html.twig
+++ b/templates/web/thesaurus/link-field-step2.html.twig
@@ -44,6 +44,7 @@
     <body class="dialog">
     <center>
         <form  class="link-field-2" action="linkfield3.php" method="post" target="LINKFIELD">
+            <div class="text-center">
             <input type="hidden" name="piv" value="{{ piv }}">
             <input type="hidden" name="bid" value="{{ bid }}">
             <input type="hidden" name="tid" value="{{ tid }}">
@@ -84,10 +85,11 @@
             {% else %}
                 <div style='position:absolute; top:5px; left:0px; width:100%; text-align:center; color:green'>{{ 'thesaurus:: pas de reindexation' | trans }}</div>
             {% endif %}
-            <br/>
-            <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');">
-            &nbsp;&nbsp;&nbsp;
-            <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');">
+            </div>
+            <div class="thesaurus_confirm_bottom_block">
+                <input type="button" id="cancel_button" class="cancel_btn" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');">
+                <input type="button" id="submit_button" class="validate_btn" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');">
+            </div>
         </form>
     </center>
 </body>
diff --git a/templates/web/thesaurus/link-field-step3.html.twig b/templates/web/thesaurus/link-field-step3.html.twig
index 1605f551c7..d2d8059fab 100644
--- a/templates/web/thesaurus/link-field-step3.html.twig
+++ b/templates/web/thesaurus/link-field-step3.html.twig
@@ -41,8 +41,9 @@
                     <br/>
                 {% endif %}
             </div>
-            <br/>
-            <input type="button" value="{{ 'boutton::fermer' | trans }}" onclick="$('.close-dialog').trigger('click');">
+            <div class="thesaurus_confirm_bottom_block">
+                <input type="button" value="{{ 'boutton::fermer' | trans }}"  class="cancel_btn" onclick="$('.close-dialog').trigger('click');">
+            </div>
         </form>
     </center>
 </body>
diff --git a/templates/web/thesaurus/new-term.html.twig b/templates/web/thesaurus/new-term.html.twig
index 37b18cc8a4..4151103aa2 100644
--- a/templates/web/thesaurus/new-term.html.twig
+++ b/templates/web/thesaurus/new-term.html.twig
@@ -8,6 +8,7 @@
         {#<script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/thesaurus/xmlhttp.js' }) }}"></script>#}
     </head>
     <body onload="loaded();" class="dialog" style="text-align:center">
+    <div class="text-center">
         {% if dlg is not none %}
             {% set opener = 'window.dialogArguments.win' %}
         {% else %}
@@ -37,7 +38,8 @@
             <br/>
             {{ prop_label }}
             <br/>
-        <center>
+        </div>
+        <div class="text-center">
             <form onsubmit="return(false);" class="thesaurus_confirm_bottom_block">
                 <input type="hidden" name="bid" value="{{ bid }} ">
                 <input type="hidden" name="pid" value="{{ pid }}">
@@ -54,7 +56,7 @@
                 &nbsp;&nbsp;&nbsp;
                 <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');" style="width:100px;">
             </form>
-        </center>
+        </div>
         {% else %}
                 {% if nb_candidates_bad > 0 %}
                     {% set prop_label = 'thesaurus:: est candidat en provenance des champs mais ne peut etre accepte a cet emplacement du thesaurus' | trans %}
diff --git a/templates/web/thesaurus/properties.html.twig b/templates/web/thesaurus/properties.html.twig
index 574e925b97..33d3732fcf 100644
--- a/templates/web/thesaurus/properties.html.twig
+++ b/templates/web/thesaurus/properties.html.twig
@@ -93,9 +93,9 @@
                                 {% endif %}
                                 </td>
                                 {% if data['lng'] %}
-                                    <td id='FLG_{{ data['id'] }}'><img src='/assets/common/images/lng/{{ data['lng'] }}_flag_18.gif' /></td>
+                                    <td id='FLG_{{ data['id'] }}'>{{ data['lng'] }}</td>
                                 {% else %}
-                                    <td id='FLG_{{ data['id'] }}'><img src='/assets/thesaurus/images/noflag.gif' /></td>
+                                    <td id='FLG_{{ data['id'] }}'></td>
                                 {% endif %}
                                 <td>{{ data['t'] }}</td>
                                 <td>{{ data['hits'] }}</td>
@@ -110,7 +110,9 @@
         </div>
     <center>
         <form onsubmit="return(false);">
-            <input style="position:relative; z-index:2" type="button" id="close_button" class="close_button" value="{{ 'boutton::fermer' | trans }}" >
+            <div class="thesaurus_confirm_bottom_block">
+                <input type="button" id="close_button" class="close_button cancel_btn" value="{{ 'boutton::fermer' | trans }}" >
+            </div>
         </form>
     </center>
     <script type="text/javascript">
@@ -279,8 +281,8 @@
                 td = tr.appendChild(document.createElement("td"));
                 td.id = "FLG_"+(nsy+1);
                 // td.innerText = n.getAttribute("lng");
-                img = td.appendChild(document.createElement("img"));
-                img.setAttribute("src", "/assets/common/images/lng/"+n.getAttribute("lng")+"_flag_18.gif");
+                span = td.appendChild(document.createElement("span"));
+                span.innerHTML = n.getAttribute("lng");
 
                 td = tr.appendChild(document.createElement("td"));
                 // td.colSpan = "2";
diff --git a/templates/web/thesaurus/thesaurus.html.twig b/templates/web/thesaurus/thesaurus.html.twig
index 5b58cdcb0e..40ac5d281e 100644
--- a/templates/web/thesaurus/thesaurus.html.twig
+++ b/templates/web/thesaurus/thesaurus.html.twig
@@ -54,10 +54,9 @@
                 t = t.replace(/</g, "&lt;");
                 t = t.replace(/>/g, "&gt;");
                // t = escape(t);
-               //  w = window.open("about:blank", div+"wSRC", "left=2, top=2, directories=yes, width=1000, height=800, location=yes, menubar=yes, toolbar=yes, help=yes, status=yes, resizable=yes, scrollbars=yes", true);
-               // w.document.write("<pre>"+t+"</pre>");
-               //w.document.close();
-               // w = loadDataAjax(url, 500 , 340);
+                w = window.open("about:blank", div+"wSRC", "left=2, top=2, directories=yes, width=1000, height=800, location=yes, menubar=yes, toolbar=yes, help=yes, status=yes, resizable=yes, scrollbars=yes", true);
+                w.document.write("<pre>"+t+"</pre>");
+                w.document.close();
 
             }
 
@@ -163,13 +162,17 @@
 
     </head>
 
-    <body id="desktop" style="background-color:#808080; overflow:hidden" onload="loaded();" onscroll="evtScrollBody();" >
+    <body id="desktop" class="thesaurus-page" style="background-color:#808080; overflow:hidden" onload="loaded();" onscroll="evtScrollBody();" >
 
         <div class="menu" id="flagsMenu" style="z-index:999">
             {% for code, language in flags %}
                 <p><img id='flagMenu_{{ code }}' src='/assets/common/images/lng/{{ code }}_flag_18.gif' /> {{ language }}</p>
-            {% endfor %}
 
+            {% endfor %}
+   {#         {% for code, language in flags %}
+                <a id='flagMenu_{{ code }}' href='javascript:void(0)' class=''>
+                    <img src='/assets/common/images/lng/{{ code }}_flag_18.gif' />{{ language }}</a>
+            {% endfor %}#}
         </div>
         <div class="menu" id="kctermMenu" style="z-index:999; width:240px;">
             <a href="javascript:void(0)" class=""         id="kcterm_properties" style="font-weight:700">{{ 'thesaurus::menu: proprietes' | trans }}</a>
@@ -190,7 +193,7 @@
             <a href="javascript:void(0)" class="" id="kterm_properties" style="font-weight:700">{{ 'thesaurus::menu: proprietes' | trans }}</a>
             <a href="javascript:void(0)" class="" id="kterm_newts">{{ 'thesaurus::menu: Nouveau terme' | trans }}</a>
             <a href="javascript:void(0)" class="" id="kterm_newsy">{{ 'thesaurus::menu: Nouveau synonyme' | trans }}</a>
-            <a href="javascript:void(0)" class="" id="kterm_delete">{{ 'thesaurus::menu: supprimer' | trans }}</a>
+            <a href="javascript:void(0)" class="" id="kterm_delete">{{ 'thesaurus::menu:  Mettre dans le stock' | trans }}</a>
             <div class="line"></div>
             <a href="javascript:void(0)" class="" id="kterm_search">{{ 'thesaurus::menu: chercher' | trans }}</a>
             <a href="javascript:void(0)" class="" id="kterm_export">{{ 'thesaurus::menu: exporter' | trans }}</a>
@@ -225,9 +228,10 @@
                 <div style="display: none">
                     <div id="confirm_populate">
                         <p><span class="alert alert-message"> {{ 'thesaurus:: confirm populate' | trans }}</span></p>
-                        <p>  <input type="button" class="cancel_button" value="{{ 'boutton::annuler' | trans }}" >
-                            &nbsp;&nbsp;&nbsp;
-                            <input type="button" id="confirm_populate_button" value="{{ 'boutton::valider' | trans }}" ></p>
+                        <div class="thesaurus_confirm_bottom_block">
+                            <input type="button" class="cancel_button cancel_btn" value="{{ 'boutton::annuler' | trans }}" >
+                            <input type="button" id="confirm_populate_button" class="validate_btn" value="{{ 'boutton::valider' | trans }}" >
+                        </div>
                     </div>
                 </div>
 
@@ -297,11 +301,13 @@
                             <td><input type="text" style="width:250px;" name="term"
                                        onkeyup="inputChanged();return(false);"></td>
                         </tr>
+                        <tr><td colspan="3" style="height: 10px"></td></tr>
                         <tr>
                             <td style="text-align:right">{{ 'thesaurus:: contexte'  | trans }} : </td>
                             <td><b>(</b>&nbsp;</td>
                             <td><input type="text" style="width:250px;" name="context">&nbsp;<b>)</b></td>
                         </tr>
+                        <tr><td colspan="3" style="height: 10px"></td></tr>
                         <tr>
                             <td valign="bottom" style="text-align:right">{{ 'phraseanet:: language' | trans }} :&nbsp;</td>
                             <td></td>
@@ -329,6 +335,8 @@
                 </div>
                 <div id="ACCEPT_DLG_CONFIRM">
                 </div>
+                <div id="DLG_LINK_FIELD_1">
+                </div>
 
             </div>
 
@@ -748,7 +756,7 @@
                                         url += "&typ=CT";
 
                                         //w = window.open(url, "PROPERTIES", "directories=no, height=340, width=500, location=no, menubar=no, resizable=yes, scrollbars=no, status=no, toolbar=no");
-                                        w = loadDataAjax(url, 500 , 340,'#DLG_PROPERTIES', '{{ 'thesaurus:dialog:: properties'  | trans }}');
+                                        w = loadDataAjax(url, 500 , 340,'#DLG_PROPERTIES', '{{ 'thesaurus:: Proprietes' | trans }}');
                                     }
                                     break;
                                 }
@@ -1075,7 +1083,7 @@
                                                             url += "&sylng=" + encodeURIComponent(lng);
 
                                                           //  w = window.open(url, "NEWTERM", "directories=no, height=290, width=490, location=no, menubar=no, resizable=yes, scrollbars=yes, status=no, toolbar=no");
-                                                            w = loadDataAjax(url,490, 290,"#NEWSY_DLG_CONFIRM",'{{ 'thesaurus:dialog:: new term / synonym'  | trans }}');
+                                                            w = loadDataAjax(url,490, 290,"#NEWSY_DLG_CONFIRM",'{% if typ == "TS" %}{{ 'thesaurus:: Nouveau terme specifique' | trans }}{% else %}{{ 'thesaurus:: Nouveau synonyme' | trans }}{% endif %}');
                                                         }
                                                     }
                                                 ],
@@ -1141,7 +1149,7 @@
                                         url +=  "&piv={{ piv }}";
                                         url += "&tid=" + o.id.substr(4);
                                        // w = window.open(url, "LINK", "directories=no, height=340, width=500, location=no, menubar=no, resizable=yes, scrollbars=no, status=no, toolbar=no");
-                                        w = loadDataAjax(url,700, 400, "#DLG_LINK_FIELD_1", '{{ 'thesaurus:dialog:: linkfields'  | trans }}');
+                                        w = loadDataAjax(url,700, 400, "#DLG_LINK_FIELD_1", '{{ 'thesaurus:: Lier la branche de thesaurus au champ' | trans }}');
                                         break;
                                     case "kterm_properties":
                                         var myObj = { "win":window };
@@ -1152,7 +1160,7 @@
                                         url += "&typ=TH";
 
                                       //  w = window.open(url, "PROPERTIES", "directories=no, height=300, width=500, location=no, menubar=no, resizable=yes, scrollbars=no, status=no, toolbar=no");
-                                       w = loadDataAjax(url,700, 400, "#DLG_PROPERTIES", '{{ 'thesaurus:dialog:: properties'  | trans }}');
+                                       w = loadDataAjax(url,700, 400, "#DLG_PROPERTIES", '{{ 'thesaurus:: Proprietes' | trans }}');
 
                                         break;
                                     case "kterm_search":
@@ -1208,7 +1216,7 @@
                                         url += "&id=" + o.id.substr(4);
                                         url += "&typ=TH";
                                         //w = window.open(url, "EXPORT", "directories=no, height=300, width=700, location=no, menubar=no, resizable=yes, scrollbars=yes, status=no, toolbar=no");
-                                        w = loadDataAjax(url, 700, 400, "#DLG_EXPORT", '{{ 'thesaurus:dialog:: export'  | trans }}');
+                                        w = loadDataAjax(url, 700, 400, "#DLG_EXPORT", '{{ 'thesaurus:: export au format texte' | trans }}');
                                         break;
                                     case "kterm_topics":
                                         var myObj = { "win":window };
@@ -1219,7 +1227,7 @@
                                         url += "&typ=TH";
                                         url += "&obr=" + list_opened_branches(o.parentNode);
                                         //w = window.open(url, "EXPORT", "directories=no, height=400, width=550, location=no, menubar=no, resizable=yes, scrollbars=yes, status=no, toolbar=no");
-                                        w = loadDataAjax(url, 700, 400, "#DLG_EXPORT_TOPICS", '{{ 'thesaurus:dialog:: export topics'  | trans }}');
+                                        w = loadDataAjax(url, 700, 400, "#DLG_EXPORT_TOPICS", '{{ 'thesaurus:: export en topics' | trans }}');
                                         break;
                                     }
                                     break;
@@ -1324,7 +1332,7 @@
                                                 url += "&id=" + o.id.substr(4);
                                                 url += "&typ=TH";
                                                 //   w = window.open(url, "PROPERTIES", "directories=no, height=340, width=500, location=no, menubar=no, resizable=yes, scrollbars=no, status=no, toolbar=no");
-                                                w = loadDataAjax(url, 500 , 340, "#NEWSY_DLG_CONFIRM", '{{ 'thesaurus:dialog:: confirm'  | trans }}');
+                                                w = loadDataAjax(url, 500 , 340, "#NEWSY_DLG_CONFIRM", '{{ 'thesaurus:: Proprietes' | trans }}');
                                             }
                                         }
                                         break;
@@ -1398,7 +1406,7 @@
                                                 url += "&src=" + eventObj.Src0.id.substr(4);
                                                 url += "&tgt=" + tgt0.id.substr(4);
                                                 //w = window.open(url, "ACCEPT", "directories=no, height=300, width=500, location=no, menubar=no, resizable=yes, scrollbars=no, status=no, toolbar=no");
-                                                w = loadDataAjax(url, 500 , 340, "#ACCEPT_DLG_CONFIRM", '{{ 'thesaurus:dialog:: confirm'  | trans }}');
+                                                w = loadDataAjax(url, 500 , 340, "#ACCEPT_DLG_CONFIRM", '{{ 'thesaurus:: accepter...' | trans }}');
                                             }
                                         }
                                         break;
@@ -1453,7 +1461,7 @@
                                                     url += "&bid={{ bid }}";
                                                     url += "&id=";
                                                    // w = window.open(url, "IMPORT", "directories=no, height=400, width=600, location=no, menubar=no, resizable=yes, scrollbars=no, status=no, toolbar=no");
-                                                    w = loadDataAjax(url, 600 , 400, "#NEWSY_DLG_CONFIRM", confirm);
+                                                    w = loadDataAjax(url, 600 , 400, "#NEWSY_DLG_CONFIRM", '{{ 'thesaurus:: Importer' | trans }}');
                                                     break;
                                                 }
                                                 break;
@@ -1519,6 +1527,7 @@
                                                 modal: true,
                                                 title: "{{ 'thesaurus: Populate title' | trans }}",
                                                 autoOpen:false,
+                                                width: 400,
                                                 open:function () {
                                                     $(this).closest(".ui-dialog")
                                                         .find(".ui-button:first") // the first button
@@ -1560,21 +1569,6 @@
                                         });
 
         </script>
-        <style>
-            .populate_btn {
-                position: absolute;
-                background: #2196f3;
-                z-index: 2;
-                right: 50px;
-                top: 50px;
-                font-size: 14px;
-                color: #fff;
-                padding: 7px;
-                font-weight: bold;
-                border: 1px solid  #d0d0d0;
-                cursor: pointer;
-            }
-        </style>
     </body>
 
 </html>