diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php
index 9182380a95..3f8170e3c2 100644
--- a/pandora_console/extensions/quick_shell.php
+++ b/pandora_console/extensions/quick_shell.php
@@ -140,25 +140,26 @@ function quickShell()
             ui_print_error_message(__('WebService engine has not been started, please check documentation.'));
             $wiz->printForm(
                 [
-                    'form'   => [
+                    'form' => [
                         'method' => 'POST',
                         'action' => '#',
-                    ],
-                    'inputs' => [
-                        [
-                            'class'     => 'w100p',
-                            'arguments' => [
-                                'name'       => 'submit',
-                                'label'      => __('Retry'),
-                                'type'       => 'submit',
-                                'attributes' => ['icon' => 'next'],
-                                'return'     => true,
-                            ],
-                        ],
+                        'id'     => 'retry_form',
                     ],
                 ]
             );
 
+            html_print_action_buttons(
+                html_print_submit_button(
+                    __('Retry'),
+                    'submit',
+                    false,
+                    [
+                        'icon' => 'next',
+                        'form' => 'retry_form',
+                    ],
+                    true
+                )
+            );
             return;
         }
 
@@ -168,6 +169,7 @@ function quickShell()
                     'action' => '#',
                     'class'  => 'wizard',
                     'method' => 'post',
+                    'id'     => 'connect_form',
                 ],
                 'inputs' => [
                     [
@@ -198,19 +200,24 @@ function quickShell()
                             'script' => "p=22; if(this.value == 'telnet') { p=23; } $('#text-port').val(p);",
                         ],
                     ],
-                    [
-                        'arguments' => [
-                            'type'       => 'submit',
-                            'label'      => __('Connect'),
-                            'attributes' => ['icon' => 'cog'],
-                        ],
-                    ],
                 ],
             ],
             false,
             true
         );
 
+        html_print_action_buttons(
+            html_print_submit_button(
+                __('Connect'),
+                'submit',
+                false,
+                [
+                    'icon' => 'cog',
+                    'form' => 'connect_form',
+                ],
+                true
+            )
+        );
         return;
     }
 
diff --git a/pandora_console/operation/agentes/custom_fields.php b/pandora_console/operation/agentes/custom_fields.php
index e336826d1f..f7a3487bbf 100644
--- a/pandora_console/operation/agentes/custom_fields.php
+++ b/pandora_console/operation/agentes/custom_fields.php
@@ -76,9 +76,9 @@ if ($fields === false) {
         $data[0] = '<b>'.$field['name'].'</b>';
 
         if ($field['display_on_front']) {
-            $data[1] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']);
+            $data[1] = html_print_image('images/validate.svg', true, ['class' => 'invert_filter']);
         } else {
-            $data[1] = html_print_image('images/delete.png', true, ['class' => 'invert_filter']);
+            $data[1] = html_print_image('images/delete.svg', true, ['class' => 'invert_filter']);
         }
 
         $custom_value = db_get_all_rows_sql(
diff --git a/pandora_console/operation/agentes/graphs.php b/pandora_console/operation/agentes/graphs.php
index e69ff9766b..f0da16847f 100644
--- a/pandora_console/operation/agentes/graphs.php
+++ b/pandora_console/operation/agentes/graphs.php
@@ -314,7 +314,7 @@ if ($start_date != $current) {
 
 if ($combined) {
     // Pass the $modules before the ajax call.
-    echo '<div class="combined-graph-container center w100p"'.'data-period="'.$period.'"'.'data-stacked="'.CUSTOM_GRAPH_LINE.'"'.'data-date="'.$date.'"'.'data-height="'.$height.'"'.'>'.html_print_image('images/spinner.gif', true).'</div>';
+    echo '<div class="combined-graph-container center w100p white_box"'.'data-period="'.$period.'"'.'data-stacked="'.CUSTOM_GRAPH_LINE.'"'.'data-date="'.$date.'"'.'data-height="'.$height.'"'.'>'.html_print_image('images/spinner.gif', true).'</div>';
 } else {
     foreach ($modules as $id_module) {
         $title = modules_get_agentmodule_name($id_module);