diff --git a/gis_data_editor.php b/gis_data_editor.php
index 0697bd7a28..1dcb1d5d5a 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -141,7 +141,7 @@ echo '<div id="openlayersmap" style="width:450px;height:300px;'
     , ($srid == 0 ? 'display:none;' : '') , '">';
 echo '</div>';
 
-echo '<div class="choice" style="float:right;clear:right;">';
+echo '<div class="choice floatright" style="clear:right;">';
 echo '<input type="checkbox" id="choice" value="useBaseLayer"'
     , ($srid != 0 ? ' checked="checked"' : '') , '/>';
 echo '<label for="choice">' ,  __("Use OpenStreetMaps as Base Layer") , '</label>';
diff --git a/js/db_structure.js b/js/db_structure.js
index 699f78d578..f9c3f10223 100644
--- a/js/db_structure.js
+++ b/js/db_structure.js
@@ -192,7 +192,7 @@ AJAX.registerOnload('db_structure.js', function () {
  *
  */
     var jqConfirm = function(msg, success) {
-        var dialogObj = $("<div style='display:none'>"+msg+"</div>");
+        var dialogObj = $("<div class='hide'>"+msg+"</div>");
         $('body').append(dialogObj);
         var buttonOptions = {};
         buttonOptions[PMA_messages.strContinue] = function () {
@@ -273,7 +273,7 @@ AJAX.registerOnload('db_structure.js', function () {
 
             }).done(function(data) {
 
-                var dialogObj = $("<div style='display:none'>"+data+"</div>");
+                var dialogObj = $("<div class='hide'>"+data+"</div>");
                 $('body').append(dialogObj);
                 var buttonOptions = {};
                 buttonOptions[PMA_messages.strContinue] = function () {
diff --git a/js/functions.js b/js/functions.js
index 162bf42129..5b0e3546ea 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3600,7 +3600,7 @@ AJAX.registerOnload('functions.js', function () {
         }
         var seeMore = '';
         if (list_size > maxRows) {
-            seeMore = "<fieldset class='tblFooters' style='text-align:center;font-weight:bold'>" +
+            seeMore = "<fieldset class='tblFooters center' style='font-weight:bold'>" +
                 "<a href='#' id='seeMore'>" + PMA_messages.seeMore + "</a></fieldset>";
         }
         var central_columns_dialog = "<div style='max-height:400px'>" +
@@ -3684,7 +3684,7 @@ AJAX.registerOnload('functions.js', function () {
         while (num_new_rows--) {
             $enum_editor_dialog.find('.values')
                 .append(
-                    "<tr style='display: none;'><td>" +
+                    "<tr class='hide'><td>" +
                     "<input type='text' />" +
                     "</td><td class='drop'>" +
                     PMA_getImage('b_drop.png') +
diff --git a/libraries/ErrorHandler.php b/libraries/ErrorHandler.php
index 3eaba73c44..cee46c8552 100644
--- a/libraries/ErrorHandler.php
+++ b/libraries/ErrorHandler.php
@@ -347,7 +347,7 @@ class ErrorHandler
                     . ' id="pma_report_errors_form"';
             if ($GLOBALS['cfg']['SendErrorReports'] == 'always') {
                 // in case of 'always', generate 'invisible' form.
-                $retval .= ' style="display:none;"';
+                $retval .= ' class="hide"';
             }
             $retval .=  '>'
                     . '<input type="hidden" name="token" value="'
diff --git a/libraries/Util.php b/libraries/Util.php
index bf9e036d6b..3730e033c4 100644
--- a/libraries/Util.php
+++ b/libraries/Util.php
@@ -3368,8 +3368,8 @@ class Util
         }
 
         $block_html .= __("Browse your computer:") . '</label>'
-            . '<div id="upload_form_status" style="display: none;"></div>'
-            . '<div id="upload_form_status_info" style="display: none;"></div>'
+            . '<div id="upload_form_status" class="hide"></div>'
+            . '<div id="upload_form_status_info" class="hide"></div>'
             . '<input type="file" name="import_file" id="input_import_file" />'
             . self::getFormattedMaximumUploadSize($max_upload_size) . "\n"
             // some browsers should respect this :)
diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
index 30205fbc95..524ca5970d 100644
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@@ -688,7 +688,7 @@ function PMA_getCentralColumnsTableHeader($class='', $title='', $actionCount=0)
     $tableheader = '<thead>';
     $tableheader .= '<tr>'
         . '<th class="' . $class . '"></th>'
-        . '<th class="" style="display:none"></th>'
+        . '<th class="hide"></th>'
         . $action
         . '<th class="' . $class . '" title="' . $title . '" data-column="name">'
         . __('Name') . '<div class="sorticon"></div></th>'
@@ -849,7 +849,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
         . '<a hrf="#">' . Util::getIcon('b_drop.png', __('Delete')) . '</a>'
         . '<input type="submit" data-rownum = "' . $row_num . '"'
         . ' class="edit_cancel_form" value="Cancel"></td>'
-        . '<td id="save_' . $row_num . '" style="display:none">'
+        . '<td id="save_' . $row_num . '" class="hide">'
         . '<input type="submit" data-rownum = "' . $row_num . '"'
         . ' class="edit_save_form" value="Save"></td>';
 
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 2cd0ef782f..1e0b3336d9 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -328,15 +328,14 @@ function PMA_displayInput($path, $name, $type, $value, $description = '',
             . $icons['tblops'] . '</a>';
     }
     if (isset($opts['setvalue']) && $opts['setvalue']) {
-        $htmlOutput .= '<a class="set-value" href="#'
+        $htmlOutput .= '<a class="set-value hide" href="#'
             . htmlspecialchars("$path={$opts['setvalue']}") . '" title="'
             . sprintf(__('Set value: %s'), htmlspecialchars($opts['setvalue']))
-            . '" style="display:none">' . $icons['edit'] . '</a>';
+            . '">' . $icons['edit'] . '</a>';
     }
     if (isset($opts['show_restore_default']) && $opts['show_restore_default']) {
-        $htmlOutput .= '<a class="restore-default" href="#' . $path . '" title="'
-            .  __('Restore default value') . '" style="display:none">'
-            . $icons['reload'] . '</a>';
+        $htmlOutput .= '<a class="restore-default hide" href="#' . $path . '" title="'
+            .  __('Restore default value') . '">' . $icons['reload'] . '</a>';
     }
     // this must match with displayErrors() in scripts/config.js
     if ($has_errors) {
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index 7639906be2..11f77cb57f 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -109,9 +109,9 @@ function PMA_getHtmlForChangePassword($mode, $username, $hostname)
                 . '<tr id="tr_element_before_generate_password"></tr>'
                 . '</table>';
 
-            $html .= '<div '
+            $html .= '<div'
                 . ($orig_auth_plugin != 'sha256_password'
-                    ? 'style="display:none"'
+                    ? ' class="hide"'
                     : '')
                 . ' id="ssl_reqd_warning_cp">'
                 . Message::notice(
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index a0a5fcf66a..d6beff2cf8 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -424,11 +424,11 @@ function PMA_getHtmlForImport(
     global $SESSION_KEY;
     $html  = '';
     $html .= '<iframe id="import_upload_iframe" name="import_upload_iframe" '
-        . 'width="1" height="1" style="display: none;"></iframe>';
-    $html .= '<div id="import_form_status" style="display: none;"></div>';
+        . 'width="1" height="1" class="hide"></iframe>';
+    $html .= '<div id="import_form_status" class="hide"></div>';
     $html .= '<div id="importmain">';
     $html .= '    <img src="' . $GLOBALS['pmaThemeImage'] . 'ajax_clock_small.gif" '
-        . 'width="16" height="16" alt="ajax clock" style="display: none;" />';
+        . 'width="16" height="16" alt="ajax clock" class="hide" />';
 
     $html .= PMA_getHtmlForImportJS($upload_id);
 
diff --git a/libraries/navigation/NavigationTree.php b/libraries/navigation/NavigationTree.php
index 5db11df455..c1b23d5bfd 100644
--- a/libraries/navigation/NavigationTree.php
+++ b/libraries/navigation/NavigationTree.php
@@ -892,7 +892,7 @@ class NavigationTree
             $retval = false;
         } else {
             $this->groupTree();
-            $retval = "<div class='list_container' style='display: none;'>";
+            $retval = "<div class='list_container hide'>";
             if (!empty($this->_searchClause) || !empty($this->_searchClause2)) {
                 $retval .= "<ul class='search_results'>";
             } else {
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index 88f83fcde7..18aafb7fbc 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -242,7 +242,7 @@ function PMA_getHtmlForSlaveConfiguration(
 
         $html .= ' <li><a href="#slave_control_href" id="slave_control_href">';
         $html .= __('Control slave:') . '</a>';
-        $html .= ' <div id="slave_control_gui" style="display: none">';
+        $html .= ' <div id="slave_control_gui" class="hide">';
         $html .= '  <ul>';
         $html .= '   <li><a href="' . $slave_control_full_link . '">';
         $html .= (($server_slave_replication[0]['Slave_IO_Running'] == 'No' ||
@@ -307,7 +307,7 @@ function PMA_getHtmlForSlaveErrorManagement($slave_skip_error_link)
     $html  = '<a href="#slave_errormanagement_href" '
         . 'id="slave_errormanagement_href">';
     $html .= __('Error management:') . '</a>';
-    $html .= ' <div id="slave_errormanagement_gui" style="display: none">';
+    $html .= ' <div id="slave_errormanagement_gui" class="hide">';
     $html .= Message::error(
         __('Skipping errors might lead into unsynchronized master and slave!')
     )->getDisplay();
diff --git a/libraries/rte/rte_footer.lib.php b/libraries/rte/rte_footer.lib.php
index c3252a2d4c..b4fc0b57fc 100644
--- a/libraries/rte/rte_footer.lib.php
+++ b/libraries/rte/rte_footer.lib.php
@@ -120,10 +120,9 @@ function PMA_EVN_getFooterLinks()
     );
     $retval .= "        </div>\n";
     $retval .= "    </fieldset>\n";
-    $retval .= "    <div style='clear: both;'></div>\n";
+    $retval .= "    <div class='clearfloat'></div>\n";
     $retval .= "</div>";
     $retval .= "<!-- FOOTER LINKS END -->\n";
 
     return $retval;
 } // end PMA_EVN_getFooterLinks()
-
diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php
index da235897cf..7cf777e31e 100644
--- a/libraries/rte/rte_list.lib.php
+++ b/libraries/rte/rte_list.lib.php
@@ -81,7 +81,7 @@ function PMA_RTE_getList($type, $items)
         $retval .= "            <th>" . __('Type') . "</th>\n";
         $retval .= "            <th>" . __('Returns') . "</th>\n";
         $retval .= "        </tr>\n";
-        $retval .= "        <tr style='display: none'>\n"; // see comment above
+        $retval .= "        <tr class='hide'>\n"; // see comment above
         for ($i = 0; $i < 7; $i++) {
             $retval .= "            <td></td>\n";
         }
@@ -96,7 +96,7 @@ function PMA_RTE_getList($type, $items)
         $retval .= "            <th>" . __('Time') . "</th>\n";
         $retval .= "            <th>" . __('Event') . "</th>\n";
         $retval .= "        </tr>\n";
-        $retval .= "        <tr style='display: none'>\n"; // see comment above
+        $retval .= "        <tr class='hide'>\n"; // see comment above
         for ($i = 0; $i < (empty($table) ? 7 : 6); $i++) {
             $retval .= "            <td></td>\n";
         }
@@ -108,7 +108,7 @@ function PMA_RTE_getList($type, $items)
         $retval .= "            <th colspan='3'>" . __('Action') . "</th>\n";
         $retval .= "            <th>" . __('Type') . "</th>\n";
         $retval .= "        </tr>\n";
-        $retval .= "        <tr style='display: none'>\n"; // see comment above
+        $retval .= "        <tr class='hide'>\n"; // see comment above
         for ($i = 0; $i < 6; $i++) {
             $retval .= "            <td></td>\n";
         }
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index bef925cd61..65d339b0c6 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -904,7 +904,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
     } else {
         $retval .= "<input name='item_type' type='hidden'"
             . " value='{$routine['item_type']}' />\n"
-            . "<div class='floatleft' style='width: 49%; text-align: center;"
+            . "<div class='floatleft center' style='width: 49%;"
             . " font-weight: bold;'>\n"
             . $routine['item_type'] . "\n"
             . "</div>\n"
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 096fe705e3..60001c2a06 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1532,7 +1532,7 @@ function PMA_getHtmlForLoginInformationFields(
             : '') . ' />' . "\n";
 
     $html_output .= '<div id="user_exists_warning"'
-        . ' name="user_exists_warning" style="display:none;">'
+        . ' name="user_exists_warning" class="hide">'
         . Message::notice(
             __(
                 'An account already exists with the same username '
@@ -1721,8 +1721,8 @@ function PMA_getHtmlForLoginInformationFields(
     }
     $html_output .= $auth_plugin_dropdown;
 
-    $html_output .= '<div '
-        . ($orig_auth_plugin != 'sha256_password' ? 'style="display:none"' : '')
+    $html_output .= '<div'
+        . ($orig_auth_plugin != 'sha256_password' ? ' class="hide"' : '')
         . ' id="ssl_reqd_warning">'
         . Message::notice(
             __(
@@ -3523,7 +3523,7 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir)
     $html_output .= '<input type="hidden" name="initial" '
         . 'value="' . (isset($_GET['initial']) ? htmlspecialchars($_GET['initial']) : '') . '" />';
     $html_output .= '</div>'
-        . '<div class="clear_both" style="clear:both"></div>';
+        . '<div class="clearfloat"></div>';
 
     // add/delete user fieldset
     $html_output .= PMA_getFieldsetForAddDeleteUser();
diff --git a/libraries/server_status_advisor.lib.php b/libraries/server_status_advisor.lib.php
index f78577bd34..3f23c8f25a 100644
--- a/libraries/server_status_advisor.lib.php
+++ b/libraries/server_status_advisor.lib.php
@@ -19,7 +19,7 @@ function PMA_getHtmlForAdvisor()
     $output .= PMA\libraries\Util::getIcon('b_help.png', __('Instructions'));
     $output .= '</a>';
     $output .= '<div id="statustabs_advisor"></div>';
-    $output .= '<div id="advisorInstructionsDialog" style="display:none;">';
+    $output .= '<div id="advisorInstructionsDialog" class="hide">';
     $output .= '<p>';
     $output .= __(
         'The Advisor system can provide recommendations '
@@ -49,7 +49,7 @@ function PMA_getHtmlForAdvisor()
     );
     $output .= '</p>';
     $output .= '</div>';
-    $output .= '<div id="advisorData" style="display:none;">';
+    $output .= '<div id="advisorData" class="hide">';
     $advisor = new PMA\libraries\Advisor();
     $output .= htmlspecialchars(
         json_encode(
@@ -60,4 +60,3 @@ function PMA_getHtmlForAdvisor()
 
     return $output;
 }
-
diff --git a/libraries/server_status_monitor.lib.php b/libraries/server_status_monitor.lib.php
index 0bcacda030..c828fce1f4 100644
--- a/libraries/server_status_monitor.lib.php
+++ b/libraries/server_status_monitor.lib.php
@@ -59,7 +59,7 @@ function PMA_getHtmlForMonitor($ServerStatusData)
 function PMA_getHtmlForAnalyseDialog()
 {
     $retval  = '<div id="logAnalyseDialog" title="';
-    $retval .= __('Log statistics') . '" style="display:none;">';
+    $retval .= __('Log statistics') . '" class="hide">';
     $retval .= '<p>' . __('Selected time range:');
     $retval .= '<input type="text" name="dateStart"'
         . ' class="datetimefield" value="" /> - ';
@@ -86,7 +86,7 @@ function PMA_getHtmlForAnalyseDialog()
     $retval .= '</p>';
     $retval .= '</div>';
     $retval .= '<div id="queryAnalyzerDialog" title="';
-    $retval .= __('Query analyzer') . '" style="display:none;">';
+    $retval .= __('Query analyzer') . '" class="hide">';
     $retval .= '<textarea id="sqlquery"> </textarea>';
     $retval .= '<p></p>';
     $retval .= '<div class="placeHolder"></div>';
@@ -103,7 +103,7 @@ function PMA_getHtmlForAnalyseDialog()
 function PMA_getHtmlForInstructionsDialog()
 {
     $retval  = '<div id="monitorInstructionsDialog" title="';
-    $retval .= __('Monitor Instructions') . '" style="display:none;">';
+    $retval .= __('Monitor Instructions') . '" class="hide">';
     $retval .= __(
         'The phpMyAdmin Monitor can assist you in optimizing the server'
         . ' configuration and track down time intensive queries. For the latter you'
@@ -118,7 +118,7 @@ function PMA_getHtmlForInstructionsDialog()
     $retval .= $GLOBALS['pmaThemeImage'] . 'ajax_clock_small.gif"';
     $retval .= ' alt="' . __('Loading…') . '" />';
     $retval .= '<div class="ajaxContent"></div>';
-    $retval .= '<div class="monitorUse" style="display:none;">';
+    $retval .= '<div class="monitorUse hide">';
     $retval .= '<p></p>';
     $retval .= '<strong>';
     $retval .= __('Using the monitor:');
@@ -164,7 +164,7 @@ function PMA_getHtmlForInstructionsDialog()
 function PMA_getHtmlForAddChartDialog()
 {
     $retval  = '<div id="addChartDialog" title="'
-        . __('Add chart') . '" style="display:none;">';
+        . __('Add chart') . '" class="hide">';
     $retval .= '<div id="tabGridVariables">';
     $retval .= '<p><input type="text" name="chartTitle" value="'
         . __('Chart Title') . '" /></p>';
@@ -208,7 +208,7 @@ function PMA_getHtmlForAddChartDialog()
     $retval .= '<input type="checkbox" id="useDivisor"'
         . ' name="useDivisor" value="1" />';
     $retval .= '<label for="useDivisor">' . __('Apply a divisor') . '</label>';
-    $retval .= '<span class="divisorInput" style="display:none;">';
+    $retval .= '<span class="divisorInput hide">';
     $retval .= '<input type="text" name="valueDivisor" size="4" value="1" />';
     $retval .= '(<a href="#kibDivisor">' . __('KiB') . '</a>, ';
     $retval .= '<a href="#mibDivisor">' . __('MiB') . '</a>)';
@@ -217,12 +217,12 @@ function PMA_getHtmlForAddChartDialog()
     $retval .= '<label for="useUnit">';
     $retval .= __('Append unit to data values');
     $retval .= '</label>';
-    $retval .= '<span class="unitInput" style="display:none;">';
+    $retval .= '<span class="unitInput hide">';
     $retval .= '<input type="text" name="valueUnit" size="4" value="" />';
     $retval .= '</span>';
     $retval .= '<p>';
     $retval .= '<a href="#submitAddSeries"><b>' . __('Add this series') . '</b></a>';
-    $retval .= '<span id="clearSeriesLink" style="display:none;">';
+    $retval .= '<span id="clearSeriesLink" class="hide">';
     $retval .= ' | <a href="#submitClearSeries">' . __('Clear series') . '</a>';
     $retval .= '</span>';
     $retval .= '</p>';
@@ -254,7 +254,7 @@ function PMA_getHtmlForTabLinks()
     $retval .= '</a>';
     $retval .= '<a href="#monitorInstructionsDialog">';
     $retval .= Util::getImage('b_help.png') . __('Instructions/Setup');
-    $retval .= '<a href="#endChartEditMode" style="display:none;">';
+    $retval .= '<a href="#endChartEditMode" class="hide">';
     $retval .= Util::getImage('s_okay.png');
     $retval .= __('Done dragging (rearranging) charts');
     $retval .= '</a>';
@@ -816,4 +816,3 @@ function PMA_getJsonForQueryAnalyzer()
     }
     return $return;
 }
-
diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php
index 0b4d6356d0..bf05faefc6 100644
--- a/libraries/server_status_variables.lib.php
+++ b/libraries/server_status_variables.lib.php
@@ -91,8 +91,7 @@ function PMA_getHtmlForFilter($ServerStatusData)
  */
 function PMA_getHtmlForLinkSuggestions($ServerStatusData)
 {
-    $retval  = '<div id="linkSuggestions" class="defaultLinks" '
-        . 'style="display:none">';
+    $retval  = '<div id="linkSuggestions" class="defaultLinks hide">';
     $retval .= '<p class="notice">' . __('Related links:');
     foreach ($ServerStatusData->links as $section_name => $section_links) {
         $retval .= '<span class="status_' . $section_name . '"> ';
@@ -274,7 +273,7 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
             $retval .= '</span>';
         }
         $retval .= '</span>';
-        $retval .= '<span style="display:none;" class="original">';
+        $retval .= '<span class="original hide">';
         if (isset($alerts[$name])) {
             if ($value > $alerts[$name]) {
                 $retval .= '<span class="attention">';
@@ -760,4 +759,3 @@ function PMA_getStatusVariablesDescriptions()
         )
     );
 }
-
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index fbbcc66fe5..4d0a6aa055 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -278,10 +278,10 @@ EOT;
         $profiling_table .= "<div class='clearfloat'></div>";
 
         //require_once 'libraries/chart.lib.php';
-        $profiling_table .= '<div id="profilingChartData" style="display:none;">';
+        $profiling_table .= '<div id="profilingChartData" class="hide">';
         $profiling_table .= json_encode($chart_json);
         $profiling_table .= '</div>';
-        $profiling_table .= '<div id="profilingchart" style="display:none;">';
+        $profiling_table .= '<div id="profilingchart" class="hide">';
         $profiling_table .= '</div>';
         $profiling_table .= '<script type="text/javascript">';
         $profiling_table .= "AJAX.registerOnload('sql.js', function () {";
@@ -334,7 +334,7 @@ function PMA_analyzeAndGetTableHtmlForProfilingResults(
             . '</td>' . "\n";
         $table .= '<td class="right">'
             . (PMA\libraries\Util::formatNumber($one_result['Duration'], 3, 1))
-            . 's<span style="display:none;" class="rawvalue">'
+            . 's<span class="rawvalue hide">'
             . $one_result['Duration'] . '</span></td>' . "\n";
         if (isset($chart_json[ucwords($one_result['Status'])])) {
             $chart_json[ucwords($one_result['Status'])]
@@ -362,7 +362,7 @@ function PMA_getTableHtmlForProfilingSummaryByState($profiling_stats)
         $table .= '<td>' . $name . '</td>' . "\n";
         $table .= '<td align="right">'
             . PMA\libraries\Util::formatNumber($stats['total_time'], 3, 1)
-            . 's<span style="display:none;" class="rawvalue">'
+            . 's<span class="rawvalue hide">'
             . $stats['total_time'] . '</span></td>' . "\n";
         $table .= '<td align="right">'
             . PMA\libraries\Util::formatNumber(
@@ -376,7 +376,7 @@ function PMA_getTableHtmlForProfilingSummaryByState($profiling_stats)
             . PMA\libraries\Util::formatNumber(
                 $stats['total_time'] / $stats['calls'], 3, 1
             )
-            . 's<span style="display:none;" class="rawvalue">'
+            . 's<span class="rawvalue hide">'
             . number_format($stats['total_time'] / $stats['calls'], 8, '.', '')
             . '</span></td>' . "\n";
         $table .= ' </tr>' . "\n";
diff --git a/prefs_manage.php b/prefs_manage.php
index faed8f9c3b..83a3dcd9c2 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -310,7 +310,7 @@ if (file_exists('setup/index.php') && ! file_exists(CONFIG_FILE)) {
     <div id="main_pane_right">
         <div class="group">
             <h2><?php echo __('Export'); ?></h2>
-            <div class="click-hide-message group-cnt" style="display:none">
+            <div class="click-hide-message group-cnt hide">
                 <?php
                 Message::rawSuccess(
                     __('Configuration has been saved.')
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 27f8fab362..c9d0969455 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -118,7 +118,7 @@ echo '<h2>' , __('Overview') , '</h2>';
 PMA_messagesEnd();
 PMA_messagesShowHtml();
 
-echo '<a href="#" id="show_hidden_messages" style="display:none">';
+echo '<a href="#" id="show_hidden_messages" class="hide">';
 echo __('Show hidden messages (#MSG_COUNT)');
 echo '</a>';
 
diff --git a/templates/database/designer/aggregate_query_panel.twig b/templates/database/designer/aggregate_query_panel.twig
index 2b486027e9..00ad38a5bb 100644
--- a/templates/database/designer/aggregate_query_panel.twig
+++ b/templates/database/designer/aggregate_query_panel.twig
@@ -1,4 +1,4 @@
-<table id="query_Aggregate" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
+<table id="query_Aggregate" class="hide" width="5%" cellpadding="0" cellspacing="0">
     <tbody>
         <tr>
             <td class="frams1" width="10px">
diff --git a/templates/database/designer/delete_relation_panel.twig b/templates/database/designer/delete_relation_panel.twig
index 84be755bef..5ac34268ee 100644
--- a/templates/database/designer/delete_relation_panel.twig
+++ b/templates/database/designer/delete_relation_panel.twig
@@ -1,4 +1,4 @@
-<table id="layer_upd_relation" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
+<table id="layer_upd_relation" class="hide" width="5%" cellpadding="0" cellspacing="0">
     <tbody>
         <tr>
             <td class="frams1" width="10px">
diff --git a/templates/database/designer/having_query_panel.twig b/templates/database/designer/having_query_panel.twig
index c5828a8acc..7e20d9c908 100644
--- a/templates/database/designer/having_query_panel.twig
+++ b/templates/database/designer/having_query_panel.twig
@@ -1,4 +1,4 @@
-<table id="query_having" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
+<table id="query_having" class="hide" width="5%" cellpadding="0" cellspacing="0">
     <tbody>
         <tr>
             <td class="frams1" width="10px">
diff --git a/templates/database/designer/new_relation_panel.twig b/templates/database/designer/new_relation_panel.twig
index 39297dc939..e831c2e142 100644
--- a/templates/database/designer/new_relation_panel.twig
+++ b/templates/database/designer/new_relation_panel.twig
@@ -1,4 +1,4 @@
-<table id="layer_new_relation" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
+<table id="layer_new_relation" class="hide" width="5%" cellpadding="0" cellspacing="0">
     <tbody>
         <tr>
             <td class="frams1" width="10px">
diff --git a/templates/database/designer/options_panel.twig b/templates/database/designer/options_panel.twig
index e6095ed80d..fd81050bd8 100644
--- a/templates/database/designer/options_panel.twig
+++ b/templates/database/designer/options_panel.twig
@@ -1,4 +1,4 @@
-<table id="pmd_optionse" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
+<table id="pmd_optionse" class="hide" width="5%" cellpadding="0" cellspacing="0">
     <tbody>
         <tr>
             <td class="frams1" width="10px">
diff --git a/templates/database/designer/query_details.phtml b/templates/database/designer/query_details.phtml
index 243f983a2d..c954805481 100644
--- a/templates/database/designer/query_details.phtml
+++ b/templates/database/designer/query_details.phtml
@@ -1,9 +1,9 @@
 <div class="panel">
-    <div style="clear:both;">
+    <div class="clearfloat">
     </div>
     <div id="ab">
     </div>
-    <div style="clear:both;">
+    <div class="clearfloat">
     </div>
 </div>
 <a class="trigger" href="#">
diff --git a/templates/database/designer/rename_to_panel.twig b/templates/database/designer/rename_to_panel.twig
index b3e1ba37b4..377435f511 100644
--- a/templates/database/designer/rename_to_panel.twig
+++ b/templates/database/designer/rename_to_panel.twig
@@ -1,4 +1,4 @@
-<table id="query_rename_to" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
+<table id="query_rename_to" class="hide" width="5%" cellpadding="0" cellspacing="0">
     <tbody>
         <tr>
             <td class="frams1" width="10px">
diff --git a/templates/database/designer/table_list.phtml b/templates/database/designer/table_list.phtml
index 3d5774e77b..999140e529 100644
--- a/templates/database/designer/table_list.phtml
+++ b/templates/database/designer/table_list.phtml
@@ -1,4 +1,4 @@
-<div id="layer_menu" style="display:none;">
+<div id="layer_menu" class="hide">
     <div class="center">
         <a href="#" class="M_butt" target="_self" >
             <img title="<?= __('Hide/Show all'); ?>"
diff --git a/templates/database/designer/where_query_panel.twig b/templates/database/designer/where_query_panel.twig
index 7435dfb0b4..4ec518eff8 100644
--- a/templates/database/designer/where_query_panel.twig
+++ b/templates/database/designer/where_query_panel.twig
@@ -1,4 +1,4 @@
-<table id="query_where" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
+<table id="query_where" class="hide" width="5%" cellpadding="0" cellspacing="0">
     <tbody>
         <tr>
             <td class="frams1" width="10px">
diff --git a/templates/prefs_autoload.twig b/templates/prefs_autoload.twig
index 511cfca298..efe44a9e7f 100644
--- a/templates/prefs_autoload.twig
+++ b/templates/prefs_autoload.twig
@@ -1,4 +1,4 @@
-<div id="prefs_autoload" class="notice print_ignore" style="display:none">
+<div id="prefs_autoload" class="notice print_ignore hide">
     <form action="prefs_manage.php" method="post" class="disableAjax">
         {{ hidden_inputs|raw }}
         <input type="hidden" name="json" value="" />
diff --git a/templates/server/databases/table_row.phtml b/templates/server/databases/table_row.phtml
index 7087c8363e..d6dc608b80 100644
--- a/templates/server/databases/table_row.phtml
+++ b/templates/server/databases/table_row.phtml
@@ -44,13 +44,13 @@
     <?php endforeach; ?>
 
     <?php if ($master_replication_status): ?>
-        <td class="tool" style="text-align: center;">
+        <td class="tool center">
             <?= $master_replication; ?>
         </td>
     <?php endif; ?>
 
     <?php if ($slave_replication_status): ?>
-        <td class="tool" style="text-align: center;">
+        <td class="tool center">
             <?= $slave_replication; ?>
         </td>
     <?php endif; ?>
diff --git a/templates/table/chart/tbl_chart.phtml b/templates/table/chart/tbl_chart.phtml
index 786e1a84a7..b9e14c611d 100644
--- a/templates/table/chart/tbl_chart.phtml
+++ b/templates/table/chart/tbl_chart.phtml
@@ -31,20 +31,20 @@
                     <input type="radio" name="chartType" value="area" id="radio_area" />
                     <label for ="radio_area"><?= _pgettext('Chart type', 'Area') ?></label>
                 </div>
-                <span class="span_pie" style="display:none;">
+                <span class="span_pie hide">
                     <input type="radio" name="chartType" value="pie" id="radio_pie" />
                     <label for ="radio_pie"><?= _pgettext('Chart type', 'Pie') ?></label>
                 </span>
-                <span class="span_timeline" style="display:none;">
+                <span class="span_timeline hide">
                     <input type="radio" name="chartType" value="timeline" id="radio_timeline" />
                     <label for ="radio_timeline"><?= _pgettext('Chart type', 'Timeline') ?></label>
                 </span>
-                <span class="span_scatter" style="display:none;">
+                <span class="span_scatter hide">
                 <input type="radio" name="chartType" value="scatter" id="radio_scatter" />
                 <label for ="radio_scatter"><?= _pgettext('Chart type', 'Scatter') ?></label>
                 </span>
                 <br /><br />
-                <span class="barStacked" style="display:none;">
+                <span class="barStacked hide">
                     <input type="checkbox" name="barStacked" value="1" id="checkbox_barStacked" />
                     <label for ="checkbox_barStacked"><?= __('Stacked') ?></label>
                 </span>
@@ -110,7 +110,7 @@
                 <input type="text" name="yaxis_label" id="yaxis_label" value="<?= __('Y Values'); ?>" />
                 <br />
             </div>
-            <p style="clear:both;">&nbsp;</p>
+            <div class="clearfloat"></div>
             <div>
                 <input type="checkbox" id="chkAlternative" name="chkAlternative" value="alternativeFormat" />
                 <label for="chkAlternative"><?= __('Series names are in a column'); ?></label>
@@ -146,7 +146,7 @@
                 </select>
             </div>
             <?= PMA\libraries\Util::getStartAndNumberOfRowsPanel($sql_query); ?>
-            <p style="clear:both;">&nbsp;</p>
+            <div class="clearfloat"></div>
             <div id="resizer" style="width:600px; height:400px;">
                 <div style="position: absolute; right: 10px; top: 10px; cursor: pointer; z-index: 1000;">
                     <a class="disableAjax" id="saveChart" href="#" download="chart.png">
diff --git a/templates/table/gis_visualization/gis_visualization.phtml b/templates/table/gis_visualization/gis_visualization.phtml
index e2b92ae386..ab86e4ca39 100644
--- a/templates/table/gis_visualization/gis_visualization.phtml
+++ b/templates/table/gis_visualization/gis_visualization.phtml
@@ -62,7 +62,7 @@
             </div>
         </div>
 
-        <div style="clear:both;">&nbsp;</div>
+        <div class="clearfloat"></div>
 
         <div id="placeholder"
              style="width:<?= htmlspecialchars($visualizationSettings['width']); ?>px;height:<?= htmlspecialchars($visualizationSettings['height']); ?>px;">
diff --git a/templates/table/search/options.phtml b/templates/table/search/options.phtml
index 89908c0e24..e3460193c4 100644
--- a/templates/table/search/options.phtml
+++ b/templates/table/search/options.phtml
@@ -75,4 +75,4 @@
     ); ?>
 
 </fieldset>
-<br style="clear: both;" />
+<div class="clearfloat"></div>
diff --git a/templates/table/search/zoom_result_form.phtml b/templates/table/search/zoom_result_form.phtml
index e3b34f584d..35bbfb3f20 100644
--- a/templates/table/search/zoom_result_form.phtml
+++ b/templates/table/search/zoom_result_form.phtml
@@ -15,7 +15,7 @@
                             <?= __('How to use'); ?>
                         </a>
                     </center>
-                    <div id="querydata" style="display:none">
+                    <div id="querydata" class="hide">
                         <?= htmlspecialchars(json_encode($data)); ?>
                     </div>
                     <div id="querychart"></div>
@@ -26,7 +26,7 @@
         </center>
 
     <!-- Displays rows in point edit form -->
-        <div id="dataDisplay" style="display:none">
+        <div id="dataDisplay" class="hide">
             <table>
                 <thead>
                 <tr>
diff --git a/templates/table/structure/move_columns_dialog.phtml b/templates/table/structure/move_columns_dialog.phtml
index fe3f072a4b..5d7dac2260 100644
--- a/templates/table/structure/move_columns_dialog.phtml
+++ b/templates/table/structure/move_columns_dialog.phtml
@@ -1,4 +1,4 @@
-<div id="move_columns_dialog" title="<?= __('Move columns'); ?>" style="display: none">
+<div id="move_columns_dialog" class="hide" title="<?= __('Move columns'); ?>">
     <p><?= __('Move the columns by dragging them up and down.'); ?></p>
     <form action="tbl_structure.php">
         <div><?= PMA\libraries\URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); ?>
diff --git a/test/libraries/PMA_FormDisplay_tpl_test.php b/test/libraries/PMA_FormDisplay_tpl_test.php
index c8b537caa9..5198ba48e7 100644
--- a/test/libraries/PMA_FormDisplay_tpl_test.php
+++ b/test/libraries/PMA_FormDisplay_tpl_test.php
@@ -198,7 +198,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertContains(
-            '<a class="restore-default" href="#test/path"',
+            '<a class="restore-default hide" href="#test/path"',
             $result
         );
 
@@ -247,8 +247,8 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertContains(
-            '<a class="set-value" href="#test/path=setVal" ' .
-            'title="Set value: setVal" style="display:none">',
+            '<a class="set-value hide" href="#test/path=setVal" ' .
+            'title="Set value: setVal">',
             $result
         );
 
diff --git a/test/libraries/PMA_server_status_advisor_test.php b/test/libraries/PMA_server_status_advisor_test.php
index 86f82a1835..336d2ba680 100644
--- a/test/libraries/PMA_server_status_advisor_test.php
+++ b/test/libraries/PMA_server_status_advisor_test.php
@@ -158,7 +158,7 @@ class PMA_ServerStatusAdvisor_Test extends PHPUnit_Framework_TestCase
         //Advisor datas, we just validate that the Advisor Array is right
         //Advisor logic related with OS should be validate on class Advisor
         $this->assertContains(
-            '<div id="advisorData" style="display:none;">',
+            '<div id="advisorData" class="hide">',
             $html
         );
 
diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php
index fab148c865..c840c6de3a 100644
--- a/test/libraries/PMA_server_status_variables_test.php
+++ b/test/libraries/PMA_server_status_variables_test.php
@@ -198,7 +198,7 @@ class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
 
         //validate 1: PMA_getHtmlForLinkSuggestions
         $this->assertContains(
-            '<div id="linkSuggestions" class="defaultLinks"',
+            '<div id="linkSuggestions" class="defaultLinks hide"',
             $html
         );
         //validate 2: linkSuggestions
diff --git a/test/libraries/common/PMA_browseUploadFile_test.php b/test/libraries/common/PMA_browseUploadFile_test.php
index 4c3b430b25..fc101cbb21 100644
--- a/test/libraries/common/PMA_browseUploadFile_test.php
+++ b/test/libraries/common/PMA_browseUploadFile_test.php
@@ -65,8 +65,8 @@ class PMA_GetBrowseUploadFileBlock_Test extends PHPUnit_Framework_TestCase
             PMA\libraries\Util::getBrowseUploadFileBlock($size),
             '<label for="input_import_file">' . __("Browse your computer:")
             . '</label>'
-            . '<div id="upload_form_status" style="display: none;"></div>'
-            . '<div id="upload_form_status_info" style="display: none;"></div>'
+            . '<div id="upload_form_status" class="hide"></div>'
+            . '<div id="upload_form_status_info" class="hide"></div>'
             . '<input type="file" name="import_file" id="input_import_file" />'
             . "(" . __('Max: ') . $res . $unit . ")" . "\n"
             . '<input type="hidden" name="MAX_FILE_SIZE" value="'