diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index da268c17..62498722 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -595,10 +595,14 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
             <i class="fa fa-fw fa-calendar icon-link" data-toggle="tooltip" title="<?php echo $hesklang['events']; ?>"></i>
         </td>
         <td>
-            <a data-property="generate-link" href="#">
-                <i class="fa fa-fw fa-code icon-link" data-toggle="tooltip"
-                   data-placement="top" title="#"></i>
-            </a>
+            <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>
+                </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>
@@ -641,8 +645,6 @@ echo mfh_get_hidden_fields_for_language(array(
     'aaoff',
     'cat_private',
     'cat_public',
-    '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 f9d5e49d..a7716ad7 100644
--- a/internal-api/js/manage-categories.js
+++ b/internal-api/js/manage-categories.js
@@ -92,15 +92,14 @@ function loadTable() {
                     // Private
                     $template.find('[data-property="type-link"]').attr('href', '#private')
                         .find('i').addClass('fa-lock').attr('title', mfhLang.text('cat_private')).addClass('gray');
-                    $template.find('[data-property="generate-link"]')
-                        .find('i').removeClass('fa-code').addClass('fa-ban').addClass('red')
-                            .attr('title', mfhLang.text('cpric'));
+                    $template.find('.generate-link-group').find('i.fa-ban');
+                    $template.find('.generate-link-group').find('a').hide();
                 } else {
                     // Public
                     $template.find('[data-property="type-link"]').attr('href', '#public')
                         .find('i').addClass('fa-unlock-alt').attr('title', mfhLang.text('cat_public')).addClass('blue');
-                    $template.find('[data-property="generate-link"]')
-                        .find('i').addClass('green').attr('title', mfhLang.text('geco'));
+                    $template.find('.generate-link-group').find('i.fa-ban').hide();
+                    $template.find('.generate-link-group').find('a');
                 }
 
                 $tableBody.append($template);