diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index fe74c172c8..b38ff6591a 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -167,19 +167,22 @@ foreach ($servers as $server) {
         break;
     }
 
-    $data[6] = $server['threads'].' : '.$server['queued_modules'];
+    $data[6] = '';
     if ($server['queued_modules'] > 500) {
-        $data[6] .= '&nbsp;&nbsp;<div class="inline"><a onclick="show_dialog();" >'.html_print_image(
+        $data[6] .= '<div class="inline"><a onclick="show_dialog();" >'.html_print_image(
             'images/info-warning.svg',
             true,
             [
                 'width' => 16,
                 'heght' => 16,
                 'class' => 'pulsate clickable',
+                'style' => 'margin-left: -25px;',
             ]
-        ).'</a></div>';
+        ).'</a></div>&nbsp;&nbsp;';
     }
 
+    $data[6] .= $server['threads'].' : '.$server['queued_modules'];
+
     $data[7] = ui_print_timestamp($server['keepalive'], true);
 
 
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 78751eb001..995745f38b 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -1155,7 +1155,6 @@ if (check_login()) {
             $last_status_change_text = __('Time elapsed since last status change: ');
             $last_status_change_text .= (empty($module['last_status_change']) === false) ? human_time_comparation($module['last_status_change']) : __('N/A');
 
-            $data[4] .= ui_print_status_image($status, htmlspecialchars($title), true, false, false, true, $last_status_change_text);
             if ($show_context_help_first_time === false) {
                 $show_context_help_first_time = true;
 
@@ -1164,6 +1163,8 @@ if (check_login()) {
                 }
             }
 
+            $data[4] .= ui_print_status_image($status, htmlspecialchars($title), true, false, false, true, $last_status_change_text);
+
             // Module thresholds.
             $data[5] = '';
             if ((int) $module['id_tipo_modulo'] !== 25) {
diff --git a/pandora_console/include/functions_clippy.php b/pandora_console/include/functions_clippy.php
index 8dbaaaa780..2b883df434 100644
--- a/pandora_console/include/functions_clippy.php
+++ b/pandora_console/include/functions_clippy.php
@@ -297,8 +297,12 @@ function clippy_context_help($help=null)
     $code = str_replace('{clippy_obj}', 'intro_'.$id, $code);
 
     $return = $code.'<div id="'.$id.'" class="inline"><a onclick="show_'.$id.'();" href="javascript: void(0);" >'.html_print_image(
-        'images/clippy_icon.png',
-        true
+        'images/info-warning.svg',
+        true,
+        [
+            'class' => 'main_menu_icon invert_filter',
+            'style' => 'margin-left: -25px;',
+        ]
     ).'</a></div>
         <script type="text/javascript">