diff --git a/src/gui/src/ServerConfigDialogBase.ui b/src/gui/src/ServerConfigDialogBase.ui
index df52f6fb85..3614fc45e6 100644
--- a/src/gui/src/ServerConfigDialogBase.ui
+++ b/src/gui/src/ServerConfigDialogBase.ui
@@ -6,8 +6,8 @@
0
0
- 795
- 534
+ 778
+ 453
@@ -17,7 +17,7 @@
-
- 0
+ 2
@@ -339,301 +339,230 @@
Advanced server settings
-
-
-
-
-
- true
-
+
-
+
+
+ 0
-
- &Switch
+
+ 0
-
-
-
-
+
-
+
+
+
+ true
+
+
+
+ &Switch computer
+
+
-
-
-
- true
-
-
- Switch &after waiting
-
-
+
+
-
+
+
+ true
+
+
+ Switch &after waiting
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ false
+
+
+ 10
+
+
+ 10000
+
+
+ 10
+
+
+ 250
+
+
+
+ -
+
+
+ ms
+
+
+
+
-
-
+
+
-
+
+
+ true
+
+
+ Switch on double &tap within
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ false
+
+
+ 10
+
+
+ 10000
+
+
+ 10
+
+
+ 250
+
+
+
+ -
+
+
+ ms
+
+
+
+
+
+
+
+
+ -
+
+
+
+ true
+
+
+
+ Clipboard sharing
+
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Enable clipboard sharing
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ false
+
+
+ 10000
+
+
+ 3
+
+
+
+ -
+
+
+ mb
+
+
+
+
+
+ -
+
- Qt::Horizontal
+ Qt::Vertical
- 40
- 20
+ 20
+ 23
- -
-
-
- false
-
-
- 10
-
-
- 10000
-
-
- 10
-
-
- 250
-
-
-
- -
-
-
- ms
-
-
-
-
- -
-
-
-
-
-
- true
-
-
- Switch on double &tap within
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- false
-
-
- 10
-
-
- 10000
-
-
- 10
-
-
- 250
-
-
-
- -
-
-
- ms
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
+
+
+
- -
-
-
-
- false
-
+
-
+
+
+ Qt::Vertical
-
- &Options
+
+
+ 20
+ 40
+
-
-
-
-
-
-
-
-
- Enable clipboard sharing
-
-
- true
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- false
-
-
- 50
-
-
- 3
-
-
-
- -
-
-
- MB
-
-
-
-
-
- -
-
-
- true
-
-
- Don't take &foreground window on Windows servers
-
-
-
- -
-
-
- true
-
-
- Use &relative mouse moves
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 16
-
-
-
-
- -
-
-
- Ignore auto config clients
-
-
-
- -
-
-
-
-
-
- true
-
-
- &Check clients every
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- false
-
-
- 1000
-
-
- 30000
-
-
- 1000
-
-
- 5000
-
-
-
- -
-
-
- ms
-
-
-
-
-
- -
-
-
- Disable lock to screen
-
-
-
-
-
+
- -
+
-
@@ -647,49 +576,36 @@
false
-
-
+
-
To&p-left
- -
+
-
Top-rig&ht
- -
+
-
&Bottom-left
- -
+
-
Bottom-ri&ght
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
+
-
+
-
@@ -701,38 +617,150 @@
-
-
+
+
+ 30000
+
+
+
+ -
+
+
+ px
+
+
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Qt::Vertical
+
-
+
+
+ 0
-
-
- 20
- 40
-
+
+ 0
-
+ -
+
+
+
+ false
+
+
+
+ &Options
+
+
+
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 16
+
+
+
+
+ -
+
+
+ true
+
+
+ Use &relative mouse moves
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+ true
+
+
+ &Check clients every
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ false
+
+
+ 1000
+
+
+ 30000
+
+
+ 1000
+
+
+ 5000
+
+
+
+ -
+
+
+ ms
+
+
+
+
+
+ -
+
+
+ Ignore auto config clients
+
+
+
+ -
+
+
+ Disable lock to screen
+
+
+
+ -
+
+
+ true
+
+
+ Don't take &foreground window on Windows servers
+
+
+
+
+
+
+