QmlDesigner: Update icons of Qt Quick Designer

Change-Id: I970da740c15505cae525fc3514a27c1bc12fe40f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

82 files changed, 455 insertions, 180 deletions

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression.png
index d13cf9fad9..8e6d13d7d9 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression@2x.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression@2x.png
index 56244287a5..ec5e85b953 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression@2x.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression@2x.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder.png
index ae22d32b6e..b8a20751bf 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder@2x.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder@2x.png
index 305619812d..d0160d6ed1 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder@2x.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder@2x.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/submenu.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/submenu.png
index 18be756dec..a798b1d853 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/submenu.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/submenu.png
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/submenu@2x.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/submenu@2x.png
index 58d6320b77..e068ed9799 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/submenu@2x.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/submenu@2x.png
diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme
new file mode 100644
index 0000000000..fca71810bc
--- /dev/null
+++ b/share/qtcreator/themes/design.creatortheme
@@ -0,0 +1,426 @@
+[General]
+ThemeName=Design
+PreferredStyles=Fusion
+DefaultTextEditorColorScheme=creator-dark.xml
+
+[Palette]
+
+;color for the mode toolbar, un-selected tabs, toolbars for each panel, scroll bar backgrounds and active tab panels, text for the non selected tabs.
+;shadowBackground=ff404244
+shadowBackground=ff191919
+
+
+;main text color
+;text=ffd0d0d0
+text=ffdadada
+
+;disabled text
+textDisabled=60a4a6a8
+
+;icons, spinbox ticks,
+;toolBarItem=b6fbfdff
+toolBarItem=ffb3b3b3
+
+
+; all disabled icons and the separators between icons
+;toolBarItemDisabled=60a4a6a8
+toolBarItemDisabled=ff686868
+
+
+
+;text for dropdown selectors in the panel menus, file selection and text for all pop out panels such as issues, search results, etc.
+fancyBarsNormalTextColor=ffd0d0d0
+;fancyBarsNormalTextColor=ffd3299a
+
+
+
+;text for the mode sidebar menu.
+fancyBarsBoldTextColor=b6fbfdff
+;fancyBarsBoldTextColor=b6d3299a
+
+
+
+;also the color for the scroll bar handles and inside rectangle for the Type text box, and the working area timeline ruler.
+;also the background selection rectangle for icons and selection highlight for bounding box.
+;hoverBackground=22ffffff
+hoverBackground=ff404244
+
+
+
+;blended background color for controls 1 spinboxes, background selection square for snapping modes, publish as alias icon.
+;color for filter background and overwrite width and height boxes
+;selectedBackground=66000000
+selectedBackground=ff111111
+
+
+;background for default "open a document" screen in the edit mode,
+;normalBackground=ff2E2F30
+normalBackground=ff262728
+
+
+
+;not used anywhere i can see
+alternateBackground=ff353637
+
+
+error=ffdf4f4f
+warning=ffecbc1c
+
+
+;dividng lines between all the panels
+;splitter=ff06080A
+splitter=ff474747
+
+
+
+
+
+textColorLink=ff007af4
+textColorLinkVisited=ffa57aff
+backgroundColorDisabled=ff444444
+
+[Colors]
+BackgroundColorAlternate=alternateBackground
+BackgroundColorDark=shadowBackground
+BackgroundColorHover=hoverBackground
+BackgroundColorNormal=normalBackground
+BackgroundColorDisabled=backgroundColorDisabled
+BackgroundColorSelected=selectedBackground
+BadgeLabelBackgroundColorChecked=ffe0e0e0
+BadgeLabelBackgroundColorUnchecked=ff808080
+BadgeLabelTextColorChecked=ff606060
+BadgeLabelTextColorUnchecked=ffffffff
+CanceledSearchTextColor=ff0000
+ComboBoxArrowColor=toolBarItem
+ComboBoxArrowColorDisabled=toolBarItemDisabled
+ComboBoxTextColor=fancyBarsNormalTextColor
+DetailsButtonBackgroundColorHover=22ffffff
+DetailsWidgetBackgroundColor=18ffffff
+DockWidgetResizeHandleColor=splitter
+DoubleTabWidget1stSeparatorColor=splitter
+DoubleTabWidget1stTabActiveTextColor=text
+DoubleTabWidget1stTabBackgroundColor=ff505050
+DoubleTabWidget1stTabInactiveTextColor=text
+DoubleTabWidget2ndSeparatorColor=toolBarItemDisabled
+DoubleTabWidget2ndTabActiveTextColor=text
+DoubleTabWidget2ndTabBackgroundColor=selectedBackground
+DoubleTabWidget2ndTabInactiveTextColor=text
+EditorPlaceholderColor=normalBackground
+FancyToolBarSeparatorColor=toolBarItemDisabled
+FancyTabBarBackgroundColor=shadowBackground
+FancyTabWidgetDisabledSelectedTextColor=toolBarItemDisabled
+FancyTabWidgetDisabledUnselectedTextColor=toolBarItemDisabled
+FancyTabWidgetEnabledSelectedTextColor=fancyBarsBoldTextColor
+FancyTabWidgetEnabledUnselectedTextColor=fancyBarsBoldTextColor
+FancyToolButtonHoverColor=hoverBackground
+FancyToolButtonSelectedColor=selectedBackground
+FutureProgressBackgroundColor=shadowBackground
+IconsBaseColor=toolBarItem
+IconsDisabledColor=toolBarItemDisabled
+IconsInfoColor=ff3099dc
+IconsInfoToolBarColor=ff71b2db
+IconsWarningColor=warning
+IconsWarningToolBarColor=fff2d76e
+IconsErrorColor=error
+IconsErrorToolBarColor=ffdb6f71
+IconsRunColor=ff6da838
+IconsRunToolBarColor=ff93be6c
+IconsStopColor=ffee6969
+IconsStopToolBarColor=ffe27f7f
+IconsInterruptColor=ff587ff7
+IconsInterruptToolBarColor=ff6a7bc3
+IconsDebugColor=toolBarItem
+IconsNavigationArrowsColor=ffebc322
+IconsBuildHammerHandleColor=ffb06112
+IconsBuildHammerHeadColor=ff828384
+IconsModeWelcomeActiveColor=ff80c342
+IconsModeEditActiveColor=ff99aaef
+IconsModeDesignActiveColor=ffbb6000
+IconsModeDebugActiveColor=ff99aaef
+IconsModeProjectActiveColor=ff80c342
+IconsModeAnalyzeActiveColor=ff43adee
+IconsModeHelpActiveColor=fff4be04
+IconsCodeModelKeywordColor=ff777777
+IconsCodeModelClassColor=ffc0b550
+IconsCodeModelStructColor=ff53b053
+IconsCodeModelFunctionColor=ffd34373
+IconsCodeModelVariableColor=ff2bbbcc
+IconsCodeModelEnumColor=ffc0b550
+IconsCodeModelMacroColor=ff476ba0
+IconsCodeModelAttributeColor=ff316511
+IconsCodeModelUniformColor=ff994899
+IconsCodeModelVaryingColor=ffa08833
+IconsCodeModelOverlayBackgroundColor=70000000
+IconsCodeModelOverlayForegroundColor=ffd0d0d0
+InfoBarBackground=ff505000
+InfoBarText=text
+MenuBarEmptyAreaBackgroundColor=shadowBackground
+MenuBarItemBackgroundColor=shadowBackground
+MenuBarItemTextColorDisabled=textDisabled
+MenuBarItemTextColorNormal=text
+MenuItemTextColorDisabled=textDisabled
+MenuItemTextColorNormal=text
+MiniProjectTargetSelectorBackgroundColor=shadowBackground
+MiniProjectTargetSelectorBorderColor=shadowBackground
+MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground
+MiniProjectTargetSelectorTextColor=fancyBarsNormalTextColor
+PanelStatusBarBackgroundColor=shadowBackground
+PanelsWidgetSeparatorLineColor=000000
+PanelTextColorDark=text
+PanelTextColorMid=ffa0a0a0
+PanelTextColorLight=text
+ProgressBarColorError=error
+ProgressBarColorFinished=dda4d576
+ProgressBarColorNormal=ff999999
+ProgressBarTitleColor=fancyBarsBoldTextColor
+ProgressBarBackgroundColor=a0606060
+SplitterColor=splitter
+TextColorDisabled=textDisabled
+TextColorError=ffff4040
+TextColorHighlight=ffff0000
+TextColorHighlightBackground=8a7f2c
+TextColorLink=textColorLink
+TextColorLinkVisited=textColorLinkVisited
+TextColorNormal=text
+ToggleButtonBackgroundColor=shadowBackground
+ToolBarBackgroundColor=shadowBackground
+TreeViewArrowColorNormal=hoverBackground
+TreeViewArrowColorSelected=text
+
+OutputPanes_DebugTextColor=text
+OutputPanes_ErrorMessageTextColor=ffff6c6c
+OutputPanes_MessageOutput=ff008787
+OutputPanes_NormalMessageTextColor=text
+OutputPanes_StdErrTextColor=ffff6666
+OutputPanes_StdOutTextColor=text
+OutputPanes_WarningMessageTextColor=fff3c300
+OutputPanes_TestPassTextColor=ff00b400
+OutputPanes_TestFailTextColor=ffcf4848
+OutputPanes_TestXFailTextColor=ff28dc28
+OutputPanes_TestXPassTextColor=ffdc2828
+OutputPanes_TestSkipTextColor=ff828282
+OutputPanes_TestWarnTextColor=ffc8c800
+OutputPanes_TestFatalTextColor=ffc82828
+OutputPanes_TestDebugTextColor=ff329696
+OutputPaneButtonFlashColor=error
+OutputPaneToggleButtonTextColorChecked=fancyBarsNormalTextColor
+OutputPaneToggleButtonTextColorUnchecked=fancyBarsNormalTextColor
+
+Debugger_LogWindow_LogInput=ff00acac
+Debugger_LogWindow_LogStatus=ff00875a
+Debugger_LogWindow_LogTime=ffbf0303
+
+Debugger_WatchItem_ValueNormal=text
+Debugger_WatchItem_ValueInvalid=textDisabled
+Debugger_WatchItem_ValueChanged=ffff6666
+
+Debugger_Breakpoint_TextMarkColor=ffff4040
+
+Welcome_TextColor=text
+Welcome_ForegroundPrimaryColor=ff999999
+Welcome_ForegroundSecondaryColor=ff808080
+Welcome_BackgroundColor=normalBackground
+Welcome_ButtonBackgroundColor=normalBackground
+Welcome_DividerColor=ff555555
+Welcome_HoverColor=ff444444
+Welcome_LinkColor=ff7fc63c
+Welcome_DisabledLinkColor=textDisabled
+
+Timeline_TextColor=text
+Timeline_BackgroundColor1=normalBackground
+Timeline_BackgroundColor2=ff444444
+Timeline_DividerColor=ff555555
+Timeline_HighlightColor=ff3099dc
+Timeline_PanelBackgroundColor=ff808080
+Timeline_PanelHeaderColor=alternateBackground
+Timeline_HandleColor=alternateBackground
+Timeline_RangeColor=selectedBackground
+
+VcsBase_FileStatusUnknown_TextColor=text
+VcsBase_FileAdded_TextColor=ff00ff00
+VcsBase_FileModified_TextColor=ff8ee0ff
+VcsBase_FileDeleted_TextColor=fffff6c6c
+VcsBase_FileRenamed_TextColor=ffffa500
+VcsBase_FileUnmerged_TextColor=ffff4040
+
+Bookmarks_TextMarkColor=ff8080ff
+
+TextEditor_SearchResult_ScrollBarColor=ff00c000
+TextEditor_CurrentLine_ScrollBarColor=ffffffff
+
+ProjectExplorer_TaskError_TextMarkColor=error
+ProjectExplorer_TaskWarn_TextMarkColor=warning
+
+ClangCodeModel_Error_TextMarkColor=error
+ClangCodeModel_Warning_TextMarkColor=warning
+
+
+;Designer Main colors
+
+; Design View panel backgrounds - Library, Form Viewer, Properties, States, Timeline & Connections. - lOOKS LIKE IS NO LONGER USED.
+QmlDesigner_BackgroundColor=ff4c4e50
+;QmlDesigner_BackgroundColor=ffd3299a
+
+
+; Design View selected items - Navigator Selection, Timeline Property Selection, TImeline bar, property text highlighted
+QmlDesigner_HighlightColor=ff3f91c4
+;QmlDesigner_HighlightColor=ffd3299a
+
+
+
+; live selection color for the form editors smart guides.
+;QmlDesigner_FormEditorSelectionColor=ff4ba2ff
+QmlDesigner_FormEditorSelectionColor=ffd3299a
+
+
+;color for lable text in form editor
+QmlDesigner_FormEditorForegroundColor=ffdadada
+;QmlDesigner_FormEditorForegroundColor=ffd3299a
+
+
+
+
+;new colors
+
+;background color for main form view, library, navigator, properties, connections
+;QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50
+QmlDesigner_BackgroundColorDarkAlternate=ff262626
+
+;filter outlines, override W/H outlines, properties spinbox background, timeline separators.
+;QmlDesigner_BackgroundColorDarker=ff262728
+QmlDesigner_BackgroundColorDarker=ff191919
+
+;properties outlines, states thumbnail outlines, add state button outlines.
+;QmlDesigner_BorderColor=splitter
+QmlDesigner_BorderColor=ff353535
+
+;background sqaures for components, effects, etc. Handles for scrollbars, type background in properties.
+;QmlDesigner_ButtonColor=ff595b5c
+QmlDesigner_ButtonColor=ff353535
+
+
+;non - selected tabs, text color for selected tabs.
+;QmlDesigner_TabDark=shadowBackground
+QmlDesigner_TabDark=ff111111
+
+
+;active tab backgrounds and non selected tab text.
+QmlDesigner_TabLight=text
+;QmlDesigner_TabLight=ff262626
+
+;extra_new_colors
+
+; color for the form editor background
+;QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor
+QmlDesigner_FormeditorBackgroundColor=ff000000
+
+;QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor
+QmlDesigner_AlternateBackgroundColor=ffc14fc1
+
+QmlDesigner_ScrollBarHandleColor=ff595b5c
+
+
+
+;palette colors
+
+;outline colors on the combo box, zoom slider, flowtag button, dialog outlines, on loading project the whole screen flashes this color
+;PaletteWindow=normalBackground
+PaletteWindow=ff262626
+
+
+
+; item text for search results panel and application output panel, twirl down triangles in edit mode, text editor.
+PaletteWindowText=text
+;PaletteWindowText=ffd3299a
+
+
+;Search bar background, edit view project list background, style combo box background
+PaletteBase=normalBackground
+;PaletteBase=ff191919
+
+
+
+;can't see where this is used.
+PaletteAlternateBase=alternateBackground
+;PaletteAlternateBase=ffd3299a
+
+
+
+;flow tag backgrounds, import combobox background, edit mode scrollbars
+;PaletteButton=shadowBackground
+PaletteButton=ff262626
+
+
+
+;alternate text in the search and application output panel - NO LONGER SEEMS TO DO ANYTHING
+PaletteBrightText=ffff3333
+;PaletteBrightText=ffd3299a
+
+
+;
+; text inside dropdown combo boxes, styles, connections.
+PaletteText=text
+;PaletteText=ffd3299a
+
+
+
+;text for flowtags, import dropdown, ticks for tick boxes.
+PaletteButtonText=text
+;PaletteButtonText=ffd3299a
+
+
+PaletteButtonTextDisabled=textDisabled
+
+
+;background color for the tool tip hover background
+PaletteToolTipBase=selectedBackground
+;PaletteToolTipBase=ffd3299a
+
+
+;the selection highlight on the dropdown combo box in the file selection top menu and connections panel and tab mode selector dropdowns
+PaletteHighlight=selectedBackground
+;PaletteHighlight=ffd3299a
+
+
+; outline of warning in editor mode, underline of "open a document" page in the edit mode
+PaletteDark=shadowBackground
+;PaletteDark=ffd3299a
+
+
+;selected text highlight in edit and design studio modes
+PaletteHighlightedText=ffffffff
+;PaletteHighlightedText=ffd3299a
+
+
+; text for for floating tool tips
+PaletteToolTipText=text
+;PaletteToolTipText=ffd3299a
+
+
+PaletteLink=textColorLink
+PaletteLinkVisited=textColorLinkVisited
+PaletteWindowDisabled=backgroundColorDisabled
+PaletteWindowTextDisabled=textDisabled
+PaletteBaseDisabled=backgroundColorDisabled
+PaletteTextDisabled=textDisabled
+
+[Flags]
+ComboBoxDrawTextShadow=false
+DerivePaletteFromTheme=true
+DrawIndicatorBranch=true
+DrawSearchResultWidgetFrame=false
+DrawTargetSelectorBottom=false
+DrawToolBarHighlights=false
+DrawToolBarBorders=false
+ApplyThemePaletteGlobally=true
+FlatToolBars=true
+FlatSideBarIcons=true
+FlatProjectsMode=true
+FlatMenuBar=true
+ToolBarIconShadow=true
+WindowColorAsBase=false
+
+[Gradients]
+DetailsWidgetHeaderGradient\1\color=00000000
+DetailsWidgetHeaderGradient\1\pos=1
+DetailsWidgetHeaderGradient\size=1
diff --git a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp
index 3133ba932a..ff01ccd97d 100644
--- a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp
@@ -69,14 +69,11 @@ QPixmap QmlDesignerIconProvider::getPixmap(const QString &id)
     else if (id == "plus")
         result = Utils::Icons::PLUS_TOOLBAR.pixmap();
     else if (id == "expression")
-        result = Icon({
-                { iconPath() + QLatin1String("expression.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap();
+        result = Icon(iconPath() + "expression.png").pixmap();
     else if (id == "placeholder")
-        result = Icon({
-                { iconPath() + QLatin1String("placeholder.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap();
+        result = Icon(iconPath() + "placeholder.png").pixmap();
     else if (id == "submenu")
-        result = Icon({
-                { iconPath() + QLatin1String("submenu.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap();
+        result = Icon(iconPath() + "submenu.png").pixmap();
     else if (id == "up-arrow")
         result = Icon({
                 { iconPath() + QLatin1String("up-arrow.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap();
diff --git a/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon.png b/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon.png
index 1e36a168c7..ef59d89279 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon.png
+++ b/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon.png
diff --git a/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon@2x.png b/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon@2x.png
new file mode 100644
index 0000000000..6540cc859c
--- /dev/null
+++ b/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon@2x.png
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.qrc b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.qrc
index c9899d2ac5..8e786cae4c 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.qrc
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.qrc
@@ -1,7 +1,7 @@
 <RCC>
-    <qresource prefix="/ItemLibrary" >
+    <qresource prefix="/ItemLibrary">
         <file>images/item-default-icon.png</file>
         <file>images/item-invalid-icon.png</file>
+        <file>images/item-default-icon@2x.png</file>
     </qresource>
 </RCC>
-
diff --git a/src/plugins/qmldesigner/components/navigator/export_checked.png b/src/plugins/qmldesigner/components/navigator/export_checked.png
index f0c3b230c0..98e34dd561 100644
--- a/src/plugins/qmldesigner/components/navigator/export_checked.png
+++ b/src/plugins/qmldesigner/components/navigator/export_checked.png
diff --git a/src/plugins/qmldesigner/components/navigator/export_checked@2x.png b/src/plugins/qmldesigner/components/navigator/export_checked@2x.png
index 07f49a8f26..91fb221f04 100644
--- a/src/plugins/qmldesigner/components/navigator/export_checked@2x.png
+++ b/src/plugins/qmldesigner/components/navigator/export_checked@2x.png
diff --git a/src/plugins/qmldesigner/components/navigator/export_unchecked.png b/src/plugins/qmldesigner/components/navigator/export_unchecked.png
index 377c97fa8a..32f052838c 100644
--- a/src/plugins/qmldesigner/components/navigator/export_unchecked.png
+++ b/src/plugins/qmldesigner/components/navigator/export_unchecked.png
diff --git a/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png b/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png
index 6a309be703..05abc2ab41 100644
--- a/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png
+++ b/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png
diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc
index 04b2667776..0ca65a7948 100644
--- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc
+++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc
@@ -33,6 +33,10 @@
         <file>images/splitview-layouts-icon-16px.png</file>
         <file>images/stack-layouts-icon.png</file>
         <file>images/stack-layouts-icon-16px.png</file>
+        <file>images/column-layouts-icon@2x.png</file>
+        <file>images/grid-layouts-icon@2x.png</file>
+        <file>images/row-layouts-icon@2x.png</file>
+        <file>images/stack-layouts-icon@2x.png</file>
     </qresource>
     <qresource prefix="/propertyEditorQmlSources/QtQuick">
         <file>Controls/ButtonSpecifics.qml</file>
diff --git a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png
index 474df84f6a..9e17cc85bf 100644
--- a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png
+++ b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png
diff --git a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png
index 0e2ac31fea..a75ee209d5 100644
--- a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png
+++ b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png
diff --git a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon@2x.png b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon@2x.png
new file mode 100644
index 0000000000..c70f845e70
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon@2x.png
diff --git a/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png
index 1e9178ff3e..dd6ecb4632 100644
--- a/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png
+++ b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png
diff --git a/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon@2x.png b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon@2x.png
new file mode 100644
index 0000000000..3fca41167a
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon@2x.png
diff --git a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png
index 3a0f5c2186..706194278e 100644
--- a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png
+++ b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png
diff --git a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png
index 1082f43b51..df4b60327e 100644
--- a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png
+++ b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png
diff --git a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon@2x.png b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon@2x.png
new file mode 100644
index 0000000000..ffef790cdc
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon@2x.png
diff --git a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png
index 3f7ab00c1d..4e7b74aae3 100644
--- a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png
+++ b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png
diff --git a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png
index bbd6783cc5..987ef39507 100644
--- a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png
+++ b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png
diff --git a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon@2x.png b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon@2x.png
new file mode 100644
index 0000000000..d57cfc2a27
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon@2x.png
diff --git a/src/plugins/qmldesigner/qmldesignericons.h b/src/plugins/qmldesigner/qmldesignericons.h
index 20be7b97f5..9a16ce2b0c 100644
--- a/src/plugins/qmldesigner/qmldesignericons.h
+++ b/src/plugins/qmldesigner/qmldesignericons.h
@@ -38,10 +38,8 @@ const Utils::Icon ARROW_DOWN({
         {QLatin1String(":/navigator/icon/arrowdown.png"), Utils::Theme::IconsBaseColor}});
 const Utils::Icon ARROW_LEFT({
         {QLatin1String(":/navigator/icon/arrowleft.png"), Utils::Theme::IconsBaseColor}});
-const Utils::Icon EXPORT_CHECKED({
-        {QLatin1String(":/navigator/icon/export_checked.png"), Utils::Theme::IconsBaseColor}});
-const Utils::Icon EXPORT_UNCHECKED({
-        {QLatin1String(":/navigator/icon/export_unchecked.png"), Utils::Theme::IconsBaseColor}});
+const Utils::Icon EXPORT_CHECKED(":/navigator/icon/export_checked.png");
+const Utils::Icon EXPORT_UNCHECKED(":/navigator/icon/export_unchecked.png");
 const Utils::Icon SNAPPING({
         {QLatin1String(":/icon/layout/snapping.png"), Utils::Theme::IconsBaseColor}});
 const Utils::Icon NO_SNAPPING({
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png
index acd3d477af..5418a0f55a 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png
index e8f79c6bf2..17f7ed0688 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon@2x.png
new file mode 100644
index 0000000000..fb4fb33910
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon-16px.png
index b8115abab9..9e17cc85bf 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon-16px.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon-16px.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon.png
index f4ee9fae81..a75ee209d5 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon@2x.png
new file mode 100644
index 0000000000..c70f845e70
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png
index 46e3f57183..bdc2253959 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png
index 1f83fbbc5b..d7ab9de8a7 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon@2x.png
new file mode 100644
index 0000000000..b28b0fa4d9
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon-16px.png
index 67ed96565e..099def3f5b 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon-16px.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon-16px.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon.png
index c24a713908..5bb3e91da3 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon@2x.png
new file mode 100644
index 0000000000..b2714d34b0
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png
index 3f6e38e4e4..0dff9a075d 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png
index f2acc88761..50c6f75cd8 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon@2x.png
new file mode 100644
index 0000000000..b3ffdea6eb
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon-16px.png
index 8bf1fb2f5a..038a02ed86 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon-16px.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon-16px.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon.png
index c30fec0422..7457fbd7e1 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon@2x.png
new file mode 100644
index 0000000000..af233a0df3
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png
index 1519fe1eb1..7457fbd7e1 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png
index c24ecd99e5..038a02ed86 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon@2x.png
new file mode 100644
index 0000000000..af233a0df3
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/image-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/image-icon.png
index e7a8cff471..318ce0874a 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/image-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/image-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png
index 8bedea8594..3aa46b6106 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/image-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/image-icon@2x.png
new file mode 100644
index 0000000000..cc84918975
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/image-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/item-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/item-icon.png
index fc53d38ae7..af81cdfdb1 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/item-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/item-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png
index 7d2d7a5050..46d3ec1dbc 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/item-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/item-icon@2x.png
new file mode 100644
index 0000000000..f05aa57c2f
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/item-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png
index 9c1327373d..5a2f3c203b 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png
index 1deac24a2a..2657bf2181 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon@2x.png
new file mode 100644
index 0000000000..b1d3fb67d2
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png
index 9260c8b327..791e5f9520 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png
index 4f7bb0cd57..f426957af3 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon@2x.png
new file mode 100644
index 0000000000..14607fb896
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png
index 32bb26c059..8dc82b8196 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png
index b9b9da253b..a6a61f61b2 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon@2x.png
new file mode 100644
index 0000000000..d654a8e7e6
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png
index 4a092f1519..3997195f72 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png
index e00eb9aef9..72893106ae 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon@2x.png
new file mode 100644
index 0000000000..150fa50ea2
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon-16px.png
index 42c03d6e2c..1113e8148b 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon-16px.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon-16px.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon.png
index f908c3d0d8..df4b60327e 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon@2x.png
new file mode 100644
index 0000000000..ffef790cdc
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png
index 53f10d6c9e..068ebeef0f 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png
index da30741772..b96ed468cb 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon@2x.png
new file mode 100644
index 0000000000..3b7cb6d5da
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/text-icon.png
index 9c90cc4403..29a81f5d6c 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/text-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/text-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png
index b744ef0eea..ee7cc512cb 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/text-icon@2x.png
new file mode 100644
index 0000000000..1df8f765de
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/text-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png
index a605c16ba4..c743c22074 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png
index 5a565d8b28..3ceef6d037 100644
--- a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png
+++ b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon@2x.png
new file mode 100644
index 0000000000..666644d2d3
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon@2x.png
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc
index 39121e2340..5b146ece1c 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc
@@ -52,5 +52,22 @@
         <file>images/grid-positioner-icon-16px.png</file>
         <file>images/row-positioner-icon.png</file>
         <file>images/row-positioner-icon-16px.png</file>
+        <file>images/border-image-icon@2x.png</file>
+        <file>images/column-positioner-icon@2x.png</file>
+        <file>images/flickable-icon@2x.png</file>
+        <file>images/flow-positioner-icon@2x.png</file>
+        <file>images/focusscope-icon@2x.png</file>
+        <file>images/grid-positioner-icon@2x.png</file>
+        <file>images/gridview-icon@2x.png</file>
+        <file>images/image-icon@2x.png</file>
+        <file>images/item-icon@2x.png</file>
+        <file>images/listview-icon@2x.png</file>
+        <file>images/mouse-area-icon@2x.png</file>
+        <file>images/pathview-icon@2x.png</file>
+        <file>images/rect-icon@2x.png</file>
+        <file>images/row-positioner-icon@2x.png</file>
+        <file>images/text-edit-icon@2x.png</file>
+        <file>images/text-icon@2x.png</file>
+        <file>images/text-input-icon@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
index 0ae6693541..5ecfda7cef 100644
--- a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
+++ b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
@@ -163,16 +163,7 @@ MetaInfo {
         ItemLibraryEntry {
             name: "List View"
             category: "Qt Quick - Views"
-            libraryIcon: ":/qtquickplugin/images/pathview-icon.png"
-            version: "1.1"
-
-            QmlSource { source: ":/qtquickplugin/source/listview.qml" }
-        }
-
-        ItemLibraryEntry {
-            name: "List View"
-            category: "Qt Quick - Views"
-            libraryIcon: ":/qtquickplugin/images/pathview-icon.png"
+            libraryIcon: ":/qtquickplugin/images/listview-icon.png"
             version: "2.0"
 
             QmlSource { source: ":/qtquickplugin/source/listviewv2.qml" }
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 95f5e2fb3a..f3dca3a6c0 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -1324,123 +1324,6 @@
        width="100%"
        height="100%" />
     <g
-       id="share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder">
-      <rect
-         y="584"
-         x="501"
-         height="14"
-         width="14"
-         id="rect6661"
-         style="fill:#ffffff" />
-      <circle
-         r="2"
-         cy="591.5"
-         cx="507.5"
-         id="path6659"
-         style="fill:none;stroke:#000000" />
-    </g>
-    <g
-       id="share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu">
-      <rect
-         y="584"
-         x="515"
-         height="14"
-         width="14"
-         id="rect6685"
-         style="fill:#ffffff" />
-      <path
-         style="fill:#000000"
-         d="m 521.5,587 c -2.48528,0 -4.5,2.01472 -4.5,4.5 0,2.48528 2.01472,4.5 4.5,4.5 2.48528,0 4.5,-2.01472 4.5,-4.5 0,-2.48528 -2.01472,-4.5 -4.5,-4.5 z m -4,3 8,0 -4,4 z"
-         id="path6673"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssssscccc" />
-    </g>
-    <g
-       id="share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression">
-      <rect
-         y="584"
-         x="529"
-         height="14"
-         width="14"
-         id="rect6738"
-         style="fill:#ffffff" />
-      <g
-         transform="matrix(0.98173989,-0.19022827,0.19022827,0.98173989,-103.24469,112.42841)"
-         id="g6727">
-        <circle
-           style="fill:none;stroke:#000000"
-           id="path6713"
-           cx="534"
-           cy="594"
-           r="2.5" />
-        <rect
-           style="fill:#000000"
-           id="rect6715"
-           width="1"
-           height="1.5"
-           x="533.5"
-           y="590"
-           inkscape:transform-center-y="-3.25" />
-        <use
-           x="0"
-           y="0"
-           xlink:href="#rect6715"
-           inkscape:transform-center-y="-1.6249936"
-           id="use6717"
-           transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)"
-           width="100%"
-           height="100%"
-           inkscape:transform-center-x="2.814585" />
-        <use
-           x="0"
-           y="0"
-           xlink:href="#use6717"
-           inkscape:transform-center-x="2.8145807"
-           inkscape:transform-center-y="1.6250117"
-           id="use6719"
-           transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)"
-           width="100%"
-           height="100%" />
-        <use
-           x="0"
-           y="0"
-           xlink:href="#use6719"
-           inkscape:transform-center-y="3.2500106"
-           id="use6721"
-           transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)"
-           width="100%"
-           height="100%" />
-        <use
-           x="0"
-           y="0"
-           xlink:href="#use6721"
-           inkscape:transform-center-y="1.6250042"
-           id="use6723"
-           transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)"
-           width="100%"
-           height="100%"
-           inkscape:transform-center-x="-2.8145849" />
-        <use
-           x="0"
-           y="0"
-           xlink:href="#use6723"
-           inkscape:transform-center-x="-2.8145806"
-           inkscape:transform-center-y="-1.625001"
-           id="use6725"
-           transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)"
-           width="100%"
-           height="100%" />
-      </g>
-      <use
-         height="100%"
-         width="100%"
-         transform="matrix(0.99010264,-0.14034516,0.14034516,0.99010264,-74.079837,74.823351)"
-         id="use6736"
-         xlink:href="#g6727"
-         y="0"
-         x="0" />
-    </g>
-    <g
        id="src/libs/qmleditorwidgets/images/checkbox_indicator"
        transform="translate(-26,0)">
       <rect
@@ -4180,47 +4063,6 @@
          id="path6788-2" />
     </g>
     <g
-       transform="translate(378,268)"
-       style="display:inline"
-       id="src/plugins/qmldesigner/components/navigator/export_checked">
-      <rect
-         id="rect6774-6"
-         height="16"
-         width="16"
-         y="300"
-         x="350"
-         style="fill:#ffffff;fill-opacity:1" />
-      <path
-         style="fill:#000000;fill-opacity:1"
-         d="m 619,570 0,3 1,0 0,-2 10,0 0,11 -10,0 0,-2 -1,0 0,3 12,0 0,-13 -12,0 z m -2,4 0,1 5,0 0,-1 -5,0 z m 0,2 0,1 5,0 0,-1 -5,0 z m 0,2 0,1 5,0 0,-1 -5,0 z"
-         transform="translate(-266,-268)"
-         id="polygon6766-5"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="src/plugins/qmldesigner/components/navigator/export_unchecked"
-       transform="translate(394,268)">
-      <rect
-         style="fill:#ffffff;fill-opacity:1"
-         x="350"
-         y="300"
-         width="16"
-         height="16"
-         id="rect7336" />
-      <path
-         style="fill:#000000"
-         d="m 354,303 10,0 0,11 -10,0 z m -1,12 12,0 0,-13 -12,0 z"
-         id="path7346"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
-      <path
-         id="path7338"
-         style="opacity:0.5;fill:#000000;fill-opacity:1"
-         d="m 354,310 0,1 5,0 0,-1 z m 0,-2 0,1 5,0 0,-1 z m 0,-2 0,1 5,0 0,-1 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccc" />
-    </g>
-    <g
        transform="translate(710,268)"
        style="display:inline"
        id="src/plugins/qmldesigner/components/formeditor/no_snapping">