diff --git a/src/ui/qgsgpsdevicedialogbase.ui b/src/ui/qgsgpsdevicedialogbase.ui
index 927704f10f0..a944f72b64c 100644
--- a/src/ui/qgsgpsdevicedialogbase.ui
+++ b/src/ui/qgsgpsdevicedialogbase.ui
@@ -82,10 +82,10 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
-         <item row="1" column="2">
+         <item row="1" column="1">
           <widget class="QToolButton" name="mButtonAddDevice">
            <property name="toolTip">
-            <string>Add new path</string>
+            <string>Add new device</string>
            </property>
            <property name="text">
             <string/>
@@ -96,7 +96,7 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="1">
+         <item row="1" column="0">
           <spacer>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -109,10 +109,10 @@
            </property>
           </spacer>
          </item>
-         <item row="1" column="3">
+         <item row="1" column="2">
           <widget class="QToolButton" name="mButtonRemoveDevice">
            <property name="toolTip">
-            <string>Remove path</string>
+            <string>Remove device</string>
            </property>
            <property name="text">
             <string/>
@@ -123,7 +123,7 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="1" colspan="3">
+         <item row="0" column="0" colspan="3">
           <widget class="QListWidget" name="mListDevices">
            <property name="minimumSize">
             <size>