diff --git a/src/apps/deskflow-gui/dialogs/ServerConfigDialog.ui b/src/apps/deskflow-gui/dialogs/ServerConfigDialog.ui
index 45006fba6..7fc5c3c70 100644
--- a/src/apps/deskflow-gui/dialogs/ServerConfigDialog.ui
+++ b/src/apps/deskflow-gui/dialogs/ServerConfigDialog.ui
@@ -384,24 +384,14 @@
             </item>
             <item>
              <widget class="QSpinBox" name="sbSwitchCornerSize">
+              <property name="suffix">
+               <string>px</string>
+              </property>
               <property name="maximum">
                <number>30000</number>
               </property>
              </widget>
             </item>
-            <item>
-             <widget class="QLabel" name="label_3">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>px</string>
-              </property>
-             </widget>
-            </item>
            </layout>
           </item>
           <item>
@@ -504,6 +494,9 @@
               <property name="enabled">
                <bool>false</bool>
               </property>
+              <property name="suffix">
+               <string>MB</string>
+              </property>
               <property name="maximum">
                <number>10000</number>
               </property>
@@ -512,13 +505,6 @@
               </property>
              </widget>
             </item>
-            <item>
-             <widget class="QLabel" name="label_4">
-              <property name="text">
-               <string>MB</string>
-              </property>
-             </widget>
-            </item>
            </layout>
           </item>
           <item>
@@ -588,6 +574,9 @@
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="suffix">
+               <string>ms</string>
+              </property>
               <property name="minimum">
                <number>1000</number>
               </property>
@@ -602,13 +591,6 @@
               </property>
              </widget>
             </item>
-            <item>
-             <widget class="QLabel" name="m_pLabel_16">
-              <property name="text">
-               <string>ms</string>
-              </property>
-             </widget>
-            </item>
            </layout>
           </item>
           <item>
@@ -721,6 +703,9 @@
               <property name="enabled">
                <bool>false</bool>
               </property>
+              <property name="suffix">
+               <string>ms</string>
+              </property>
               <property name="minimum">
                <number>10</number>
               </property>
@@ -735,13 +720,6 @@
               </property>
              </widget>
             </item>
-            <item>
-             <widget class="QLabel" name="m_pLabel_14">
-              <property name="text">
-               <string>ms</string>
-              </property>
-             </widget>
-            </item>
            </layout>
           </item>
           <item>
@@ -774,6 +752,9 @@
               <property name="enabled">
                <bool>false</bool>
               </property>
+              <property name="suffix">
+               <string>ms</string>
+              </property>
               <property name="minimum">
                <number>10</number>
               </property>
@@ -788,13 +769,6 @@
               </property>
              </widget>
             </item>
-            <item>
-             <widget class="QLabel" name="m_pLabel_15">
-              <property name="text">
-               <string>ms</string>
-              </property>
-             </widget>
-            </item>
            </layout>
           </item>
           <item>