diff --git a/admin/show_tickets.php b/admin/show_tickets.php
index a6d6697f..93935495 100644
--- a/admin/show_tickets.php
+++ b/admin/show_tickets.php
@@ -37,6 +37,7 @@ require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/status_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -48,13 +49,68 @@ define('CALENDAR', 1);
 /* Check permissions for this feature */
 hesk_checkPermission('can_view_tickets');
 
-/* Print header */
-require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 
-/* Print admin navigation */
-require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
+/* Print header */
+require_once(HESK_PATH . 'inc/header_new_admin.inc.php');
+require_once(HESK_PATH . 'inc/new_admin_header_and_sidebar.inc.php');
 
 ?>
+<section class="content">
+    <?php hesk_handle_messages(); ?>
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['tickets']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            <?php
+            /* Print the list of tickets */
+            $is_search = 1;
+            require_once(HESK_PATH . 'inc/print_tickets.inc.php');
+            echo '<br>';
+            /* Update staff default settings? */
+            if (!empty($_GET['def'])) {
+                hesk_updateStaffDefaults();
+            }
+
+            /* Print forms for listing and searching tickets */
+            require_once(HESK_PATH . 'inc/show_search_form.inc.php');
+            ?>
+        </div>
+    </div>
+    <div class="box">
+        <div class="box-body">
+            <?php
+            $hesk_settings['hesk_license']('HMgPSAxOw0KaWYgKGZpbGVfZXhpc3RzKEhFU0tfUEFUSCAuI
+        CdoZXNrX2xpY2Vuc2UucGhwJykpDQp7DQokaCA9ICghZW1wdHkoJF9TRVJWRVJbJ0hUVFBfSE9TVCddK
+        SkgPyAkX1NFUlZFUlsnSFRUUF9IT1NUJ10gOiAoKCFlbXB0eSgkX1NFUlZFUlsnU0VSVkVSX05BTUUnX
+        SkpID8gJF9TRVJWRVJbJ1NFUlZFUl9OQU1FJ10gOiBnZXRlbnYoJ1NFUlZFUl9OQU1FJykpOw0KJGggP
+        SBzdHJfcmVwbGFjZSgnd3d3LicsJycsc3RydG9sb3dlcigkaCkpOw0KaW5jbHVkZShIRVNLX1BBVEggL
+        iAnaGVza19saWNlbnNlLnBocCcpOw0KaWYgKGlzc2V0KCRoZXNrX3NldHRpbmdzWydsaWNlbnNlJ10pI
+        CYmIHN0cnBvcygkaGVza19zZXR0aW5nc1snbGljZW5zZSddLHNoYTEoJGguJ2gzJkZwMiNMYUEmNTkhd
+        yg4LlpjXSordVI1MTInKSkgIT09IGZhbHNlKQ0Kew0KJHMgPSAwOw0KfQ0KZWxzZQ0Kew0KZWNobyAnP
+        HAgc3R5bGU9InRleHQtYWxpZ246Y2VudGVyO2NvbG9yOnJlZDsiPklOVkFMSUQgTElDRU5TRSAoTk9UI
+        FJFR0lTVEVSRUQgRk9SICcuJGguJykhPC9wPic7DQp9DQp9DQppZiAoJHMpDQp7DQplY2hvICc8aHIgL
+        z48dGFibGUgYm9yZGVyPSIwIiB3aWR0aD0iMTAwJSI+PHRyPjx0ZD48Yj4nLiRoZXNrbGFuZ1sncmVtb
+        3ZlX3N0YXRlbWVudCddLic8L2I+PC90ZD48dGQgc3R5bGU9InRleHQtYWxpZ246cmlnaHQiPjxhIGhyZ
+        WY9IkphdmFzY3JpcHQ6dm9pZCgwKSIgb25jbGljaz0iYWxlcnQoXCcnLiRoZXNrbGFuZ1snc3VwcG9yd
+        F9ub3RpY2UnXS4nXCcpIj4nLiRoZXNrbGFuZ1snc2gnXS4nPC9hPjwvdGQ+PC90cj48L3RhYmxlPjxwP
+        icuJGhlc2tsYW5nWydzdXBwb3J0X3JlbW92ZSddLicuIDxhIGhyZWY9Imh0dHBzOi8vd3d3Lmhlc2suY
+        29tL2J1eS5waHAiIHRhcmdldD0iX2JsYW5rIj4nLiRoZXNrbGFuZ1snY2xpY2tfaW5mbyddLic8L2E+P
+        C9wPic7DQp9DQo=', "\112");
+
+            /* Clean unneeded session variables */
+            hesk_cleanSessionVars('hide');
+            ?>
+        </div>
+    </div>
+</section>
 <div class="row">
     <div class="col-md-12 move-down-20">
         <?php
@@ -67,19 +123,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             href="new_ticket.php" class="btn btn-success"><span
                                 class="glyphicon glyphicon-plus-sign"></span> <?php echo $hesklang['nti']; ?></a></span></h4>
             </div>
-            <?php
-            /* Print the list of tickets */
-            $is_search = 1;
-            require_once(HESK_PATH . 'inc/print_tickets.inc.php');
 
-            /* Update staff default settings? */
-            if (!empty($_GET['def'])) {
-                hesk_updateStaffDefaults();
-            }
-
-            /* Print forms for listing and searching tickets */
-            require_once(HESK_PATH . 'inc/show_search_form.inc.php');
-            ?>
         </div>
     </div>
     <?php
diff --git a/inc/new_admin_header_and_sidebar.inc.php b/inc/new_admin_header_and_sidebar.inc.php
index 360a6d1f..b42223aa 100644
--- a/inc/new_admin_header_and_sidebar.inc.php
+++ b/inc/new_admin_header_and_sidebar.inc.php
@@ -175,7 +175,7 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes
                 }
                 ?>
                 <li class="<?php echo $active; ?> treeview">
-                    <a href="admin_new_main.php">
+                    <a href="admin_main.php">
                         <i class="fa fa-home" <?php echo $iconDisplay; ?>></i> <span><?php echo $hesklang['main_page']; ?></span>
                     </a>
                 </li>