Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5

resources/qml/Preferences/GeneralPage.qml

@@ -361,12 +361,6 @@ UM.PreferencesPage
                 width: UM.Theme.getSize("default_margin").width
             }
 
-            Label
-            {
-                font.bold: true
-                text: catalog.i18nc("@label", "Override Profile")
-            }
-
             UM.TooltipArea
             {
                 width: childrenRect.width;
@@ -374,10 +368,20 @@ UM.PreferencesPage
 
                 text: catalog.i18nc("@info:tooltip", "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again.")
 
+                Column
+                {
+                    spacing: 4
+
+                    Label
+                    {
+                        font.bold: true
+                        text: catalog.i18nc("@label", "Override Profile")
+                    }
+
                     ComboBox
                     {
                         id: choiceOnProfileOverrideDropDownButton
-                    width: 300
+                        width: 200
 
                         model: ListModel
                         {
@@ -407,6 +411,7 @@ UM.PreferencesPage
                         onActivated: UM.Preferences.setValue("cura/choice_on_profile_override", model.get(index).code)
                     }
                 }
+            }
 
             Item
             {