diff --git a/templates/web/common/index_bootstrap.html.twig b/templates/web/common/index_bootstrap.html.twig
index 9b9f27a228..6249ef8e66 100644
--- a/templates/web/common/index_bootstrap.html.twig
+++ b/templates/web/common/index_bootstrap.html.twig
@@ -32,7 +32,7 @@
             <script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui.js"></script>
         {% endblock %}
     </head>
-    <body class="PNB">
+    <body class="PNB {{ cssfile  }}">
         <div id="mainContainer" class="PNB">
             {% include 'common/menubar.html.twig' %}
             <div class="PNB" id="mainContent" style="overflow: auto">
diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig
index fd5662fea0..8b8d724b66 100644
--- a/templates/web/prod/WorkZone/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Basket.html.twig
@@ -1,5 +1,5 @@
 <div>
-    <button class="tools-accordion"><span>Actions<i class="fa fa-chevron-right rotate"></i></span></button>
+    <button class="tools-accordion">Actions</button>
     <div class="tools-panel">
         <button class="ui-corner-all TOOL_disktt_btn basket_window" data-selection-source="basket">
             <img src="/assets/common/images/icons/disktt_history.png"/>
diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig
index 926c6cf660..de3d0f4316 100644
--- a/templates/web/prod/WorkZone/Macros.html.twig
+++ b/templates/web/prod/WorkZone/Macros.html.twig
@@ -33,7 +33,7 @@
                             />
                       </td>
                       <td>
-                          <a class="contextMenuTrigger"></a>
+                          <a class="contextMenuTrigger icon-display-grid" href="#"></a>
                       </td>
                   </tr>
               </table>
@@ -127,7 +127,7 @@
                         {% endif %}
                       -->
                         <td>
-                            <a class="contextMenuTrigger"></a>
+                            <a class="contextMenuTrigger icon-display-grid" href="#"></a>
                         </td>
                   </tr>
             </table>
@@ -230,7 +230,7 @@
               <table>
                   <tr>
                       <td>
-                          <a class="contextMenuTrigger"></a>
+                          <a class="contextMenuTrigger icon-display-grid" href="#"></a>
                       </td>
                   </tr>
               </table>
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 786c583e8d..d2b34b8ff1 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -277,6 +277,9 @@
                         {% endif %}
                         <div id="FIRST_QUERY_CONTAINER" class="last-query" style="display: none" data-format="json">{{ startq | raw }}</div>
                     {% endif %}
+                    {#container fetched by js #}
+                    <input type="hidden" name="advanced-search-title" id="advanced-search-title" value="{{ 'Advanced Search' | trans }}">
+
                     <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.getAuthenticatedUser(), 'start_page_query')}}">
                         <input type="hidden" name="pag" id="formAnswerPage" value="">
@@ -454,7 +457,7 @@
                                                     <hr />
                                                     <label class="status-section-title">
                                                         <span class="danger_indicator">{{ 'Date(s) from field(s)' | trans }}</span>
-                                                        <img id="info-box-trigger" src="/assets/common/images/icons/info-white.png" width="18" height="18">
+                                                        <img id="info-box-trigger" src="/assets/common/images/icons/Info-white.png" width="18" height="18">
                                                         <div id="info-box">
                                                             <p>
                                                                 {{ 'prod::advancesearch:tooltips:datefield_restriction_explanation' | trans }}
diff --git a/templates/web/prod/preview/popularity.html.twig b/templates/web/prod/preview/popularity.html.twig
index 0aba714025..06127353c4 100644
--- a/templates/web/prod/preview/popularity.html.twig
+++ b/templates/web/prod/preview/popularity.html.twig
@@ -67,7 +67,16 @@
             }
         }
 
-
+        var $color = "#FFFFFF";
+        if ($('body').hasClass('000000')) {
+            $color = "#FFFFFF";
+        }
+        if ($('body').hasClass('FFFFFF')) {
+            $color = "#000000";
+        }
+        /*if ($('body').hasClass('959595')) {
+            $color = "#000000";
+        }*/
         function drawChartVisualisation() {
             var maxValue = statistics.max_views < 4 ? 4 : statistics.max_views;
             var data = new google.visualization.DataTable();
@@ -76,9 +85,10 @@
 
             data.addRows(arrayViews);
 
+
             var options = {
                 titleTextStyle: {
-                    color: 'white',
+                    color: $color,
                     fontSize: 13
                 },
                 colors: ['#FF9900'],
@@ -87,28 +97,28 @@
                 hAxis: {
                     title: '{{ 'preview::date' | trans }}',
                     titleTextStyle: {
-                        color: 'white',
+                        color: $color,
                         fontSize: 11
                     },
-                    textStyle:{color: '#FFF'},
+                    textStyle:{color: $color},
                     format: 'd/M/yy',
                     gridlines: {color: 'none'},
                     min: new Date(statistics.from),
                     max: new Date(statistics.to),
-                    baselineColor: '#FFF'
+                    baselineColor: $color
                 },
                 vAxis: {
                     title: '{{ 'preview::visualisation' | trans }}',
                     titleTextStyle: {
-                        color: 'white',
+                        color: $color,
                         fontSize: 11
                     },
-                    textStyle:{color: '#FFF'},
+                    textStyle:{color: $color},
                     minValue: 0,
                     maxValue: maxValue,
-                    baselineColor: '#FFF'
+                    baselineColor: $color
                 },
-                legend: {position: 'top', textStyle: {color: 'white'}},
+                legend: {position: 'top', textStyle: {color: $color}},
             };
 
             var chart = new google.visualization.ColumnChart(
@@ -128,7 +138,7 @@
 
             var options = {
                 titleTextStyle: {
-                    color: 'white',
+                    color: $color,
                     fontSize: 13
                 },
                 colors: ['#FF9900'],
@@ -137,29 +147,29 @@
                 hAxis: {
                     title: '{{ 'preview::date' | trans }}',
                     titleTextStyle: {
-                        color: 'white',
+                        color: $color,
                         fontSize: 11
                     },
-                    textStyle:{color: '#FFF'},
+                    textStyle:{color: $color},
                     format: 'd/M/yy',
                     gridlines: {color: 'none'},
                     min: new Date(statistics.from),
                     max: new Date(statistics.to),
-                    baselineColor: '#FFF'
+                    baselineColor: $color
                 },
                 vAxis: {
                     title: '{{ 'preview::downloads' | trans }}',
                     titleTextStyle: {
-                        color: 'white',
+                        color: $color,
                         fontSize: 11
                     },
-                    textStyle:{color: '#FFF'},
+                    textStyle:{color: $color},
                     minValue: 0,
                     maxValue: maxValue,
-                    baselineColor: '#FFF',
+                    baselineColor: $color,
                     format: '0'
                 },
-                legend: {position: 'top', textStyle: {color: 'white'}},
+                legend: {position: 'top', textStyle: {color: $color}},
             };
 
             var chart = new google.visualization.ColumnChart(
@@ -175,7 +185,7 @@
                 'backgroundColor': 'transparent',
                 is3D: true,
                 colors:['#FF9900','#3FDFFD', '#14CAB5', '#CAA514', '#97853C'],
-                legend: {position: 'right', textStyle: {color: 'white'}},
+                legend: {position: 'right', textStyle: {color: $color}},
                 chartArea: {width:'90%',height:'70%'}
             };
 
@@ -199,4 +209,4 @@
     });
 
 
-</script>
\ No newline at end of file
+</script>
