diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 47fd710ec3..00e48c9b1b 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4798,9 +4798,15 @@ input:checked + .p-slider:before {
   margin-bottom: 0 !important;
 }
 
-.user_edit_first_row,
+.user_edit_first_row {
+  display: flex;
+}
+
 .user_edit_second_row {
   display: flex;
+  flex-flow: row wrap;
+  flex-direction: row;
+  justify-content: space-between;
 }
 
 .user_edit_first_row,
@@ -4865,7 +4871,6 @@ input:checked + .p-slider:before {
 
 .edit_user_options {
   width: 50%;
-  margin-right: 20px;
   padding-right: 50px;
 }
 
@@ -4883,8 +4888,7 @@ input:checked + .p-slider:before {
 }
 
 .edit_user_timezone {
-  width: 50%;
-  padding-left: 50px;
+  width: 40%;
 }
 
 .edit_user_timezone #zonepicker {
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 3ffdac1731..69593c3754 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -44,7 +44,7 @@ if (!is_metaconsole()) {
         'living'         => 'Living Earth',
     ];
 
-    $local_file = 'include/javascript/timezonepicker/images/gray-600.png';
+    $local_file = 'include/javascript/timezonepicker/images/gray-400.png';
 
     // Dimensions must always be exact since the imagemap does not scale.
     $array_size = getimagesize($local_file);
@@ -599,10 +599,10 @@ echo '<form name="user_mod" method="post" action="'.ui_get_full_url().'&amp;modi
 
 if (!is_metaconsole()) {
     echo '<div id="timezone-picker">
-                            <img id="timezone-image" src="'.$local_file.'" width="'.$map_width.'" height="'.$map_height.'" usemap="#timezone-map" />
-                            <img class="timezone-pin" src="include/javascript/timezonepicker/images/pin.png" style="padding-top: 4px;" />
-                            <map name="timezone-map" id="timezone-map">'.$area_data_timezone_polys.$area_data_timezone_rects.'</map>
-                        </div>';
+                        <img id="timezone-image" src="'.$local_file.'" width="'.$map_width.'" height="'.$map_height.'" usemap="#timezone-map" />
+                        <img class="timezone-pin" src="include/javascript/timezonepicker/images/pin.png" style="padding-top: 4px;" />
+                        <map name="timezone-map" id="timezone-map">'.$area_data_timezone_polys.$area_data_timezone_rects.'</map>
+                    </div>';
 }
 
                 echo '</div>