diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php
index a99087e85d..44d4bc64b6 100644
--- a/pandora_console/extensions/agents_modules.php
+++ b/pandora_console/extensions/agents_modules.php
@@ -838,7 +838,7 @@ function mainAgentsModules()
 
     echo '<tr>';
 
-    echo "<th width='140px' class='pdd_r_10px lign_right'>".__('Agents').' / '.__('Modules').'</th>';
+    echo "<th width='140px' class='pdd_r_10px align_right'>".__('Agents').' / '.__('Modules').'</th>';
 
     if ($hor_offset > 0) {
         $new_hor_offset = ($hor_offset - $block);
diff --git a/pandora_console/include/class/ConfigPEN.class.php b/pandora_console/include/class/ConfigPEN.class.php
index facc82d757..03638df6f2 100644
--- a/pandora_console/include/class/ConfigPEN.class.php
+++ b/pandora_console/include/class/ConfigPEN.class.php
@@ -240,17 +240,17 @@ class ConfigPEN extends HTML
                         $tmp->description = io_safe_output($tmp->description);
                         $tmp->manufacturer = io_safe_output($tmp->manufacturer);
 
-                        $tmp->options = '';
+                        $tmp->options = '<div class="table_action_buttons float-right">';
 
-                        $tmp->options = '<a href="javascript:" onclick="showForm(\'';
+                        $tmp->options .= '<a href="javascript:" onclick="showForm(\'';
                         $tmp->options .= $tmp->pen;
                         $tmp->options .= '\')" >';
                         $tmp->options .= html_print_image(
-                            'images/operation.png',
+                            'images/edit.svg',
                             true,
                             [
                                 'title' => __('Show'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         );
                         $tmp->options .= '</a>';
@@ -258,15 +258,17 @@ class ConfigPEN extends HTML
                         $tmp->options .= $tmp->pen;
                         $tmp->options .= '\')" >';
                         $tmp->options .= html_print_image(
-                            'images/cross.png',
+                            'images/delete.svg',
                             true,
                             [
                                 'title' => __('Delete'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         );
                         $tmp->options .= '</a>';
 
+                        $tmp->options .= '</div>';
+
                         $carry[] = $tmp;
                         return $carry;
                     }
@@ -406,7 +408,7 @@ class ConfigPEN extends HTML
             'action'   => '#',
             'id'       => 'modal_form',
             'onsubmit' => 'return false;',
-            'class'    => '',
+            'class'    => 'filter-list-adv',
         ];
 
         $inputs = [];
@@ -420,7 +422,7 @@ class ConfigPEN extends HTML
             'size'     => 50,
         ];
 
-        if ((bool) $values['pen']) {
+        if ((bool) $values['pen'] === true) {
             $arguments['disabled'] = true;
         }
 
@@ -599,7 +601,7 @@ class ConfigPEN extends HTML
                 __('Description'),
                 [
                     'text'  => __('Options'),
-                    'class' => 'table_action_buttons',
+                    'class' => 'table_action_buttons align_right',
                 ],
             ];
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 7627c331eb..b779c8c926 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -2110,6 +2110,7 @@ table.rounded_cells td {
   align-items: center;
 }
 
+.ta-right,
 .right {
   text-align: right;
 }
@@ -9190,8 +9191,8 @@ div.stat-win-spinner img {
   min-width: 50px;
 }
 
-.lign_right {
-  text-align: right;
+.align_right {
+  text-align: right !important;
 }
 
 .font_11pt {