diff --git a/admin/admin_main.php b/admin/admin_main.php
index d80ecf5a..48dd7605 100644
--- a/admin/admin_main.php
+++ b/admin/admin_main.php
@@ -60,7 +60,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
 
 <div class="row">
-    <div class="col-md-12" style="padding-top: 20px">
+    <div class="col-md-12 pad-down-20">
     <?php 
         /* This will handle error, success and notice messages */
         hesk_handle_messages();
@@ -73,7 +73,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 echo '
                 <div class="panel panel-default">
                     <div class="panel-heading">
-                        <h4>'.$hesklang['open_tickets'].' <span class="nu-floatRight" style="margin-top: -7px;"><a href="new_ticket.php" class="btn btn-success">'.$hesklang['nti'].'</a></span></h4>
+                        <h4>'.$hesklang['open_tickets'].' <span class="nu-floatRight panel-button"><a href="new_ticket.php" class="btn btn-success">'.$hesklang['nti'].'</a></span></h4>
                     </div>'; // The rest of the panel will be printed by print_tickets.inc.php
 	        }
 
diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 2cfe2a9c..a50962f2 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -96,7 +96,7 @@ if ( defined('HESK_DEMO') )
 
 ?>
 
-<div class="row" style="margin-top: 20px">
+<div class="row move-down-20">
     <div class="col-md-4">
         <div class="panel panel-default">
             <div class="panel-heading"><?php echo $hesklang['installation_information']; ?></div>
@@ -113,14 +113,14 @@ if ( defined('HESK_DEMO') )
 
                         if ($latest === true)
                         {
-                            $cellClass = 'class="success"';
+                            $cellClass = 'success';
                         } elseif ($latest != -1)
                         {
-                            $cellClass = 'class="warning"';
+                            $cellClass = 'warning';
                         }
                     }
                     ?>
-                    <td style="padding-left: 10px" <?php echo $cellClass; ?>>
+                    <td class="pad-right-10 <?php echo $cellClass; ?>">
                         <?php echo $hesk_settings['hesk_version']; ?>
                         <?php
                         if ($hesk_settings['check_updates'])
@@ -128,18 +128,18 @@ if ( defined('HESK_DEMO') )
 
                             if ($latest === true)
                             {
-                                echo ' - <span style="color:green">' . $hesklang['hud'] . '</span> ';
+                                echo ' - <span class="green">' . $hesklang['hud'] . '</span> ';
                             }
                             elseif ($latest != -1)
                             {
                                 // Is this a beta/dev version?
                                 if ( strpos($hesk_settings['hesk_version'], 'beta') || strpos($hesk_settings['hesk_version'], 'dev')  || strpos($hesk_settings['hesk_version'], 'RC') )
                                 {
-                                    echo ' <span style="color:darkorange">' . $hesklang['beta'] . '</span> '; ?> <a href="http://www.hesk.com/update.php?v=<?php echo $hesk_settings['hesk_version']; ?>" target="_blank"><?php echo $hesklang['check4updates']; ?></a><?php
+                                    echo ' <span class="dark-orange">' . $hesklang['beta'] . '</span> '; ?> <a href="http://www.hesk.com/update.php?v=<?php echo $hesk_settings['hesk_version']; ?>" target="_blank"><?php echo $hesklang['check4updates']; ?></a><?php
                                 }
                                 else
                                 {
-                                    echo ' - <span style="color:darkorange;font-weight:bold">' . $hesklang['hnw'] . '</span> '; ?> <a href="http://www.hesk.com/update.php?v=<?php echo $hesk_settings['hesk_version']; ?>" target="_blank"><?php echo $hesklang['getup']; ?></a><?php
+                                    echo ' - <span class="dark-orange bold">' . $hesklang['hnw'] . '</span> '; ?> <a href="http://www.hesk.com/update.php?v=<?php echo $hesk_settings['hesk_version']; ?>" target="_blank"><?php echo $hesklang['getup']; ?></a><?php
                                 }
                             }
                             else
@@ -155,7 +155,7 @@ if ( defined('HESK_DEMO') )
                     </td>
                 </tr>
                 <tr>
-                    <td class="text-right" style="padding-bottom: 5px">
+                    <td class="text-right pad-up-5">
                         <?php echo $hesklang['mods_for_hesk_version']; ?>:
                     </td>
                     <?php
@@ -165,24 +165,24 @@ if ( defined('HESK_DEMO') )
                         $latest = hesk_checkMfhVersion($modsForHeskVersion);
                         if ($latest === true)
                         {
-                            $cellClass = 'class="success"';
+                            $cellClass = 'success';
                         } elseif ($latest != -1)
                         {
-                            $cellClass = 'class="warning"';
+                            $cellClass = 'warning';
                         }
                     }
                     ?>
-                    <td <?php echo $cellClass; ?> style="padding-left: 10px; padding-bottom: 5px">
+                    <td class="pad-right-10 pad-up-5 <?php echo $cellClass; ?>">
                         <?php echo $modsForHeskVersion; ?>
                         <?php
                         if ($hesk_settings['check_updates'])
                         {
                             if ($latest === true)
                             {
-                                echo ' - <span style="color:green">' . $hesklang['mfh_up_to_date'] . '</span>';
+                                echo ' - <span class="green">' . $hesklang['mfh_up_to_date'] . '</span>';
                             } else
                             {
-                                ?> - <a href="https://mods-for-hesk.mkochcs.com" target="_blank" style="color:orange;font-weight:bold"><?php echo $hesklang['hnw']; ?></a>
+                                ?> - <a href="https://mods-for-hesk.mkochcs.com" target="_blank" class="orange bold"><?php echo $hesklang['hnw']; ?></a>
                            <?php
                             }
                         } else
@@ -195,12 +195,12 @@ if ( defined('HESK_DEMO') )
                 </tr>
                 <tr><td class="text-right">
                     <?php echo $hesklang['phpv']; ?>:
-                    </td><td style="padding-left: 10px">
+                    </td><td class="pad-right-10">
                     <?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : PHP_VERSION . ' ' . (function_exists('mysqli_connect') ? '(MySQLi)' : '(MySQL)'); ?>
                 </td></tr>
-                <tr><td class="text-right" style="padding-bottom: 5px">
+                <tr><td class="text-right pad-up-5">
                     <?php echo $hesklang['mysqlv']; ?>:
-                </td><td style="padding-left: 10px; padding-bottom: 5px">
+                </td><td class="pad-right-10 pad-up-5">
                     <?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : hesk_dbResult( hesk_dbQuery('SELECT VERSION() AS version') ); ?>
                 </td></tr>
                 <tr>
@@ -211,7 +211,7 @@ if ( defined('HESK_DEMO') )
                     $heskSettingsWritable = is_writable(HESK_PATH . 'hesk_settings.inc.php');
                     $cellClass = $heskSettingsWritable ? 'success' : 'danger';
                     ?>
-                    <td style="padding-left: 10px" class="<?php echo $cellClass; ?>">
+                    <td class="pad-right-10 <?php echo $cellClass; ?>">
                         <?php
                         if ($heskSettingsWritable) {
                             $enable_save_settings=1;
@@ -231,7 +231,7 @@ if ( defined('HESK_DEMO') )
                     $attachmentsWritable = is_writable(HESK_PATH . $hesk_settings['attach_dir']);
                     $cellClass = $attachmentsExist && $attachmentsWritable ? 'success' : 'danger';
                     ?>
-                    <td style="padding-left: 10px" class="<?php echo $cellClass; ?>">
+                    <td class="pad-right-10 <?php echo $cellClass; ?>">
                         <?php
                         if ($attachmentsExist)
                         {
@@ -500,7 +500,7 @@ if ( defined('HESK_DEMO') )
             <div class="tab-content summaryList tabPadding">
               <!-- General Settings -->
                 <div class="tab-pane fade in active" id="general">
-                <h6 style="font-weight: bold"><?php echo $hesklang['gs']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['gs']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
 
                 <div class="form-group">
@@ -534,7 +534,7 @@ if ( defined('HESK_DEMO') )
                     </div>    
                 </div>
 
-                <h6 style="font-weight: bold"><?php echo $hesklang['lgs']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['lgs']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
                 <div class="form-group">
                     <label for="s_language" class="col-sm-3 control-label"><?php echo $hesklang['hesk_lang']; ?> <a href="Javascript:void(0)" onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#9','400','500')"><i class="fa fa-question-circle settingsquestionmark"></i></a></label>  
@@ -559,7 +559,7 @@ if ( defined('HESK_DEMO') )
                     </div>
                 </div>
 
-                <h6 style="font-weight: bold"><?php echo $hesklang['db']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['db']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
 
                 <div class="form-group">
@@ -594,9 +594,9 @@ if ( defined('HESK_DEMO') )
                 </div>
                 <div class="form-group">
                     <div class="col-sm-9 col-sm-offset-3">
-                        <input type="button" class="btn btn-default" onclick="hesk_testMySQL()" value="<?php echo $hesklang['mysqltest']; ?>" style="margin-top:4px" />
+                        <input type="button" class="btn btn-default move-down-4" onclick="hesk_testMySQL()" value="<?php echo $hesklang['mysqltest']; ?>" />
                         <!-- START MYSQL TEST -->
-                        <div id="mysql_test" style="display:none">
+                        <div id="mysql_test" style="display: none">
                         </div>
 
                         <script language="Javascript" type="text/javascript">
@@ -648,7 +648,7 @@ if ( defined('HESK_DEMO') )
 
                 <!-- Helpdesk Settings -->
               <div class="tab-pane fade in" id="helpdesk">
-                <h6 style="font-weight: bold"><?php echo $hesklang['hd']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['hd']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
 
                 <div class="form-group">
@@ -724,7 +724,7 @@ if ( defined('HESK_DEMO') )
                     </div>
                 </div>
 
-                <h6 style="font-weight: bold"><?php echo $hesklang['features']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['features']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
                 <div class="row">
                     <div class="col-md-6">
@@ -1021,7 +1021,7 @@ if ( defined('HESK_DEMO') )
                     </div>
                 </div>
 
-                <h6 style="font-weight: bold"><?php echo $hesklang['sp']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['sp']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
 
                 <div class="form-group">
@@ -1125,7 +1125,7 @@ if ( defined('HESK_DEMO') )
                 </div>
             </div>
             <br/>
-            <h6 style="font-weight: bold"><?php echo $hesklang['security']; ?></h6>
+            <h6 class="bold"><?php echo $hesklang['security']; ?></h6>
             <div class="footerWithBorder blankSpace"></div>
 
             <div class="form-group">
@@ -1175,7 +1175,7 @@ if ( defined('HESK_DEMO') )
                 </div>
             </div>
             <br/>
-            <h6 style="font-weight: bold"><?php echo $hesklang['attachments']; ?></h6>
+            <h6 class="bold"><?php echo $hesklang['attachments']; ?></h6>
             <div class="footerWithBorder blankSpace"></div>
 
             <div class="form-group">
@@ -1267,7 +1267,7 @@ if ( defined('HESK_DEMO') )
         </div>
 
               <div class="tab-pane fade in" id="knowledgebase">
-                <h6 style="font-weight: bold"><?php echo $hesklang['kb_set']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['kb_set']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
                 <div class="form-group">
                     <label for="s_kb_enable" class="col-sm-4 control-label"><?php echo $hesklang['s_ekb']; ?> <a href="Javascript:void(0)" onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#22','400','500')"><i class="fa fa-question-circle settingsquestionmark"></i></a></label>
@@ -1443,7 +1443,7 @@ if ( defined('HESK_DEMO') )
                     <div class="col-sm-3">
                         <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['s_spop']); ?>" name="s_kb_index_popart" size="5" maxlength="2" value="<?php echo $hesk_settings['kb_index_popart']; ?>" />
                     </div>
-                    <div class="col-sm-5" style="padding-left:0px">
+                    <div class="col-sm-5 pad-right-0">
                         <p class="form-control-static"><?php echo $hesklang['s_onin']; ?></p>
                     </div>
                 </div>
@@ -1451,7 +1451,7 @@ if ( defined('HESK_DEMO') )
                     <div class="col-sm-3 col-sm-offset-4">
                         <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['s_spop']); ?>" name="s_kb_popart" size="5" maxlength="2" value="<?php echo $hesk_settings['kb_popart']; ?>" />
                     </div>
-                    <div class="col-sm-5" style="padding-left:0px">
+                    <div class="col-sm-5 pad-right-0">
                         <p class="form-control-static"><?php echo $hesklang['s_onkb']; ?></p>
                     </div>
                 </div>
@@ -1460,7 +1460,7 @@ if ( defined('HESK_DEMO') )
                     <div class="col-sm-3">
                         <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['s_slat']); ?>" name="s_kb_index_latest" size="5" maxlength="2" value="<?php echo $hesk_settings['kb_index_latest']; ?>" />
                     </div>
-                    <div class="col-sm-5" style="padding-left:0px">
+                    <div class="col-sm-5 pad-right-0">
                         <p class="form-control-static"><?php echo $hesklang['s_onin']; ?></p>    
                     </div>
                 </div>
@@ -1468,7 +1468,7 @@ if ( defined('HESK_DEMO') )
                     <div class="col-sm-3 col-sm-offset-4">
                         <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['s_slat']); ?>" name="s_kb_latest" size="5" maxlength="2" value="<?php echo $hesk_settings['kb_latest']; ?>" />
                     </div>
-                    <div class="col-sm-5" style="padding-left:0px">
+                    <div class="col-sm-5 pad-right-0">
                         <p class="form-control-static"><?php echo $hesklang['s_onkb']; ?></p>
                     </div>
                 </div>
@@ -1477,7 +1477,7 @@ if ( defined('HESK_DEMO') )
                     <div class="col-sm-3">
                         <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['s_relart']); ?>" name="s_kb_related" size="5" maxlength="2" value="<?php echo $hesk_settings['kb_related']; ?>" />
                     </div>
-                    <div class="col-sm-5" style="padding-left:0px">
+                    <div class="col-sm-5 pad-right-0">
                         <p class="form-control-static"><?php echo $hesklang['s_onin']; ?></p>
                     </div>
                 </div>
@@ -1485,7 +1485,7 @@ if ( defined('HESK_DEMO') )
 
                 <!-- Custom Fields Tab -->
               <div class="tab-pane fade in" id="customFields">
-                <h6 style="font-weight: bold"><?php echo $hesklang['custom_use']; ?> <a href="Javascript:void(0)" onclick="Javascript:hesk_window('<?php echo $help_folder; ?>custom.html#41','400','500')"><i class="fa fa-question-circle settingsquestionmark"></i></a></h6>
+                <h6 class="bold"><?php echo $hesklang['custom_use']; ?> <a href="Javascript:void(0)" onclick="Javascript:hesk_window('<?php echo $help_folder; ?>custom.html#41','400','500')"><i class="fa fa-question-circle settingsquestionmark"></i></a></h6>
                   <div class="footerWithBorder blankSpace"></div>
 
 
@@ -1572,7 +1572,7 @@ if ( defined('HESK_DEMO') )
 
                 <!-- Email Tab -->    
               <div class="tab-pane fade in" id="email">
-                <h6 style="font-weight: bold"><?php echo $hesklang['emlsend']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['emlsend']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
 
                 <div class="form-group">
@@ -1789,7 +1789,7 @@ if ( defined('HESK_DEMO') )
 
                     </div> <!-- END SMTP SETTINGS DIV -->   
 
-                <h6 style="font-weight: bold"><?php echo $hesklang['emlpipe']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['emlpipe']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
 
                 <div class="form-group">
@@ -1805,7 +1805,7 @@ if ( defined('HESK_DEMO') )
                     </div>
                 </div>
 
-                <h6 style="font-weight: bold"><?php echo $hesklang['pop3']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['pop3']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
 
                 <div class="form-group">
@@ -1897,7 +1897,7 @@ if ( defined('HESK_DEMO') )
                     </div>
                     <div class="form-group">
                         <div class="col-sm-9 col-sm-offset-3">
-                            <input type="button" class="btn btn-default" onclick="hesk_testPOP3()" value="<?php echo $hesklang['pop3test']; ?>" style="margin-top:4px" />    
+                            <input type="button" class="btn btn-default move-down-4" onclick="hesk_testPOP3()" value="<?php echo $hesklang['pop3test']; ?>" />
                         </div>
                     </div>
                     <table border="0"  width="100%">
@@ -1962,7 +1962,7 @@ if ( defined('HESK_DEMO') )
 
                     </div> <!-- END POP3 SETTINGS DIV -->
 
-                    <h6 style="font-weight: bold"><?php echo $hesklang['loops']; ?></h6>
+                    <h6 class="bold"><?php echo $hesklang['loops']; ?></h6>
                     <div class="footerWithBorder blankSpace"></div>
 
                     <div class="form-group">
@@ -1976,12 +1976,12 @@ if ( defined('HESK_DEMO') )
                         <div class="col-sm-3">
                             <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['loopt']); ?>" name="s_loop_time" size="5" maxlength="5" value="<?php echo $hesk_settings['loop_time']; ?>" />
                         </div>
-                        <div class="col-sm-6" style="padding-left: 0px">
+                        <div class="col-sm-6 pad-right-0">
                             <p class="form-control-static"><?php echo $hesklang['ss']; ?></p>
                         </div>
                     </div>
 
-                    <h6 style="font-weight: bold"><?php echo $hesklang['suge']; ?></h6>
+                    <h6 class="bold"><?php echo $hesklang['suge']; ?></h6>
                     <div class="footerWithBorder blankSpace"></div>
 
                     <div class="form-group">
@@ -2025,7 +2025,7 @@ if ( defined('HESK_DEMO') )
                         </table>
                     </div>
 
-                    <h6 style="font-weight: bold"><?php echo $hesklang['custnot']; ?> <a href="Javascript:void(0)" onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#65','400','500')"><i class="fa fa-question-circle settingsquestionmark"></i></a></h6>
+                    <h6 class="bold"><?php echo $hesklang['custnot']; ?> <a href="Javascript:void(0)" onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#65','400','500')"><i class="fa fa-question-circle settingsquestionmark"></i></a></h6>
                     <div class="footerWithBorder blankSpace"></div>
                     <div class="form-group">
                         <label for="s_notify_new" class="col-sm-3 control-label"><?php echo $hesklang['notnew']; ?></label>
@@ -2054,7 +2054,7 @@ if ( defined('HESK_DEMO') )
                         </div>
                     </div>
 
-                    <h6 style="font-weight: bold"><?php echo $hesklang['other']; ?></h6>
+                    <h6 class="bold"><?php echo $hesklang['other']; ?></h6>
                     <div class="footerWithBorder blankSpace"></div>
 
                     <div class="form-group">
@@ -2090,7 +2090,7 @@ if ( defined('HESK_DEMO') )
                                 {
                                 ?>
                                     <label>
-                                        <i class="fa fa-ban" style="color: red; font-size: 1.2em; margin-left: -20px; font-weight: bold"
+                                        <i class="fa fa-ban bold red font-size-120" style="margin-left: -20px;"
                                            data-toggle="popover"
                                            title="<?php echo $hesklang['feature_disabled']; ?>"
                                            data-content="<?php echo $hesklang['multi_eml_disabled']; ?>"></i> <?php echo $hesklang['meml2']; ?></label>
@@ -2232,7 +2232,7 @@ if ( defined('HESK_DEMO') )
 
                 <!-- Miscellaneous Tab -->
               <div class="tab-pane fade in" id="misc">
-                <h6 style="font-weight: bold"><?php echo $hesklang['dat']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['dat']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
 
                 <div class="form-group">
@@ -2250,15 +2250,15 @@ if ( defined('HESK_DEMO') )
                         <div class="col-sm-2 col-sm-offset-4">
                             <input type="text" class="form-control" name="s_diff_hours" size="5" maxlength="3" value="<?php echo $hesk_settings['diff_hours']; ?>" />
                         </div>
-                        <div class="col-sm-6" style="padding-left:0px">
+                        <div class="col-sm-6 pad-right-0">
                             <p class="form-control-static"><?php echo $hesklang['t_h']; ?></p>
                         </div>
                     </div>
-                    <div class="row" style="padding-top:5px">
+                    <div class="row pad-right-0">
                         <div class="col-sm-2 col-sm-offset-4">
                             <input type="text" class="form-control" name="s_diff_minutes" size="5" maxlength="3" value="<?php echo $hesk_settings['diff_minutes']; ?>" />    
                         </div>
-                        <div class="col-sm-6" style="padding-left: 0px">
+                        <div class="col-sm-6 pad-right-0">
                             <p class="form-control-static"><?php echo $hesklang['t_m']; ?></p>    
                         </div>
                     </div>
@@ -2282,7 +2282,7 @@ if ( defined('HESK_DEMO') )
                     </div>
                 </div>
 
-                <h6 style="font-weight: bold"><?php echo $hesklang['other']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['other']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
 
                 <div class="form-group">
@@ -2323,7 +2323,7 @@ if ( defined('HESK_DEMO') )
                             <label><input type="checkbox" name="s_online" value="1" <?php if ($hesk_settings['online']) {echo 'checked="checked"';} ?>/> <?php echo $hesklang['sonline2']; ?></label>
                         </div>
                     </div>
-                    <div class="col-sm-2" style="padding-left:0px">
+                    <div class="col-sm-2 pad-right-0">
                         <input type="text" class="form-control" name="s_online_min" size="5" maxlength="4" value="<?php echo $hesk_settings['online_min']; ?>" />    
                     </div>
                 </div>
@@ -2392,7 +2392,7 @@ if ( defined('HESK_DEMO') )
               </div>
               <!-- Mods For Hesk: Color settings -->
               <div class="tab-pane fade in" id="colors">
-                  <h6 style="font-weight: bold"><?php echo $hesklang['uiColors']; ?></h6>
+                  <h6 class="bold"><?php echo $hesklang['uiColors']; ?></h6>
                   <div class="footerWithBorder blankSpace"></div>
                   <div class="row">
                       <div class="col-sm-6 col-xs-12">
@@ -2714,7 +2714,7 @@ function hesk_cacheMfhLatestVersion($latest)
 
 function hesk_testLanguage($return_options = 0)
 {
-	global $hesk_settings, $hesklang;
+	global $hesk_settings, $hesklang, $modsForHesk_settings;
 
 	/* Get a list of valid emails */
     include_once(HESK_PATH . 'inc/email_functions.inc.php');
diff --git a/admin/banned_emails.php b/admin/banned_emails.php
index a5f3c9a4..9c581323 100644
--- a/admin/banned_emails.php
+++ b/admin/banned_emails.php
@@ -67,7 +67,7 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
 
-<div class="row" style="padding: 20px">
+<div class="row pad-down-20">
     <ul class="nav nav-tabs" role="tablist">
         <li role="presentation" class="active">
             <a href="#"><?php echo $hesklang['banemail']; ?> <i class="fa fa-question-circle settingsquestionmark" onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['banemail_intro']); ?>')"></i></a>
@@ -141,7 +141,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 </form>
             </div>
             <div class="col-md-4">
-                <h6 style="font-weight: bold"><?php echo $hesklang['banex']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['banex']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
                 <b>john@email.com</b><br />
                 <b>@domain.com</b>
@@ -202,17 +202,17 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
                         echo '
                         <tr>
-                            <td class="'.$color.'" style="text-align:left">'.$ban['email'].'</td>
-                            <td class="'.$color.'" style="text-align:left">'.(isset($admins[$ban['banned_by']]) ? $admins[$ban['banned_by']] : $hesklang['e_udel']).'</td>
-                            <td class="'.$color.'" style="text-align:left">'.$ban['dt'].'</td>
+                            <td class="'.$color.' text-left">'.$ban['email'].'</td>
+                            <td class="'.$color.' text-left">'.(isset($admins[$ban['banned_by']]) ? $admins[$ban['banned_by']] : $hesklang['e_udel']).'</td>
+                            <td class="'.$color.' text-left">'.$ban['dt'].'</td>
                             ';
 
                             if ($can_unban)
                             {
                             echo '
-                            <td class="'.$color.'" style="text-align:left;">
+                            <td class="'.$color.' text-left>
                                 <a href="banned_emails.php?a=unban&amp;id='.$ban['id'].'&amp;token='.hesk_token_echo(0).'" onclick="return confirm_delete();">
-                                    <i class="fa fa-times" style="color: red; font-size: 16px;"data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['delban'].'"></i>
+                                    <i class="fa fa-times red font-size-16p" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['delban'].'"></i>
                                 </a>
                             </td>
                             ';
diff --git a/admin/banned_ips.php b/admin/banned_ips.php
index 74d2c917..1b91cf23 100644
--- a/admin/banned_ips.php
+++ b/admin/banned_ips.php
@@ -68,7 +68,7 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
 
-<div class="row" style="padding: 20px">
+<div class="row pad-20">
     <ul class="nav nav-tabs" role="tablist">
         <?php
         // Show a link to banned_emails.php if user has permission to do so
@@ -143,7 +143,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 </form>
             </div>
             <div class="col-md-4">
-                <h6 style="font-weight: bold"><?php echo $hesklang['banex']; ?></h6>
+                <h6 class="bold"><?php echo $hesklang['banex']; ?></h6>
                 <div class="footerWithBorder blankSpace"></div>
                 <b>123.0.0.0</b><br />
                 <b>123.0.0.1 - 123.0.0.53</b><br />
@@ -193,9 +193,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 echo '
                                     <td>
                                         <a href="banned_ips.php?a=ban&amp;ip='.urlencode($ban['ip']).'&amp;token='.hesk_token_echo(0).'">
-                                            <i class="fa fa-ban" style="color: red; font-size: 16px" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['ippermban'].'"></i></a>
+                                            <i class="fa fa-ban red font-size-16p" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['ippermban'].'"></i></a>
                                         <a href="banned_ips.php?a=unbantemp&amp;ip='.urlencode($ban['ip']).'&amp;token='.hesk_token_echo(0).'" onclick="return confirm_delete();">
-                                            <i class="fa fa-times" style="color: red; font-size: 16px"data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['delban'].'"></i></a>
+                                            <i class="fa fa-times red font-size-16p" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['delban'].'"></i></a>
                                     </td>
                                     ';
                             }
@@ -275,9 +275,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         if ($can_unban)
                         {
                             echo '
-                                <td class="'.$color.'" style="text-align:left;">
+                                <td class="'.$color.' text-left">
                                     <a href="banned_ips.php?a=unban&amp;id='.$ban['id'].'&amp;token='.hesk_token_echo(0).'" onclick="return confirm_delete();">
-                                        <i class="fa fa-times" style="color: red; font-size: 16px" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['delban'].'"></i></a>
+                                        <i class="fa fa-times red font-size-16p" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['delban'].'"></i></a>
                                 </td>
                             ';
                         }
diff --git a/admin/export.php b/admin/export.php
index 8827667c..318a2c87 100644
--- a/admin/export.php
+++ b/admin/export.php
@@ -705,7 +705,7 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
 
-<div class="row" style="margin-top: 20px">
+<div class="row move-down-20">
     <div class="col-md-4">
         <div class="panel panel-default">
             <div class="panel-heading"><?php echo $hesklang['export']; ?></div>
@@ -898,7 +898,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 </div>
                 </div>         
             </div>
-            <div class="form-group" style="text-align: center">
+            <div class="form-group text-center">
                 <input type="submit" value="<?php echo $hesklang['export_btn']; ?>" class="btn btn-default" />
                 <input type="hidden" name="cot" value="1" />
             </div>          
diff --git a/admin/find_tickets.php b/admin/find_tickets.php
index 8ee9d828..6836f7d5 100644
--- a/admin/find_tickets.php
+++ b/admin/find_tickets.php
@@ -66,11 +66,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 </tr>
 <tr>
 <td>
-<div class="row" style="padding-top: 20px">
+<div class="row pad-down-20">
     <div class="col-md-12">
         <div class="panel panel-default">
             <div class="panel-heading">
-                <h4><?php echo $hesklang['tickets_found']; ?> <span style="float: right; margin-top: -7px;"><a href="new_ticket.php" class="btn btn-success"><?php echo $hesklang['nti']; ?></a></span></h4>
+                <h4><?php echo $hesklang['tickets_found']; ?> <span class="nu-floatRight panel-button"><a href="new_ticket.php" class="btn btn-success"><?php echo $hesklang['nti']; ?></a></span></h4>
             </div>
 
 <?php
diff --git a/admin/mail.php b/admin/mail.php
index 0bbb26b3..c2535884 100644
--- a/admin/mail.php
+++ b/admin/mail.php
@@ -57,9 +57,9 @@ while ($row=hesk_dbFetchAssoc($res))
 }
 
 /* What folder are we in? */
-$hesk_settings['mailtmp']['inbox']  = '<a href="mail.php"><i class="fa fa-download"></i></a> <a href="mail.php">'.$hesklang['inbox'].'</a>';
-$hesk_settings['mailtmp']['outbox'] = '<a href="mail.php?folder=outbox"><i class="fa fa-upload" style="font-size: 16px"></i></a> <a href="mail.php?folder=outbox">'.$hesklang['outbox'].'</a>';
-$hesk_settings['mailtmp']['new']    = '<a href="mail.php?a=new"><i class="fa fa-pencil-square-o" style="font-size:16px"></i></a> <a href="mail.php?a=new">'.$hesklang['m_new'].'</a>';
+$hesk_settings['mailtmp']['inbox']  = '<a href="mail.php"><i class="fa fa-download font-size-16p"></i></a> <a href="mail.php">'.$hesklang['inbox'].'</a>';
+$hesk_settings['mailtmp']['outbox'] = '<a href="mail.php?folder=outbox"><i class="font-size-16p fa fa-upload"></i></a> <a href="mail.php?folder=outbox">'.$hesklang['outbox'].'</a>';
+$hesk_settings['mailtmp']['new']    = '<a href="mail.php?a=new"><i class="font-size-16p fa fa-pencil-square-o"></i></a> <a href="mail.php?a=new">'.$hesklang['m_new'].'</a>';
 
 /* Get action */
 if ( $action = hesk_REQUEST('a') )
@@ -76,12 +76,12 @@ if (isset($_GET['folder']) && hesk_GET('folder') == 'outbox')
 	$hesk_settings['mailtmp']['this']   = 'from';
 	$hesk_settings['mailtmp']['other']  = 'to';
 	$hesk_settings['mailtmp']['m_from'] = $hesklang['m_to'];
-	$hesk_settings['mailtmp']['outbox'] = '<b><i class="fa fa-upload" style="font-size:16px"></i> '.$hesklang['outbox'].'</b>';
+	$hesk_settings['mailtmp']['outbox'] = '<b><i class="font-size-16p fa fa-upload"></i> '.$hesklang['outbox'].'</b>';
     $hesk_settings['mailtmp']['folder'] = 'outbox';
 }
 elseif ($action == 'new')
 {
-	$hesk_settings['mailtmp']['new'] = '<b><i class="fa fa-pencil-square-o" style="font-size: 16px"></i> '.$hesklang['m_new'].'</b>';
+	$hesk_settings['mailtmp']['new'] = '<b><i class="font-size-16p fa fa-pencil-square-o"></i> '.$hesklang['m_new'].'</b>';
 	$_SESSION['hide']['list'] = 1;
 
     /* Do we have a recipient selected? */
@@ -97,7 +97,7 @@ else
 	$hesk_settings['mailtmp']['m_from'] = $hesklang['m_from'];
     if ($action != 'read')
     {
-		$hesk_settings['mailtmp']['inbox']  = '<b><i class="fa fa-download" style="font-size: 16px"></i> '.$hesklang['inbox'].'</b>';
+		$hesk_settings['mailtmp']['inbox']  = '<b><i class="font-size-16p fa fa-download"></i> '.$hesklang['inbox'].'</b>';
         $hesk_settings['mailtmp']['folder'] = '';
     }
 }
@@ -135,7 +135,7 @@ function confirm_delete()
 //-->
 </script>
 
-<div class="row" style="margin-top: 20px">
+<div class="row move-down-20">
     <div class="col-md-3">
         <div class="panel panel-default">
             <div class="panel-heading"><?php echo $hesklang['navigation']; ?></div>
@@ -474,10 +474,10 @@ function show_message()
                     $folder = '&amp;folder=outbox';
                     if ($pm['to'] == $_SESSION['id'])
                     {
-                        echo '<a href="mail.php?a=mark_unread&amp;id='.$id.'&amp;token='.hesk_token_echo(0).'"><i style="font-size: 14px" class="fa fa-envelope-o"></i></a> ';
+                        echo '<a href="mail.php?a=mark_unread&amp;id='.$id.'&amp;token='.hesk_token_echo(0).'"><i class="fa fa-envelope-o font-size-14p"></i></a> ';
                         $folder = '';
                     }
-                    echo '<a href="mail.php?a=delete&amp;id='.$id.'&amp;token='.hesk_token_echo(0).$folder.'" onclick="return hesk_confirmExecute(\''.hesk_makeJsString($hesklang['delm']).'?\');"><i class="fa fa-times" style="font-size: 14px; color: red"></i></a>';
+                    echo '<a href="mail.php?a=delete&amp;id='.$id.'&amp;token='.hesk_token_echo(0).$folder.'" onclick="return hesk_confirmExecute(\''.hesk_makeJsString($hesklang['delm']).'?\');"><i class="fa fa-times font-size-14p red"></i></a>';
                     ?>
 
                 </td>
diff --git a/admin/manage_canned.php b/admin/manage_canned.php
index 409d4756..a4c9a7e2 100644
--- a/admin/manage_canned.php
+++ b/admin/manage_canned.php
@@ -119,7 +119,7 @@ function hesk_insertAtCursor(myField, myValue) {
     $j=0;
     $num = hesk_dbNumRows($result);  
 ?>
-<div class="row" style="margin-top: 20px">
+<div class="row move-down-20">
     <div class="col-md-4">
         <div class="panel panel-default">
             <div class="panel-heading"><?php echo $hesklang['savedResponses']; ?></div>
@@ -179,17 +179,17 @@ function hesk_insertAtCursor(myField, myValue) {
                         {
                             if ($j == 1)
                             {
-                                echo'<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" /> <a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-down" style="font-size: 14px; color: green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_dn'].'"></i></a>';
+                                echo'<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" /> <a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_dn'].'"></i></a>';
                             }
                             elseif ($j == $num)
                             {
-                                echo'<a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-up" style="font-size: 14px; color: green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_up'].'"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
+                                echo'<a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_up'].'"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
                             }
                             else
                             {
                                 echo'
-                                <a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-up" style="font-size: 14px; color: green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_up'].'"></i></a>
-                                <a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-down" style="font-size: 14px; color: green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_dn'].'"></i></a>
+                                <a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_up'].'"></i></a>
+                                <a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_dn'].'"></i></a>
                                 ';
                             }
                         }
@@ -199,7 +199,7 @@ function hesk_insertAtCursor(myField, myValue) {
                         }
 
                         echo '
-                        <a href="manage_canned.php?a=remove&amp;id='.$mysaved['id'].'&amp;token='.hesk_token_echo(0).'" onclick="return confirm_delete();"><i class="fa fa-times" style="font-size: 14px; color: #FF0000" data-toggle="tooltip" data-placement="top" title="'.$hesklang['delete'].'"></i></a>&nbsp;</td>
+                        <a href="manage_canned.php?a=remove&amp;id='.$mysaved['id'].'&amp;token='.hesk_token_echo(0).'" onclick="return confirm_delete();"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" title="'.$hesklang['delete'].'"></i></a>&nbsp;</td>
                         </tr>
                         ';
                     } // End while
@@ -366,7 +366,7 @@ function hesk_insertAtCursor(myField, myValue) {
                         ?>
                 </div>     
             </div>
-            <div class="form-group" style="text-align: center">
+            <div class="form-group text-center">
                 <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
                 <input type="submit" value="<?php echo $hesklang['save_changes']; ?>" class="btn btn-default" />
             </div>          
diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index 405ac594..647e9251 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -100,7 +100,7 @@ else {return false;}
         $options .= '>'.$mycat['name'].'</option>';
     }
 ?>
-<div class="row" style="margin-top: 20px">
+<div class="row move-down-20">
     <div align="left" class="col-md-4">
         <ul class="nav nav-tabs">
             <li class="active"><a href="#addCat" data-toggle="tab"><?php echo $hesklang['add_cat']; ?></a></li>
@@ -165,7 +165,7 @@ else {return false;}
                             </div>     
                         </div>     
                     </div>
-                    <div class="form-group" style="text-align: center">
+                    <div class="form-group text-center">
                         <input type="hidden" name="a" value="new" />
                         <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
                         <input type="submit" value="<?php echo $hesklang['create_cat']; ?>" class="btn btn-default" />     
@@ -188,7 +188,7 @@ else {return false;}
                             <input class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['cat_name']); ?>" type="text" name="name" size="40" maxlength="40" <?php if (isset($_SESSION['catname2'])) {echo ' value="'.hesk_input($_SESSION['catname2']).'" ';} ?> />
                         </div>
                     </div>
-                    <div class="form-group" style="text-align: center">
+                    <div class="form-group text-center">
                         <input type="hidden" name="a" value="rename" />
                         <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
                         <input type="submit" value="<?php echo $hesklang['ren_cat']; ?>" class="btn btn-default" />     
@@ -322,17 +322,17 @@ else {return false;}
                 }
                 else
                 {
-                    $remove_code=' <a href="manage_categories.php?a=remove&amp;catid='.$mycat['id'].'&amp;token='.hesk_token_echo(0).'" onclick="return confirm_delete();"><i class="fa fa-times" style="color: #FF0000; font-size: 14px;" data-toggle="tooltip" data-placement="top" title="'.$hesklang['delete'].'"></i></a>';
+                    $remove_code=' <a href="manage_categories.php?a=remove&amp;catid='.$mycat['id'].'&amp;token='.hesk_token_echo(0).'" onclick="return confirm_delete();"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" title="'.$hesklang['delete'].'"></i></a>';
                 }
 
                 /* Is category private or public? */
                 if ($mycat['type'])
                 {
-                    $type_code = '<a href="manage_categories.php?a=type&amp;s=0&amp;catid='.$mycat['id'].'&amp;token='.hesk_token_echo(0).'"><span class="glyphicon glyphicon-user" style="color: gray" data-toggle="tooltip" data-placement="top" title="'.$hesklang['cat_private'].'"></span></a>';
+                    $type_code = '<a href="manage_categories.php?a=type&amp;s=0&amp;catid='.$mycat['id'].'&amp;token='.hesk_token_echo(0).'"><span class="glyphicon glyphicon-user gray" data-toggle="tooltip" data-placement="top" title="'.$hesklang['cat_private'].'"></span></a>';
                 }
                 else
                 {
-                    $type_code = '<a href="manage_categories.php?a=type&amp;s=1&amp;catid='.$mycat['id'].'&amp;token='.hesk_token_echo(0).'"><span class="glyphicon glyphicon-user" style="color: #0000FF" data-toggle="tooltip" data-placement="top" title="'.$hesklang['cat_public'].'"></span></a>';
+                    $type_code = '<a href="manage_categories.php?a=type&amp;s=1&amp;catid='.$mycat['id'].'&amp;token='.hesk_token_echo(0).'"><span class="glyphicon glyphicon-user blue" data-toggle="tooltip" data-placement="top" title="'.$hesklang['cat_public'].'"></span></a>';
                 }
 
                 /* Is auto assign enabled? */
@@ -340,11 +340,11 @@ else {return false;}
                 {
                     if ($mycat['autoassign'])
                     {
-                        $autoassign_code = '<a href="manage_categories.php?a=autoassign&amp;s=0&amp;catid='.$mycat['id'].'&amp;token='.hesk_token_echo(0).'"><i class="fa fa-bolt" style="font-size: 14px; color: orange" data-toggle="tooltip" data-placement="top" title="'.$hesklang['aaon'].'"></i></a>';
+                        $autoassign_code = '<a href="manage_categories.php?a=autoassign&amp;s=0&amp;catid='.$mycat['id'].'&amp;token='.hesk_token_echo(0).'"><i class="fa fa-bolt icon-link orange" data-toggle="tooltip" data-placement="top" title="'.$hesklang['aaon'].'"></i></a>';
                     }
                     else
                     {
-                        $autoassign_code = '<a href="manage_categories.php?a=autoassign&amp;s=1&amp;catid='.$mycat['id'].'&amp;token='.hesk_token_echo(0).'"><i class="fa fa-bolt" style="font-size: 14px; color: gray" data-toggle="tooltip" data-placement="top" title="'.$hesklang['aaoff'].'"></i></a>';
+                        $autoassign_code = '<a href="manage_categories.php?a=autoassign&amp;s=1&amp;catid='.$mycat['id'].'&amp;token='.hesk_token_echo(0).'"><i class="fa fa-bolt icon-link gray" data-toggle="tooltip" data-placement="top" title="'.$hesklang['aaoff'].'"></i></a>';
                     }
                 }
                 else
@@ -367,7 +367,7 @@ else {return false;}
                 </td>
                 <td>'.output_user_dropdown($mycat['id'], $mycat['manager'], $users).'</td>
                 <td>
-                <a href="Javascript:void(0)" onclick="Javascript:hesk_window(\'manage_categories.php?a=linkcode&amp;catid='.$mycat['id'].'&amp;p='.$mycat['type'].'\',\'200\',\'500\')" id="tooltip"><i class="fa fa-code" style="font-size: 14px; color: '. ($mycat['type'] ? 'gray' : 'green') . '" data-toggle="tooltip" data-placement="top" title="'.$hesklang['geco'].'"></i></a>
+                <a href="Javascript:void(0)" onclick="Javascript:hesk_window(\'manage_categories.php?a=linkcode&amp;catid='.$mycat['id'].'&amp;p='.$mycat['type'].'\',\'200\',\'500\')" id="tooltip"><i class="fa fa-code icon-link" style="color: '. ($mycat['type'] ? 'gray' : 'green') . '" data-toggle="tooltip" data-placement="top" title="'.$hesklang['geco'].'"></i></a>
                 ' . $autoassign_code . '
                 ' . $type_code . ' ';
 
@@ -375,17 +375,17 @@ else {return false;}
                 {
                     if ($j == 1)
                     {
-                        echo'<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" /> <a href="manage_categories.php?a=order&amp;catid='.$mycat['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-down" style="font-size: 14px; color: green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_dn'].'"></i></a>';
+                        echo'<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" /> <a href="manage_categories.php?a=order&amp;catid='.$mycat['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_dn'].'"></i></a>';
                     }
                     elseif ($j == $num)
                     {
-                        echo'<a href="manage_categories.php?a=order&amp;catid='.$mycat['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-up" style="font-size: 14px; color: green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_up'].'"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
+                        echo'<a href="manage_categories.php?a=order&amp;catid='.$mycat['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_up'].'"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
                     }
                     else
                     {
                         echo'
-                        <a href="manage_categories.php?a=order&amp;catid='.$mycat['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-up" style="font-size: 14px; color: green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_up'].'"></i></a>
-                        <a href="manage_categories.php?a=order&amp;catid='.$mycat['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-down" style="font-size: 14px; color: green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_dn'].'"></i></a>&nbsp;
+                        <a href="manage_categories.php?a=order&amp;catid='.$mycat['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_up'].'"></i></a>
+                        <a href="manage_categories.php?a=order&amp;catid='.$mycat['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_dn'].'"></i></a>&nbsp;
                         ';
                     }
                 }
@@ -471,7 +471,7 @@ h3
 </head>
 <body>
 
-<div style="text-align:center">
+<div class="text-center">
 
 <h3><?php echo $hesklang['genl']; ?></h3>
 
diff --git a/admin/manage_email_templates.php b/admin/manage_email_templates.php
index b22ffa03..5d816e92 100644
--- a/admin/manage_email_templates.php
+++ b/admin/manage_email_templates.php
@@ -60,7 +60,7 @@ if ($modsForHesk_settings['html_emails']) {
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
 
-<div class="row" style="padding: 20px">
+<div class="row pad-20">
     <ul class="nav nav-tabs" role="tablist">
         <?php
         // Show a link to banned_emails.php if user has permission
@@ -253,12 +253,12 @@ function getTemplateMarkup($template, $languageCode, $html = false) {
     $languageCodeUrl = urlencode($languageCode);
     if ($html) {
         $markup = '<a href="manage_email_templates.php?action=edit&template='.$templateUrl.'&language='.$languageCodeUrl.'&html=true">';
-        $markup .= '<i class="fa fa-html5" style="font-size: 1.5em" data-toggle="tooltip" title="'.$hesklang['edit_html_template'].'"></i>';
+        $markup .= '<i class="fa fa-html5 font-size-150" data-toggle="tooltip" title="'.$hesklang['edit_html_template'].'"></i>';
         $markup .= '</a>';
         return $markup;
     } else {
         $markup = '<a href="manage_email_templates.php?action=edit&template='.$templateUrl.'&language='.$languageCodeUrl.'&html=false">';
-        $markup .= '<i class="fa fa-file-text-o" style="font-size: 1.5em" data-toggle="tooltip" title="'.$hesklang['edit_plain_text_template'].'"></i>';
+        $markup .= '<i class="fa fa-file-text-o font-size-150" data-toggle="tooltip" title="'.$hesklang['edit_plain_text_template'].'"></i>';
         $markup .= '</a>';
         return $markup;
     }
diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php
index 81cac7bd..97a407b0 100644
--- a/admin/manage_knowledgebase.php
+++ b/admin/manage_knowledgebase.php
@@ -193,9 +193,9 @@ while (count($kb_cat) > 0)
 
 			// Generate KB menu icons
 			$menu_icons =
-			'<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$my.'" onclick="document.getElementById(\'option'.$j.'\').selected=true;return true;"><i class="fa fa-plus" style="color: green;font-size:16px"></i></a>  '
-			.'<a href="manage_knowledgebase.php?a=add_category&amp;parent='.$my.'" onclick="document.getElementById(\'option'.$j.'_2\').selected=true;return true;"><i class="fa fa-caret-right" style="font-size:18px; color:blue"></i></a>  '
-			.'<a href="manage_knowledgebase.php?a=manage_cat&amp;catid='.$my.'"><i class="fa fa-gear" style="font-size: 16px;color: gray"></i></a> '
+			'<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$my.'" onclick="document.getElementById(\'option'.$j.'\').selected=true;return true;"><i class="fa fa-plus font-size-16p green" ></i></a>  '
+			.'<a href="manage_knowledgebase.php?a=add_category&amp;parent='.$my.'" onclick="document.getElementById(\'option'.$j.'_2\').selected=true;return true;"><i class="fa fa-caret-right font-size-16p blue"></i></a>  '
+			.'<a href="manage_knowledgebase.php?a=manage_cat&amp;catid='.$my.'"><i class="fa fa-gear font-size-16p gray"></i></a> '
 			;
 
 			// Can this category be moved up?
@@ -205,7 +205,7 @@ while (count($kb_cat) > 0)
             }
             else
             {
-				$menu_icons .= '<a href="manage_knowledgebase.php?a=order_cat&amp;catid='.$my.'&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up" style="font-size:16px;color:green"></i></a> ';
+				$menu_icons .= '<a href="manage_knowledgebase.php?a=order_cat&amp;catid='.$my.'&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up font-size-16p green"></i></a> ';
 			}
 
 			// Can this category be moved down?
@@ -215,7 +215,7 @@ while (count($kb_cat) > 0)
             }
             else
             {
-				$menu_icons .= '<a href="manage_knowledgebase.php?a=order_cat&amp;catid='.$my.'&amp;move=15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-down" style="color:green;font-size:16px"></i></a> ';
+				$menu_icons .= '<a href="manage_knowledgebase.php?a=order_cat&amp;catid='.$my.'&amp;move=15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-down font-size-16p green"></i></a> ';
 			}
 
             if (isset($node[$up]))
@@ -268,7 +268,7 @@ if (!isset($_SESSION['hide']['treemenu']))
 {
 	?>
     <div class="row"><div class="col-md-10 col-md-offset-1">
-	<h3><?php echo $hesklang['kb']; ?> <a href="javascript:void(0)" onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['kb_intro']); ?>')"><i class="fa fa-question-circle settingsquestionmark" style="font-size:20px"></i></a></h3>
+	<h3><?php echo $hesklang['kb']; ?> <a href="javascript:void(0)" onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['kb_intro']); ?>')"><i class="fa fa-question-circle settingsquestionmark font-size-20p"></i></a></h3>
     <div class="footerWithBorder blankSpace"></div>
 
 	<!-- SUB NAVIGATION -->
@@ -292,8 +292,8 @@ if (!isset($_SESSION['hide']['treemenu']))
 	<p>
     <i class="fa fa-search"></i> <a href="manage_knowledgebase.php?a=list_private"><?php echo $hesklang['listp']; ?></a><br >
     <i class="fa fa-search"></i> <a href="manage_knowledgebase.php?a=list_draft"><?php echo $hesklang['listd']; ?></a><br />
-    <i class="fa fa-gear" style="font-size: 16px;color: gray"></i> <a href="manage_knowledgebase.php?a=update_count"><?php echo $hesklang['uac']; ?></a><br />
-    <i class="fa fa-globe" style="font-size:16px"></i> <a href="http://support.mozilla.com/en-US/kb/how-to-write-knowledge-base-articles" rel="nofollow" target="_blank"><?php echo $hesklang['goodkb']; ?></a></p>
+    <i class="fa fa-gear font-size-16p gray"></i> <a href="manage_knowledgebase.php?a=update_count"><?php echo $hesklang['uac']; ?></a><br />
+    <i class="fa fa-globe font-size-16p"></i> <a href="http://support.mozilla.com/en-US/kb/how-to-write-knowledge-base-articles" rel="nofollow" target="_blank"><?php echo $hesklang['goodkb']; ?></a></p>
 
 	&nbsp;<br />
 
@@ -352,13 +352,13 @@ if (!isset($_SESSION['hide']['new_article']))
         <?php
     }
     ?>
-    <h3 style="margin-left:10px;"><a name="new_article"></a><?php echo $hesklang['new_kb_art']; ?></h3>
-    <div class="footerWithBorder blankSpace" style="margin-left:10px; margin-right:10px"></div>
+    <h3 class="move-right-10"><a name="new_article"></a><?php echo $hesklang['new_kb_art']; ?></h3>
+    <div class="footerWithBorder blankSpace move-right-10 move-left-10"></div>
 
     <form action="manage_knowledgebase.php" role="form" method="post" name="form1" enctype="multipart/form-data">
         <div class="row">
             <div class="col-md-3">
-                <div class="panel panel-default" style="margin-left:10px">
+                <div class="panel panel-default move-right-10">
                     <div class="panel-heading"><?php echo $hesklang['information']; ?></div>
                     <div class="panel-body">
                         <div class="form-group">
@@ -414,11 +414,11 @@ if (!isset($_SESSION['hide']['new_article']))
                 <p><textarea class="form-control" name="content" rows="25" cols="70" id="content"><?php if (isset($_SESSION['new_article']['content'])) {echo $_SESSION['new_article']['content'];} ?></textarea></p>
             </div>
             <div class="col-md-3">
-                <div class="panel panel-default" style="margin-right: 10px">
+                <div class="panel panel-default move-left-10">
                     <div class="panel-body">
                         <div class="form-group">
                             <label for="keywords" class="control-label"><?php echo $hesklang['kw']; ?></label>
-                            <p style="font-size: .9em" class="form-control-static"><?php echo $hesklang['kw1']; ?></p><br/>
+                            <p class="font-size-90 form-control-static"><?php echo $hesklang['kw1']; ?></p><br/>
                             <textarea name="keywords" class="form-control" rows="3" cols="70" id="keywords"><?php if (isset($_SESSION['new_article']['keywords'])) {echo $_SESSION['new_article']['keywords'];} ?></textarea>
                         </div>
                         <div class="form-group">
@@ -491,7 +491,7 @@ if (!isset($_SESSION['hide']['new_category']))
 	<!-- SUB NAVIGATION -->
 
     <div class="row">
-        <div class="col-md-4" style="margin-left:40px">
+        <div class="col-md-4 move-right-40">
 		    <?php
                 /* Show the treemenu? */
                 if (isset($_SESSION['hide']['cat_treemenu']))
@@ -500,7 +500,7 @@ if (!isset($_SESSION['hide']['new_category']))
                 }
             ?>
 	    </div>
-        <div class="col-md-7" style="margin-right:20px">
+        <div class="col-md-7 move-left-20">
             <form action="manage_knowledgebase.php" class="form-horizontal" method="post" role="form" name="form2">
                 <h3><a name="new_category"></a><?php echo $hesklang['kb_cat_new']; ?></h3>
                 <div class="footerWithBorder blankSpace"></div>
@@ -592,16 +592,16 @@ function list_draft() {
 
     if ($num == 0)
     {
-    	echo '<p style="margin-left:40px">'.$hesklang['kb_no_dart'].' &nbsp; <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><i class="fa fa-plus"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><b>'.$hesklang['kb_i_art2'].'</b></a></p>';
+    	echo '<p class="move-right-40">'.$hesklang['kb_no_dart'].' &nbsp; <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><i class="fa fa-plus"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><b>'.$hesklang['kb_i_art2'].'</b></a></p>';
     }
     else
     {
     	?>
-        <div style="float:right">
-	        <?php echo '<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><i class="fa fa-plus" style="color: green;font-size:16px"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><b>'.$hesklang['kb_i_art2'].'</b></a>'; ?>
+        <div class="nu-floatRight">
+	        <?php echo '<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><i class="fa fa-plus font-size-16p green"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><b>'.$hesklang['kb_i_art2'].'</b></a>'; ?>
 	    </div>
 
-	    <h3 style="padding-bottom:5px;">&raquo; <?php echo $hesklang['artd']; ?></h3>
+	    <h3 class="pad-up-5">&raquo; <?php echo $hesklang['artd']; ?></h3>
 
 		<div align="center">
 		<table border="0" width="100%" cellspacing="1" cellpadding="3" class="white">
@@ -645,9 +645,9 @@ function list_draft() {
 			<td class="<?php echo $color; ?>"><?php echo $j; ?>.</td>
 			<td class="<?php echo $color; ?>"><?php echo $article['subject']; ?></td>
             <td class="<?php echo $color; ?>"><?php echo $kb_cat[$article['catid']]; ?></td>
-            <td class="<?php echo $color; ?>" style="text-align:center; white-space:nowrap;">
+            <td class="<?php echo $color; ?> text-center" style="white-space:nowrap;">
             <a href="knowledgebase_private.php?article=<?php echo $article['id']; ?>&amp;back=1<?php if ($article['type'] == 2) {echo '&amp;draft=1';} ?>" target="_blank"><img src="../img/article_text.png" width="16" height="16" alt="<?php echo $hesklang['viewart']; ?>" title="<?php echo $hesklang['viewart']; ?>" <?php echo $style; ?> /></a>
-            <a href="manage_knowledgebase.php?a=edit_article&amp;id=<?php echo $article['id']; ?>"><i class="fa fa-pencil" style="color:orange;font-size:16px"></i></a>
+            <a href="manage_knowledgebase.php?a=edit_article&amp;id=<?php echo $article['id']; ?>"><i class="fa fa-pencil icon-link orange"></i></a>
             <a href="manage_knowledgebase.php?a=remove_article&amp;id=<?php echo $article['id']; ?>&amp;token=<?php hesk_token_echo(); ?>" onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_art']); ?>');"><img src="../img/delete.png" width="16" height="16" alt="<?php echo $hesklang['delete']; ?>" title="<?php echo $hesklang['delete']; ?>" <?php echo $style; ?> /></a>&nbsp;</td>
 			</tr>
             <?php
@@ -717,13 +717,13 @@ function list_private() {
 
     if ($num == 0)
     {
-    	echo '<p style="margin-left:40px">'.$hesklang['kb_no_part'].' &nbsp; <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=1"><i class="fa fa-plus"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=1"><b>'.$hesklang['kb_i_art2'].'</b></a></p>';
+    	echo '<p class="move-right-40">'.$hesklang['kb_no_part'].' &nbsp; <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=1"><i class="fa fa-plus"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=1"><b>'.$hesklang['kb_i_art2'].'</b></a></p>';
     }
     else
     {
     	?>
-        <div style="float:right">
-	        <?php echo '<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=1"><i class="fa fa-plus" style="color: green;font-size:16px"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=1"><b>'.$hesklang['kb_i_art2'].'</b></a>'; ?>
+        <div class="nu-floatRight">
+	        <?php echo '<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=1"><i class="fa fa-plus icon-link green"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=1"><b>'.$hesklang['kb_i_art2'].'</b></a>'; ?>
 	    </div>
 
 	    <h3 style="padding-bottom:5px;">&raquo; <?php echo $hesklang['artp']; ?></h3>
@@ -792,9 +792,9 @@ function list_private() {
             <td class="<?php echo $color; ?>"><?php echo $kb_cat[$article['catid']]; ?></td>
             <td class="<?php echo $color; ?>"><?php echo $article['views']; ?></td>
             <?php echo $rat; ?>
-            <td class="<?php echo $color; ?>" style="text-align:center; white-space:nowrap;">
+            <td class="<?php echo $color; ?> text-center">
             <a href="knowledgebase_private.php?article=<?php echo $article['id']; ?>&amp;back=1<?php if ($article['type'] == 2) {echo '&amp;draft=1';} ?>" target="_blank"><img src="../img/article_text.png" width="16" height="16" alt="<?php echo $hesklang['viewart']; ?>" title="<?php echo $hesklang['viewart']; ?>" <?php echo $style; ?> /></a>
-            <a href="manage_knowledgebase.php?a=edit_article&amp;id=<?php echo $article['id']; ?>"><i class="fa fa-pencil" style="color:orange;font-size:16px"></i></a>
+            <a href="manage_knowledgebase.php?a=edit_article&amp;id=<?php echo $article['id']; ?>"><i class="fa fa-pencil icon-link orange"></i></a>
             <a href="manage_knowledgebase.php?a=remove_article&amp;id=<?php echo $article['id']; ?>&amp;token=<?php hesk_token_echo(); ?>" onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_art']); ?>');"><img src="../img/delete.png" width="16" height="16" alt="<?php echo $hesklang['delete']; ?>" title="<?php echo $hesklang['delete']; ?>" <?php echo $style; ?> /></a>&nbsp;</td>
 			</tr>
             <?php
@@ -1326,14 +1326,14 @@ function edit_article()
         <li class="active"><?php echo $hesklang['kb_art_edit']; ?></li>
     </ol>
 
-    <h3 style="margin-left:10px"><?php echo $hesklang['kb_art_edit']; ?></h3>
-    <div class="footerWithBorder blankSpace" style="margin-left:10px; margin-right:10px"></div>
+    <h3 class="move-right-10"><?php echo $hesklang['kb_art_edit']; ?></h3>
+    <div class="footerWithBorder blankSpace move-right-10 move-left-10"></div>
 
 
     <form action="manage_knowledgebase.php" role="form" method="post" name="form1" enctype="multipart/form-data">
         <div class="row">
             <div class="col-md-3">
-                <div class="panel panel-default" style="margin-left:10px">
+                <div class="panel panel-default move-right-10">
                     <div class="panel-heading"><?php echo $hesklang['information']; ?></div>
                     <div class="panel-body">
                         <div class="form-group">
@@ -1412,11 +1412,11 @@ function edit_article()
                 <textarea name="content" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['kb_content']); ?>" rows="25" cols="70" id="content"><?php echo $article['content']; ?></textarea>
             </div>
             <div class="col-md-3">
-                <div class="panel panel-default" style="margin-right:10px">
+                <div class="panel panel-default move-left-10">
                     <div class="panel-body">
                         <div class="form-group">
                             <label for="keywords" class="control-label"><?php echo $hesklang['kw']; ?></label>
-                            <p style="font-size: .9em" class="form-control-static"><?php echo $hesklang['kw1']; ?></p><br>
+                            <p class="font-size-90 form-control-static"><?php echo $hesklang['kw1']; ?></p><br>
                             <textarea name="keywords" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['kw']); ?>" rows="3" cols="70" id="keywords"><?php echo $article['keywords']; ?></textarea>
                         </div>
                         <div class="form-group">
@@ -1459,7 +1459,7 @@ function edit_article()
     </form>
 
     <div class="row">
-        <div class="col-md-12" style="margin-left:10px;margin-right:10px">
+        <div class="col-md-12 move-left-10 move-right-10">
             <h3><?php echo $hesklang['revhist']; ?></h3>
             <div class="footerWithBorder blankSpace"></div>
 
@@ -1587,7 +1587,7 @@ function manage_category() {
     {
     ?>
 
-    <h3 style="margin-left:40px"><?php echo $hesklang['category']; ?>: <span class="black"><?php echo $this_cat['name']; ?></span></h3>
+    <h3 class="move-right-40"><?php echo $hesklang['category']; ?>: <span class="black"><?php echo $this_cat['name']; ?></span></h3>
 
 
     &nbsp;<br />
@@ -1601,7 +1601,7 @@ function manage_category() {
     <div class="row">
         <?php if ($catid != 1): ?>
         <div class="col-md-4">
-            <div style="margin-left:25px">
+            <div class="move-right-25">
                 <div class="panel panel-default">
                     <div class="panel-heading"><?php echo $hesklang['catset']; ?></div>
                     <div class="panel-body">
@@ -1641,7 +1641,7 @@ function manage_category() {
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" style="text-align:center">
+                            <div class="form-group text-center">
                                 <input type="hidden" name="a" value="edit_category" />
                                 <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
                                 <input type="hidden" name="catid" value="<?php echo $catid; ?>" />
@@ -1658,7 +1658,7 @@ function manage_category() {
     <?php
     if ($num == 0)
     {
-    	echo '<p>'.$hesklang['kb_no_art'].' &nbsp; <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><i class="fa fa-plus" style="color: green;font-size:16px"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><b>'.$hesklang['kb_i_art2'].'</b></a></p>';
+    	echo '<p>'.$hesklang['kb_no_art'].' &nbsp; <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><i class="fa fa-plus icon-link green"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><b>'.$hesklang['kb_i_art2'].'</b></a></p>';
     }
     else
     {
@@ -1669,7 +1669,7 @@ function manage_category() {
 		$num_nosticky = $num - $num_sticky;
 
     	?>
-                <h3><?php echo $hesklang['kb_cat_art']; ?> <small style="float:right"><?php echo '<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><i class="fa fa-plus"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><b>'.$hesklang['kb_i_art2'].'</b></a>'; ?></small></h3>
+                <h3><?php echo $hesklang['kb_cat_art']; ?> <small class="nu-floatRight"><?php echo '<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><i class="fa fa-plus"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><b>'.$hesklang['kb_i_art2'].'</b></a>'; ?></small></h3>
                 <div class="footerWithBorder blankSpace"></div>
 
                 <table class="table table-striped">
@@ -1761,21 +1761,21 @@ function manage_category() {
                         {
                         ?>
                             <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />
-                            <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-down" style="color:green;font-size:16px" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_dn']; ?>"></i></a>
+                            <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_dn']; ?>"></i></a>
                         <?php
                         }
                         elseif ($k == $num)
                         {
                         ?>
-                            <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-up" style="font-size:16px;color:green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_up']; ?>"></i></a>
+                            <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_up']; ?>"></i></a>
                             <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />
                         <?php
                         }
                         else
                         {
                         ?>
-                            <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-up" style="font-size:16px;color:green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_up']; ?>"></i></a>
-                            <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-down" style="color:green;font-size:16px" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_dn'] ?>"></i></a>
+                            <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_up']; ?>"></i></a>
+                            <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_dn'] ?>"></i></a>
                         <?php
                         }
                     }
@@ -1784,10 +1784,10 @@ function manage_category() {
                         echo '<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;vertical-align:text-bottom;" /> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;vertical-align:text-bottom;" />';
                     }
                     ?>
-                    <a href="manage_knowledgebase.php?a=sticky&amp;s=<?php echo $article['sticky'] ? 0 : 1 ?>&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-exclamation-triangle" style="font-size:16px;color:<?php if ( ! $article['sticky']) {echo 'gray';} else {echo 'orange';} ?>" data-toggle="tooltip" data-placement="top" title="<?php if (!$article['sticky']) {echo $hesklang['stickyon'];} else {echo $hesklang['stickyoff'];} ?>"></i></a>
-                    <a href="knowledgebase_private.php?article=<?php echo $article['id']; ?>&amp;back=1<?php if ($article['type'] == 2) {echo '&amp;draft=1';} ?>" target="_blank"><i class="fa fa-file-o" style="font-size:16px" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['viewart'] ?>"></i></a>
+                    <a href="manage_knowledgebase.php?a=sticky&amp;s=<?php echo $article['sticky'] ? 0 : 1 ?>&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-exclamation-triangle icon-link" style="color:<?php if ( ! $article['sticky']) {echo 'gray';} else {echo 'orange';} ?>" data-toggle="tooltip" data-placement="top" title="<?php if (!$article['sticky']) {echo $hesklang['stickyon'];} else {echo $hesklang['stickyoff'];} ?>"></i></a>
+                    <a href="knowledgebase_private.php?article=<?php echo $article['id']; ?>&amp;back=1<?php if ($article['type'] == 2) {echo '&amp;draft=1';} ?>" target="_blank"><i class="fa fa-file-o icon-link" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['viewart'] ?>"></i></a>
                     <a href="manage_knowledgebase.php?a=edit_article&amp;id=<?php echo $article['id']; ?>"><i class="fa fa-pencil" style="color:orange;font-size:16px" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['edit'] ?>"></i></a>
-                    <a href="manage_knowledgebase.php?a=remove_article&amp;id=<?php echo $article['id']; ?>&amp;token=<?php hesk_token_echo(); ?>" onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_art']); ?>');"><i class="fa fa-times" style="font-size:16px;color:red" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['delete'] ?>"></i></a>&nbsp;</td>
+                    <a href="manage_knowledgebase.php?a=remove_article&amp;id=<?php echo $article['id']; ?>&amp;token=<?php hesk_token_echo(); ?>" onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_art']); ?>');"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['delete'] ?>"></i></a>&nbsp;</td>
                     </tr>
                     <?php
                     $j++;
@@ -2128,9 +2128,9 @@ function show_treeMenu() {
 
 	&nbsp;<br />
 
-	<i class="fa fa-plus" style="color: green;font-size:16px"></i> = <?php echo $hesklang['kb_p_art2']; ?><br />
-	<i class="fa fa-caret-right" style="font-size:18px; color:blue"></i> = <?php echo $hesklang['kb_p_cat2']; ?><br />
-	<i class="fa fa-gear" style="font-size: 16px;color: gray"></i> = <?php echo $hesklang['kb_p_man2']; ?><br />
+	<i class="fa fa-plus icon-link green"></i> = <?php echo $hesklang['kb_p_art2']; ?><br />
+	<i class="fa fa-caret-right blue" style="font-size:18px"></i> = <?php echo $hesklang['kb_p_cat2']; ?><br />
+	<i class="fa fa-gear icon-link gray"></i> = <?php echo $hesklang['kb_p_man2']; ?><br />
     <img src="../img/blank.gif" width="1" height="16" alt="" style="padding:1px" class="optionWhiteNbOFF" />(<span class="kb_published">1</span>, <span class="kb_private">2</span>, <span class="kb_draft">3</span>) = <?php echo $hesklang['xyz']; ?></span><br />
     <?php
 }
@@ -2146,9 +2146,9 @@ function show_subnav($hide='',$catid=1)
 		$catid = intval($_SESSION['KB_CATEGORY']);
 	}
 
-    $link['view'] = '<a href="knowledgebase_private.php"><i class="fa fa-search" style="font-size:16px"></i></a> <a href="knowledgebase_private.php">'.$hesklang['gopr'].'</a> | ';
-    $link['newa'] = '<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><i class="fa fa-plus" style="color: green;font-size:16px"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'">'.$hesklang['kb_i_art'].'</a> | ';
-    $link['newc'] = '<a href="manage_knowledgebase.php?a=add_category&amp;parent='.$catid.'"><i class="fa fa-caret-right" style="font-size:18px; color:blue"></i></a> <a href="manage_knowledgebase.php?a=add_category&amp;parent='.$catid.'">'.$hesklang['kb_i_cat'].'</a> | ';
+    $link['view'] = '<a href="knowledgebase_private.php"><i class="fa fa-search icon-link"></i></a> <a href="knowledgebase_private.php">'.$hesklang['gopr'].'</a> | ';
+    $link['newa'] = '<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><i class="fa fa-plus icon-link green"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'">'.$hesklang['kb_i_art'].'</a> | ';
+    $link['newc'] = '<a href="manage_knowledgebase.php?a=add_category&amp;parent='.$catid.'"><i class="fa fa-caret-right blue" style="font-size:18px"></i></a> <a href="manage_knowledgebase.php?a=add_category&amp;parent='.$catid.'">'.$hesklang['kb_i_cat'].'</a> | ';
 
     if ($hide && isset($link[$hide]))
     {
@@ -2157,20 +2157,20 @@ function show_subnav($hide='',$catid=1)
     }
 	?>
 
-	<form style="margin-left:40px;padding:0px;" method="get" action="manage_knowledgebase.php">
+	<form class="move-right-40" style="padding:0px;" method="get" action="manage_knowledgebase.php">
     <p>
     <?php
     echo $link['view'];
     echo $link['newa'];
     echo $link['newc'];
     ?>
-	<i class="fa fa-pencil" style="color:orange;font-size:16px"></i></a> <input type="hidden" name="a" value="edit_article" /><?php echo $hesklang['aid']; ?>: <input type="text" name="id" size="3" /> <input type="submit" value="<?php echo $hesklang['edit']; ?>" class="btn btn-default btn-xs" />
+	<i class="fa fa-pencil icon-link orange"></i></a> <input type="hidden" name="a" value="edit_article" /><?php echo $hesklang['aid']; ?>: <input type="text" name="id" size="3" /> <input type="submit" value="<?php echo $hesklang['edit']; ?>" class="btn btn-default btn-xs" />
     </p>
 	</form>
 
     &nbsp;<br />
 
-<div style="margin-left:40px;margin-right:20px">
+<div class="move-right-40 move-left-20">
 
 	<?php
 
diff --git a/admin/manage_permission_templates.php b/admin/manage_permission_templates.php
index 70ef0e23..1849f1b2 100644
--- a/admin/manage_permission_templates.php
+++ b/admin/manage_permission_templates.php
@@ -90,7 +90,7 @@ else {return false;}
         array_push($categories, $row);
     }
 ?>
-<div class="row" style="margin-top: 20px">
+<div class="row move-down-20">
     <div class="col-md-10 col-md-offset-1">
         <h3><?php echo $hesklang['manage_permission_templates']; ?> 
 			<i class="fa fa-question-circle settingsquestionmark" data-toggle="tooltip" data-placement="right" 
diff --git a/admin/manage_statuses.php b/admin/manage_statuses.php
index 4360ad57..4222cb23 100644
--- a/admin/manage_statuses.php
+++ b/admin/manage_statuses.php
@@ -38,7 +38,7 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
 
-<div class="row" style="padding: 20px">
+<div class="row pad-20">
     <ul class="nav nav-tabs" role="tablist">
         <?php
         // Show a link to banned_emails.php if user has permission
@@ -96,7 +96,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         <div class="panel-heading">
                             <h4>
                                 <?php echo $hesklang['statuses']; ?>
-                                <span class="nu-floatRight" style="margin-top: -7px">
+                                <span class="nu-floatRight panel-buton">
                                     <button class="btn btn-success" data-toggle="modal" data-target="#modal-status-new">
                                         <i class="fa fa-plus-circle"></i>
                                         <?php
@@ -121,7 +121,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             foreach ($statuses as $key => $row):
                             ?>
                                 <tr id="s<?php echo $row['ID']; ?>_row">
-                                    <td style="color: <?php echo $row['TextColor']; ?>; font-weight: bold">
+                                    <td class="bold" style="color: <?php echo $row['TextColor']; ?>">
                                         <?php echo $row['text']; ?>
                                     </td>
                                     <td>
@@ -140,13 +140,13 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                     <td>
                                         <?php
                                         if ($row['IsClosed']) {
-                                            echo '<i class="fa fa-check-circle icon-link" style="color: green;"></i>';
+                                            echo '<i class="fa fa-check-circle icon-link green"></i>';
                                         }
                                         ?>
                                     </td>
                                     <td>
                                         <span data-toggle="modal" data-target="#modal-status-<?php echo $row['ID']; ?>" style="cursor: pointer;">
-                                            <i class="fa fa-pencil icon-link" style="color: orange"
+                                            <i class="fa fa-pencil icon-link orange"
                                                data-toggle="tooltip" title="<?php echo $hesklang['edit']; ?>"></i>
                                         </span>
                                         <?php echoArrows($j, $numberOfStatuses, $row['ID'], $modsForHesk_settings); ?>
@@ -390,7 +390,7 @@ function echoArrows($index, $numberOfStatuses, $statusId, $modsForHesk_settings)
     if ($index !== 1) {
         // Display move up
         echo '<a href="manage_statuses.php?a=sort&move=-15&id='.$statusId.'">
-            <i class="fa fa-arrow-up icon-link" style="color: green" data-toggle="tooltip"
+            <i class="fa fa-arrow-up icon-link green" data-toggle="tooltip"
             title="'.htmlspecialchars($hesklang['move_up']).'"></i></a> ';
     } else {
         echo '<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;"> ';
@@ -399,7 +399,7 @@ function echoArrows($index, $numberOfStatuses, $statusId, $modsForHesk_settings)
     if ($index !== $numberOfStatuses) {
         // Display move down
         echo '<a href="manage_statuses.php?a=sort&move=15&id='.$statusId.'">
-            <i class="fa fa-arrow-down icon-link" style="color: green" data-toggle="tooltip"
+            <i class="fa fa-arrow-down icon-link green" data-toggle="tooltip"
             title="'.htmlspecialchars($hesklang['move_dn']).'"></i></a>';
     } else {
         echo '<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;">';
diff --git a/admin/manage_ticket_templates.php b/admin/manage_ticket_templates.php
index ad699b45..5f040082 100644
--- a/admin/manage_ticket_templates.php
+++ b/admin/manage_ticket_templates.php
@@ -99,7 +99,7 @@ $i=1;
 $j=0;
 $num = hesk_dbNumRows($result);
 ?>
-<div class="row" style="margin-top: 20px;">
+<div class="row move-down-20">
     <div class="col-md-4">
         <div class="panel panel-default">
             <div class="panel-heading">
@@ -146,7 +146,7 @@ $num = hesk_dbNumRows($result);
                             echo '
                                     <tr>
                                     <td>'.$mysaved['title'].'</td>
-                                    <td style="text-align:left;">
+                                    <td class="text-left">
                                     ';
 
                             if ($num > 1)
@@ -155,17 +155,17 @@ $num = hesk_dbNumRows($result);
                                 {
                                     echo'<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />
                                         <a href="manage_ticket_templates.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'">
-                                            <i class="fa fa-arrow-down" style="font-size:16px;color:green;" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['move_dn'].'"></i></a>';
+                                            <i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['move_dn'].'"></i></a>';
                                 }
                                 elseif ($j == $num)
                                 {
-                                    echo'<a href="manage_ticket_templates.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-up" style="font-size:16px;color:green;" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['move_up'].'"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
+                                    echo'<a href="manage_ticket_templates.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['move_up'].'"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
                                 }
                                 else
                                 {
                                     echo'
-                                        <a href="manage_ticket_templates.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-up" style="font-size:16px;color:green;" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['move_up'].'"></i></a>
-                                        <a href="manage_ticket_templates.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-down" style="font-size:16px;color:green;" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['move_dn'].'"></i></a>
+                                        <a href="manage_ticket_templates.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['move_up'].'"></i></a>
+                                        <a href="manage_ticket_templates.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['move_dn'].'"></i></a>
                                         ';
                                 }
                             }
@@ -175,7 +175,7 @@ $num = hesk_dbNumRows($result);
                             }
 
                             echo '
-                                    <a href="manage_ticket_templates.php?a=remove&amp;id='.$mysaved['id'].'&amp;token='.hesk_token_echo(0).'" onclick="return confirm_delete();"><i class="fa fa-times" style="font-size:16px;color:red;" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['delete'].'"></i></a></td>
+                                    <a href="manage_ticket_templates.php?a=remove&amp;id='.$mysaved['id'].'&amp;token='.hesk_token_echo(0).'" onclick="return confirm_delete();"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" data-original-title="'.$hesklang['delete'].'"></i></a></td>
                                     </tr>
                                     ';
                         } // End while
diff --git a/admin/manage_users.php b/admin/manage_users.php
index a6f78c95..598b000b 100644
--- a/admin/manage_users.php
+++ b/admin/manage_users.php
@@ -176,7 +176,7 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
 
-<div style="margin-top: 20px" class="row">
+<div class="row move-down-20">
     <div class="col-md-10 col-md-offset-1">
          <script language="Javascript" type="text/javascript"><!--
             function confirm_delete()
@@ -247,24 +247,24 @@ while ($myuser = hesk_dbFetchAssoc($res))
 	{
     	if (isset($hesk_settings['users_online'][$myuser['id']]))
         {
-			$myuser['name'] = '<i style="color: green" class="fa fa-circle" data-toggle="tooltip" data-placement="top" title="'.$hesklang['online'].'"></i> ' . $myuser['name'];
+			$myuser['name'] = '<i class="fa fa-circle green" data-toggle="tooltip" data-placement="top" title="'.$hesklang['online'].'"></i> ' . $myuser['name'];
         }
         else
         {
-			$myuser['name'] = '<i style="color: gray" class="fa fa-circle" data-toggle="tooltip" data-placement="top" title="'.$hesklang['offline'].'"></i> ' . $myuser['name'];
+			$myuser['name'] = '<i class="fa fa-circle gray" data-toggle="tooltip" data-placement="top" title="'.$hesklang['offline'].'"></i> ' . $myuser['name'];
         }
 	}
 
 	/* To edit yourself go to "Profile" page, not here. */
     if ($myuser['id'] == $_SESSION['id'])
     {
-    	$edit_code = '<a href="profile.php"><i style="font-size: 16px" class="fa fa-pencil" data-toggle="tooltip" data-placement="top" title="'.$hesklang['edit'].'"></i></a>';
+    	$edit_code = '<a href="profile.php"><i class="fa fa-pencil icon-link" data-toggle="tooltip" data-placement="top" title="'.$hesklang['edit'].'"></i></a>';
     } elseif ($myuser['id'] == 1)
     {
         $edit_code = ' <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
     } else
     {
-    	$edit_code = '<a href="manage_users.php?a=edit&amp;id='.$myuser['id'].'"><i style="font-size: 16px" class="fa fa-pencil" data-toggle="tooltip" data-placement="top" title="'.$hesklang['edit'].'"></i></a>';
+    	$edit_code = '<a href="manage_users.php?a=edit&amp;id='.$myuser['id'].'"><i class="fa fa-pencil icon-link" data-toggle="tooltip" data-placement="top" title="'.$hesklang['edit'].'"></i></a>';
     }
 
     if ($myuser['isadmin'])
@@ -282,7 +282,7 @@ while ($myuser = hesk_dbFetchAssoc($res))
         $remove_code = ' <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
     } else
     {
-        $remove_code = ' <a href="manage_users.php?a=remove&amp;id='.$myuser['id'].'&amp;token='.hesk_token_echo(0).'" onclick="return confirm_delete();"><i style="font-size: 16px; color: red" class="fa fa-times" data-toggle="tooltip" data-placement="top" title="'.$hesklang['delete'].'"></i></a>';
+        $remove_code = ' <a href="manage_users.php?a=remove&amp;id='.$myuser['id'].'&amp;token='.hesk_token_echo(0).'" onclick="return confirm_delete();"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" title="'.$hesklang['delete'].'"></i></a>';
     }
 
 	/* Is auto assign enabled? */
@@ -290,11 +290,11 @@ while ($myuser = hesk_dbFetchAssoc($res))
     {
     	if ($myuser['autoassign'])
         {
-			$autoassign_code = '<a href="manage_users.php?a=autoassign&amp;s=0&amp;id='.$myuser['id'].'&amp;token='.hesk_token_echo(0).'"><i style="color: orange; font-size: 16px" class="fa fa-bolt" data-toggle="tooltip" data-placement="top" title="'.$hesklang['aaon'].'"></i></a>';
+			$autoassign_code = '<a href="manage_users.php?a=autoassign&amp;s=0&amp;id='.$myuser['id'].'&amp;token='.hesk_token_echo(0).'"><i class="fa fa-bolt icon-link orange" data-toggle="tooltip" data-placement="top" title="'.$hesklang['aaon'].'"></i></a>';
         }
         else
         {
-			$autoassign_code = '<a href="manage_users.php?a=autoassign&amp;s=1&amp;id='.$myuser['id'].'&amp;token='.hesk_token_echo(0).'"><i style="color: gray; font-size: 16px" class="fa fa-bolt" data-toggle="tooltip" data-placement="top" title="'.$hesklang['aaoff'].'"></i></a>';
+			$autoassign_code = '<a href="manage_users.php?a=autoassign&amp;s=1&amp;id='.$myuser['id'].'&amp;token='.hesk_token_echo(0).'"><i class="fa fa-bolt icon-link gray" data-toggle="tooltip" data-placement="top" title="'.$hesklang['aaoff'].'"></i></a>';
         }
     }
     else
@@ -306,9 +306,9 @@ while ($myuser = hesk_dbFetchAssoc($res))
     if ($myuser['id'] != $_SESSION['id'] && $myuser['id'] != 1) {
         /* Is the user active? */
         if ($myuser['active']) {
-            $activeMarkup = '<a href="manage_users.php?a=active&amp;s=0&amp;id=' . $myuser['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i style="color: green; font-size: 16px" class="fa fa-user" data-toggle="tooltip" data-placement="top" title="' . $hesklang['disable_user'] . '"></i></a>';
+            $activeMarkup = '<a href="manage_users.php?a=active&amp;s=0&amp;id=' . $myuser['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-user icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['disable_user'] . '"></i></a>';
         } else {
-            $activeMarkup = '<a href="manage_users.php?a=active&amp;s=1&amp;id=' . $myuser['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i style="color: gray; font-size: 16px" class="fa fa-user" data-toggle="tooltip" data-placement="top" title="' . $hesklang['enable_user'] . '"></i></a>';
+            $activeMarkup = '<a href="manage_users.php?a=active&amp;s=1&amp;id=' . $myuser['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-user icon-link gray" data-toggle="tooltip" data-placement="top" title="' . $hesklang['enable_user'] . '"></i></a>';
         }
     }
 
@@ -345,7 +345,7 @@ EOC;
 </table>
 <?php if ($hesk_settings['online'])
 {
-    echo '&nbsp;&nbsp;&nbsp;<i style="color: green" class="fa fa-circle"></i> '.$hesklang['online'].' &nbsp;&nbsp;&nbsp; <i style="color: gray" class="fa fa-circle"></i> '.$hesklang['offline'];
+    echo '&nbsp;&nbsp;&nbsp;<i class="fa fa-circle green"></i> '.$hesklang['online'].' &nbsp;&nbsp;&nbsp; <i class="fa fa-circle gray"></i> '.$hesklang['offline'];
 }?>
     </div>
 </div>
@@ -481,7 +481,7 @@ function edit_user()
       <li class="active"><?php echo $hesklang['editing_user'].' '.$_SESSION['original_user']; ?></li>
     </ol>
     
-    <div class="row" style="padding-top: 20px">
+    <div class="row pad-down-20">
         <div class="col-md-8 col-md-offset-2">
         	<?php
 	        /* This will handle error, success and notice messages */
diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index 9c416f4d..67ffc1de 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -149,7 +149,7 @@ if (!$show['show']) {
   <li><a href="admin_main.php"><?php echo $hesk_settings['hesk_title']; ?></a></li>
   <li class="active"><?php echo $hesklang['nti2']; ?></li>
 </ol>
-    <div class="row" style="margin-top: 20px">
+    <div class="row move-down-20">
         <?php if ($columnWidth == 'col-md-8'): ?>
         <div class="col-md-4">
             <div class="panel panel-default">
diff --git a/admin/profile.php b/admin/profile.php
index 304d34b2..cc8f9af6 100644
--- a/admin/profile.php
+++ b/admin/profile.php
@@ -99,7 +99,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
 
 <div class="row">
-    <div class="col-md-8 col-md-offset-2" style="padding-top: 20px">
+    <div class="col-md-8 col-md-offset-2 pad-down-20">
         <?php
         /* This will handle error, success and notice messages */
         hesk_handle_messages();
diff --git a/admin/reports.php b/admin/reports.php
index 69ae1bf2..a10b2c2c 100644
--- a/admin/reports.php
+++ b/admin/reports.php
@@ -231,7 +231,7 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
 
-<div class="row" style="margin-top: 20px">
+<div class="row move-down-20">
     <div align="left" class="col-md-4">
         <div class="panel panel-default">
             <div class="panel-heading">
@@ -255,7 +255,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 <form action="reports.php" method="get" name="form1" role="form">
                     <div class="form-group">
                         <label for="dtrg" class="control-label"><?php echo $hesklang['dtrg']; ?></b>:</label>
-                        <div class="radio" style="margin-left: 20px">
+                        <div class="radio move-right-20">
                             <input type="radio" name="w" value="0" id="w0" <?php echo $selected['w'][0]; ?> />
                             <select name="time" onclick="document.getElementById('w0').checked = true" onfocus="document.getElementById('w0').checked = true" style="margin-top:5px;margin-bottom:5px;">
                                 <option value="1" <?php echo $selected['time'][1]; ?>><?php echo $hesklang['r1']; ?> (<?php echo $hesklang['d'.date('w')]; ?>)</option>
@@ -272,7 +272,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 <option value="12" <?php echo $selected['time'][12]; ?>><?php echo $hesklang['r12']; ?></option>
                             </select>
                         </div>
-                        <div class="radio" style="margin-left: 20px">
+                        <div class="radio move-right-20">
                             <input type="radio" name="w" value="1" id="w1" <?php echo $selected['w'][1]; ?> />
                             <?php echo $hesklang['from']; ?> <input type="text" name="datefrom" value="<?php echo $input_datefrom; ?>" id="datefrom" class="tcal" size="10" onclick="document.getElementById('w1').checked = true" onfocus="document.getElementById('w1').checked = true;this.focus;" />
                             <?php echo $hesklang['to']; ?> <input type="text" name="dateto" value="<?php echo $input_dateto; ?>" id="dateto" class="tcal" size="10" onclick="document.getElementById('w1').checked = true" onfocus="document.getElementById('w1').checked = true; this.focus;" />     
@@ -287,7 +287,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             <option value="4" <?php echo $selected['type'][4]; ?>><?php echo $hesklang['t4']; ?></option>
                         </select>    
                     </div>
-                    <div class="form-group" style="text-align: center">
+                    <div class="form-group text-center">
                         <input type="submit" value="<?php echo $hesklang['dire']; ?>" class="btn btn-default" />
                         <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />     
                     </div>         
diff --git a/admin/service_messages.php b/admin/service_messages.php
index 988dd776..be7bf4fc 100644
--- a/admin/service_messages.php
+++ b/admin/service_messages.php
@@ -70,7 +70,7 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
 
-<div class="row" style="padding: 20px">
+<div class="row pad-20">
     <ul class="nav nav-tabs" role="tablist">
         <?php
         // Show a link to banned_emails.php if user has permission to do so
@@ -244,14 +244,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                                     ?>
                                                     <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />
                                                     <a href="service_messages.php?a=order_sm&amp;id=<?php echo $sm['id']; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>">
-                                                        <i class="fa fa-arrow-down" style="font-size: 16px; color: green" data-toggle="tooltip" data-placement="top" data-original-title="<?php echo $hesklang['move_dn']; ?>"></i></a>
+                                                        <i class="fa fa-arrow-down font-size-16p green" data-toggle="tooltip" data-placement="top" data-original-title="<?php echo $hesklang['move_dn']; ?>"></i></a>
                                                 <?php
                                                 }
                                                 elseif ($k == $num)
                                                 {
                                                     ?>
                                                     <a href="service_messages.php?a=order_sm&amp;id=<?php echo $sm['id']; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>">
-                                                        <i class="fa fa-arrow-up" style="font-size: 16px; color: green" data-toggle="tooltip" data-placement="top" data-original-title="<?php echo $hesklang['move_up']; ?>"></i></a>
+                                                        <i class="fa fa-arrow-up font-size-16p green" data-toggle="tooltip" data-placement="top" data-original-title="<?php echo $hesklang['move_up']; ?>"></i></a>
                                                     <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />
                                                 <?php
                                                 }
@@ -259,17 +259,17 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                                 {
                                                     ?>
                                                     <a href="service_messages.php?a=order_sm&amp;id=<?php echo $sm['id']; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>">
-                                                        <i class="fa fa-arrow-up" style="font-size: 16px; color: green" data-toggle="tooltip" data-placement="top" data-original-title="<?php echo $hesklang['move_up']; ?>"></i></a>
+                                                        <i class="fa fa-arrow-up font-size-16p green" data-toggle="tooltip" data-placement="top" data-original-title="<?php echo $hesklang['move_up']; ?>"></i></a>
                                                     <a href="service_messages.php?a=order_sm&amp;id=<?php echo $sm['id']; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>">
-                                                        <i class="fa fa-arrow-down" style="font-size: 16px; color: green" data-toggle="tooltip" data-placement="top" data-original-title="<?php echo $hesklang['move_dn']; ?>"></i></a>
+                                                        <i class="fa fa-arrow-down font-size-16p green" data-toggle="tooltip" data-placement="top" data-original-title="<?php echo $hesklang['move_dn']; ?>"></i></a>
                                                 <?php
                                                 }
                                             }
                                             ?>
                                             <a href="service_messages.php?a=edit_sm&amp;id=<?php echo $sm['id']; ?>">
-                                                <i class="fa fa-pencil" style="font-size: 16px;color:orange" data-toggle="tooltip" data-placement="top" data-original-title="<?php echo $hesklang['edit']; ?>"></i></a>
+                                                <i class="fa fa-pencil font-size-16p orange" data-toggle="tooltip" data-placement="top" data-original-title="<?php echo $hesklang['edit']; ?>"></i></a>
                                             <a href="service_messages.php?a=remove_sm&amp;id=<?php echo $sm['id']; ?>&amp;token=<?php hesk_token_echo(); ?>" onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_sm']); ?>');">
-                                                <i class="fa fa-times" style="font-size: 16px;color:red" data-toggle="tooltip" data-placement="top" data-original-title="<?php echo $hesklang['delete']; ?>"></i></a>&nbsp;</td>
+                                                <i class="fa fa-times font-size-16p red" data-toggle="tooltip" data-placement="top" data-original-title="<?php echo $hesklang['delete']; ?>"></i></a>&nbsp;</td>
                                     </tr>
                                     <?php
                                     $j++;
@@ -295,7 +295,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         <div class="form-group">
                             <label for="style" class="col-md-2 control-label"><?php echo $hesklang['sm_style']; ?></label>
                             <div class="col-md-2">
-                                <div class="radio alert" style="box-shadow: none; padding: 5px; border-radius: 4px;">
+                                <div class="radio alert pad-5" style="box-shadow: none; border-radius: 4px;">
                                     <label>
                                         <input type="radio" name="style" value="0"  onclick="setIcon('')"
                                             <?php if (!isset($_SESSION['new_sm']['style']) || (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 0) ) {echo 'checked';} ?>>
@@ -304,7 +304,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 </div>
                             </div>
                             <div class="col-md-2">
-                                <div class="radio alert alert-success" style="padding: 5px;">
+                                <div class="radio alert alert-success pad-5">
                                     <label style="margin-top: -5px">
                                         <input type="radio" name="style" value="1" onclick="setIcon('fa fa-check-circle')"
                                             <?php if (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 1 ) {echo 'checked';} ?>>
@@ -313,7 +313,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 </div>
                             </div>
                             <div class="col-md-2">
-                                <div class="radio alert alert-info" style="padding: 5px"  onclick="setIcon('fa fa-comment')">
+                                <div class="radio alert alert-info pad-5"  onclick="setIcon('fa fa-comment')">
                                     <label style="margin-top: -5px">
                                         <input type="radio" name="style" value="2"
                                             <?php if (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 2) {echo 'checked';} ?>>
@@ -322,7 +322,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 </div>
                             </div>
                             <div class="col-md-2">
-                                <div class="radio alert alert-warning" style="padding: 5px" onclick="setIcon('fa fa-exclamation-triangle')">
+                                <div class="radio alert alert-warning pad-5" onclick="setIcon('fa fa-exclamation-triangle')">
                                     <label style="margin-top: -5px">
                                         <input type="radio" name="style" value="3"
                                             <?php if (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 3) {echo 'checked';} ?>>
@@ -331,7 +331,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 </div>
                             </div>
                             <div class="col-md-2">
-                                <div class="radio alert alert-danger" style="padding: 5px" onclick="setIcon('fa fa-times-circle')">
+                                <div class="radio alert alert-danger pad-5" onclick="setIcon('fa fa-times-circle')">
                                     <label style="margin-top: -5px">
                                         <input type="radio" name="style" value="4"
                                             <?php if (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 4) {echo 'checked';} ?> >
@@ -356,7 +356,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         <div class="form-group">
                             <label for="type" class="col-md-2 control-label"><?php echo $hesklang['sm_type']; ?></label>
                             <div class="col-md-2">
-                                <div class="radio" style="padding: 5px">
+                                <div class="radio pad-5">
                                     <label>
                                         <input type="radio" name="type" value="0"
                                             <?php if (!isset($_SESSION['new_sm']['type']) || (isset($_SESSION['new_sm']['type']) && $_SESSION['new_sm']['type'] == 0) ) {echo 'checked';} ?> >
@@ -365,7 +365,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 </div>
                             </div>
                             <div class="col-md-2">
-                                <div class="radio" style="padding: 5px">
+                                <div class="radio pad-5">
                                     <label>
                                         <input type="radio" name="type" value="1"
                                             <?php if (isset($_SESSION['new_sm']['type']) && $_SESSION['new_sm']['type'] == 1) {echo 'checked';} ?> >
diff --git a/admin/show_tickets.php b/admin/show_tickets.php
index 45337f43..2c842b56 100644
--- a/admin/show_tickets.php
+++ b/admin/show_tickets.php
@@ -59,14 +59,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
 ?>
 <div class="row">
-    <div class="col-md-12" style="margin-top: 20px">
+    <div class="col-md-12 move-down-20">
         <?php
         /* This will handle error, success and notice messages */
         hesk_handle_messages();
         ?>
         <div class="panel panel-default">
             <div class="panel-heading">
-                <h4><?php echo $hesklang['tickets']; ?> <span style="float: right; margin-top: -7px;"><a href="new_ticket.php" class="btn btn-success"><span class="glyphicon glyphicon-plus-sign"></span> New ticket</a></span></h4>
+                <h4><?php echo $hesklang['tickets']; ?> <span class="nu-floatRight panel-button"><a href="new_ticket.php" class="btn btn-success"><span class="glyphicon glyphicon-plus-sign"></span> New ticket</a></span></h4>
             </div>
         <?php
             /* Print the list of tickets */
diff --git a/css/hesk_newStyle.css b/css/hesk_newStyle.css
index 4749b50c..f598da5b 100644
--- a/css/hesk_newStyle.css
+++ b/css/hesk_newStyle.css
@@ -60,50 +60,10 @@
         padding-top: 10px;
     }    
 }
-
-.row {
-    margin-left: 0px;
-    margin-right: 0px;
-}
-
-.navbar {
-    margin-bottom: 0;
-}
-.h3questionmark:hover {
-    text-decoration: underline;
-}
-.form-signin {
-    max-width: 800px;
-    margin: 0 auto;
-}
-.loginError {
-    max-width: 800px;
-    padding-top: 20px;
-    margin-left: auto;
-    margin-right: auto;
-}
 .kbContent {
     padding-top: 10px;
     text-align: left;
 }
-.withBorder {
-    border-bottom: 1px solid #ddd;
-}
-.ticketMessageContainer {
-    background-color: #ededef;
-    border: 1px solid #ddd;
-    margin-bottom: 20px;
-}
-.ticketName {
-    font-size: 20px;
-    font-weight: 300;
-    color: #000;
-    margin-top: 5px;
-}
-.ticketEmail {
-    font-size: 14px;
-    color: #888;
-}
 .ticketMessageTop {
     padding-top: 10px;
     padding-left: 10px;
@@ -113,11 +73,6 @@
     background-color: #fff;
 }
 
-.pushMargin {
-    margin-top: -10px;
-    margin-bottom: -10px;
-}
-
 .pushMarginLeft {
     margin-left: -15px;
     margin-right: -15px;
@@ -132,15 +87,6 @@
     font-size: 15px;
     background-color: #fff;
 }
-.ticketMessageBottom > .message {
-    margin-bottom: 0px;
-
-}
-
-.message > * {
-    margin-top: 0;
-    margin-bottom: 0;
-}
 
 .ticketMessage {
     margin-left: 238px;
@@ -148,57 +94,6 @@
     height: 100%;
     position: relative;
 }
-.ticketPropertyTitle {
-    color: rgba(255, 255, 255, .75);
-    font-size: 11px;
-    text-transform: uppercase;
-}
-
-@media (min-width: 992px) {
-    .ticketPropertyText {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
-
-    .ticketPropertyText:hover {
-        white-space: normal;
-        overflow: none;
-    }
-}
-
-.ticketPropertyText {
-    font-size: 16px;
-    line-height: 1em;
-    color: #fff;
-    padding-bottom: 2px;
-}
-
-.criticalPriority {
-    background-color: red;
-}
-.highPriority {
-    background-color: #ff6a00;
-}
-.medLowPriority {
-    background-color: #8BB467;
-}
-div.blankSpace {
-    padding-top: 20px;
-}
-div.footerWithBorder {
-    border-top: 1px solid #cfd4d6;
-}
-div.rightSideDash {
-    padding-left: 18px;
-    padding-right: 18px;
-}
-div.enclosing {
-    background-color: #fff;
-    color: #4a5571;
-    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-    font-size: 12px;
-    width: 100%}
 div.headersm {
     width: 100%;
     color: #fff;
@@ -214,34 +109,6 @@ div.headersm {
     background-image: none;
     height: auto;
 }
-div.installWarning {
-    width: 70%;
-    height: 52px;
-    margin-top: 10px;
-    margin-left: auto;
-    margin-right: auto;
-}
-div.setupContainer {
-    margin: 50px;
-    text-align: center;
-}
-div.setupLogo {
-    vertical-align: middle;
-    border: 0;
-    margin-top: -2px;
-}
-div.setupButtons {
-    text-decoration: none;
-    border: 4px solid #eee;
-    background: #fff;
-    border-radius: 5px;
-    color: #61718c;
-    -webkit-box-shadow: rgba(0, 0, 0, .1)0 0 3px;
-    -moz-box-shadow: rgba(0, 0, 0, .1)0 0 3px;
-    text-align: center;
-    margin: 20px 0;
-    padding: 10px 0;
-}
 .agreementBox {
     position: relative;
     background-color: #fff;
@@ -254,93 +121,39 @@ div.setupButtons {
     -moz-box-sizing: border-box;
     box-sizing: border-box;
 }
-.summaryList {
-    border-style: solid;
-    border-width: 1px;
-    border-color: #ddd;
-    border-top-color: transparent;
-}
-.installRequirements {
-    margin-left: auto;
-    margin-right: auto;
-    width: 90%;
-}
-
-.white-readonly {
-    cursor: text !important;
-    background-color: #fff !important;
-}
-
-button.btn.dropdown-toggle {
-    height: 34px;
-}
-
-button.dropdown-submit {
-    background:none!important;
-    border:none;
-}
-
-.attachment-table > tbody > tr > td > i {
-    color: #ddd;
-    text-shadow: 2px 2px #ccc;
-}
-
-.attachment-table > tbody > tr > td {
-    vertical-align: middle;
-}
-
-.attachment-table > tbody > tr > td > span > img {
-    max-height: 80px;
-    max-width: 80px;
-    cursor: pointer;
-}
-
-.plaintext-editor {
-    font-family: monospace;
-}
-
-.table-fixed {
-    table-layout: fixed;
-}
 
 .indent-15 {
     margin-left: 15px;
 }
 
-.button-link {
-    color: #4a5571;
-}
-
-.button-link:hover {
-    text-decoration: none;
-    color: #000;
+.pad-right-10 {
+    padding-left: 10px;
 }
 
-.button-link .col-xs-1 {
-    margin: 0 auto;
-    padding: 0;
+.pad-right-0 {
+    padding-left: 0;
 }
 
-.button-link .panel-body:hover {
-    background-color: #EEE;
+.move-right-40 {
+    margin-left: 40px;
 }
 
-.default-row-margins {
-    margin: 0 -15px;
+.move-right-25 {
+    margin-left: 25px;
 }
 
-.icon-link {
-    font-size: 16px !important;
+.move-right-20 {
+    margin-left: 20px;
 }
 
-.orange {
-    color: orange;
+.move-right-10 {
+    margin-left: 10px;
 }
 
-.red {
-    color: #FF0000;
+.move-left-20 {
+    margin-right: 20px;
 }
 
-.gray {
-    color: gray;
+.move-left-10 {
+    margin-right: 10px;
 }
\ No newline at end of file
diff --git a/css/hesk_newStyleRTL.css b/css/hesk_newStyleRTL.css
index 661b83ba..17a44a39 100644
--- a/css/hesk_newStyleRTL.css
+++ b/css/hesk_newStyleRTL.css
@@ -6,10 +6,6 @@
     float: left;
 }
 
-.tabPadding {
-    padding: 10px;
-}
-
 @media (max-width:991px) {
     .close-ticket {
         text-align: right;
@@ -60,53 +56,10 @@
         padding-top: 10px;
     }    
 }
-
-.row {
-    margin-right: 0px;
-    margin-left: 0px;
-}
-
-.navbar {
-    margin-bottom: 0;
-}
-.settingsquestionmark:hover {
-    text-decoration: underline;
-}
-.h3questionmark:hover {
-    text-decoration: underline;
-}
-.form-signin {
-    max-width: 800px;
-    margin: 0 auto;
-}
-.loginError {
-    max-width: 800px;
-    padding-top: 20px;
-    margin-right: auto;
-    margin-left: auto;
-}
 .kbContent {
     padding-top: 10px;
     text-align: right;
 }
-.withBorder {
-    border-bottom: 1px solid #ddd;
-}
-.ticketMessageContainer {
-    background-color: #ededef;
-    border: 1px solid #ddd;
-    margin-bottom: 20px;
-}
-.ticketName {
-    font-size: 20px;
-    font-weight: 300;
-    color: #000;
-    margin-top: 5px;
-}
-.ticketEmail {
-    font-size: 14px;
-    color: #888;
-}
 .ticketMessageTop {
     padding-top: 10px;
     padding-right: 10px;
@@ -116,11 +69,6 @@
     background-color: #fff;
 }
 
-.pushMargin {
-    margin-top: -10px;
-    margin-bottom: -10px;
-}
-
 .pushMarginLeft {
     margin-right: -15px;
     margin-left: -15px;
@@ -135,15 +83,6 @@
     font-size: 15px;
     background-color: #fff;
 }
-.ticketMessageBottom > .message {
-    margin-bottom: 0px;
-
-}
-
-.message > * {
-    margin-top: 0;
-    margin-bottom: 0;
-}
 
 .ticketMessage {
     margin-right: 238px;
@@ -151,53 +90,6 @@
     height: 100%;
     position: relative;
 }
-.ticketPropertyTitle {
-    color: rgba(255, 255, 255, .75);
-    font-size: 11px;
-    text-transform: uppercase;
-}
-@media (min-width: 992px) {
-    .ticketPropertyText {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
-
-    .ticketPropertyText:hover {
-        white-space: normal;
-        overflow: none;
-    }
-}
-.ticketPropertyText {
-    font-size: 16px;
-    line-height: 1em;
-    color: #fff;
-}
-.criticalPriority {
-    background-color: red;
-}
-.highPriority {
-    background-color: #ff6a00;
-}
-.medLowPriority {
-    background-color: #8BB467;
-}
-div.blankSpace {
-    padding-top: 20px;
-}
-div.footerWithBorder {
-    border-top: 1px solid #cfd4d6;
-}
-div.rightSideDash {
-    padding-right: 18px;
-    padding-left: 18px;
-}
-div.enclosing {
-    background-color: #fff;
-    color: #4a5571;
-    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-    font-size: 12px;
-    width: 100%}
 div.headersm {
     width: 100%;
     color: #fff;
@@ -211,34 +103,6 @@ div.headersm {
     font-weight: 700;
     padding-right: 20px;
 }
-div.installWarning {
-    width: 70%;
-    height: 52px;
-    margin-top: 10px;
-    margin-right: auto;
-    margin-left: auto;
-}
-div.setupContainer {
-    margin: 50px;
-    text-align: center;
-}
-div.setupLogo {
-    vertical-align: middle;
-    border: 0;
-    margin-top: -2px;
-}
-div.setupButtons {
-    text-decoration: none;
-    border: 4px solid #eee;
-    background: #fff;
-    border-radius: 5px;
-    color: #61718c;
-    -webkit-box-shadow: rgba(0, 0, 0, .1)0 0 3px;
-    -moz-box-shadow: rgba(0, 0, 0, .1)0 0 3px;
-    text-align: center;
-    margin: 20px 0;
-    padding: 10px 0;
-}
 .agreementBox {
     position: relative;
     background-color: #fff;
@@ -251,90 +115,43 @@ div.setupButtons {
     -moz-box-sizing: border-box;
     box-sizing: border-box;
 }
-.summaryList {
-    border-style: solid;
-    border-width: 1px;
-    border-color: #ddd;
-    border-top-color: transparent;
-}
-.installRequirements {
-    margin-right: auto;
-    margin-left: auto;
-    width: 90%;
-}
-.white-readonly {
-    cursor: text !important;
-    background-color: #fff !important;
-}
-button.btn.dropdown-toggle {
-    height: 34px;
-}
-button.dropdown-submit {
-    background:none!important;
-    border:none;
-}
-
-.attachment-table > tbody > tr > td > i {
-    color: #ddd;
-    text-shadow: 2px 2px #ccc;
-}
-
-.attachment-table > tbody > tr > td {
-    vertical-align: middle;
-}
-
-.attachment-table > tbody > tr > td > span > img {
-    max-height: 80px;
-    max-width: 80px;
-    cursor: pointer;
-}
-
-.plaintext-editor {
-    font-family: monospace;
-}
-
-.table-fixed {
-    table-layout: fixed;
-}
 
 .indent-15 {
     margin-right: 15px;
 }
 
-.button-link {
-    color: #4a5571;
+.pad-down-20 {
+    padding-top: 20px;
 }
 
-.button-link:hover {
-    text-decoration: none;
-    color: #000;
+.pad-right-10 {
+    padding-right: 10px;
 }
 
-.button-link .col-xs-1 {
-    margin: 0 auto;
-    padding: 0;
+.move-down-20 {
+    margin-top: 20px;
 }
 
-.button-link .panel-body:hover {
-    background-color: #EEE;
+.move-right-40 {
+    margin-right: 40px;
 }
 
-.default-row-margins {
-    margin: 0 -15px;
+.move-right-25 {
+    margin-right: 25px;
 }
 
-.icon-link {
-    font-size: 16px;
+.move-right-20 {
+    margin-right: 20px;
 }
 
-.orange {
-    color: orange;
+.move-right-10 {
+    margin-right: 10px;
 }
 
-.red {
-    color: #FF0000;
+.move-left-20 {
+    margin-left: 20px;
 }
 
-.gray {
-    color: gray;
+.move-left-10 {
+    margin-left: 10px;
 }
\ No newline at end of file
diff --git a/css/mods-for-hesk.css b/css/mods-for-hesk.css
new file mode 100644
index 00000000..0ef4ff08
--- /dev/null
+++ b/css/mods-for-hesk.css
@@ -0,0 +1,307 @@
+
+.summaryList {
+    border-style: solid;
+    border-width: 1px;
+    border-color: #ddd;
+    border-top-color: transparent;
+}
+.installRequirements {
+    margin-left: auto;
+    margin-right: auto;
+    width: 90%;
+}
+
+.white-readonly {
+    cursor: text !important;
+    background-color: #fff !important;
+}
+
+button.btn.dropdown-toggle {
+    height: 34px;
+}
+
+button.dropdown-submit {
+    background:none!important;
+    border:none;
+}
+
+.attachment-table > tbody > tr > td > i {
+    color: #ddd;
+    text-shadow: 2px 2px #ccc;
+}
+
+.attachment-table > tbody > tr > td {
+    vertical-align: middle;
+}
+
+.attachment-table > tbody > tr > td > span > img {
+    max-height: 80px;
+    max-width: 80px;
+    cursor: pointer;
+}
+
+.plaintext-editor {
+    font-family: monospace;
+}
+
+.table-fixed {
+    table-layout: fixed;
+}
+
+.row {
+    margin-left: 0px;
+    margin-right: 0px;
+}
+
+.navbar {
+    margin-bottom: 0;
+}
+
+.h3questionmark:hover {
+    text-decoration: underline;
+}
+
+.form-signin {
+    max-width: 800px;
+    margin: 0 auto;
+}
+
+.loginError {
+    max-width: 800px;
+    padding-top: 20px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.withBorder {
+    border-bottom: 1px solid #ddd;
+}
+
+.ticketMessageContainer {
+    background-color: #ededef;
+    border: 1px solid #ddd;
+    margin-bottom: 20px;
+}
+
+.ticketName {
+    font-size: 20px;
+    font-weight: 300;
+    color: #000;
+    margin-top: 5px;
+}
+
+.ticketEmail {
+    font-size: 14px;
+    color: #888;
+}
+
+.pushMargin {
+    margin-top: -10px;
+    margin-bottom: -10px;
+}
+
+.ticketMessageBottom > .message {
+    margin-bottom: 0px;
+}
+
+.message > * {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+@media (min-width: 992px) {
+    .ticketPropertyText {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    .ticketPropertyText:hover {
+        white-space: normal;
+        overflow: visible;
+    }
+}
+
+.ticketPropertyText {
+    font-size: 16px;
+    line-height: 1em;
+    color: #fff;
+    padding-bottom: 2px;
+}
+
+.highPriority {
+    background-color: #ff6a00;
+}
+
+.medLowPriority {
+    background-color: #8BB467;
+}
+
+div.blankSpace {
+    padding-top: 20px;
+}
+
+div.footerWithBorder {
+    border-top: 1px solid #cfd4d6;
+}
+
+div.rightSideDash {
+    padding-left: 18px;
+    padding-right: 18px;
+}
+
+.ticketPropertyTitle {
+    color: rgba(255, 255, 255, .75);
+    font-size: 11px;
+    text-transform: uppercase;
+}
+
+div.enclosing {
+    background-color: #fff;
+    color: #4a5571;
+    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+    font-size: 12px;
+    width: 100%
+}
+
+div.installWarning {
+    width: 70%;
+    height: 52px;
+    margin-top: 10px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+div.setupContainer {
+    margin: 50px;
+    text-align: center;
+}
+
+div.setupLogo {
+    vertical-align: middle;
+    border: 0;
+    margin-top: -2px;
+}
+
+div.setupButtons {
+    text-decoration: none;
+    border: 4px solid #eee;
+    background: #fff;
+    border-radius: 5px;
+    color: #61718c;
+    -webkit-box-shadow: rgba(0, 0, 0, .1)0 0 3px;
+    -moz-box-shadow: rgba(0, 0, 0, .1)0 0 3px;
+    text-align: center;
+    margin: 20px 0;
+    padding: 10px 0;
+}
+
+.hide {
+    display: none;
+}
+
+.font-size-90 {
+    font-size: .9em !important;
+}
+
+.font-size-120 {
+    font-size: 1.2em !important;
+}
+
+.font-size-150 {
+    font-size: 1.5em !important;
+}
+
+.font-size-14p {
+    font-size: 14px !important;
+}
+
+.font-size-16p {
+    font-size: 16px !important;
+}
+
+.font-size-20p {
+    font-size: 20px !important;
+}
+
+.pad-up-5 {
+    padding-down: 5px;
+}
+
+.pad-5 {
+    padding: 5px;
+}
+
+.panel-button {
+    margin-top: -7px;
+}
+
+.bold {
+    font-weight: bold;
+}
+
+.move-down-20 {
+    margin-top: 20px;
+}
+
+.move-down-4 {
+    margin-top: 4px;
+}
+
+.button-link {
+    color: #4a5571;
+}
+
+.button-link:hover {
+    text-decoration: none;
+    color: #000;
+}
+
+.button-link .col-xs-1 {
+    margin: 0 auto;
+    padding: 0;
+}
+
+.button-link .panel-body:hover {
+    background-color: #EEE;
+}
+
+.default-row-margins {
+    margin: 0 -15px;
+}
+
+.icon-link {
+    font-size: 16px !important;
+}
+
+.orange {
+    color: orange;
+}
+
+.dark-orange {
+    color: darkorange;
+}
+
+.red, .criticalPriority {
+    color: #FF0000;
+}
+
+.gray {
+    color: gray;
+}
+
+.green {
+    color: green;
+}
+
+.blue {
+    color: blue;
+}
+
+.pad-down-20 {
+    padding-top: 20px;
+}
+
+.pad-20 {
+    padding: 20px;
+}
\ No newline at end of file
diff --git a/inc/header.inc.php b/inc/header.inc.php
index 1353dffb..71013444 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -32,6 +32,9 @@
 *  https://www.hesk.com/buy.php
 *******************************************************************************/
 
+// Define the current build
+define('MODS_FOR_HESK_BUILD', 21);
+
 /* Check if this is a valid include */
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 if (!function_exists('mfh_getSettings')) {
@@ -48,18 +51,20 @@ $modsForHesk_settings = mfh_getSettings();
     <meta name="viewport" content="width=device-width, user-scalable=no">
     <meta name="theme-color" content="<?php echo '#414a5c'; ?>">
     <?php if ($modsForHesk_settings['rtl']) { ?>
-    <link href="<?php echo HESK_PATH; ?>hesk_style_RTL.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
+    <link href="<?php echo HESK_PATH; ?>hesk_style_RTL.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
     <?php } else { ?>
-	<link href="<?php echo HESK_PATH; ?>hesk_style.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
+	<link href="<?php echo HESK_PATH; ?>hesk_style.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
     <?php } ?>
     <link href="<?php echo HESK_PATH; ?>css/datepicker.css" type="text/css" rel="stylesheet" />
-	<link href="<?php echo HESK_PATH; ?>css/bootstrap.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
-	<link href="<?php echo HESK_PATH; ?>css/bootstrap-theme.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" <?php if ($modsForHesk_settings['use_bootstrap_theme'] == 0) {echo 'disabled';} ?>>
+	<link href="<?php echo HESK_PATH; ?>css/bootstrap.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
+	<link href="<?php echo HESK_PATH; ?>css/bootstrap-theme.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" <?php if ($modsForHesk_settings['use_bootstrap_theme'] == 0) {echo 'disabled';} ?>>
     <?php if ($modsForHesk_settings['rtl']) { ?>
-    <link href="<?php echo HESK_PATH; ?>css/bootstrap-rtl.min.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
-	<link href="<?php echo HESK_PATH; ?>css/hesk_newStyleRTL.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
+    <link href="<?php echo HESK_PATH; ?>css/bootstrap-rtl.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
+    <link href="<?php echo HESK_PATH; ?>css/mods-for-hesk.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
+	<link href="<?php echo HESK_PATH; ?>css/hesk_newStyleRTL.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
     <?php } else { ?>
-    <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
+    <link href="<?php echo HESK_PATH; ?>css/mods-for-hesk.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
+    <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
     <?php } ?>
     <link href="<?php echo HESK_PATH; ?>css/bootstrap-iconpicker.min.css" rel="stylesheet">
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 16fb8b59..b235a460 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -32,6 +32,9 @@
 *  https://www.hesk.com/buy.php
 *******************************************************************************/
 
+// Define the current build
+define('MODS_FOR_HESK_BUILD', 21);
+
 /* Check if this is a valid include */
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
@@ -45,18 +48,20 @@ $modsForHesk_settings = mfh_getSettings();
     <meta name="viewport" content="width=device-width, user-scalable=no">
     <meta name="theme-color" content="<?php echo '#414a5c'; ?>">
 	<?php if ($modsForHesk_settings['rtl']) { ?>
-    <link href="<?php echo HESK_PATH; ?>hesk_style_RTL.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
+    <link href="<?php echo HESK_PATH; ?>hesk_style_RTL.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
     <?php } else { ?>
-	<link href="<?php echo HESK_PATH; ?>hesk_style.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
+	<link href="<?php echo HESK_PATH; ?>hesk_style.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
     <?php } ?>
     <link href="<?php echo HESK_PATH; ?>css/datepicker.css" type="text/css" rel="stylesheet" />
-	<link href="<?php echo HESK_PATH; ?>css/bootstrap.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
-	<link href="<?php echo HESK_PATH; ?>css/bootstrap-theme.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" <?php if ($modsForHesk_settings['use_bootstrap_theme'] == 0) {echo 'disabled';} ?>>
+	<link href="<?php echo HESK_PATH; ?>css/bootstrap.css?v=21" type="text/css" rel="stylesheet" />
+	<link href="<?php echo HESK_PATH; ?>css/bootstrap-theme.css?v=21" type="text/css" rel="stylesheet" <?php if ($modsForHesk_settings['use_bootstrap_theme'] == 0) {echo 'disabled';} ?>>
     <?php if ($modsForHesk_settings['rtl']) { ?>
-    <link href="<?php echo HESK_PATH; ?>css/bootstrap-rtl.min.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
-	<link href="<?php echo HESK_PATH; ?>css/hesk_newStyleRTL.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
+    <link href="<?php echo HESK_PATH; ?>css/bootstrap-rtl.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
+	<link href="<?php echo HESK_PATH; ?>css/mods-for-hesk.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
+	<link href="<?php echo HESK_PATH; ?>css/hesk_newStyleRTL.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
     <?php } else { ?>
-    <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.css?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
+	<link href="<?php echo HESK_PATH; ?>css/mods-for-hesk.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
+    <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet" />
     <?php } ?>
     <link href="<?php echo HESK_PATH; ?>css/bootstrap-iconpicker.min.css" rel="stylesheet">
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
diff --git a/index.php b/index.php
index b8c42f9f..b10f6ca1 100644
--- a/index.php
+++ b/index.php
@@ -1342,7 +1342,7 @@ function print_start()
 	if ($hesk_settings['alink'])
 	{
 		?>
-		<p style="text-align:center"><a href="<?php echo $hesk_settings['admin_dir']; ?>/" ><?php echo $hesklang['ap']; ?></a></p>
+		<p class="text-center"><a href="<?php echo $hesk_settings['admin_dir']; ?>/" ><?php echo $hesklang['ap']; ?></a></p>
 		<?php
 	}
 
diff --git a/knowledgebase.php b/knowledgebase.php
index 4cbc3afd..2faccc2e 100644
--- a/knowledgebase.php
+++ b/knowledgebase.php
@@ -419,7 +419,7 @@ function hesk_show_kb_article($artid)
                     <?php
                     foreach ($related_articles as $id => $subject)
                     {
-                        echo '<span class="glyphicon glyphicon-file" style="font-size: 16px"></span> <a href="knowledgebase.php?article='.$id.'">'.$subject.'</a><br />';
+                        echo '<span class="glyphicon glyphicon-file icon-link"></span> <a href="knowledgebase.php?article='.$id.'">'.$subject.'</a><br />';
                     }
                     ?>
                 </div>
diff --git a/ticket.php b/ticket.php
index a3649af5..6c1a6532 100644
--- a/ticket.php
+++ b/ticket.php
@@ -353,7 +353,7 @@ if (!$show['show']) {
             <div class="col-md-9 col-xs-12 pushMarginLeft">
                 <div class="ticketMessageTop withBorder">
                         <!-- Date and Action buttons -->
-                        <p><?php echo $hesklang['date']; ?>: <?php echo hesk_date($ticket['dt'], true); ?><span style="float: right"><?php echo hesk_getCustomerButtons($i); ?></span></p>
+                        <p><?php echo $hesklang['date']; ?>: <?php echo hesk_date($ticket['dt'], true); ?><span class="nu-floatRight"><?php echo hesk_getCustomerButtons($i); ?></span></p>
                         <!-- Custom Fields Before Message -->
                         <?php
                             foreach ($hesk_settings['custom_fields'] as $k=>$v)