diff --git a/doc/qtcreator/images/qmldesigner-custom-component-properties.png b/doc/qtcreator/images/qmldesigner-custom-component-properties.png
deleted file mode 100644
index 9fbb8b7901d..00000000000
Binary files a/doc/qtcreator/images/qmldesigner-custom-component-properties.png and /dev/null differ
diff --git a/doc/qtcreator/src/qtquick/library/qtquick-components-custom.qdoc b/doc/qtcreator/src/qtquick/library/qtquick-components-custom.qdoc
index 1c785acd653..dc7ba752685 100644
--- a/doc/qtcreator/src/qtquick/library/qtquick-components-custom.qdoc
+++ b/doc/qtcreator/src/qtquick/library/qtquick-components-custom.qdoc
@@ -49,20 +49,19 @@
     \list 1
         \li Select \uicontrol File > \uicontrol {New File or Project} >
             \if defined(qtcreator)
-            \uicontrol Qt > \uicontrol {QML File (Qt Quick 2)} >
+            \uicontrol Qt > \uicontrol {Qt Quick UI File} >
             \else
-            \uicontrol {Qt Quick Files} > \uicontrol {Qt Quick File} >
+            \uicontrol {Qt Quick Files} > \uicontrol {Qt Quick UI File} >
             \endif
-            \uicontrol Choose to create a new .qml file.
+            \uicontrol Choose to create a new \c .ui.qml file.
             \note Components are listed in \uicontrol Library >
             \uicontrol Components > \uicontrol {My Components} only
             if the filename begins with a capital letter.
-        \li Click \uicontrol Design to open the component file (ui.qml) in
+        \li Click \uicontrol Design to open the file in
             \uicontrol {Form Editor}.
         \li Drag-and-drop a component from \uicontrol Library to
             \uicontrol Navigator or \uicontrol {Form Editor}.
         \li Edit component properties in the \uicontrol Properties view.
-            \image qmldesigner-custom-component-properties.png
             The available properties depend on the component type. You can
             \l{Specifying Dynamic Properties}{add properties for
             components} in \uicontrol {Connection View} > \uicontrol Properties.
diff --git a/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc b/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc
index d3125d7a016..a92328e0389 100644
--- a/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc
@@ -42,12 +42,12 @@
 
         \li Select \uicontrol File > \uicontrol {New File or Project} >
             \if defined(qtcreator)
-            \uicontrol Qt > \uicontrol {QML File (Qt Quick 2)} >
+            \uicontrol Qt > \uicontrol {Qt Quick UI File} >
             \else
-            \uicontrol {Qt Quick Files} > \uicontrol {Qt Quick File} >
+            \uicontrol {Qt Quick Files} > \uicontrol {Qt Quick UI File} >
             \endif
-            \uicontrol Choose to create a QML file called Button.qml (for
-            example).
+            \uicontrol Choose to create a \l{UI Files}{UI file} called
+            Button.ui.qml (for example).
 
             \note Components are listed in \l Library > \uicontrol Components >
             \uicontrol {My Components} only if the filename begins with a
@@ -160,11 +160,12 @@
     To create a button component, select \uicontrol File >
     \uicontrol {New File or Project} >
     \if defined(qtcreator)
-    \uicontrol Qt > \uicontrol {QML File (Qt Quick 2)} >
+    \uicontrol Qt > \uicontrol {Qt Quick UI File} >
     \else
-    \uicontrol {Qt Quick Files} > \uicontrol {Qt Quick File} >
+    \uicontrol {Qt Quick Files} > \uicontrol {Qt Quick UI File} >
     \endif
-    \uicontrol Choose to create a file called Button.qml (for example).
+    \uicontrol Choose to create a \l{UI Files}{UI file} called Button.ui.qml
+    (for example).
 
     \note Components are listed in \l Library > \uicontrol Components >
     \uicontrol {My Components} only if the filename begins with a
@@ -175,8 +176,7 @@
     To construct the button component:
 
     \list 1
-        \li Click \uicontrol {Design} to edit the component file in
-            \l {Form Editor}.
+        \li Click \uicontrol {Design} to edit the UI file in \l {Form Editor}.
         \li Select \l Library > \uicontrol Assets > \inlineimage plus.png
             to copy the image files you want to use to the project folder.
         \li In \l Navigator, select the root component and set the
diff --git a/doc/qtdesignstudio/images/studio-dial.png b/doc/qtdesignstudio/images/studio-dial.png
index f440845e71f..05f15b4c45f 100644
Binary files a/doc/qtdesignstudio/images/studio-dial.png and b/doc/qtdesignstudio/images/studio-dial.png differ