From a1df8e45166f15ed77e2ef8b3ad6757299662dc7 Mon Sep 17 00:00:00 2001
From: Lassi Lehikoinen <lassi.lehikoinen@qt.io>
Date: Wed, 16 Dec 2020 15:21:23 +0200
Subject: Modify settingsui to work against Qt 6

Following modules are removed in Qt 6
- XmlListModel
- QtGraphicalEffects

Adapt settingsui to work without them.
Also remove needless resources and make miscallaneous improvements.

Task-number: QTBUG-89065
Change-Id: Ie66d73e4d8f9c1dd4cbec2fe5f9f71f32f7d1bdf
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 src/imports/CMakeLists.txt                         |   4 +-
 src/imports/imports.pro                            |   2 +-
 src/imports/networksettings/CMakeLists.txt         |   2 +-
 src/imports/networksettings/plugin.cpp             |   6 +-
 src/networksettings/connman.pri                    |   1 -
 .../connman/qnetworksettingsmanager_p.cpp          |   3 -
 .../connman/qnetworksettingsmanager_p.h            |   3 +-
 src/settingsui/AutoScroller.qml                    |   4 +-
 src/settingsui/ViewSettings.qml                    |   2 +-
 src/settingsui/common/CustomSwitch.qml             |   6 +-
 src/settingsui/common/CustomTableView.qml          |   6 +-
 src/settingsui/common/HandwritingModeButton.qml    |   2 +-
 src/settingsui/main.qml                            |   8 +--
 src/settingsui/network/AddressListEntry.qml        |   6 +-
 src/settingsui/network/ComboBoxEntry.qml           |   6 +-
 src/settingsui/network/EditWiredSettings.qml       |   8 +--
 src/settingsui/network/IpAddressTextField.qml      |   6 +-
 src/settingsui/network/NetworkDetails.qml          |   2 +-
 src/settingsui/network/NetworkListView.qml         |  10 +--
 src/settingsui/network/NetworkSettings.qml         |  15 +++--
 src/settingsui/network/PassphraseEnter.qml         |   8 +--
 src/settingsui/network/WifiSelectorDelegate.qml    |   8 +--
 src/settingsui/network/WifiSettings.qml            |   8 +--
 src/settingsui/network/WifiSignalMonitor.qml       |   2 +-
 src/settingsui/network/WiredSettings.qml           |   8 +--
 .../qtbuttonimageproviderplugin/QtButton.qml       |   2 +-
 src/settingsui/settingsuiplugin/CMakeLists.txt     |  40 ------------
 .../settingsuiplugin/SettingsDelegate.qml          |  13 +---
 src/settingsui/settingsuiplugin/SettingsHeader.qml |   4 +-
 .../settingsuiplugin/SettingsTitleItem.qml         |   2 +-
 src/settingsui/settingsuiplugin/icons.qrc          |  39 -----------
 .../settingsuiplugin/icons/Audio_qt_6x.png         | Bin 499 -> 0 bytes
 .../settingsuiplugin/icons/Bluetooth_qt_1x.png     | Bin 748 -> 0 bytes
 .../settingsuiplugin/icons/Bluetooth_qt_6x.png     | Bin 1859 -> 0 bytes
 .../settingsuiplugin/icons/Camcorder_qt_1x.png     | Bin 616 -> 0 bytes
 .../settingsuiplugin/icons/Camera_qt_1x.png        | Bin 766 -> 0 bytes
 .../settingsuiplugin/icons/Chevron-left_black.png  | Bin 1541 -> 0 bytes
 .../icons/Chevron-left_black_6x.png                | Bin 1569 -> 0 bytes
 .../settingsuiplugin/icons/Clock_qt_1x.png         | Bin 881 -> 0 bytes
 .../settingsuiplugin/icons/Clock_qt_6x.png         | Bin 3114 -> 0 bytes
 .../settingsuiplugin/icons/Display_qt_6x.png       | Bin 864 -> 0 bytes
 .../settingsuiplugin/icons/Flag_qt_6x.png          | Bin 1938 -> 0 bytes
 .../settingsuiplugin/icons/Headphones_qt_1x.png    | Bin 736 -> 0 bytes
 .../settingsuiplugin/icons/Heartbeat_qt_1x.png     | Bin 864 -> 0 bytes
 .../settingsuiplugin/icons/Keyboard_qt_1x.png      | Bin 741 -> 0 bytes
 .../settingsuiplugin/icons/Laptop_qt_1x.png        | Bin 651 -> 0 bytes
 .../settingsuiplugin/icons/Microphone_qt_1x.png    | Bin 811 -> 0 bytes
 .../settingsuiplugin/icons/MobilePhone_qt_1x.png   | Bin 657 -> 0 bytes
 .../settingsuiplugin/icons/Mouse_qt_1x.png         | Bin 658 -> 0 bytes
 .../settingsuiplugin/icons/Power_black_6x.png      | Bin 3106 -> 0 bytes
 .../settingsuiplugin/icons/Tablet_qt_1x.png        | Bin 518 -> 0 bytes
 .../settingsuiplugin/icons/Volume_down_qt_1x.png   | Bin 474 -> 0 bytes
 .../settingsuiplugin/icons/Volume_mute_qt_1x.png   | Bin 684 -> 0 bytes
 .../settingsuiplugin/icons/Volume_up_qt_1x.png     | Bin 517 -> 0 bytes
 .../settingsuiplugin/icons/World_qt_6x.png         | Bin 3745 -> 0 bytes
 .../settingsuiplugin/icons/ref/Audio.png           | Bin 135 -> 0 bytes
 src/settingsui/settingsuiplugin/icons/ref/Back.png | Bin 1725 -> 0 bytes
 .../settingsuiplugin/icons/ref/Bluetooth.png       | Bin 1364 -> 0 bytes
 .../settingsuiplugin/icons/ref/Camcorder.png       | Bin 1036 -> 0 bytes
 .../settingsuiplugin/icons/ref/Camera.png          | Bin 1889 -> 0 bytes
 .../settingsuiplugin/icons/ref/Chevron-left.png    | Bin 1475 -> 0 bytes
 .../settingsuiplugin/icons/ref/Chevron-right.png   | Bin 1463 -> 0 bytes
 .../settingsuiplugin/icons/ref/Circle-x.png        | Bin 3358 -> 0 bytes
 .../settingsuiplugin/icons/ref/Clock.png           | Bin 2438 -> 0 bytes
 src/settingsui/settingsuiplugin/icons/ref/Cogs.png | Bin 2756 -> 0 bytes
 .../settingsuiplugin/icons/ref/Connections.png     | Bin 3226 -> 0 bytes
 .../settingsuiplugin/icons/ref/Display.png         | Bin 754 -> 0 bytes
 src/settingsui/settingsuiplugin/icons/ref/Flag.png | Bin 1395 -> 0 bytes
 .../settingsuiplugin/icons/ref/Headphones.png      | Bin 2141 -> 0 bytes
 .../settingsuiplugin/icons/ref/Heartbeat.png       | Bin 2280 -> 0 bytes
 .../settingsuiplugin/icons/ref/Keyboard.png        | Bin 571 -> 0 bytes
 .../settingsuiplugin/icons/ref/Laptop.png          | Bin 753 -> 0 bytes
 src/settingsui/settingsuiplugin/icons/ref/Lock.png | Bin 1043 -> 0 bytes
 .../settingsuiplugin/icons/ref/Microphone.png      | Bin 1891 -> 0 bytes
 .../settingsuiplugin/icons/ref/MobilePhone.png     | Bin 1034 -> 0 bytes
 .../settingsuiplugin/icons/ref/Mouse.png           | Bin 1560 -> 0 bytes
 src/settingsui/settingsuiplugin/icons/ref/Plus.png | Bin 2888 -> 0 bytes
 .../settingsuiplugin/icons/ref/Power.png           | Bin 2466 -> 0 bytes
 .../settingsuiplugin/icons/ref/Settings.png        | Bin 2630 -> 0 bytes
 .../settingsuiplugin/icons/ref/Tablet.png          | Bin 892 -> 0 bytes
 .../settingsuiplugin/icons/ref/Volume_down.png     | Bin 505 -> 0 bytes
 .../settingsuiplugin/icons/ref/Volume_mute.png     | Bin 1000 -> 0 bytes
 .../settingsuiplugin/icons/ref/Volume_up.png       | Bin 513 -> 0 bytes
 src/settingsui/settingsuiplugin/icons/ref/Wifi.png | Bin 2102 -> 0 bytes
 .../settingsuiplugin/icons/ref/Wifi1.png           | Bin 824 -> 0 bytes
 .../settingsuiplugin/icons/ref/Wifi2.png           | Bin 987 -> 0 bytes
 .../settingsuiplugin/icons/ref/Wifi3.png           | Bin 1195 -> 0 bytes
 .../settingsuiplugin/icons/ref/Wifi4.png           | Bin 2102 -> 0 bytes
 .../settingsuiplugin/icons/ref/WifiAnim.png        | Bin 2830 -> 0 bytes
 .../settingsuiplugin/icons/ref/World.png           | Bin 4559 -> 0 bytes
 .../settingsuiplugin/icons/ref/Wrench.png          | Bin 1677 -> 0 bytes
 .../settingsuiplugin/newIcons/close_icon.svg       |   1 -
 .../settingsuiplugin/newIcons/detail_icon.svg      |   1 -
 .../settingsuiplugin/newIcons/grid_icon.svg        |   1 -
 .../newIcons/header_toggle_icon.svg                |   1 -
 .../settingsuiplugin/newIcons/info_icon.svg        |   1 -
 .../settingsuiplugin/newIcons/mouse_icon.svg       |   1 -
 .../settingsuiplugin/newIcons/mute_icon.svg        |   1 -
 .../settingsuiplugin/newIcons/network_icon.svg     |   2 +-
 .../settingsuiplugin/newIcons/pause_icon.svg       |   1 -
 .../settingsuiplugin/newIcons/play_icon.svg        |   1 -
 .../newIcons/qt_logo_green_rgb.svg                 |  20 ------
 .../settingsuiplugin/newIcons/settings_icon.svg    |   1 -
 .../newIcons/settingsmenu_launcher_icon.svg        |   1 -
 .../settingsuiplugin/newIcons/stop_icon.svg        |   1 -
 .../settingsuiplugin/newIcons/touch_icon.svg       |   1 -
 .../settingsuiplugin/newIcons/volume_icon.svg      |   1 -
 src/settingsui/settingsuiplugin/plugin.cpp         |  10 +--
 src/settingsui/settingsuiplugin/pluginMain.qml     |  71 ++++++++-------------
 src/settingsui/settingsuiplugin/settingsui.qrc     |  40 ------------
 src/settingsui/settingsuiplugin/settingsview.xml   |  11 ----
 111 files changed, 102 insertions(+), 302 deletions(-)
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Chevron-left_black.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Chevron-left_black_6x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Display_qt_6x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Power_black_6x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/World_qt_6x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Audio.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Back.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Bluetooth.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Camcorder.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Camera.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Chevron-left.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Chevron-right.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Circle-x.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Clock.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Cogs.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Connections.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Display.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Flag.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Headphones.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Heartbeat.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Keyboard.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Laptop.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Lock.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Microphone.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/MobilePhone.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Mouse.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Plus.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Power.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Settings.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Tablet.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Volume_down.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Volume_mute.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Volume_up.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Wifi.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Wifi1.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Wifi2.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Wifi3.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Wifi4.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/WifiAnim.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/World.png
 delete mode 100644 src/settingsui/settingsuiplugin/icons/ref/Wrench.png
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/close_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/detail_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/grid_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/header_toggle_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/info_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/mouse_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/mute_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/pause_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/play_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/qt_logo_green_rgb.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/settings_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/settingsmenu_launcher_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/stop_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/touch_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/newIcons/volume_icon.svg
 delete mode 100644 src/settingsui/settingsuiplugin/settingsview.xml

diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
index 9ecd47d..163fe57 100644
--- a/src/imports/CMakeLists.txt
+++ b/src/imports/CMakeLists.txt
@@ -1,5 +1,3 @@
 # Generated from imports.pro.
 
-if(TARGET networksettings)
-    add_subdirectory(networksettings)
-endif()
+add_subdirectory(networksettings)
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 0d4185e..67ab980 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(networksettings): SUBDIRS += networksettings
+SUBDIRS += networksettings
diff --git a/src/imports/networksettings/CMakeLists.txt b/src/imports/networksettings/CMakeLists.txt
index 0c43a30..b2b07b8 100644
--- a/src/imports/networksettings/CMakeLists.txt
+++ b/src/imports/networksettings/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_add_qml_module(networksettingsplugin
         Qt::Gui
         Qt::Qml
         Qt::Quick
-        networksettings
+        Qt::NetworkSettings
 )
 
 #### Keys ignored in scope 1:.:.:networksettings.pro:<TRUE>:
diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp
index 56bece7..e4d6cee 100644
--- a/src/imports/networksettings/plugin.cpp
+++ b/src/imports/networksettings/plugin.cpp
@@ -40,7 +40,7 @@
 #include <QQmlContext>
 
 /*!
-    \qmlmodule QtDeviceUtilities.NetworkSettings 1.0
+    \qmlmodule QtDeviceUtilities.NetworkSettings
     \ingroup qtdevice-utilities-qml-modules
     \ingroup qmlmodules
     \title Qt Network Settings QML Types
@@ -53,7 +53,7 @@
     To import and use the module's QML types, use the following statement:
 
     \badcode
-    import QtDeviceUtilities.NetworkSettings 1.0
+    import QtDeviceUtilities.NetworkSettings
     \endcode
 
     \l{Qt Device Utilities WiFi Tutorial} demonstrates how you can use
@@ -185,7 +185,7 @@ void NetworkSettingsQmlPlugin::registerTypes(const char *uri)
     qRegisterMetaType<QNetworkSettingsServiceFilter*>("QNetworkSettingsServiceFilter*");
     qRegisterMetaType<QNetworkSettingsInterfaceModel*>("QNetworkSettingsInterfaceModel*");
 
-    qmlRegisterSingletonType<QNetworkSettingsManager>(uri, 1, 0, "NetworkSettingsManager", &instance<QNetworkSettingsManager>);
+    qmlRegisterSingletonType<QNetworkSettingsManager>(uri, 2, 0, "NetworkSettingsManager", &instance<QNetworkSettingsManager>);
 }
 
 QT_END_NAMESPACE
diff --git a/src/networksettings/connman.pri b/src/networksettings/connman.pri
index 3f92830..957f2f0 100644
--- a/src/networksettings/connman.pri
+++ b/src/networksettings/connman.pri
@@ -1,7 +1,6 @@
 QT       += core network dbus
 
 INCLUDEPATH += $${PWD}/connman
-DEFINES += QMAKE_BUILD
 
 DBUS_INTERFACES = \
     connman/connman_manager.xml \
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
index 7c65018..3f594bd 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
@@ -34,9 +34,6 @@
 #include "qnetworksettingsservicemodel.h"
 #include "qnetworksettingsuseragent.h"
 #include "moc_connman_manager_interface.cpp"
-#ifdef QMAKE_BUILD
-#include "connman_manager_interface.cpp"
-#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h
index c199621..c696cdd 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.h
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.h
@@ -46,9 +46,8 @@
 #include "connmancommon.h"
 #include "qnetworksettingsmanager.h"
 #include "qnetworksettingsinterfacemodel.h"
+#include "connman_manager_interface.h"
 
-// Automatically generated class in global namespace
-class NetConnmanManagerInterface;
 QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceModel)
 QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceFilter)
 QT_FORWARD_DECLARE_CLASS(QNetworkSettingsService)
diff --git a/src/settingsui/AutoScroller.qml b/src/settingsui/AutoScroller.qml
index daebb25..e1d5c27 100644
--- a/src/settingsui/AutoScroller.qml
+++ b/src/settingsui/AutoScroller.qml
@@ -26,8 +26,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
-import QtQuick.VirtualKeyboard 2.0
+import QtQuick
+import QtQuick.VirtualKeyboard
 
 Item {
 
diff --git a/src/settingsui/ViewSettings.qml b/src/settingsui/ViewSettings.qml
index 9bbbc10..4f326cf 100644
--- a/src/settingsui/ViewSettings.qml
+++ b/src/settingsui/ViewSettings.qml
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
+import QtQuick
 
 Item {
     id: viewSettings
diff --git a/src/settingsui/common/CustomSwitch.qml b/src/settingsui/common/CustomSwitch.qml
index fa9f9aa..c552127 100644
--- a/src/settingsui/common/CustomSwitch.qml
+++ b/src/settingsui/common/CustomSwitch.qml
@@ -26,9 +26,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
-import QtDeviceUtilities.QtButtonImageProvider 1.0
-import QtQuick.Controls 2.1
+import QtQuick
+import QtDeviceUtilities.QtButtonImageProvider
+import QtQuick.Controls
 
 Switch {
     id: control
diff --git a/src/settingsui/common/CustomTableView.qml b/src/settingsui/common/CustomTableView.qml
index 2eb42e4..a5a7fe8 100644
--- a/src/settingsui/common/CustomTableView.qml
+++ b/src/settingsui/common/CustomTableView.qml
@@ -26,9 +26,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 
 ColumnLayout {
     id: root
diff --git a/src/settingsui/common/HandwritingModeButton.qml b/src/settingsui/common/HandwritingModeButton.qml
index 411892e..8b47d2e 100644
--- a/src/settingsui/common/HandwritingModeButton.qml
+++ b/src/settingsui/common/HandwritingModeButton.qml
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
+import QtQuick
 
 Item {
     id: handwritingModeButton
diff --git a/src/settingsui/main.qml b/src/settingsui/main.qml
index 8c97811..c014923 100644
--- a/src/settingsui/main.qml
+++ b/src/settingsui/main.qml
@@ -26,10 +26,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Window 2.2
-import QtDeviceUtilities.SettingsUI 1.0
-import QtQuick.VirtualKeyboard 2.0
+import QtQuick
+import QtQuick.Window
+import QtDeviceUtilities.SettingsUI
+import QtQuick.VirtualKeyboard
 import "common"
 
 Window {
diff --git a/src/settingsui/network/AddressListEntry.qml b/src/settingsui/network/AddressListEntry.qml
index 9612778..9701587 100644
--- a/src/settingsui/network/AddressListEntry.qml
+++ b/src/settingsui/network/AddressListEntry.qml
@@ -26,9 +26,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 
 RowLayout {
     id: root
diff --git a/src/settingsui/network/ComboBoxEntry.qml b/src/settingsui/network/ComboBoxEntry.qml
index 1d4858a..ce88964 100644
--- a/src/settingsui/network/ComboBoxEntry.qml
+++ b/src/settingsui/network/ComboBoxEntry.qml
@@ -26,9 +26,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 
 RowLayout {
     id: root
diff --git a/src/settingsui/network/EditWiredSettings.qml b/src/settingsui/network/EditWiredSettings.qml
index 857c8e9..a59da20 100644
--- a/src/settingsui/network/EditWiredSettings.qml
+++ b/src/settingsui/network/EditWiredSettings.qml
@@ -26,10 +26,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
-import QtDeviceUtilities.NetworkSettings 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtDeviceUtilities.NetworkSettings
 
 Item {
     id: root
diff --git a/src/settingsui/network/IpAddressTextField.qml b/src/settingsui/network/IpAddressTextField.qml
index dcf8771..748e402 100644
--- a/src/settingsui/network/IpAddressTextField.qml
+++ b/src/settingsui/network/IpAddressTextField.qml
@@ -26,9 +26,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 
 TextField {
     Layout.fillWidth: true
diff --git a/src/settingsui/network/NetworkDetails.qml b/src/settingsui/network/NetworkDetails.qml
index 6e9ee4c..88b0946 100644
--- a/src/settingsui/network/NetworkDetails.qml
+++ b/src/settingsui/network/NetworkDetails.qml
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
+import QtQuick
 
 Loader {
     id: root
diff --git a/src/settingsui/network/NetworkListView.qml b/src/settingsui/network/NetworkListView.qml
index 3b75412..7c35433 100644
--- a/src/settingsui/network/NetworkListView.qml
+++ b/src/settingsui/network/NetworkListView.qml
@@ -26,11 +26,11 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
-import QtQml 2.0
-import QtDeviceUtilities.NetworkSettings 1.0
-import QtDeviceUtilities.QtButtonImageProvider 1.0
-import QtQuick.Controls 2.1
+import QtQuick
+import QtQml
+import QtDeviceUtilities.NetworkSettings
+import QtDeviceUtilities.QtButtonImageProvider
+import QtQuick.Controls
 
 ListView {
     id: list
diff --git a/src/settingsui/network/NetworkSettings.qml b/src/settingsui/network/NetworkSettings.qml
index 8aa8cc0..a0555f4 100644
--- a/src/settingsui/network/NetworkSettings.qml
+++ b/src/settingsui/network/NetworkSettings.qml
@@ -26,11 +26,11 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.2
-import QtDeviceUtilities.NetworkSettings 1.0
-import QtDeviceUtilities.QtButtonImageProvider 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtDeviceUtilities.NetworkSettings
+import QtDeviceUtilities.QtButtonImageProvider
 import "../common"
 
 Item {
@@ -88,7 +88,7 @@ Item {
         anchors.top: wlanText.bottom
         anchors.left: wifiSwitch.right
         anchors.right: manualDisconnect.left
-        anchors.rightMargin: 15
+        anchors.rightMargin: 10
         enabled: wifiSwitch.checked
         fillColor: enabled ? viewSettings.buttonGreenColor : viewSettings.buttonGrayColor
         borderColor: "transparent"
@@ -115,12 +115,13 @@ Item {
     }
     Text {
         id: networkListTextItem
-        text: qsTr("Network list")
+        text: qsTr("Network list:")
         font.pixelSize: pluginMain.subTitleFontSize
         font.family: appFont
         font.styleName: "SemiBold"
         color: "white"
         anchors.top: wifiSwitch.bottom
+        anchors.topMargin: 10
     }
     NetworkListView {
         id: networkList
diff --git a/src/settingsui/network/PassphraseEnter.qml b/src/settingsui/network/PassphraseEnter.qml
index 1ed8d92..5d3167c 100644
--- a/src/settingsui/network/PassphraseEnter.qml
+++ b/src/settingsui/network/PassphraseEnter.qml
@@ -26,10 +26,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-import QtDeviceUtilities.QtButtonImageProvider 1.0
-import QtDeviceUtilities.NetworkSettings 1.0
+import QtQuick
+import QtQuick.Controls
+import QtDeviceUtilities.QtButtonImageProvider
+import QtDeviceUtilities.NetworkSettings
 
 Rectangle {
     id: passphrasePopup
diff --git a/src/settingsui/network/WifiSelectorDelegate.qml b/src/settingsui/network/WifiSelectorDelegate.qml
index ea044f6..3c462c5 100644
--- a/src/settingsui/network/WifiSelectorDelegate.qml
+++ b/src/settingsui/network/WifiSelectorDelegate.qml
@@ -26,10 +26,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
-import QtDeviceUtilities.NetworkSettings 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtDeviceUtilities.NetworkSettings
 
 ItemDelegate {
     id: root
diff --git a/src/settingsui/network/WifiSettings.qml b/src/settingsui/network/WifiSettings.qml
index a6130ac..0286483 100644
--- a/src/settingsui/network/WifiSettings.qml
+++ b/src/settingsui/network/WifiSettings.qml
@@ -26,10 +26,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
-import QtDeviceUtilities.NetworkSettings 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtDeviceUtilities.NetworkSettings
 
 Item {
     id: root
diff --git a/src/settingsui/network/WifiSignalMonitor.qml b/src/settingsui/network/WifiSignalMonitor.qml
index 06afca4..25e4aa4 100644
--- a/src/settingsui/network/WifiSignalMonitor.qml
+++ b/src/settingsui/network/WifiSignalMonitor.qml
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
+import QtQuick
 
 Item {
     id: root
diff --git a/src/settingsui/network/WiredSettings.qml b/src/settingsui/network/WiredSettings.qml
index 11c6c24..f5d3a8f 100644
--- a/src/settingsui/network/WiredSettings.qml
+++ b/src/settingsui/network/WiredSettings.qml
@@ -26,10 +26,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
-import QtDeviceUtilities.NetworkSettings 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtDeviceUtilities.NetworkSettings
 
 Item {
     id: root
diff --git a/src/settingsui/qtbuttonimageproviderplugin/QtButton.qml b/src/settingsui/qtbuttonimageproviderplugin/QtButton.qml
index 6fb61f4..d65ae23 100644
--- a/src/settingsui/qtbuttonimageproviderplugin/QtButton.qml
+++ b/src/settingsui/qtbuttonimageproviderplugin/QtButton.qml
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
+import QtQuick
 
 Image {
     id: root
diff --git a/src/settingsui/settingsuiplugin/CMakeLists.txt b/src/settingsui/settingsuiplugin/CMakeLists.txt
index da3142f..ec62693 100644
--- a/src/settingsui/settingsuiplugin/CMakeLists.txt
+++ b/src/settingsui/settingsuiplugin/CMakeLists.txt
@@ -39,54 +39,14 @@ set(settingsui_resource_files
     "SettingsHeader.qml"
     "SettingsTitleItem.qml"
     "icons/Alert_yellow_1x.png"
-    "icons/Audio_qt_6x.png"
-    "icons/Bluetooth_qt_1x.png"
-    "icons/Bluetooth_qt_6x.png"
-    "icons/Camcorder_qt_1x.png"
-    "icons/Camera_qt_1x.png"
-    "icons/Chevron-left_black.png"
-    "icons/Chevron-left_black_6x.png"
-    "icons/Clock_qt_1x.png"
-    "icons/Clock_qt_6x.png"
-    "icons/Display_qt_6x.png"
-    "icons/Flag_qt_6x.png"
     "icons/FloatingButton_Active.png"
     "icons/FloatingButton_Available.png"
     "icons/FloatingButton_Unavailable.png"
-    "icons/Headphones_qt_1x.png"
-    "icons/Heartbeat_qt_1x.png"
-    "icons/Keyboard_qt_1x.png"
-    "icons/Laptop_qt_1x.png"
-    "icons/Microphone_qt_1x.png"
-    "icons/MobilePhone_qt_1x.png"
-    "icons/Mouse_qt_1x.png"
-    "icons/Power_black_6x.png"
-    "icons/Tablet_qt_1x.png"
-    "icons/Volume_down_qt_1x.png"
-    "icons/Volume_mute_qt_1x.png"
-    "icons/Volume_up_qt_1x.png"
     "icons/WifiAnim_black_2x.png"
     "icons/Wifi_lightgray_2x.png"
-    "icons/World_qt_6x.png"
     "newIcons/back_icon.svg"
-    "newIcons/close_icon.svg"
-    "newIcons/detail_icon.svg"
-    "newIcons/grid_icon.svg"
-    "newIcons/header_toggle_icon.svg"
-    "newIcons/info_icon.svg"
-    "newIcons/mouse_icon.svg"
-    "newIcons/mute_icon.svg"
     "newIcons/network_icon.svg"
-    "newIcons/pause_icon.svg"
-    "newIcons/play_icon.svg"
-    "newIcons/qt_logo_green_rgb.svg"
-    "newIcons/settings_icon.svg"
-    "newIcons/settingsmenu_launcher_icon.svg"
-    "newIcons/stop_icon.svg"
-    "newIcons/touch_icon.svg"
-    "newIcons/volume_icon.svg"
     "pluginMain.qml"
-    "settingsview.xml"
 )
 
 qt_add_resource(settingsuiplugin "settingsui"
diff --git a/src/settingsui/settingsuiplugin/SettingsDelegate.qml b/src/settingsui/settingsuiplugin/SettingsDelegate.qml
index 91f4ca4..cf7696a 100644
--- a/src/settingsui/settingsuiplugin/SettingsDelegate.qml
+++ b/src/settingsui/settingsuiplugin/SettingsDelegate.qml
@@ -26,8 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick
 
 Item {
     width: settingsList.width
@@ -46,13 +45,6 @@ Item {
         height: Math.min(parent.width * 0.5, parent.height * 0.6)
         width: height
         fillMode: Image.PreserveAspectFit
-        visible: parent.isSelected ? false : true
-    }
-    ColorOverlay {
-        source: img
-        anchors.fill: img
-        visible: parent.isSelected ? true : false
-        color: viewSettings.buttonGreenColor
     }
 
     Text {
@@ -71,6 +63,7 @@ Item {
         font.family: appFont
         font.styleName: parent.isSelected ? "Bold" : "Regular"
     }
+
     MouseArea {
         id: mouseArea
         anchors.fill: parent
@@ -80,6 +73,4 @@ Item {
             titleItem.title = title
         }
     }
-
-    Component.onCompleted: pluginMain.init()
 }
diff --git a/src/settingsui/settingsuiplugin/SettingsHeader.qml b/src/settingsui/settingsuiplugin/SettingsHeader.qml
index c9ba7cf..1d2f737 100644
--- a/src/settingsui/settingsuiplugin/SettingsHeader.qml
+++ b/src/settingsui/settingsuiplugin/SettingsHeader.qml
@@ -26,8 +26,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
-import QtDeviceUtilities.NetworkSettings 1.0
+import QtQuick
+import QtDeviceUtilities.NetworkSettings
 
 Item {
     id: header
diff --git a/src/settingsui/settingsuiplugin/SettingsTitleItem.qml b/src/settingsui/settingsuiplugin/SettingsTitleItem.qml
index 0ead0c6..6156091 100644
--- a/src/settingsui/settingsuiplugin/SettingsTitleItem.qml
+++ b/src/settingsui/settingsuiplugin/SettingsTitleItem.qml
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
+import QtQuick
 
 Column {
     id: page
diff --git a/src/settingsui/settingsuiplugin/icons.qrc b/src/settingsui/settingsuiplugin/icons.qrc
index eddec64..c6944ca 100644
--- a/src/settingsui/settingsuiplugin/icons.qrc
+++ b/src/settingsui/settingsuiplugin/icons.qrc
@@ -1,51 +1,12 @@
 <RCC>
     <qresource prefix="/">
         <file>icons/Alert_yellow_1x.png</file>
-        <file>icons/Audio_qt_6x.png</file>
-        <file>icons/Bluetooth_qt_1x.png</file>
-        <file>icons/Bluetooth_qt_6x.png</file>
-        <file>icons/Camcorder_qt_1x.png</file>
-        <file>icons/Camera_qt_1x.png</file>
-        <file>icons/Clock_qt_1x.png</file>
-        <file>icons/Clock_qt_6x.png</file>
-        <file>icons/Display_qt_6x.png</file>
-        <file>icons/Flag_qt_6x.png</file>
         <file>icons/FloatingButton_Active.png</file>
         <file>icons/FloatingButton_Available.png</file>
         <file>icons/FloatingButton_Unavailable.png</file>
-        <file>icons/Headphones_qt_1x.png</file>
-        <file>icons/Heartbeat_qt_1x.png</file>
-        <file>icons/Keyboard_qt_1x.png</file>
-        <file>icons/Laptop_qt_1x.png</file>
-        <file>icons/Microphone_qt_1x.png</file>
-        <file>icons/MobilePhone_qt_1x.png</file>
-        <file>icons/Mouse_qt_1x.png</file>
-        <file>icons/Tablet_qt_1x.png</file>
-        <file>icons/Volume_down_qt_1x.png</file>
-        <file>icons/Volume_mute_qt_1x.png</file>
-        <file>icons/Volume_up_qt_1x.png</file>
         <file>icons/WifiAnim_black_2x.png</file>
         <file>icons/Wifi_lightgray_2x.png</file>
-        <file>icons/World_qt_6x.png</file>
-        <file>icons/Chevron-left_black_6x.png</file>
-        <file>icons/Chevron-left_black.png</file>
-        <file>icons/Power_black_6x.png</file>
         <file>newIcons/back_icon.svg</file>
-        <file>newIcons/close_icon.svg</file>
-        <file>newIcons/detail_icon.svg</file>
-        <file>newIcons/grid_icon.svg</file>
-        <file>newIcons/header_toggle_icon.svg</file>
-        <file>newIcons/info_icon.svg</file>
-        <file>newIcons/mouse_icon.svg</file>
-        <file>newIcons/mute_icon.svg</file>
         <file>newIcons/network_icon.svg</file>
-        <file>newIcons/pause_icon.svg</file>
-        <file>newIcons/play_icon.svg</file>
-        <file>newIcons/settings_icon.svg</file>
-        <file>newIcons/settingsmenu_launcher_icon.svg</file>
-        <file>newIcons/stop_icon.svg</file>
-        <file>newIcons/touch_icon.svg</file>
-        <file>newIcons/volume_icon.svg</file>
-        <file>newIcons/qt_logo_green_rgb.svg</file>
     </qresource>
 </RCC>
diff --git a/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png
deleted file mode 100644
index a33b286..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Audio_qt_6x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png
deleted file mode 100644
index d9378b4..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png
deleted file mode 100644
index 87d80cd..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Bluetooth_qt_6x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png
deleted file mode 100644
index 79db562..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Camcorder_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png
deleted file mode 100644
index 0b831c5..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Camera_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Chevron-left_black.png b/src/settingsui/settingsuiplugin/icons/Chevron-left_black.png
deleted file mode 100644
index 0ebc3f4..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Chevron-left_black.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Chevron-left_black_6x.png b/src/settingsui/settingsuiplugin/icons/Chevron-left_black_6x.png
deleted file mode 100644
index c1a8cff..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Chevron-left_black_6x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png
deleted file mode 100644
index d4b220d..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Clock_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png
deleted file mode 100644
index b351887..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Clock_qt_6x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png
deleted file mode 100644
index 89d1845..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Display_qt_6x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png b/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png
deleted file mode 100644
index 32212da..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Flag_qt_6x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png
deleted file mode 100644
index da86427..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Headphones_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png
deleted file mode 100644
index 9599158..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Heartbeat_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png
deleted file mode 100644
index 5911e06..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Keyboard_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png
deleted file mode 100644
index 4708259..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Laptop_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png
deleted file mode 100644
index 9182212..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Microphone_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png b/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png
deleted file mode 100644
index 50fcc0a..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/MobilePhone_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png
deleted file mode 100644
index a1eefe5..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Mouse_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Power_black_6x.png b/src/settingsui/settingsuiplugin/icons/Power_black_6x.png
deleted file mode 100644
index d6add07..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Power_black_6x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png
deleted file mode 100644
index 1d0bc4f..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Tablet_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png
deleted file mode 100644
index 05c2ce4..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Volume_down_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png
deleted file mode 100644
index ca14213..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Volume_mute_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png b/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png
deleted file mode 100644
index 08f6221..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/Volume_up_qt_1x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/World_qt_6x.png b/src/settingsui/settingsuiplugin/icons/World_qt_6x.png
deleted file mode 100644
index 2aee655..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/World_qt_6x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Audio.png b/src/settingsui/settingsuiplugin/icons/ref/Audio.png
deleted file mode 100644
index 8434f0a..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Audio.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Back.png b/src/settingsui/settingsuiplugin/icons/ref/Back.png
deleted file mode 100644
index 9029fd0..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Back.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Bluetooth.png b/src/settingsui/settingsuiplugin/icons/ref/Bluetooth.png
deleted file mode 100644
index e7c80a9..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Bluetooth.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Camcorder.png b/src/settingsui/settingsuiplugin/icons/ref/Camcorder.png
deleted file mode 100644
index 8c317a2..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Camcorder.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Camera.png b/src/settingsui/settingsuiplugin/icons/ref/Camera.png
deleted file mode 100644
index c71ab25..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Camera.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Chevron-left.png b/src/settingsui/settingsuiplugin/icons/ref/Chevron-left.png
deleted file mode 100644
index 95006f4..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Chevron-left.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Chevron-right.png b/src/settingsui/settingsuiplugin/icons/ref/Chevron-right.png
deleted file mode 100644
index 2860e9a..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Chevron-right.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Circle-x.png b/src/settingsui/settingsuiplugin/icons/ref/Circle-x.png
deleted file mode 100644
index 2bbfa97..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Circle-x.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Clock.png b/src/settingsui/settingsuiplugin/icons/ref/Clock.png
deleted file mode 100644
index 1dae63e..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Clock.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Cogs.png b/src/settingsui/settingsuiplugin/icons/ref/Cogs.png
deleted file mode 100644
index feaae50..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Cogs.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Connections.png b/src/settingsui/settingsuiplugin/icons/ref/Connections.png
deleted file mode 100644
index b042d3c..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Connections.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Display.png b/src/settingsui/settingsuiplugin/icons/ref/Display.png
deleted file mode 100644
index cf1251a..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Display.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Flag.png b/src/settingsui/settingsuiplugin/icons/ref/Flag.png
deleted file mode 100644
index 485ed48..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Flag.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Headphones.png b/src/settingsui/settingsuiplugin/icons/ref/Headphones.png
deleted file mode 100644
index 9e5c483..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Headphones.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Heartbeat.png b/src/settingsui/settingsuiplugin/icons/ref/Heartbeat.png
deleted file mode 100644
index 168135e..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Heartbeat.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Keyboard.png b/src/settingsui/settingsuiplugin/icons/ref/Keyboard.png
deleted file mode 100644
index c814e8e..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Keyboard.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Laptop.png b/src/settingsui/settingsuiplugin/icons/ref/Laptop.png
deleted file mode 100644
index 465bb54..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Laptop.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Lock.png b/src/settingsui/settingsuiplugin/icons/ref/Lock.png
deleted file mode 100644
index 6afb6ac..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Lock.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Microphone.png b/src/settingsui/settingsuiplugin/icons/ref/Microphone.png
deleted file mode 100644
index 63cb500..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Microphone.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/MobilePhone.png b/src/settingsui/settingsuiplugin/icons/ref/MobilePhone.png
deleted file mode 100644
index b186c09..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/MobilePhone.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Mouse.png b/src/settingsui/settingsuiplugin/icons/ref/Mouse.png
deleted file mode 100644
index 146305b..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Mouse.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Plus.png b/src/settingsui/settingsuiplugin/icons/ref/Plus.png
deleted file mode 100644
index 391fe94..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Plus.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Power.png b/src/settingsui/settingsuiplugin/icons/ref/Power.png
deleted file mode 100644
index b54a084..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Power.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Settings.png b/src/settingsui/settingsuiplugin/icons/ref/Settings.png
deleted file mode 100644
index d8b255c..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Settings.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Tablet.png b/src/settingsui/settingsuiplugin/icons/ref/Tablet.png
deleted file mode 100644
index 71b0065..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Tablet.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Volume_down.png b/src/settingsui/settingsuiplugin/icons/ref/Volume_down.png
deleted file mode 100644
index 0773b1d..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Volume_down.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Volume_mute.png b/src/settingsui/settingsuiplugin/icons/ref/Volume_mute.png
deleted file mode 100644
index 36ab384..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Volume_mute.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Volume_up.png b/src/settingsui/settingsuiplugin/icons/ref/Volume_up.png
deleted file mode 100644
index 61eebbd..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Volume_up.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Wifi.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi.png
deleted file mode 100644
index 5d1e0d9..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Wifi.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Wifi1.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi1.png
deleted file mode 100644
index f1b1489..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Wifi1.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Wifi2.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi2.png
deleted file mode 100644
index a22b472..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Wifi2.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Wifi3.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi3.png
deleted file mode 100644
index 76d412b..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Wifi3.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Wifi4.png b/src/settingsui/settingsuiplugin/icons/ref/Wifi4.png
deleted file mode 100644
index 5d1e0d9..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Wifi4.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/WifiAnim.png b/src/settingsui/settingsuiplugin/icons/ref/WifiAnim.png
deleted file mode 100644
index 0694f63..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/WifiAnim.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/World.png b/src/settingsui/settingsuiplugin/icons/ref/World.png
deleted file mode 100644
index cf6eaf0..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/World.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/icons/ref/Wrench.png b/src/settingsui/settingsuiplugin/icons/ref/Wrench.png
deleted file mode 100644
index 5b6e1c6..0000000
Binary files a/src/settingsui/settingsuiplugin/icons/ref/Wrench.png and /dev/null differ
diff --git a/src/settingsui/settingsuiplugin/newIcons/close_icon.svg b/src/settingsui/settingsuiplugin/newIcons/close_icon.svg
deleted file mode 100644
index c98fe51..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/close_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="close" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>close_icon</title><path d="M25.5,22,42.09,4.78a2.52,2.52,0,1,0-3.64-3.5L22,18.36,5.55,1.27a2.53,2.53,0,0,0-3.64,3.5L18.49,22,1.91,39.22a2.53,2.53,0,0,0,3.64,3.5L22,25.64,38.45,42.73a2.52,2.52,0,1,0,3.64-3.5Z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/detail_icon.svg b/src/settingsui/settingsuiplugin/newIcons/detail_icon.svg
deleted file mode 100644
index f0dc4ec..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/detail_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="detail" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>detail</title><path d="M42.31,5.08H1.69A1.69,1.69,0,0,0,0,6.77V37.23a1.69,1.69,0,0,0,1.69,1.69H42.31A1.69,1.69,0,0,0,44,37.23V6.77A1.69,1.69,0,0,0,42.31,5.08ZM40.61,26.71H24V8.46H40.61Zm-7.16,8.82H24V28.29h9.43Zm-12.57,0H14.59V28.29h6.29Zm0-27.08V26.71H3.38V8.46ZM3.38,28.29h8.07v7.25H3.38ZM35,35.54V28.29h5.59v7.25Z" style="fill:#fff"/><rect x="6.74" y="11" width="12.57" height="1.57" style="fill:#fff"/><rect x="6.74" y="18.86" width="12.57" height="1.57" style="fill:#fff"/><rect x="6.74" y="14.14" width="12.57" height="1.57" style="fill:#fff"/><rect x="6.74" y="22" width="12.57" height="1.57" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/grid_icon.svg b/src/settingsui/settingsuiplugin/newIcons/grid_icon.svg
deleted file mode 100644
index decd8e2..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/grid_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="grid" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>grid_icon</title><path d="M42.31,5.08H1.69A1.69,1.69,0,0,0,0,6.77V37.23a1.69,1.69,0,0,0,1.69,1.69H42.31A1.69,1.69,0,0,0,44,37.23V6.77A1.69,1.69,0,0,0,42.31,5.08ZM40.62,21.26H29.19V8.46H40.62Zm-23.79,0V8.46H27.24v12.8Zm10.41,1.3v13H16.83v-13ZM14.88,8.46v12.8H3.39V8.46ZM3.39,22.56H14.88v13H3.39Zm25.81,13v-13H40.62v13Z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/header_toggle_icon.svg b/src/settingsui/settingsuiplugin/newIcons/header_toggle_icon.svg
deleted file mode 100644
index 06d0b6a..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/header_toggle_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>header_toggle_icon</title><g style="isolation:isolate"><g id="toggle"><g style="opacity:0.35000000000000003;mix-blend-mode:multiply"><polygon points="3.36 15 23.27 33 42.64 15 3.36 15" style="fill:none;stroke:#09102b;stroke-linejoin:round;stroke-width:2px"/></g><polygon points="2.36 13 22.27 31 41.64 13 2.36 13" style="fill:none;stroke:#fff;stroke-linejoin:round;stroke-width:2px"/></g></g></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/info_icon.svg b/src/settingsui/settingsuiplugin/newIcons/info_icon.svg
deleted file mode 100644
index 64d24c0..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/info_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="info" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>info_icon</title><path d="M21.86,15.59a2,2,0,0,1-1.33-.48A1.69,1.69,0,0,1,20,13.77a1.68,1.68,0,0,1,.56-1.3A1.91,1.91,0,0,1,21.86,12a1.93,1.93,0,0,1,1.28.46,1.65,1.65,0,0,1,.56,1.35,1.7,1.7,0,0,1-.54,1.34,1.88,1.88,0,0,1-1.29.48m1.83,3.83V30.14a2.39,2.39,0,0,1-.53,1.68,1.76,1.76,0,0,1-1.35.57,1.67,1.67,0,0,1-1.32-.58A2.47,2.47,0,0,1,20,30.14V19.53a2.38,2.38,0,0,1,.51-1.66,1.71,1.71,0,0,1,1.32-.56,1.78,1.78,0,0,1,1.35.56,2.16,2.16,0,0,1,.53,1.55" style="fill:#fff"/><path d="M21.89,43.5A21.5,21.5,0,0,1,6.7,6.8,21.5,21.5,0,0,1,37.11,37.2a21.38,21.38,0,0,1-15.21,6.3m0-39.35A17.85,17.85,0,0,0,9.28,34.62,17.85,17.85,0,1,0,34.52,9.38,17.73,17.73,0,0,0,21.9,4.15" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/mouse_icon.svg b/src/settingsui/settingsuiplugin/newIcons/mouse_icon.svg
deleted file mode 100644
index 5843fe1..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/mouse_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mouse" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 44 44"><defs><clipPath id="clip-path"><polygon points="26.94 20.62 29.12 14.45 30.87 5.33 28.23 5.83 22.8 4.3 18.92 7.24 9.96 3.31 29 -5.98 42.56 8.54 26.94 20.62" style="fill:none"/></clipPath></defs><title>mouse_icon</title><path d="M5,22.1a1.06,1.06,0,0,1,0-1.5l4.23-4.25a1.06,1.06,0,0,1,1.5,0l8.48,8.46h0a1.06,1.06,0,0,1,0,1.5L15,30.56a1.06,1.06,0,0,1-1.5,0L5,22.1Zm5-3.5L7.24,21.35l7,7,2.73-2.74-7-7Z" style="fill:#fff"/><path d="M24.18,5.35a1,1,0,0,1,0,1.36l-4.41,4.41a3.68,3.68,0,0,1,.77.48l4.33-4.44a1,1,0,0,1,1.36,1.36l-4.31,4.42.62.62,4.12-4.23A1,1,0,1,1,28,10.68l-4.15,4.26a6,6,0,0,1,.5.81l4-4a.86.86,0,0,1,1.27,0,1,1,0,0,1,0,1.36L24,18.8,22.73,20,19.5,23.26a2.38,2.38,0,0,1-1.39.66l-6.57-6.56a2.59,2.59,0,0,1,.22-.76l1.38-5a1,1,0,0,1,.26-.44l3.05-3.05a.91.91,0,1,1,1.29,1.29L16.5,10.62l-.22,1.26,6.54-6.54a1,1,0,0,1,1.36,0m1.5-1.5a3.09,3.09,0,0,0-4.36,0l-2.4,2.4a3.07,3.07,0,0,0-4,.34L11.9,9.64A3.12,3.12,0,0,0,11.09,11L9.76,15.89a4.74,4.74,0,0,0-.32,1.19,2.12,2.12,0,0,0,.6,1.79h0l6.56,6.56a2.12,2.12,0,0,0,1.78.6A4.48,4.48,0,0,0,21,24.76l3.23-3.23,1.23-1.23,5.41-5.49a3.09,3.09,0,0,0,0-4.36,3,3,0,0,0-.7-.52,3.08,3.08,0,0,0-1.85-2.51,3.08,3.08,0,0,0-.64-1.31,2.33,2.33,0,0,0-1.14-.53,3.07,3.07,0,0,0-.87-1.74Z" style="fill:#fff"/><g style="clip-path:url(#clip-path)"><path d="M18.34,16.84A9,9,0,0,1,16.4,14c-1.14-2.88,1-6.75,2.41-8.18l4.11-4.11a4.79,4.79,0,0,1,6.63,0l4,4a4.8,4.8,0,0,1,0,6.66l-4.1,4.1c-1.44,1.41-5.3,3.56-8.17,2.42a9,9,0,0,1-2.9-1.95Zm14-10.08L28.4,2.85a3.14,3.14,0,0,0-4.28,0L20,7c-1.32,1.35-2.78,4.51-2,6.37a7.43,7.43,0,0,0,3.92,3.91c1.84.73,5-.73,6.36-2.06l4.1-4.1a3.15,3.15,0,0,0,0-4.32Z" style="fill:#fff"/></g><path d="M37,25.09a1.16,1.16,0,0,1-.51-.12,5.58,5.58,0,0,1-3.22-3.78,7.76,7.76,0,0,1,1.65-6.1c.68-.86,1.4-1.67,2.1-2.44,2.18-2.42,4.06-4.51,3.51-7.11a3.24,3.24,0,0,0-2.21-2.48c-1.87-.62-4.3.1-6.35,1.88a1.16,1.16,0,1,1-1.53-1.76C33.1.82,36.32-.06,39,.84A5.56,5.56,0,0,1,42.76,5c.81,3.76-1.66,6.51-4.05,9.16-.67.75-1.37,1.53-2,2.33a5.5,5.5,0,0,0-1.21,4.14,3.31,3.31,0,0,0,2,2.21A1.17,1.17,0,0,1,37,25.09Z" style="fill:#fff"/><path d="M1.08,35.78h2l1.59,5.57,1.59-5.57h2v7.13H7.13V37.06H7L5.29,42.62H4.08L2.39,37.06H2.24v5.85H1.08Z" style="fill:#fff"/><path d="M9.62,39.38c0-2.38.68-3.71,2.9-3.71s2.89,1.32,2.89,3.71S14.75,43,12.52,43,9.62,41.78,9.62,39.38Zm4.6,0c0-1.77-.32-2.7-1.7-2.7s-1.71.94-1.71,2.7S11.14,42,12.52,42,14.22,41.19,14.22,39.38Z" style="fill:#fff"/><path d="M19.31,42c1,0,1.47-.43,1.47-1.38V35.78h1.17v4.83c0,1.72-.93,2.41-2.63,2.41s-2.61-.7-2.61-2.41V35.78h1.17v4.85C17.86,41.6,18.36,42,19.31,42Z" style="fill:#fff"/><path d="M27.68,36.84s-1.46-.17-2.06-.17c-.87,0-1.32.31-1.32.93s.37.82,1.59,1.15c1.5.42,2,.81,2,2A2.09,2.09,0,0,1,25.54,43a15.19,15.19,0,0,1-2.33-.28l.11-.93s1.41.19,2.14.19,1.29-.4,1.29-1.14-.32-.81-1.41-1.07c-1.54-.4-2.21-.86-2.21-2.1,0-1.44.95-2,2.37-2a15.76,15.76,0,0,1,2.26.25Z" style="fill:#fff"/><path d="M29.18,35.78h4.49v1H30.33v2H33v1H30.33v2.08h3.34v1H29.18Z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/mute_icon.svg b/src/settingsui/settingsuiplugin/newIcons/mute_icon.svg
deleted file mode 100644
index 2ffd61f..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/mute_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mute" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>mute_icon</title><path d="M17.92,40.48A2,2,0,0,1,16.68,40L7.59,32.77H2a2,2,0,0,1-2-2V13.22a2,2,0,0,1,2-2h5.6L16.68,4A2,2,0,0,1,19.9,5.5v33a2,2,0,0,1-2,2ZM4,28.8H8.29a2,2,0,0,1,1.24.44l6.41,5.13V9.64L9.52,14.77a2,2,0,0,1-1.24.44H4V28.8Z" style="fill:#fff"/><path d="M42,32.41a2,2,0,0,1-1.4-.58L23.77,15a2,2,0,0,1,2.81-2.81L43.42,29A2,2,0,0,1,42,32.41Z" style="fill:#fff"/><path d="M25.29,32.52a2,2,0,0,1-1.42-3.37L40.48,12.08a2,2,0,0,1,2.85,2.77L26.71,31.92a2,2,0,0,1-1.42.6Z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/network_icon.svg b/src/settingsui/settingsuiplugin/newIcons/network_icon.svg
index 6280828..157fb52 100644
--- a/src/settingsui/settingsuiplugin/newIcons/network_icon.svg
+++ b/src/settingsui/settingsuiplugin/newIcons/network_icon.svg
@@ -1 +1 @@
-<svg id="network" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>network_icon</title><path d="M8.22,28.71A6.71,6.71,0,1,1,14.93,22a6.72,6.72,0,0,1-6.71,6.71Zm0-10A3.25,3.25,0,1,0,11.47,22a3.25,3.25,0,0,0-3.25-3.25Z" style="fill:#fff"/><path d="M35.78,13.92a6.71,6.71,0,1,1,6.71-6.71,6.72,6.72,0,0,1-6.71,6.71Zm0-10A3.25,3.25,0,1,0,39,7.21,3.25,3.25,0,0,0,35.78,4Z" style="fill:#fff"/><path d="M35.78,43.5a6.71,6.71,0,1,1,6.71-6.71,6.72,6.72,0,0,1-6.71,6.71Zm0-10A3.25,3.25,0,1,0,39,36.79a3.25,3.25,0,0,0-3.25-3.25Z" style="fill:#fff"/><path d="M30.66,35.89a1.73,1.73,0,0,1-.86-.23L12.12,25.46a1.73,1.73,0,0,1,1.73-3L31.52,32.66a1.73,1.73,0,0,1-.87,3.23Z" style="fill:#fff"/><path d="M13,21.77a1.73,1.73,0,0,1-.87-3.23L29.79,8.34a1.73,1.73,0,1,1,1.73,3L13.85,21.54a1.71,1.71,0,0,1-.86.23Z" style="fill:#fff"/></svg>
\ No newline at end of file
+<svg id="network" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>network_icon</title><path d="M8.22,28.71A6.71,6.71,0,1,1,14.93,22a6.72,6.72,0,0,1-6.71,6.71Zm0-10A3.25,3.25,0,1,0,11.47,22a3.25,3.25,0,0,0-3.25-3.25Z" style="fill:#41cd52"/><path d="M35.78,13.92a6.71,6.71,0,1,1,6.71-6.71,6.72,6.72,0,0,1-6.71,6.71Zm0-10A3.25,3.25,0,1,0,39,7.21,3.25,3.25,0,0,0,35.78,4Z" style="fill:#41cd52"/><path d="M35.78,43.5a6.71,6.71,0,1,1,6.71-6.71,6.72,6.72,0,0,1-6.71,6.71Zm0-10A3.25,3.25,0,1,0,39,36.79a3.25,3.25,0,0,0-3.25-3.25Z" style="fill:#41cd52"/><path d="M30.66,35.89a1.73,1.73,0,0,1-.86-.23L12.12,25.46a1.73,1.73,0,0,1,1.73-3L31.52,32.66a1.73,1.73,0,0,1-.87,3.23Z" style="fill:#41cd52"/><path d="M13,21.77a1.73,1.73,0,0,1-.87-3.23L29.79,8.34a1.73,1.73,0,1,1,1.73,3L13.85,21.54a1.71,1.71,0,0,1-.86.23Z" style="fill:#41cd52"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/pause_icon.svg b/src/settingsui/settingsuiplugin/newIcons/pause_icon.svg
deleted file mode 100644
index 04000f9..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/pause_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="pause" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>pause_icon</title><path d="M15.51,43.5H9.76a4.65,4.65,0,0,1-4.64-4.64V5.14A4.65,4.65,0,0,1,9.76.5h5.75a4.65,4.65,0,0,1,4.64,4.64V38.86a4.65,4.65,0,0,1-4.64,4.64ZM9.76,4.55a.6.6,0,0,0-.59.59V38.86a.6.6,0,0,0,.59.59h5.75a.6.6,0,0,0,.59-.59V5.14a.6.6,0,0,0-.59-.59Z" style="fill:#fff"/><path d="M34.24,43.5H28.49a4.65,4.65,0,0,1-4.64-4.64V5.14A4.65,4.65,0,0,1,28.49.5h5.75a4.65,4.65,0,0,1,4.64,4.64V38.86a4.65,4.65,0,0,1-4.64,4.64ZM28.49,4.55a.6.6,0,0,0-.59.59V38.86a.6.6,0,0,0,.59.59h5.75a.6.6,0,0,0,.59-.59V5.14a.6.6,0,0,0-.59-.59Z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/play_icon.svg b/src/settingsui/settingsuiplugin/newIcons/play_icon.svg
deleted file mode 100644
index ab27771..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/play_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="play" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>play_icon</title><path d="M6.58,43.82c-2.4,0-4.08-1.91-4.08-4.65V4.83C2.5,2.09,4.18.18,6.58.18A5.29,5.29,0,0,1,9.22.95L39,18.12A4.56,4.56,0,0,1,41.5,22,4.56,4.56,0,0,1,39,25.88L9.22,43.05a5.28,5.28,0,0,1-2.65.77ZM6.64,4.28a5.24,5.24,0,0,0,0,.55V39.17a1.56,1.56,0,0,0,.08.55,1.74,1.74,0,0,0,.51-.21L36.92,22.33a1.61,1.61,0,0,0,.46-.36c-.06,0-.19-.16-.46-.31L7.18,4.49a1.6,1.6,0,0,0-.54-.22Z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/qt_logo_green_rgb.svg b/src/settingsui/settingsuiplugin/newIcons/qt_logo_green_rgb.svg
deleted file mode 100644
index bdb07d1..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/qt_logo_green_rgb.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 20.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 293.4 216.1" style="enable-background:new 0 0 293.4 216.1;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#41CD52;}
-	.st1{fill:#FFFFFF;}
-</style>
-<g>
-	<polygon class="st0" points="265.2,0 255,0 40.7,0 40.7,0 0,40.7 0,176.8 0,187.9 0,216.1 28.2,216.1 38.4,216.1 252.7,216.1 
-		252.7,216.1 293.4,175.4 293.4,39.3 293.4,28.2 293.4,0 	"/>
-	<path class="st1" d="M109.2,169.2c-19.3,0-32.8-5.2-40.4-15.6c-7.6-10.4-11.4-26.9-11.4-49.3c0-22.5,3.9-39.2,11.6-50.1
-		c7.7-10.9,21.2-16.4,40.2-16.4c19.1,0,32.5,5.4,40.1,16.3c7.7,10.8,11.5,27.5,11.5,50.1c0,14.9-1.6,26.9-4.7,36
-		c-3.2,9.2-8.3,16.2-15.5,21l15.6,25.1l-19.1,8.9l-16.5-27.1C118.2,168.9,114.4,169.2,109.2,169.2z M85.1,140.3
-		c4.2,7.2,12.3,10.9,24.2,10.9s19.9-3.6,24.1-10.7c4.1-7.1,6.2-19.2,6.2-36.1c0-17-2.1-29.3-6.4-37S121,55.9,109.3,55.9
-		c-11.6,0-19.6,3.8-24,11.5c-4.3,7.7-6.5,19.9-6.5,36.8C78.8,121,80.9,133.1,85.1,140.3z"/>
-	<path class="st1" d="M232.4,89.2h-25.6v40.9c0,7.6,0.6,12.6,1.7,15.1s4,3.7,8.5,3.7l15.2-0.6l0.9,16.2c-8.3,1.6-14.6,2.4-19,2.4
-		c-10.5,0-17.7-2.4-21.6-7.2c-3.9-4.8-5.9-13.9-5.9-27.3V89.3h-14.1V72h14.2V45.1h20.1V72h25.6V89.2z"/>
-</g>
-</svg>
diff --git a/src/settingsui/settingsuiplugin/newIcons/settings_icon.svg b/src/settingsui/settingsuiplugin/newIcons/settings_icon.svg
deleted file mode 100644
index 7f5dbde..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/settings_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="settings" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>settings_icon</title><path d="M41,17.82H35a14.73,14.73,0,0,0-1.47-3.24l4-4a2.38,2.38,0,0,0,0-3.38L35.83,5.53a2.39,2.39,0,0,0-3.38,0l-4,4a14.34,14.34,0,0,0-3.53-1.43V2.89A2.39,2.39,0,0,0,22.49.5H20.1a2.39,2.39,0,0,0-2.39,2.39V8.14a14,14,0,0,0-3.84,1.61L10.49,6.37a2.4,2.4,0,0,0-3.38,0L5.42,8.06a2.4,2.4,0,0,0,0,3.38l3.44,3.44A14.24,14.24,0,0,0,7.28,19H2.79A2.39,2.39,0,0,0,.39,21.4v2.39a2.39,2.39,0,0,0,2.39,2.38h4.8a14,14,0,0,0,1.93,4L6.27,33.4a2.4,2.4,0,0,0,0,3.38L8,38.47a2.4,2.4,0,0,0,3.38,0L15,34.84a13.89,13.89,0,0,0,3.94,1.27v5A2.4,2.4,0,0,0,21.3,43.5h2.39a2.4,2.4,0,0,0,2.39-2.39V35.5a14,14,0,0,0,3.38-1.72l3.85,3.85a2.4,2.4,0,0,0,3.38,0l1.69-1.69a2.38,2.38,0,0,0,0-3.38l-4.21-4.22A14.15,14.15,0,0,0,35.31,25H41a2.39,2.39,0,0,0,2.39-2.39V20.21A2.4,2.4,0,0,0,41,17.82ZM21.3,31.5A9.5,9.5,0,1,1,30.8,22,9.5,9.5,0,0,1,21.3,31.5Z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/settingsmenu_launcher_icon.svg b/src/settingsui/settingsuiplugin/newIcons/settingsmenu_launcher_icon.svg
deleted file mode 100644
index 479a79f..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/settingsmenu_launcher_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="settings_menu_launcher" data-name="settings menu launcher" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>settingsmenu_launcher_icon</title><rect y="1.86" width="44" height="9.43" style="fill:#9d9faa"/><rect y="17.57" width="44" height="9.43" style="fill:#9d9faa"/><rect y="33.29" width="44" height="7.86" style="fill:#9d9faa"/><rect y="1.86" width="44" height="9.43" style="fill:#9ca0aa"/><rect y="17.57" width="44" height="9.43" style="fill:#9ca0aa"/><rect y="33.29" width="44" height="7.86" style="fill:#9ca0aa"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/stop_icon.svg b/src/settingsui/settingsuiplugin/newIcons/stop_icon.svg
deleted file mode 100644
index 2eeff5f..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/stop_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="stop" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>stop_icon</title><path d="M37.66,44H6.34A6.35,6.35,0,0,1,0,37.66V6.34A6.35,6.35,0,0,1,6.34,0H37.66A6.35,6.35,0,0,1,44,6.34V37.66A6.35,6.35,0,0,1,37.66,44ZM6.34,4.14a2.2,2.2,0,0,0-2.2,2.2V37.66a2.2,2.2,0,0,0,2.2,2.2H37.66a2.2,2.2,0,0,0,2.2-2.2V6.34a2.2,2.2,0,0,0-2.2-2.2Z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/touch_icon.svg b/src/settingsui/settingsuiplugin/newIcons/touch_icon.svg
deleted file mode 100644
index 40ce016..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/touch_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="touch" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>touch_icon</title><path d="M10.64,21.23a1.06,1.06,0,0,1,0-1.5l4.23-4.25a1.06,1.06,0,0,1,1.5,0l8.48,8.46h0a1.06,1.06,0,0,1,0,1.5l-4.24,4.25a1.06,1.06,0,0,1-1.5,0l-8.47-8.45Zm5-3.5-2.74,2.74,7,7,2.73-2.74-7-7Z" style="fill:#fff"/><path d="M29.83,4.48a1,1,0,0,1,0,1.36l-4.41,4.41a3.68,3.68,0,0,1,.77.48l.44-.44A1,1,0,0,1,28,11.64l-.42.42.62.62.23-.23a1,1,0,1,1,1.36,1.36l-.25.25a3.68,3.68,0,0,1,.48.76,1,1,0,0,1,1.36,1.36l-1.74,1.74-1.23,1.23-3.23,3.23a2.38,2.38,0,0,1-1.39.66L17.2,16.49a2.52,2.52,0,0,1,.22-.76l1.37-5a1,1,0,0,1,.26-.44l3.05-3.05A.91.91,0,1,1,23.4,8.51L22.15,9.75,21.93,11l6.54-6.54a1,1,0,0,1,1.36,0M31.33,3A3.09,3.09,0,0,0,27,3l-2.4,2.4a3.08,3.08,0,0,0-4,.34L17.55,8.77a3.13,3.13,0,0,0-.81,1.39L15.42,15a4.74,4.74,0,0,0-.32,1.19A2.12,2.12,0,0,0,15.7,18h0l6.57,6.56a2.11,2.11,0,0,0,1.78.6,4.49,4.49,0,0,0,2.61-1.27l3.23-3.23,1.23-1.23,1.74-1.74a3.09,3.09,0,0,0,0-4.36,3,3,0,0,0-.7-.52,3.08,3.08,0,0,0-1.85-2.51A3.09,3.09,0,0,0,29.68,9l1.65-1.65a3.09,3.09,0,0,0,0-4.36Z" style="fill:#fff"/><path d="M6.65,34.69h5.2v1h-2v6.1H8.68v-6.1h-2Z" style="fill:#fff"/><path d="M12.38,38.29c0-2.38.68-3.71,2.9-3.71s2.89,1.32,2.89,3.71-.67,3.64-2.89,3.64S12.38,40.69,12.38,38.29Zm4.6,0c0-1.77-.32-2.7-1.7-2.7s-1.71.94-1.71,2.7.32,2.63,1.71,2.63S17,40.1,17,38.29Z" style="fill:#fff"/><path d="M22.07,40.92c1,0,1.47-.43,1.47-1.38V34.69H24.7v4.83c0,1.72-.93,2.41-2.63,2.41s-2.61-.7-2.61-2.41V34.69h1.17v4.85C20.62,40.5,21.12,40.92,22.07,40.92Z" style="fill:#fff"/><path d="M30.71,41.7a11.23,11.23,0,0,1-2,.23c-2.17,0-2.67-1.24-2.67-3.67s.54-3.68,2.67-3.68a10,10,0,0,1,2,.26l0,.94a13.25,13.25,0,0,0-1.84-.17c-1.31,0-1.63.64-1.63,2.65s.26,2.64,1.66,2.64a13.87,13.87,0,0,0,1.81-.16Z" style="fill:#fff"/><path d="M36.18,38.73H33.1v3.08H31.95V34.69H33.1v3h3.08v-3h1.17v7.13H36.18Z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/newIcons/volume_icon.svg b/src/settingsui/settingsuiplugin/newIcons/volume_icon.svg
deleted file mode 100644
index 12f944e..0000000
--- a/src/settingsui/settingsuiplugin/newIcons/volume_icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="volume" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44"><title>volume_icon</title><path d="M33.13,40.13a2,2,0,0,1-1.4-3.39,20.87,20.87,0,0,0,0-29.48,2,2,0,1,1,2.81-2.81,24.85,24.85,0,0,1,0,35.09,2,2,0,0,1-1.4.58Z" style="fill:#fff"/><path d="M27.38,34.38A2,2,0,0,1,26,31a12.72,12.72,0,0,0,0-18,2,2,0,0,1,2.81-2.81,16.69,16.69,0,0,1,0,23.59,2,2,0,0,1-1.4.58Z" style="fill:#fff"/><path d="M20.13,40.48A2,2,0,0,1,18.89,40L9.8,32.77H4.19a2,2,0,0,1-2-2V13.22a2,2,0,0,1,2-2h5.6L18.89,4A2,2,0,0,1,22.12,5.5v33a2,2,0,0,1-2,2ZM6.18,28.8h4.32a2,2,0,0,1,1.24.44l6.41,5.13V9.64l-6.42,5.14a2,2,0,0,1-1.24.44H6.18V28.8Z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/src/settingsui/settingsuiplugin/plugin.cpp b/src/settingsui/settingsuiplugin/plugin.cpp
index 3e9a274..3ea37ad 100644
--- a/src/settingsui/settingsuiplugin/plugin.cpp
+++ b/src/settingsui/settingsuiplugin/plugin.cpp
@@ -38,7 +38,7 @@ static void initResources()
 }
 
 /*!
-    \qmlmodule QtDeviceUtilities.SettingsUI 1.0
+    \qmlmodule QtDeviceUtilities.SettingsUI
     \title Qt Device Utilities: Settings UI
     \ingroup qtdevice-utilities-qml-modules
     \ingroup qmlmodules
@@ -51,7 +51,7 @@ static void initResources()
     To import and use the module's QML types, use the following statement:
 
     \badcode
-    import QtDeviceUtilities.SettingsUI 1.0
+    import QtDeviceUtilities.SettingsUI
     \endcode
 
     \section1 QML Types
@@ -68,8 +68,8 @@ static void initResources()
     For example:
 
     \qml
-    import QtQuick 2.6
-    import QtDeviceUtilities.SettingsUI 1.0
+    import QtQuick
+    import QtDeviceUtilities.SettingsUI
 
     SettingsUI {
         id: settingsUI
@@ -94,7 +94,7 @@ public:
     {
         // @uri QtDeviceUtilities.SettingsUI
         Q_ASSERT(uri == QLatin1String("QtDeviceUtilities.SettingsUI"));
-        qmlRegisterType(QUrl("qrc:/pluginMain.qml"), uri, 1, 0, "SettingsUI");
+        qmlRegisterType(QUrl("qrc:/pluginMain.qml"), uri, 2, 0, "SettingsUI");
     }
 
 };
diff --git a/src/settingsui/settingsuiplugin/pluginMain.qml b/src/settingsui/settingsuiplugin/pluginMain.qml
index 5701034..76a6ced 100644
--- a/src/settingsui/settingsuiplugin/pluginMain.qml
+++ b/src/settingsui/settingsuiplugin/pluginMain.qml
@@ -26,13 +26,11 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.5
-import QtQuick.Layouts 1.2
-import QtQuick.Controls 2.0
-import Qt.labs.settings 1.0
-import QtQuick.XmlListModel 2.0
-import QtDeviceUtilities.NetworkSettings 1.0
-import QtGraphicalEffects 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import Qt.labs.settings
+import QtDeviceUtilities.NetworkSettings
 
 Rectangle {
     id: pluginMain
@@ -41,7 +39,6 @@ Rectangle {
     color: "#09102b"
     opacity: 0.97
 
-    property bool __initialized: false
     property var service
     property int margin: (pluginMain.width / 3 * 2) * 0.05
     property int spacing: margin * 0.5
@@ -52,33 +49,13 @@ Rectangle {
     property int fieldTextHeight: height * 0.05
     property int buttonHeight: height * 0.05
 
-    property alias model: xmlModel.source
-
-    function init()
-    {
-        if (!__initialized) {
-            __initialized = true;
-            settingsList.currentIndex = 0
-            if (xmlModel.count >= 1) {
-                settingsLoader.source = xmlModel.get(0).path + '/' +
-                                        xmlModel.get(0).view + '.qml'
-                titleItem.title = xmlModel.get(0).title
-            } else {
-                titleItem.title = qsTr("No settings")
-            }
-        }
-    }
-
     signal closed()
 
-    XmlListModel {
-        id: xmlModel
-        source: "settingsview.xml"
-        query: "/xml/settings/item"
-        XmlRole { name: "title"; query: "title/string()"}
-        XmlRole { name: "icon"; query: "icon/string()"}
-        XmlRole { name: "view"; query: "view/string()"}
-        XmlRole { name: "path"; query: "path/string()"}
+    Component.onCompleted: {
+        settingsList.currentIndex = 0
+        settingsLoader.source = settingsListModel.get(0).path + '/' +
+                                settingsListModel.get(0).view + '.qml'
+        titleItem.title = settingsListModel.get(0).title
     }
 
     SettingsHeader {
@@ -86,30 +63,32 @@ Rectangle {
         onClicked: pluginMain.closed()
     }
 
+    ListModel {
+        id: settingsListModel
+
+        ListElement {
+            title: "Network"
+            view: "NetworkSettings"
+            path: "network"
+            icon: "newIcons/network_icon.svg"
+        }
+    }
+
     ListView {
         id: settingsList
         objectName: "settingsList"
         anchors.top: settingsHeader.bottom
         anchors.left: parent.left
         anchors.bottom: parent.bottom
-        width: parent.width / 3
-        model: xmlModel
+        width: parent.width / 3.33
+        model: settingsListModel
 
         delegate: SettingsDelegate {}
     }
 
-    Rectangle {
-        id: rightLine
-        width: 3
-        height: parent.height * 0.8
-        anchors.left: settingsList.right
-        anchors.top: settingsHeader.bottom
-        color: "#9d9faa"
-    }
-
     SettingsTitleItem {
         id: titleItem
-        anchors.left: rightLine.right
+        anchors.left: settingsList.right
         anchors.right: parent.right
         anchors.top: settingsHeader.bottom
         anchors.leftMargin: pluginMain.margin * 2
@@ -118,7 +97,7 @@ Rectangle {
     Loader {
         id: settingsLoader
         anchors.top: titleItem.bottom
-        anchors.left: rightLine.right
+        anchors.left: settingsList.right
         anchors.right: parent.right
         anchors.bottom: parent.bottom
         anchors.leftMargin: pluginMain.margin * 2
diff --git a/src/settingsui/settingsuiplugin/settingsui.qrc b/src/settingsui/settingsuiplugin/settingsui.qrc
index 673bb6a..7c8b661 100644
--- a/src/settingsui/settingsuiplugin/settingsui.qrc
+++ b/src/settingsui/settingsuiplugin/settingsui.qrc
@@ -13,7 +13,6 @@
         <file>../network/WifiSettings.qml</file>
         <file>../network/WifiSignalMonitor.qml</file>
         <file>../network/WiredSettings.qml</file>
-        <file>settingsview.xml</file>
         <file>../common/CustomSwitch.qml</file>
         <file>../network/NetworkListView.qml</file>
         <file>../network/PassphraseEnter.qml</file>
@@ -21,51 +20,12 @@
         <file>SettingsDelegate.qml</file>
         <file>SettingsTitleItem.qml</file>
         <file>icons/Alert_yellow_1x.png</file>
-        <file>icons/Audio_qt_6x.png</file>
-        <file>icons/Bluetooth_qt_1x.png</file>
-        <file>icons/Bluetooth_qt_6x.png</file>
-        <file>icons/Camcorder_qt_1x.png</file>
-        <file>icons/Camera_qt_1x.png</file>
-        <file>icons/Clock_qt_1x.png</file>
-        <file>icons/Clock_qt_6x.png</file>
-        <file>icons/Display_qt_6x.png</file>
-        <file>icons/Flag_qt_6x.png</file>
         <file>icons/FloatingButton_Active.png</file>
         <file>icons/FloatingButton_Available.png</file>
         <file>icons/FloatingButton_Unavailable.png</file>
-        <file>icons/Headphones_qt_1x.png</file>
-        <file>icons/Heartbeat_qt_1x.png</file>
-        <file>icons/Keyboard_qt_1x.png</file>
-        <file>icons/Laptop_qt_1x.png</file>
-        <file>icons/Microphone_qt_1x.png</file>
-        <file>icons/MobilePhone_qt_1x.png</file>
-        <file>icons/Mouse_qt_1x.png</file>
-        <file>icons/Tablet_qt_1x.png</file>
-        <file>icons/Volume_down_qt_1x.png</file>
-        <file>icons/Volume_mute_qt_1x.png</file>
-        <file>icons/Volume_up_qt_1x.png</file>
         <file>icons/WifiAnim_black_2x.png</file>
         <file>icons/Wifi_lightgray_2x.png</file>
-        <file>icons/World_qt_6x.png</file>
-        <file>icons/Chevron-left_black_6x.png</file>
-        <file>icons/Chevron-left_black.png</file>
-        <file>icons/Power_black_6x.png</file>
         <file>newIcons/back_icon.svg</file>
-        <file>newIcons/close_icon.svg</file>
-        <file>newIcons/detail_icon.svg</file>
-        <file>newIcons/grid_icon.svg</file>
-        <file>newIcons/header_toggle_icon.svg</file>
-        <file>newIcons/info_icon.svg</file>
-        <file>newIcons/mouse_icon.svg</file>
-        <file>newIcons/mute_icon.svg</file>
         <file>newIcons/network_icon.svg</file>
-        <file>newIcons/pause_icon.svg</file>
-        <file>newIcons/play_icon.svg</file>
-        <file>newIcons/settings_icon.svg</file>
-        <file>newIcons/settingsmenu_launcher_icon.svg</file>
-        <file>newIcons/stop_icon.svg</file>
-        <file>newIcons/touch_icon.svg</file>
-        <file>newIcons/volume_icon.svg</file>
-        <file>newIcons/qt_logo_green_rgb.svg</file>
     </qresource>
 </RCC>
diff --git a/src/settingsui/settingsuiplugin/settingsview.xml b/src/settingsui/settingsuiplugin/settingsview.xml
deleted file mode 100644
index d7285ea..0000000
--- a/src/settingsui/settingsuiplugin/settingsview.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xml>
-    <settings>
-        <item>
-            <title>Network</title>
-            <view>NetworkSettings</view>
-            <path>network</path>
-            <icon>newIcons/network_icon.svg</icon>
-        </item>
-    </settings>
-</xml>
-- 
cgit v1.2.3