diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index 6802c366..7ca3e40a 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -272,6 +272,7 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
                                 <th><?php echo $hesklang['id']; ?></th>
                                 <th><?php echo $hesklang['cat_name']; ?></th>
                                 <th><?php echo $hesklang['visibility']; ?></th>
+                                <th><?php echo $hesklang['aass']; ?></th>
                                 <th><?php echo $hesklang['priority']; ?></th>
                                 <th><?php echo $hesklang['not']; ?></th>
                                 <th><?php echo $hesklang['graph']; ?></th>
@@ -480,6 +481,10 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
             <i style="display: none" class="fa fa-fw fa-unlock-alt icon-link blue"></i>
             <span data-property="type"></span>
         </td>
+        <td>
+            <i class="fa fa-fw fa-bolt icon-link"></i>
+            <span data-property="autoassign"></span>
+        </td>
         <td><span data-property="priority"></span></td>
         <td><a data-property="number-of-tickets" href="#"></a></td>
         <td>
@@ -495,16 +500,10 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
         <td>
             <span class="generate-link-group">
                 <a data-property="generate-link" href="#">
-                    <i class="fa fa-fw fa-code icon-link green" data-toggle="tooltip"
-                       data-placement="top" title="<?php echo $hesklang['geco']; ?>"></i>
+                    <i class="fa fa-fw icon-link" data-toggle="tooltip"
+                       data-placement="top"></i>
                 </a>
-                <i class="fa fa-fw fa-ban icon-link red" data-toggle="tooltip" data-placement="top"
-                      title="<?php echo $hesklang['cpric']; ?>"></i>
             </span>
-            <a data-property="autoassign-link" href="#">
-                <i class="fa fa-fw fa-bolt icon-link"
-                   data-toggle="tooltip" data-placement="top" title="Category autoassign tooltip"></i>
-            </a>
             <span class="sort-arrows">
                 <a href="#" data-action="sort"
                    data-direction="up">
@@ -542,6 +541,10 @@ echo mfh_get_hidden_fields_for_language(array(
     'cat_public',
     'cat_removed',
     'error_deleting_category',
+    'enabled_title_case',
+    'disabled_title_case',
+    'geco',
+    'cpric',
 ));
 
 require_once(HESK_PATH . 'inc/footer.inc.php');
diff --git a/internal-api/js/manage-categories.js b/internal-api/js/manage-categories.js
index 30d7c93b..53e0c5a5 100644
--- a/internal-api/js/manage-categories.js
+++ b/internal-api/js/manage-categories.js
@@ -84,23 +84,29 @@ function loadTable() {
                 }
 
                 if (this.autoAssign) {
-                    $template.find('[data-property="autoassign-link"]').attr('href', '#on')
-                        .find('i').attr('title', mfhLang.text('aaon')).addClass('orange');
+                    $template.find('.fa-bolt').addClass('orange');
+                    $template.find('[data-property="autoassign"]').text(mfhLang.text('enabled_title_case'));
                 } else {
-                    $template.find('[data-property="autoassign-link"]').attr('href', '#off')
-                        .find('i').attr('title', mfhLang.text('aaoff')).addClass('gray');
+                    $template.find('.fa-bolt').addClass('gray');
+                    $template.find('[data-property="autoassign"]').text(mfhLang.text('disabled_title_case'));
                 }
 
                 if (this.type === 1) {
                     // Private
                     $template.find('[data-property="type"]').text(mfhLang.text('cat_private'));
                     $template.find('.fa-lock').show();
-                    $template.find('.generate-link-group').find('a').hide();
+                    $template.find('[data-property="generate-link"]').find('i')
+                        .addClass('fa-ban')
+                        .addClass('red')
+                        .attr('title', mfhLang.text('cpric'));
                 } else {
                     // Public
                     $template.find('[data-property="type"]').text(mfhLang.text('cat_public'));
                     $template.find('.fa-unlock-alt').show();
-                    $template.find('.generate-link-group').find('i.fa-ban').hide();
+                    $template.find('[data-property="generate-link"]').find('i')
+                        .addClass('fa-code')
+                        .addClass('green')
+                        .attr('title', mfhLang.text('geco'));
                 }
 
                 $tableBody.append($template);