diff --git a/pandora_console/general/register.php b/pandora_console/general/register.php
index 8714d1ec12..ed646f52f3 100644
--- a/pandora_console/general/register.php
+++ b/pandora_console/general/register.php
@@ -184,7 +184,7 @@ if (!$double_auth_enabled
       background: "black"
     },
     width: 500,
-    height: 400,
+    height: 'auto',
     close: function (event, ui) {
       // Abort the ajax request
       if (typeof request != 'undefined'){
diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index 6686a26c7b..c0548b32e8 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -43,7 +43,7 @@ if (is_ajax() === true) {
         $table = new StdClass();
         $table->data = [];
         $table->width = '100%';
-        $table->class = 'databox filters table_result_auth';
+        $table->class = 'databox filters table_result_auth filter-table-adv';
         $table->size['name'] = '30%';
         $table->style['name'] = 'font-weight: bold';
 
@@ -94,7 +94,11 @@ if (is_ajax() === true) {
                     '',
                     30,
                     100,
-                    true
+                    true,
+                    false,
+                    false,
+                    '',
+                    'w400px'
                 );
                 $table->data['ldap_server'] = $row;
 
@@ -107,7 +111,11 @@ if (is_ajax() === true) {
                     '',
                     10,
                     100,
-                    true
+                    true,
+                    false,
+                    false,
+                    '',
+                    'w400px'
                 );
                 $table->data['ldap_port'] = $row;
 
@@ -126,7 +134,10 @@ if (is_ajax() === true) {
                     '',
                     '',
                     0,
-                    true
+                    true,
+                    false,
+                    true,
+                    'w400px'
                 );
                 $table->data['ldap_version'] = $row;
 
@@ -189,12 +200,12 @@ if (is_ajax() === true) {
                     $alt = '',
                     60,
                     100,
-                    true
-                );
-                $row['control'] .= ui_print_reveal_password(
-                    'ldap_admin_pass',
-                    true
+                    true,
+                    false,
+                    false,
+                    'w400px-important'
                 );
+
                 $table->data['ldap_admin_pass'] = $row;
 
                 // Ldapsearch timeout.
@@ -208,7 +219,11 @@ if (is_ajax() === true) {
                     '',
                     10,
                     10,
-                    true
+                    true,
+                    false,
+                    false,
+                    '',
+                    'w400px'
                 );
                 $table->data['ldap_search_timeout'] = $row;
 
@@ -239,7 +254,11 @@ if (is_ajax() === true) {
                     '',
                     30,
                     100,
-                    true
+                    true,
+                    false,
+                    false,
+                    '',
+                    'w400px'
                 );
                 $table->data['ldap_server_secondary'] = $row;
 
@@ -252,7 +271,11 @@ if (is_ajax() === true) {
                     '',
                     10,
                     100,
-                    true
+                    true,
+                    false,
+                    false,
+                    '',
+                    'w400px'
                 );
                 $table->data['ldap_port_secondary'] = $row;
 
@@ -271,7 +294,10 @@ if (is_ajax() === true) {
                     '',
                     '',
                     0,
-                    true
+                    true,
+                    false,
+                    true,
+                    'w400px'
                 );
                 $table->data['ldap_version_secondary'] = $row;
 
@@ -334,11 +360,10 @@ if (is_ajax() === true) {
                     $alt = '',
                     60,
                     100,
-                    true
-                );
-                $row['control'] .= ui_print_reveal_password(
-                    'ldap_admin_pass_secondary',
-                    true
+                    true,
+                    false,
+                    false,
+                    'w400px-important'
                 );
                 $table->data['ldap_admin_pass_secondary'] = $row;
             break;
@@ -407,7 +432,11 @@ if (is_ajax() === true) {
             '',
             10,
             10,
-            true
+            true,
+            false,
+            false,
+            '',
+            'w400px'
         );
         $table->data['session_timeout'] = $row;
 
@@ -421,7 +450,7 @@ require_once $config['homedir'].'/include/functions_profile.php';
 $table = new StdClass();
 $table->data = [];
 $table->width = '100%';
-$table->class = 'databox filters';
+$table->class = 'databox filters filter-table-adv';
 $table->size['name'] = '30%';
 $table->style['name'] = 'font-weight: bold';
 
@@ -459,12 +488,15 @@ $row['control'] = html_print_select(
     '',
     '',
     0,
-    true
+    true,
+    false,
+    true,
+    'w400px'
 );
 $table->data['auth'] = $row;
 
 // Form.
-echo '<form id="form_setup" method="post">';
+echo '<form id="form_setup" class="max_floating_element_size" method="post">';
 
 if (is_metaconsole() === false) {
     html_print_input_hidden('update_config', 1);
@@ -478,17 +510,14 @@ html_print_csrf_hidden();
 
 html_print_table($table);
 html_print_div([ 'id' => 'table_auth_result' ]);
-html_print_div(
-    [
-        'class'   => 'action-buttons w100p',
-        'content' => html_print_submit_button(
-            __('Update'),
-            'update_button',
-            false,
-            [ 'icon' => 'update' ],
-            true
-        ),
-    ]
+html_print_action_buttons(
+    html_print_submit_button(
+        __('Update'),
+        'update_button',
+        false,
+        [ 'icon' => 'update' ],
+        true
+    )
 );
 
 echo '</form>';
diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php
index 308f3b8189..e69b9668f3 100644
--- a/pandora_console/godmode/setup/setup_ehorus.php
+++ b/pandora_console/godmode/setup/setup_ehorus.php
@@ -74,82 +74,98 @@ $table_remote->data = [];
 $table_remote->width = '100%';
 $table_remote->styleTable = 'margin-bottom: 10px;';
 $table_remote->id = 'ehorus-remote-setup';
-$table_remote->class = 'databox filters';
-$table_remote->size['name'] = '30%';
-$table_remote->style['name'] = 'font-weight: bold';
-$table_remote->style['control'] = 'display: flex;align-items: center;';
+$table_remote->class = 'databox filters filter-table-adv';
+$table_remote->size['ehorus_hostname'] = '50%';
+$table_remote->size['ehorus_port'] = '50%';
 
 // Enable eHorus user configuration.
 $row = [];
-$row['name'] = ('eHorus configuration at user level');
-$row['control'] = html_print_checkbox_switch('ehorus_user_level_conf', 1, $config['ehorus_user_level_conf'], true);
+$row['ehorus_user_level_conf'] = html_print_label_input_block(
+    __('eHorus configuration at user level'),
+    html_print_checkbox_switch(
+        'ehorus_user_level_conf',
+        1,
+        $config['ehorus_user_level_conf'],
+        true
+    )
+);
 $table_remote->data['ehorus_user_level_conf'] = $row;
 
 // User.
 $row = [];
-$row['name'] = __('User');
-$row['control'] = html_print_input_text('ehorus_user', $config['ehorus_user'], '', 30, 100, true);
-$table_remote->data['ehorus_user'] = $row;
+$row['ehorus_user'] = html_print_label_input_block(
+    __('User'),
+    html_print_input_text('ehorus_user', $config['ehorus_user'], '', 30, 100, true),
+    ['div_class' => 'ehorus-remote-setup-ehorus_user']
+);
 
 // Pass.
-$row = [];
-$row['name'] = __('Password');
-$row['control'] = html_print_input_password('ehorus_pass', io_output_password($config['ehorus_pass']), '', 30, 100, true);
-$row['control'] .= ui_print_reveal_password('ehorus_pass', true);
+$row['ehorus_pass'] = html_print_label_input_block(
+    __('Password'),
+    html_print_input_password('ehorus_pass', io_output_password($config['ehorus_pass']), '', 30, 100, true),
+    ['div_class' => 'ehorus-remote-setup-ehorus_user']
+);
 $table_remote->data['ehorus_pass'] = $row;
 
 // Directory hostname.
 $row = [];
-$row['name'] = __('API Hostname');
-$row['control'] = html_print_input_text('ehorus_hostname', $config['ehorus_hostname'], '', 30, 100, true);
-$table_remote->data['ehorus_hostname'] = $row;
+$row['ehorus_hostname'] = html_print_label_input_block(
+    __('API Hostname'),
+    html_print_input_text('ehorus_hostname', $config['ehorus_hostname'], '', 30, 100, true)
+);
 
 // Directory port.
-$row = [];
-$row['name'] = __('API Port');
-$row['control'] = html_print_input_text('ehorus_port', $config['ehorus_port'], '', 6, 100, true);
+$row['ehorus_port'] = html_print_label_input_block(
+    __('API Port'),
+    html_print_input_text('ehorus_port', $config['ehorus_port'], '', 6, 100, true)
+);
 $table_remote->data['ehorus_port'] = $row;
 
 // Request timeout.
 $row = [];
-$row['name'] = __('Request timeout');
-$row['control'] = html_print_input_text('ehorus_req_timeout', $config['ehorus_req_timeout'], '', 3, 10, true);
+$row['ehorus_req_timeout'] = html_print_label_input_block(
+    __('Request timeout'),
+    html_print_input_text('ehorus_req_timeout', $config['ehorus_req_timeout'], '', 3, 10, true)
+);
 $table_remote->data['ehorus_req_timeout'] = $row;
 
 // Test.
 $row = [];
-$row['name'] = __('Test');
-$row['control'] = html_print_button(
-    __('Start'),
-    'test-ehorus',
-    false,
-    '',
-    [
-        'icon' => 'cog',
-        'mode' => 'secondary mini',
-    ],
-    true
+$test_start = '<span id="test-ehorus-spinner" class="invisible">&nbsp;'.html_print_image('images/spinner.gif', true).'</span>';
+$test_start .= '<span id="test-ehorus-success" class="invisible">&nbsp;'.html_print_image('images/status_sets/default/severity_normal.png', true).'</span>';
+$test_start .= '<span id="test-ehorus-failure" class="invisible">&nbsp;'.html_print_image('images/status_sets/default/severity_critical.png', true).'</span>';
+$test_start .= '&nbsp;<span id="test-ehorus-message" class="invisible"></span>';
+$row['ehorus_test'] = html_print_label_input_block(
+    __('Test'),
+    html_print_button(
+        __('Start'),
+        'test-ehorus',
+        false,
+        '',
+        [
+            'icon'  => 'cog',
+            'mode'  => 'secondary mini',
+            'style' => 'width: 115px;',
+        ],
+        true
+    ).$test_start
 );
-$row['control'] .= '<span id="test-ehorus-spinner" class="invisible">&nbsp;'.html_print_image('images/spinner.gif', true).'</span>';
-$row['control'] .= '<span id="test-ehorus-success" class="invisible">&nbsp;'.html_print_image('images/status_sets/default/severity_normal.png', true).'</span>';
-$row['control'] .= '<span id="test-ehorus-failure" class="invisible">&nbsp;'.html_print_image('images/status_sets/default/severity_critical.png', true).'</span>';
-$row['control'] .= '&nbsp;<span id="test-ehorus-message" class="invisible"></span>';
 $table_remote->data['ehorus_test'] = $row;
 
 // Print.
-echo '<div class="center pdd_b_20px mrgn_top_20px">';
+echo '<div class="center pdd_b_10px mrgn_btn_20px white_box max_floating_element_size">';
 echo '<a target="_blank" rel="noopener noreferrer" href="http://ehorus.com">';
 if ($config['style'] === 'pandora_black' && is_metaconsole() === true) {
     html_print_image(
         'include/ehorus/images/ehorus-logo.png',
         false,
-        ['class' => 'w400px']
+        ['class' => 'w400px mrgn_top_15px']
     );
 } else {
     html_print_image(
         'include/ehorus/images/ehorus-logo-grey.png',
         false,
-        ['class' => 'w400px']
+        ['class' => 'w400px mrgn_top_15px']
     );
 }
 
@@ -179,7 +195,7 @@ if ($config['ehorus_enabled'] && !$custom_field_exists) {
     ui_print_error_message($error_message);
 }
 
-echo "<form method='post'>";
+echo "<form method='post' class='max_floating_element_size'>";
 // Form enable.
 echo '<div id="form_enable">';
 html_print_input_hidden('update_config', 1);
@@ -195,17 +211,14 @@ echo '</div>';
 
     echo '</fieldset>';
     echo '</div>';
-    html_print_div(
-        [
-            'class'   => 'action-buttons w100p',
-            'content' => html_print_submit_button(
-                __('Update'),
-                'update_button',
-                false,
-                ['icon' => 'update'],
-                true
-            ),
-        ]
+    html_print_action_buttons(
+        html_print_submit_button(
+            __('Update'),
+            'update_button',
+            false,
+            ['icon' => 'update'],
+            true
+        )
     );
     echo '</form>';
 
@@ -220,8 +233,8 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked'))
 
 if($('input:checkbox[name="ehorus_user_level_conf"]').is(':checked'))
 {
-    $('#ehorus-remote-setup-ehorus_user').hide();
-    $('#ehorus-remote-setup-ehorus_pass').hide()
+    $('.ehorus-remote-setup-ehorus_user').hide();
+    $('.ehorus-remote-setup-ehorus_pass').hide()
 }
 
 
@@ -234,13 +247,13 @@ if($('input:checkbox[name="ehorus_user_level_conf"]').is(':checked'))
     }
 
     var hideUserPass = function () {
-        $('#ehorus-remote-setup-ehorus_user').hide();
-        $('#ehorus-remote-setup-ehorus_pass').hide();
+        $('.ehorus-remote-setup-ehorus_user').hide();
+        $('.ehorus-remote-setup-ehorus_pass').hide();
     }
 
     var showUserPass = function () {
-        $('#ehorus-remote-setup-ehorus_user').show();
-        $('#ehorus-remote-setup-ehorus_pass').show();
+        $('.ehorus-remote-setup-ehorus_user').show();
+        $('.ehorus-remote-setup-ehorus_pass').show();
     }
 
     var handleEnable = function (event) {
diff --git a/pandora_console/godmode/setup/setup_integria.php b/pandora_console/godmode/setup/setup_integria.php
index fae8178498..9b4770471c 100644
--- a/pandora_console/godmode/setup/setup_integria.php
+++ b/pandora_console/godmode/setup/setup_integria.php
@@ -269,52 +269,102 @@ $table_remote->data = [];
 $table_remote->width = '100%';
 $table_remote->styleTable = 'margin-bottom: 10px;';
 $table_remote->id = 'integria-remote-setup';
-$table_remote->class = 'databox filters';
-$table_remote->size['name'] = '30%';
-$table_remote->style['name'] = 'font-weight: bold';
-$table_remote->style['control'] = 'display: flex;align-items: center;';
+$table_remote->class = 'databox filters filter-table-adv';
+$table_remote->size['hostname'] = '50%';
+$table_remote->size['api_pass'] = '50%';
 
-// Enable eHorus user configuration.
+// Enable Integria user configuration.
 $row = [];
-$row['name'] = ('Integria configuration at user level');
-$row['control'] = html_print_checkbox_switch('integria_user_level_conf', 1, $config['integria_user_level_conf'], true);
+$row['user_level'] = html_print_label_input_block(
+    __('Integria configuration at user level'),
+    html_print_checkbox_switch(
+        'integria_user_level_conf',
+        1,
+        $config['integria_user_level_conf'],
+        true
+    )
+);
 $table_remote->data['integria_user_level_conf'] = $row;
 
 // Integria user.
 $row = [];
-$row['name'] = __('User');
-$row['control'] = html_print_input_text('integria_user', $config['integria_user'], '', 30, 100, true);
-$table_remote->data['integria_user'] = $row;
+$row['user'] = html_print_label_input_block(
+    __('User'),
+    html_print_input_text(
+        'integria_user',
+        $config['integria_user'],
+        '',
+        30,
+        100,
+        true
+    ),
+    ['div_class' => 'integria-remote-setup-integria_user']
+);
 
 // Integria password.
-$row = [];
-$row['name'] = __('Password');
-$row['control'] = html_print_input_password('integria_pass', io_output_password($config['integria_pass']), '', 30, 100, true);
-$row['control'] .= ui_print_reveal_password('integria_pass', true);
+$row['password'] = html_print_label_input_block(
+    __('Password'),
+    html_print_input_password(
+        'integria_pass',
+        io_output_password($config['integria_pass']),
+        '',
+        30,
+        100,
+        true
+    ),
+    ['div_class' => 'integria-remote-setup-integria_pass']
+);
 $table_remote->data['integria_pass'] = $row;
 
 // Integria hostname.
 $row = [];
-$row['name'] = __('URL to Integria IMS setup').ui_print_help_tip(__('Full URL to your Integria IMS setup (e.g., http://192.168.1.20/integria, https://support.mycompany.com).'), true);
-$row['control'] = html_print_input_text('integria_hostname', $config['integria_hostname'], '', 30, 100, true);
-$table_remote->data['integria_hostname'] = $row;
+$row['hostname'] = html_print_label_input_block(
+    __('URL to Integria IMS setup').ui_print_help_tip(__('Full URL to your Integria IMS setup (e.g., http://192.168.1.20/integria, https://support.mycompany.com).'), true),
+    html_print_input_text(
+        'integria_hostname',
+        $config['integria_hostname'],
+        '',
+        30,
+        100,
+        true
+    ),
+    ['div_class' => 'integria-remote-setup-integria_hostname']
+);
 
 // API password.
-$row = [];
-$row['name'] = __('API Password');
-$row['control'] = html_print_input_password('integria_api_pass', io_output_password($config['integria_api_pass']), '', 30, 100, true);
-$row['control'] .= ui_print_reveal_password('integria_api_pass', true);
+$row['api_pass'] = html_print_label_input_block(
+    __('API Password'),
+    html_print_input_password(
+        'integria_api_pass',
+        io_output_password($config['integria_api_pass']),
+        '',
+        30,
+        100,
+        true
+    ),
+    ['div_class' => 'integria-remote-setup-integria_api_pass']
+);
 $table_remote->data['integria_api_pass'] = $row;
 
 // Request timeout.
 $row = [];
-$row['name'] = __('Request timeout');
-$row['control'] = html_print_input_text('integria_req_timeout', $config['integria_req_timeout'], '', 3, 10, true);
+$row['req_timeout'] = html_print_label_input_block(
+    __('Request timeout'),
+    html_print_input_text(
+        'integria_req_timeout',
+        $config['integria_req_timeout'],
+        '',
+        3,
+        10,
+        true
+    ),
+    ['div_class' => 'integria-remote-setup-integria_req_timeout']
+);
 $table_remote->data['integria_req_timeout'] = $row;
 
 $row = [];
-$row['name'] = __('Inventory');
-$row['control'] = html_print_button(
+$row['control'] = __('Inventory');
+$row['control'] .= html_print_button(
     __('Sync inventory'),
     'sync-inventory',
     false,
@@ -575,8 +625,8 @@ $table_cr_settings->data['custom_response_incident_status'] = $row;
 
 // Test.
 $row = [];
-$row['name'] = __('Test');
-$row['control'] = html_print_button(
+$row['control'] = __('Test');
+$row['control'] .= html_print_button(
     __('Start'),
     'test-integria',
     false,
@@ -594,12 +644,12 @@ $row['control'] .= '&nbsp;<span id="test-integria-message" class="invisible"></s
 $table_remote->data['integria_test'] = $row;
 
 // Print.
-echo '<div class="center pdd_b_20px mrgn_top_20px">';
+echo '<div class="center pdd_b_10px mrgn_btn_20px white_box max_floating_element_size">';
 echo '<a target="_blank" rel="noopener noreferrer" href="http://integriaims.com">';
 html_print_image(
     'images/integria_logo.svg',
     false,
-    ['class' => 'w400px'    ]
+    ['class' => 'w400px mrgn_top_15px']
 );
 echo '</a>';
 echo '<br />';
@@ -611,7 +661,7 @@ echo 'https://integriaims.com';
 echo '</a>';
 echo '</div>';
 
-echo "<form method='post'>";
+echo "<form method='post' class='max_floating_element_size'>";
 html_print_input_hidden('update_config', 1);
 
 // Form enable.
@@ -650,33 +700,24 @@ if ($has_connection != false) {
     echo '</fieldset>';
     echo '</div>';
 
-    html_print_div(
-        [
-            'class'   => 'action-buttons w100p',
-            'content' => html_print_submit_button(
-                __('Update'),
-                'update_button',
-                false,
-                ['icon' => 'update'],
-                true
-            ),
-        ]
+    $update_button = html_print_submit_button(
+        __('Update'),
+        'update_button',
+        false,
+        ['icon' => 'update'],
+        true
     );
 } else {
-    html_print_div(
-        [
-            'class'   => 'action-buttons w100p',
-            'content' => html_print_submit_button(
-                __('Update and continue'),
-                'update_button',
-                false,
-                ['icon' => 'update'],
-                true
-            ),
-        ]
+    $update_button = html_print_submit_button(
+        __('Update and continue'),
+        'update_button',
+        false,
+        ['icon' => 'update'],
+        true
     );
 }
 
+html_print_action_buttons($update_button);
 
 echo '</form>';
 
@@ -686,8 +727,8 @@ echo '</form>';
 
     if($('input:checkbox[name="integria_user_level_conf"]').is(':checked'))
     {
-        $('#integria-remote-setup-integria_user').hide();
-        $('#integria-remote-setup-integria_pass').hide()
+        $('.integria-remote-setup-integria_user').hide();
+        $('.integria-remote-setup-integria_pass').hide()
     }
 
     var handleUserLevel = function(event) {
@@ -726,13 +767,13 @@ echo '</form>';
     }
 
     var hideUserPass = function () {
-        $('#integria-remote-setup-integria_user').hide();
-        $('#integria-remote-setup-integria_pass').hide();
+        $('.integria-remote-setup-integria_user').hide();
+        $('.integria-remote-setup-integria_pass').hide();
     }
 
     var showUserPass = function () {
-        $('#integria-remote-setup-integria_user').show();
-        $('#integria-remote-setup-integria_pass').show();
+        $('.integria-remote-setup-integria_user').show();
+        $('.integria-remote-setup-integria_pass').show();
     }
 
     var handleEnable = function (event) {
diff --git a/pandora_console/include/ajax/double_auth.ajax.php b/pandora_console/include/ajax/double_auth.ajax.php
index 3a995ce43a..54856a26c3 100644
--- a/pandora_console/include/ajax/double_auth.ajax.php
+++ b/pandora_console/include/ajax/double_auth.ajax.php
@@ -216,11 +216,8 @@ if ($get_double_auth_info_page) {
     $html .= '</p>';
     $html .= '</div>';
     $html .= '<br>';
-    $html .= '<div class="center_align">';
+    $html .= '<div class="flex flex-space-around">';
     $html .= html_print_button(__('Download the app'), 'google_authenticator_download', false, '', '', true);
-    $html .= '</div>';
-    $html .= '<br>';
-    $html .= '<div class="center_align">';
     $html .= html_print_button(__('Continue'), 'continue_to_generate', false, '', '', true);
     $html .= '</div>';
 
@@ -311,11 +308,11 @@ if ($get_double_auth_generation_page) {
     $html .= '<br>';
     $html .= __('QR').': <br>';
     $html .= '<div id="qr-container"></div>';
-    $html .= '<br>';
+    $html .= '<br><div class="flex flex-space-around">';
     $html .= html_print_button(__('Refresh code'), 'continue_to_generate', false, '', '', true);
-    $html .= '&nbsp;';
     $html .= html_print_button(__('Continue'), 'continue_to_validate', false, '', '', true);
     $html .= '</div>';
+    $html .= '</div>';
 
     ob_clean();
     ?>
@@ -453,7 +450,7 @@ if ($get_double_auth_validation_page) {
     $html .= html_print_input_text('code', '', '', 50, $secret_lenght, true);
     $html .= '<div id="code_input_message" class="red"></div>';
     $html .= '<br><br>';
-    $html .= '<div id="button-container">';
+    $html .= '<div id="button-container" class="flex flex-space-around">';
     $html .= html_print_button(__('Validate code'), 'continue_to_validate', false, '', '', true);
     $html .= html_print_image('images/spinner.gif', true);
     $html .= '</div>';
diff --git a/pandora_console/include/class/ExternalTools.class.php b/pandora_console/include/class/ExternalTools.class.php
index eb751b2ff9..b086dd0419 100644
--- a/pandora_console/include/class/ExternalTools.class.php
+++ b/pandora_console/include/class/ExternalTools.class.php
@@ -234,7 +234,7 @@ class ExternalTools extends HTML
                                 'images/change-active.svg',
                                 true,
                                 [
-                                    'id'    => 'button_sound_warning',
+                                    'id'    => 'button_sound_alert',
                                     'style' => 'vertical-align: middle; margin-left: 10px',
                                     'width' => '16',
                                     'title' => __('Play sound'),
@@ -269,7 +269,7 @@ class ExternalTools extends HTML
                                 'images/change-active.svg',
                                 true,
                                 [
-                                    'id'    => 'button_sound_warning',
+                                    'id'    => 'button_sound_critical',
                                     'style' => 'vertical-align: middle; margin-left: 10px',
                                     'width' => '16',
                                     'title' => __('Play sound'),
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 82b26c79fb..4e03772017 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -509,6 +509,10 @@ select:-internal-list-box {
   width: 400px;
 }
 
+.w400px-important {
+  width: 400px !important;
+}
+
 .w450px {
   width: 450px;
 }
@@ -11752,3 +11756,7 @@ div.relative > div > div#ui-datepicker-div {
   border-radius: 0px;
   margin-left: 10px;
 }
+
+.container-div-input-password:has(.w400px-important) {
+  width: 400px;
+}
diff --git a/pandora_console/include/styles/setup.css b/pandora_console/include/styles/setup.css
index f4c1571167..59699aff82 100644
--- a/pandora_console/include/styles/setup.css
+++ b/pandora_console/include/styles/setup.css
@@ -12,8 +12,8 @@ span.subtitle-2 {
   border: 0 !important;
 }
 
-input[type="text"],
-input[type="number"] {
+input[type="text"]:not(.w100p-important),
+input[type="number"]:not(.w100p-important) {
   width: 220px;
 }