diff --git a/ui/app/AppLayouts/Browser/BrowserLayout.qml b/ui/app/AppLayouts/Browser/BrowserLayout.qml
index 9926931b62..ec758613fe 100644
--- a/ui/app/AppLayouts/Browser/BrowserLayout.qml
+++ b/ui/app/AppLayouts/Browser/BrowserLayout.qml
@@ -1,11 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Layouts 1.13
 import QtWebView 1.14
-import "../../../imports"
-import "../../../shared"
 
 Item {
     id: browserView
@@ -27,3 +22,9 @@ Item {
         url: "https://dap.ps/"
   }
 }
+
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
diff --git a/ui/app/AppLayouts/Chat/ChatColumn.qml b/ui/app/AppLayouts/Chat/ChatColumn.qml
index 2f55dde8a1..ece016573c 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn.qml
@@ -1,8 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../shared"
 import "../../../imports"
 import "./ChatColumn"
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatInput.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatInput.qml
index 332c012a42..b72bd9a916 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatInput.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatInput.qml
@@ -1,8 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../shared"
 import "../../../../imports"
 
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
index 7b661eeb83..7441bcea64 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
@@ -1,10 +1,7 @@
-import QtQuick 2.14
-
-import QtQuick.Controls 2.3
-import QtQuick.Controls 2.14 as QQC2
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
-import QtQml.Models 2.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
+import QtQml.Models 2.13
 import "../../../../shared"
 import "../../../../imports"
 import "../components"
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml b/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml
index 948b288631..e40cf78a9e 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml
@@ -1,8 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../shared"
 import "../../../../imports"
 
@@ -31,4 +29,9 @@ Item {
             color: Theme.darkGrey
         }
     }
-}
\ No newline at end of file
+}
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/Message.qml b/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
index 527b8990a1..1e78b49a1a 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
@@ -1,8 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../shared"
 import "../../../../imports"
 import "../components"
@@ -140,7 +138,6 @@ Item {
 
     }
 
-
     // Private group Messages
     Text {
         wrapMode: Text.Wrap
@@ -287,4 +284,3 @@ Designer {
     D{i:0;height:80;width:800}
 }
 ##^##*/
-
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/TopBar.qml b/ui/app/AppLayouts/Chat/ChatColumn/TopBar.qml
index 279029b8e9..f610098c5e 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/TopBar.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/TopBar.qml
@@ -1,8 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../shared"
 import "../../../../imports"
 import "../components"
@@ -95,7 +93,7 @@ Rectangle {
 
             PopupMenu {
                 id: chatContextMenu
-                QQC2.Action { 
+                Action {
                     icon.source: "../../../img/leave_chat.svg"
                     text: qsTr("Leave Chat")
                     onTriggered: chatsModel.leaveActiveChat()
@@ -104,25 +102,21 @@ Rectangle {
 
             PopupMenu {
                 id: groupContextMenu
-                QQC2.Action { 
+                Action {
                     icon.source: "../../../img/group_chat.svg"
                     text: qsTr("Group Information")
                     onTriggered: groupInfoPopup.open()
                 }
-                QQC2.Action { 
+                Action {
                     icon.source: "../../../img/leave_chat.svg"
                     text: qsTr("Leave Group")
                     onTriggered: chatsModel.leaveActiveChat()
                 }
             }
 
-
             GroupInfoPopup {
                 id: groupInfoPopup
             }
-
-            
-
         }
     }
 }
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/samples/MessagesData.qml b/ui/app/AppLayouts/Chat/ChatColumn/samples/MessagesData.qml
index c265435804..67e3acbec2 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/samples/MessagesData.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/samples/MessagesData.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
 
 ListModel {
     ListElement {
diff --git a/ui/app/AppLayouts/Chat/ChatLayout.qml b/ui/app/AppLayouts/Chat/ChatLayout.qml
index 3834537e65..d2f652e692 100644
--- a/ui/app/AppLayouts/Chat/ChatLayout.qml
+++ b/ui/app/AppLayouts/Chat/ChatLayout.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.3
+import QtQuick 2.13
+//TODO: update to import QtQuick.Controls 2.13
 import QtQuick.Controls 1.3
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick.Layouts 1.13
 import "../../../imports"
 import "."
 
diff --git a/ui/app/AppLayouts/Chat/ContactsColumn.qml b/ui/app/AppLayouts/Chat/ContactsColumn.qml
index 512d2d31c3..a0957f1267 100644
--- a/ui/app/AppLayouts/Chat/ContactsColumn.qml
+++ b/ui/app/AppLayouts/Chat/ContactsColumn.qml
@@ -1,8 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
-import QtGraphicalEffects 1.12
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../imports"
 import "../../../shared"
 import "./components"
@@ -51,7 +49,7 @@ Item {
     }
 
     AddChat {
-        id: "addChat"
+        id: addChat
     }
 
     StackLayout {
@@ -73,9 +71,3 @@ Item {
         }
     }
 }
-
-/*##^##
-Designer {
-    D{i:0;formeditorColor:"#ffffff";height:770;width:300}
-}
-##^##*/
diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/AddChat.qml b/ui/app/AppLayouts/Chat/ContactsColumn/AddChat.qml
index fd8ee2f5b9..4d9f5b8a20 100644
--- a/ui/app/AppLayouts/Chat/ContactsColumn/AddChat.qml
+++ b/ui/app/AppLayouts/Chat/ContactsColumn/AddChat.qml
@@ -1,8 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../shared"
 import "../../../../imports"
 import "../components"
@@ -80,19 +78,19 @@ Rectangle {
 
         PopupMenu {
             id: newChatMenu
-            QQC2.Action {
+            Action {
                 text: qsTr("Start new chat")
                 icon.source: "../../../img/new_chat.svg"
                 onTriggered: privateChatPopup.open()
             }
-            QQC2.Action {
+            Action {
                 text: qsTr("Start group chat")
                 icon.source: "../../../img/group_chat.svg"
                 onTriggered: {
                 onTriggered: groupChatPopup.open()
                 }
             }
-            QQC2.Action {
+            Action {
                 text: qsTr("Join public chat")
                 icon.source: "../../../img/public_chat.svg"
                 onTriggered: publicChatPopup.open()
diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml b/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml
index 405a4f0708..1d3b59b3a6 100644
--- a/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml
+++ b/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import "../../../../shared"
 import "../../../../imports"
 import "../components"
@@ -112,3 +110,11 @@ Rectangle {
         }
     }
 }
+
+
+
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml b/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml
index 6e2b87b79c..d7d8932c45 100644
--- a/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml
+++ b/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../shared"
 import "../../../../imports"
 import "../components"
@@ -42,4 +42,9 @@ Item {
             }
         }
     }
-}
\ No newline at end of file
+}
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml b/ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml
index 941edffbc7..ae21762c9a 100644
--- a/ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml
+++ b/ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../components"
 
 Item {
@@ -72,3 +72,9 @@ Item {
         }
     }
 }
+
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
diff --git a/ui/app/AppLayouts/Chat/components/ChannelIcon.qml b/ui/app/AppLayouts/Chat/components/ChannelIcon.qml
index aa697c4eb4..e8ed1a9c98 100644
--- a/ui/app/AppLayouts/Chat/components/ChannelIcon.qml
+++ b/ui/app/AppLayouts/Chat/components/ChannelIcon.qml
@@ -1,7 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 import "../../../../shared"
 
@@ -77,4 +76,3 @@ Rectangle {
     }
   }
 }
-
diff --git a/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml b/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml
index 0fb5a616c9..209008f4c0 100644
--- a/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml
@@ -1,7 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 import "../../../../shared"
 import "./"
@@ -189,12 +188,12 @@ ModalPopup {
                             cursorShape: Qt.PointingHandCursor
                             PopupMenu {
                                 id: contextMenu
-                                QQC2.Action { 
+                                Action {
                                     icon.source: "../../../img/make-admin.svg"
                                     text: qsTr("Make Admin")
                                     onTriggered: chatsModel.leaveActiveChat()
                                 }
-                                QQC2.Action { 
+                                Action {
                                     icon.source: "../../../img/remove-from-group.svg"
                                     icon.color: Theme.red
                                     text: qsTr("Remove From Group")
@@ -204,10 +203,6 @@ ModalPopup {
                         }
                     }
                 }
-
-                
-
-
             }
         }
     }
diff --git a/ui/app/AppLayouts/Chat/components/PrivateChatPopup.qml b/ui/app/AppLayouts/Chat/components/PrivateChatPopup.qml
index 03ad2f0663..bd85223249 100644
--- a/ui/app/AppLayouts/Chat/components/PrivateChatPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/PrivateChatPopup.qml
@@ -1,13 +1,12 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 import "../../../../shared"
 import "../../Profile/Sections/Contacts/"
 import "./"
 
 ModalPopup {
-
     function doJoin(){
         if (chatKey.text !== "") {
             chatsModel.joinChat(chatKey.text, Constants.chatTypeOneToOne);
diff --git a/ui/app/AppLayouts/Chat/components/ProfilePopup.qml b/ui/app/AppLayouts/Chat/components/ProfilePopup.qml
index 98cf5a7501..1079adda74 100644
--- a/ui/app/AppLayouts/Chat/components/ProfilePopup.qml
+++ b/ui/app/AppLayouts/Chat/components/ProfilePopup.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 import "../../../../shared"
 import "./"
diff --git a/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml b/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
index 78680e0a5b..db54a417f6 100644
--- a/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
@@ -1,11 +1,10 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 import "../../../../shared"
 import "./"
 
-
 ModalPopup {
     function doJoin() {
         if(channelName.text === "") return;
@@ -14,7 +13,6 @@ ModalPopup {
         
     }
 
-
     id: popup
     title: qsTr("Join public chat")
 
@@ -47,7 +45,6 @@ ModalPopup {
         Keys.onReturnPressed: doJoin()
         icon: "../../../img/hash.svg"
     }
-    
 
     RowLayout {
         id: row
diff --git a/ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml b/ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml
index 2c97065a21..217e3aee29 100644
--- a/ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 import "../../../../shared"
 import "./"
diff --git a/ui/app/AppLayouts/Chat/components/SuggestedChannel.qml b/ui/app/AppLayouts/Chat/components/SuggestedChannel.qml
index f2d83ed546..4a8d054334 100644
--- a/ui/app/AppLayouts/Chat/components/SuggestedChannel.qml
+++ b/ui/app/AppLayouts/Chat/components/SuggestedChannel.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.13
 import "../../../../imports"
 
 Rectangle {
diff --git a/ui/app/AppLayouts/Node/NodeLayout.qml b/ui/app/AppLayouts/Node/NodeLayout.qml
index c26dd9c543..3f8c193c46 100644
--- a/ui/app/AppLayouts/Node/NodeLayout.qml
+++ b/ui/app/AppLayouts/Node/NodeLayout.qml
@@ -1,8 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../imports"
 
 SplitView {
diff --git a/ui/app/AppLayouts/Profile/LeftTab.qml b/ui/app/AppLayouts/Profile/LeftTab.qml
index 7ac58ab730..30f1ec913b 100644
--- a/ui/app/AppLayouts/Profile/LeftTab.qml
+++ b/ui/app/AppLayouts/Profile/LeftTab.qml
@@ -1,9 +1,5 @@
-import QtGraphicalEffects 1.12
-import QtQuick 2.3
-import QtQuick.Controls 1.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Layouts 1.13
 import "../../../imports"
 import "../../../shared"
 import "./LeftTab"
diff --git a/ui/app/AppLayouts/Profile/LeftTab/Menu.qml b/ui/app/AppLayouts/Profile/LeftTab/Menu.qml
index c85604ca9b..0a608af827 100644
--- a/ui/app/AppLayouts/Profile/LeftTab/Menu.qml
+++ b/ui/app/AppLayouts/Profile/LeftTab/Menu.qml
@@ -1,7 +1,6 @@
-import QtGraphicalEffects 1.12
-import QtQuick 2.0
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 
 Rectangle {
diff --git a/ui/app/AppLayouts/Profile/LeftTab/Profile.qml b/ui/app/AppLayouts/Profile/LeftTab/Profile.qml
index e0eb62f85d..15259447d8 100644
--- a/ui/app/AppLayouts/Profile/LeftTab/Profile.qml
+++ b/ui/app/AppLayouts/Profile/LeftTab/Profile.qml
@@ -1,7 +1,6 @@
-import QtGraphicalEffects 1.12
-import QtQuick 2.0
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick 2.13
+import QtQuick.Layouts 1.13
+import QtGraphicalEffects 1.13
 import "../../../../imports"
 
 Rectangle {
diff --git a/ui/app/AppLayouts/Profile/ProfileLayout.qml b/ui/app/AppLayouts/Profile/ProfileLayout.qml
index 8b0bcb6d08..4ca664a0bf 100644
--- a/ui/app/AppLayouts/Profile/ProfileLayout.qml
+++ b/ui/app/AppLayouts/Profile/ProfileLayout.qml
@@ -1,13 +1,9 @@
-import QtGraphicalEffects 1.12
-import QtQuick 2.3
-import QtQuick.Controls 1.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../imports"
 import "../../../shared"
 import "./Sections"
-import "."
 
 SplitView {
     id: profileView
@@ -16,7 +12,7 @@ SplitView {
     Layout.fillHeight: true
     Layout.fillWidth: true
 
-    handleDelegate: Rectangle {
+    handle: Rectangle {
         implicitWidth: 1
         implicitHeight: 4
         color: Theme.grey
diff --git a/ui/app/AppLayouts/Profile/Sections/AboutContainer.qml b/ui/app/AppLayouts/Profile/Sections/AboutContainer.qml
index f1b9eb4fb9..cc75887782 100644
--- a/ui/app/AppLayouts/Profile/Sections/AboutContainer.qml
+++ b/ui/app/AppLayouts/Profile/Sections/AboutContainer.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 
 Item {
diff --git a/ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml b/ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml
index 3e1b28074c..1d6ae77ce8 100644
--- a/ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml
+++ b/ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 
 Item {
diff --git a/ui/app/AppLayouts/Profile/Sections/Contacts/Contact.qml b/ui/app/AppLayouts/Profile/Sections/Contacts/Contact.qml
index 264e9a5df4..435e9eb05e 100644
--- a/ui/app/AppLayouts/Profile/Sections/Contacts/Contact.qml
+++ b/ui/app/AppLayouts/Profile/Sections/Contacts/Contact.qml
@@ -1,7 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../../imports"
 import "../../../../../shared"
 
diff --git a/ui/app/AppLayouts/Profile/Sections/Contacts/ContactList.qml b/ui/app/AppLayouts/Profile/Sections/Contacts/ContactList.qml
index 666fa93c65..d3d1191e8e 100644
--- a/ui/app/AppLayouts/Profile/Sections/Contacts/ContactList.qml
+++ b/ui/app/AppLayouts/Profile/Sections/Contacts/ContactList.qml
@@ -1,7 +1,6 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "./samples/"
 import "../../../../../imports"
 import "../../../../../shared"
diff --git a/ui/app/AppLayouts/Profile/Sections/Contacts/samples/ContactsData.qml b/ui/app/AppLayouts/Profile/Sections/Contacts/samples/ContactsData.qml
index 460a084101..a63539c122 100644
--- a/ui/app/AppLayouts/Profile/Sections/Contacts/samples/ContactsData.qml
+++ b/ui/app/AppLayouts/Profile/Sections/Contacts/samples/ContactsData.qml
@@ -1,7 +1,4 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
 
 ListModel {
     ListElement {
diff --git a/ui/app/AppLayouts/Profile/Sections/ContactsContainer.qml b/ui/app/AppLayouts/Profile/Sections/ContactsContainer.qml
index 61c06b948d..b5edfe7509 100644
--- a/ui/app/AppLayouts/Profile/Sections/ContactsContainer.qml
+++ b/ui/app/AppLayouts/Profile/Sections/ContactsContainer.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 import "./Contacts"
 
diff --git a/ui/app/AppLayouts/Profile/Sections/HelpContainer.qml b/ui/app/AppLayouts/Profile/Sections/HelpContainer.qml
index da93aea11e..02db5e6fc6 100644
--- a/ui/app/AppLayouts/Profile/Sections/HelpContainer.qml
+++ b/ui/app/AppLayouts/Profile/Sections/HelpContainer.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 
 Item {
@@ -32,4 +32,4 @@ Item {
             cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ui/app/AppLayouts/Profile/Sections/LanguageContainer.qml b/ui/app/AppLayouts/Profile/Sections/LanguageContainer.qml
index 9afd99a7d3..8e360cb95d 100644
--- a/ui/app/AppLayouts/Profile/Sections/LanguageContainer.qml
+++ b/ui/app/AppLayouts/Profile/Sections/LanguageContainer.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 
 Item {
diff --git a/ui/app/AppLayouts/Profile/Sections/NotificationsContainer.qml b/ui/app/AppLayouts/Profile/Sections/NotificationsContainer.qml
index ebb26fd3c9..558e91132d 100644
--- a/ui/app/AppLayouts/Profile/Sections/NotificationsContainer.qml
+++ b/ui/app/AppLayouts/Profile/Sections/NotificationsContainer.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 
 Item {
diff --git a/ui/app/AppLayouts/Profile/Sections/PrivacyContainer.qml b/ui/app/AppLayouts/Profile/Sections/PrivacyContainer.qml
index a6b5ca676f..7a0c68e588 100644
--- a/ui/app/AppLayouts/Profile/Sections/PrivacyContainer.qml
+++ b/ui/app/AppLayouts/Profile/Sections/PrivacyContainer.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 
 Item {
diff --git a/ui/app/AppLayouts/Profile/Sections/SignoutContainer.qml b/ui/app/AppLayouts/Profile/Sections/SignoutContainer.qml
index e8ff1685ad..a28a6972c4 100644
--- a/ui/app/AppLayouts/Profile/Sections/SignoutContainer.qml
+++ b/ui/app/AppLayouts/Profile/Sections/SignoutContainer.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 import "../../../../shared"
 
@@ -34,4 +34,4 @@ Item {
             Qt.quit();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ui/app/AppLayouts/Profile/Sections/SyncContainer.qml b/ui/app/AppLayouts/Profile/Sections/SyncContainer.qml
index 71d17917f0..ca180afbd3 100644
--- a/ui/app/AppLayouts/Profile/Sections/SyncContainer.qml
+++ b/ui/app/AppLayouts/Profile/Sections/SyncContainer.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../../imports"
 
 Item {
@@ -21,13 +21,12 @@ Item {
         font.pixelSize: 20
     }
 
-
     Component {
         id: mailserversList
 
         RadioButton {
-        text: name
-        checked: index == 0 ? true: false
+            text: name
+            checked: index == 0 ? true: false
         }
     }
 
diff --git a/ui/app/AppLayouts/Wallet/AccountSettingsModal.qml b/ui/app/AppLayouts/Wallet/AccountSettingsModal.qml
index b664ed68e3..28e320e964 100644
--- a/ui/app/AppLayouts/Wallet/AccountSettingsModal.qml
+++ b/ui/app/AppLayouts/Wallet/AccountSettingsModal.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import QtQuick.Dialogs 1.3
 import "../../../imports"
 import "../../../shared"
diff --git a/ui/app/AppLayouts/Wallet/AddCustomTokenModal.qml b/ui/app/AppLayouts/Wallet/AddCustomTokenModal.qml
index 123c0da175..905dc55fc3 100644
--- a/ui/app/AppLayouts/Wallet/AddCustomTokenModal.qml
+++ b/ui/app/AppLayouts/Wallet/AddCustomTokenModal.qml
@@ -1,7 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import QtQuick.Dialogs 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../imports"
 import "../../../shared"
 
diff --git a/ui/app/AppLayouts/Wallet/AssetsTab.qml b/ui/app/AppLayouts/Wallet/AssetsTab.qml
index 614a92ea90..e0b9d10a81 100644
--- a/ui/app/AppLayouts/Wallet/AssetsTab.qml
+++ b/ui/app/AppLayouts/Wallet/AssetsTab.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.3
+import QtQuick 2.13
 import "../../../imports"
 
 Item {
diff --git a/ui/app/AppLayouts/Wallet/CollectiblesTab.qml b/ui/app/AppLayouts/Wallet/CollectiblesTab.qml
index 848444eded..b695ba3fa0 100644
--- a/ui/app/AppLayouts/Wallet/CollectiblesTab.qml
+++ b/ui/app/AppLayouts/Wallet/CollectiblesTab.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.3
+import QtQuick 2.13
 
 Item {
     Text {
@@ -6,3 +6,9 @@ Item {
         text: "Collectibles"
     }
 }
+
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
diff --git a/ui/app/AppLayouts/Wallet/Components/AddAccount.qml b/ui/app/AppLayouts/Wallet/Components/AddAccount.qml
index a35b8849f9..cec558aeaf 100644
--- a/ui/app/AppLayouts/Wallet/Components/AddAccount.qml
+++ b/ui/app/AppLayouts/Wallet/Components/AddAccount.qml
@@ -1,8 +1,5 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import "../../../../shared"
 import "../../../../imports"
 
@@ -93,28 +90,28 @@ Rectangle {
         PopupMenu {
             id: newAccountMenu
             width: 280
-            QQC2.Action {
+            Action {
                 text: qsTr("Generate an account")
                 icon.source: "../../../img/generate_account.svg"
                 onTriggered: {
                     generateAccountModal.open()
                 }
             }
-            QQC2.Action {
+            Action {
                 text: qsTr("Add a watch-only address")
                 icon.source: "../../../img/add_watch_only.svg"
                 onTriggered: {
                     addWatchOnlyAccountModal.open()
                 }
             }
-            QQC2.Action {
+            Action {
                 text: qsTr("Enter a seed phrase")
                 icon.source: "../../../img/enter_seed_phrase.svg"
                 onTriggered: {
                     addAccountWithSeedModal.open()
                 }
             }
-            QQC2.Action {
+            Action {
                 text: qsTr("Enter a private key")
                 icon.source: "../../../img/enter_private_key.svg"
                 onTriggered: {
diff --git a/ui/app/AppLayouts/Wallet/Components/AddAccountWithPrivateKey.qml b/ui/app/AppLayouts/Wallet/Components/AddAccountWithPrivateKey.qml
index 32cf87f0b8..e4bd2f3bcb 100644
--- a/ui/app/AppLayouts/Wallet/Components/AddAccountWithPrivateKey.qml
+++ b/ui/app/AppLayouts/Wallet/Components/AddAccountWithPrivateKey.qml
@@ -1,6 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
 import "../../../../imports"
 import "../../../../shared"
 
diff --git a/ui/app/AppLayouts/Wallet/Components/AddAccountWithSeed.qml b/ui/app/AppLayouts/Wallet/Components/AddAccountWithSeed.qml
index eabd05250f..1a2120b124 100644
--- a/ui/app/AppLayouts/Wallet/Components/AddAccountWithSeed.qml
+++ b/ui/app/AppLayouts/Wallet/Components/AddAccountWithSeed.qml
@@ -1,6 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
 import "../../../../imports"
 import "../../../../shared"
 
diff --git a/ui/app/AppLayouts/Wallet/Components/AddWatchOnlyAccount.qml b/ui/app/AppLayouts/Wallet/Components/AddWatchOnlyAccount.qml
index 6e2f7d840b..0e409989ba 100644
--- a/ui/app/AppLayouts/Wallet/Components/AddWatchOnlyAccount.qml
+++ b/ui/app/AppLayouts/Wallet/Components/AddWatchOnlyAccount.qml
@@ -1,6 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
 import "../../../../imports"
 import "../../../../shared"
 
diff --git a/ui/app/AppLayouts/Wallet/Components/GenerateAccountModal.qml b/ui/app/AppLayouts/Wallet/Components/GenerateAccountModal.qml
index 6ae6326839..55d87bc796 100644
--- a/ui/app/AppLayouts/Wallet/Components/GenerateAccountModal.qml
+++ b/ui/app/AppLayouts/Wallet/Components/GenerateAccountModal.qml
@@ -1,6 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
 import "../../../../imports"
 import "../../../../shared"
 
diff --git a/ui/app/AppLayouts/Wallet/Components/SendModalContent.qml b/ui/app/AppLayouts/Wallet/Components/SendModalContent.qml
index e8eea9918a..c01dea4e45 100644
--- a/ui/app/AppLayouts/Wallet/Components/SendModalContent.qml
+++ b/ui/app/AppLayouts/Wallet/Components/SendModalContent.qml
@@ -1,7 +1,4 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
 import "../../../../imports"
 import "../../../../shared"
 
diff --git a/ui/app/AppLayouts/Wallet/Components/SetCurrencyModalContent.qml b/ui/app/AppLayouts/Wallet/Components/SetCurrencyModalContent.qml
index 4d038ac684..e69c2cd0c1 100644
--- a/ui/app/AppLayouts/Wallet/Components/SetCurrencyModalContent.qml
+++ b/ui/app/AppLayouts/Wallet/Components/SetCurrencyModalContent.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import "../../../../imports"
 import "../../../../shared"
 import "../data/"
diff --git a/ui/app/AppLayouts/Wallet/Components/TokenSettingsModalContent.qml b/ui/app/AppLayouts/Wallet/Components/TokenSettingsModalContent.qml
index 047fda56b0..4bc8957440 100644
--- a/ui/app/AppLayouts/Wallet/Components/TokenSettingsModalContent.qml
+++ b/ui/app/AppLayouts/Wallet/Components/TokenSettingsModalContent.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import "../../../../imports"
 import "../../../../shared"
 import "../../Chat/ContactsColumn"
diff --git a/ui/app/AppLayouts/Wallet/Components/TransactionModal.qml b/ui/app/AppLayouts/Wallet/Components/TransactionModal.qml
index 6546967d34..12b1860e0e 100644
--- a/ui/app/AppLayouts/Wallet/Components/TransactionModal.qml
+++ b/ui/app/AppLayouts/Wallet/Components/TransactionModal.qml
@@ -1,6 +1,4 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
 import "../../../../imports"
 import "../../../../shared"
 import "./"
diff --git a/ui/app/AppLayouts/Wallet/HistoryTab.qml b/ui/app/AppLayouts/Wallet/HistoryTab.qml
index 0ddf911059..228cf384bc 100644
--- a/ui/app/AppLayouts/Wallet/HistoryTab.qml
+++ b/ui/app/AppLayouts/Wallet/HistoryTab.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.3
+import QtQuick 2.13
 import "./Components"
 import "../../../imports"
 
diff --git a/ui/app/AppLayouts/Wallet/LeftTab.qml b/ui/app/AppLayouts/Wallet/LeftTab.qml
index 40ff50b95a..a9dd849072 100644
--- a/ui/app/AppLayouts/Wallet/LeftTab.qml
+++ b/ui/app/AppLayouts/Wallet/LeftTab.qml
@@ -1,9 +1,7 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
-import QtGraphicalEffects 1.0
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
+import QtGraphicalEffects 1.13
 import "../../../imports"
 import "../../../shared"
 import "./Components"
@@ -203,4 +201,3 @@ Designer {
     D{i:0;formeditorColor:"#ffffff";formeditorZoom:0.75;height:770;width:340}
 }
 ##^##*/
-
diff --git a/ui/app/AppLayouts/Wallet/SendModal.qml b/ui/app/AppLayouts/Wallet/SendModal.qml
index cd2330a064..461db682ee 100644
--- a/ui/app/AppLayouts/Wallet/SendModal.qml
+++ b/ui/app/AppLayouts/Wallet/SendModal.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+//import QtQuick.Layouts 1.13
+//import Qt.labs.platform 1.1
 import "../../../imports"
 import "../../../shared"
 import "./Components"
diff --git a/ui/app/AppLayouts/Wallet/SetCurrencyModal.qml b/ui/app/AppLayouts/Wallet/SetCurrencyModal.qml
index e973e7a250..0f78d45938 100644
--- a/ui/app/AppLayouts/Wallet/SetCurrencyModal.qml
+++ b/ui/app/AppLayouts/Wallet/SetCurrencyModal.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+//import QtQuick.Layouts 1.13
+//import Qt.labs.platform 1.1
 import "../../../imports"
 import "../../../shared"
 import "./Components"
diff --git a/ui/app/AppLayouts/Wallet/TokenSettingsModal.qml b/ui/app/AppLayouts/Wallet/TokenSettingsModal.qml
index 6b6cfcd4b0..1376182106 100644
--- a/ui/app/AppLayouts/Wallet/TokenSettingsModal.qml
+++ b/ui/app/AppLayouts/Wallet/TokenSettingsModal.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import "../../../imports"
 import "../../../shared"
 import "./Components"
diff --git a/ui/app/AppLayouts/Wallet/WalletHeader.qml b/ui/app/AppLayouts/Wallet/WalletHeader.qml
index b0e9045e02..bdfe53c638 100644
--- a/ui/app/AppLayouts/Wallet/WalletHeader.qml
+++ b/ui/app/AppLayouts/Wallet/WalletHeader.qml
@@ -1,7 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../../../imports"
 import "../../../shared"
 
@@ -182,21 +181,21 @@ Item {
                 PopupMenu {
                     id: newSettingsMenu
                     width: 280
-                    QQC2.Action {
+                    Action {
                         text: qsTr("Account Settings")
                         icon.source: "../../img/account_settings.svg"
                         onTriggered: {
                             accountSettingsModal.open()
                         }
                     }
-                    QQC2.Action {
+                    Action {
                         text: qsTr("Add/Remove Tokens")
                         icon.source: "../../img/add_remove_token.svg"
                         onTriggered: {
                             tokenSettingsModal.open()
                         }
                     }
-                    QQC2.Action {
+                    Action {
                         text: qsTr("Set Currency")
                         icon.source: "../../img/set_currency.svg"
                         onTriggered: {
diff --git a/ui/app/AppLayouts/Wallet/WalletLayout.qml b/ui/app/AppLayouts/Wallet/WalletLayout.qml
index e55c3bc8ad..272a6bfe86 100644
--- a/ui/app/AppLayouts/Wallet/WalletLayout.qml
+++ b/ui/app/AppLayouts/Wallet/WalletLayout.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.3
+import QtQuick 2.13
+//TODO: update to import QtQuick.Controls 2.13
 import QtQuick.Controls 1.3
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick.Layouts 1.13
 import "../../../imports"
 import "../../../shared"
 import "."
@@ -14,6 +14,7 @@ SplitView {
     Layout.fillHeight: true
     Layout.fillWidth: true
 
+    // handle for QtQuick.Controls 2.13
     handleDelegate: Rectangle {
         implicitWidth: 1
         implicitHeight: 4
@@ -117,4 +118,3 @@ Designer {
     D{i:0;autoSize:true;formeditorColor:"#ffffff";height:770;width:1152}
 }
 ##^##*/
-
diff --git a/ui/app/AppLayouts/Wallet/data/Currencies.qml b/ui/app/AppLayouts/Wallet/data/Currencies.qml
index 18260e581f..0f15b929f6 100644
--- a/ui/app/AppLayouts/Wallet/data/Currencies.qml
+++ b/ui/app/AppLayouts/Wallet/data/Currencies.qml
@@ -1,7 +1,4 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
 
 ListModel {
 
diff --git a/ui/app/AppLayouts/Wallet/data/Tokens.qml b/ui/app/AppLayouts/Wallet/data/Tokens.qml
index ae3f1e1a89..40a6ff6598 100644
--- a/ui/app/AppLayouts/Wallet/data/Tokens.qml
+++ b/ui/app/AppLayouts/Wallet/data/Tokens.qml
@@ -1,7 +1,4 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
 
 ListModel {
 
diff --git a/ui/app/AppMain.qml b/ui/app/AppMain.qml
index f778084ab8..677b7b4619 100644
--- a/ui/app/AppMain.qml
+++ b/ui/app/AppMain.qml
@@ -1,8 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../imports"
 import "./AppLayouts"
 
diff --git a/ui/imports/Constants.qml b/ui/imports/Constants.qml
index ccf88ad81a..026eb4588d 100644
--- a/ui/imports/Constants.qml
+++ b/ui/imports/Constants.qml
@@ -1,6 +1,6 @@
 pragma Singleton
 
-import QtQuick 2.8
+import QtQuick 2.13
 
 QtObject {
     readonly property int chatTypeOneToOne: 1
diff --git a/ui/imports/Theme.qml b/ui/imports/Theme.qml
index a75328fab6..e14fd24822 100644
--- a/ui/imports/Theme.qml
+++ b/ui/imports/Theme.qml
@@ -1,6 +1,6 @@
 pragma Singleton
 
-import QtQuick 2.8
+import QtQuick 2.13
 
 QtObject {
     readonly property color white: "#FFFFFF"
diff --git a/ui/main.qml b/ui/main.qml
index 72a99a75a6..b2a8b7e011 100644
--- a/ui/main.qml
+++ b/ui/main.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import Qt.labs.platform 1.1
 import QtQml.StateMachine 1.14 as DSM
 import "./onboarding"
diff --git a/ui/onboarding/CreatePasswordModal.qml b/ui/onboarding/CreatePasswordModal.qml
index 586c0a2128..12656df435 100644
--- a/ui/onboarding/CreatePasswordModal.qml
+++ b/ui/onboarding/CreatePasswordModal.qml
@@ -1,6 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import QtQuick.Dialogs 1.3
 import "../imports"
 import "../shared"
diff --git a/ui/onboarding/EnterSeedPhraseModal.qml b/ui/onboarding/EnterSeedPhraseModal.qml
index 81320dd760..1b4b50aea2 100644
--- a/ui/onboarding/EnterSeedPhraseModal.qml
+++ b/ui/onboarding/EnterSeedPhraseModal.qml
@@ -1,6 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import "../imports"
 import "../shared"
 
diff --git a/ui/onboarding/ExistingKey.qml b/ui/onboarding/ExistingKey.qml
index 70c299d27e..0e28103dd0 100644
--- a/ui/onboarding/ExistingKey.qml
+++ b/ui/onboarding/ExistingKey.qml
@@ -1,11 +1,5 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.4
-import QtQuick.Layouts 1.11
-import QtQuick.Window 2.11
-import QtQuick.Dialogs 1.3
-import "../shared"
-import "../imports"
-import "."
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 
 Item {
     property var onClosed: function () {}
@@ -44,4 +38,3 @@ Designer {
     D{i:0;autoSize:true;height:480;width:640}
 }
 ##^##*/
-
diff --git a/ui/onboarding/GenKey.qml b/ui/onboarding/GenKey.qml
index f358d83659..9ee52492f8 100644
--- a/ui/onboarding/GenKey.qml
+++ b/ui/onboarding/GenKey.qml
@@ -1,10 +1,4 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.4
-import QtQuick.Layouts 1.11
-import QtQuick.Window 2.11
-import QtQuick.Dialogs 1.3
-import "../imports"
-import "../shared"
+import QtQuick 2.13
 
 Item {
     property var onClosed: function () {}
@@ -43,4 +37,3 @@ Designer {
     D{i:0;autoSize:true;formeditorColor:"#ffffff";height:480;width:640}
 }
 ##^##*/
-
diff --git a/ui/onboarding/GenKeyModal.qml b/ui/onboarding/GenKeyModal.qml
index 7921d47c5b..0a45c74e8c 100644
--- a/ui/onboarding/GenKeyModal.qml
+++ b/ui/onboarding/GenKeyModal.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import "../imports"
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import "../shared"
 import "./Login"
 
diff --git a/ui/onboarding/Intro.qml b/ui/onboarding/Intro.qml
index 6bc41014b9..c0ffa54b86 100644
--- a/ui/onboarding/Intro.qml
+++ b/ui/onboarding/Intro.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import "../shared"
 
 RowLayout {
diff --git a/ui/onboarding/KeysMain.qml b/ui/onboarding/KeysMain.qml
index 9b2467fe0b..c2e3f8295a 100644
--- a/ui/onboarding/KeysMain.qml
+++ b/ui/onboarding/KeysMain.qml
@@ -1,9 +1,6 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import "../shared"
-import "../imports"
 
 Page {
     id: page
@@ -82,7 +79,6 @@ Page {
     }
 }
 
-
 /*##^##
 Designer {
     D{i:0;autoSize:true;formeditorColor:"#ffffff";formeditorZoom:0.8999999761581421;height:760;width:1080}
diff --git a/ui/onboarding/Login.qml b/ui/onboarding/Login.qml
index dbc92c55c6..90bf119cd4 100644
--- a/ui/onboarding/Login.qml
+++ b/ui/onboarding/Login.qml
@@ -1,9 +1,8 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.4
-import QtQuick.Layouts 1.11
-import QtQuick.Window 2.11
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 import QtQuick.Dialogs 1.3
-import QtGraphicalEffects 1.0
+import QtGraphicalEffects 1.13
 import "../shared"
 import "../imports"
 import "./Login"
@@ -221,4 +220,3 @@ Designer {
     D{i:0;autoSize:true;formeditorColor:"#ffffff";formeditorZoom:0.75;height:480;width:640}
 }
 ##^##*/
-
diff --git a/ui/onboarding/Login/AccountList.qml b/ui/onboarding/Login/AccountList.qml
index 60e0003e6c..8a458d877a 100644
--- a/ui/onboarding/Login/AccountList.qml
+++ b/ui/onboarding/Login/AccountList.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import "./samples/"
 import "../../imports"
 
@@ -34,4 +32,3 @@ Designer {
     D{i:0;autoSize:true;height:480;width:640}
 }
 ##^##*/
-
diff --git a/ui/onboarding/Login/AddressView.qml b/ui/onboarding/Login/AddressView.qml
index bc0f9cfb7b..949e6214c5 100644
--- a/ui/onboarding/Login/AddressView.qml
+++ b/ui/onboarding/Login/AddressView.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import "../../imports"
 import "../../shared"
 
diff --git a/ui/onboarding/Login/ConfirmAddExistingKeyModal.qml b/ui/onboarding/Login/ConfirmAddExistingKeyModal.qml
index 69b9f018f1..8b2205105b 100644
--- a/ui/onboarding/Login/ConfirmAddExistingKeyModal.qml
+++ b/ui/onboarding/Login/ConfirmAddExistingKeyModal.qml
@@ -1,6 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import "../../imports"
 import "../../shared"
 
diff --git a/ui/onboarding/Login/SelectAnotherAccountModal.qml b/ui/onboarding/Login/SelectAnotherAccountModal.qml
index 15c74fbc00..d5512148a1 100644
--- a/ui/onboarding/Login/SelectAnotherAccountModal.qml
+++ b/ui/onboarding/Login/SelectAnotherAccountModal.qml
@@ -1,6 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import "../../imports"
 import "../../shared"
 
diff --git a/ui/onboarding/Login/samples/AccountsData.qml b/ui/onboarding/Login/samples/AccountsData.qml
index d5f4ec1903..17a36048d7 100644
--- a/ui/onboarding/Login/samples/AccountsData.qml
+++ b/ui/onboarding/Login/samples/AccountsData.qml
@@ -1,7 +1,4 @@
-import QtQuick 2.3
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.1
+import QtQuick 2.13
 
 ListModel {
     ListElement {
diff --git a/ui/onboarding/Slide.qml b/ui/onboarding/Slide.qml
index 5a0581dba2..ebebdf5aac 100644
--- a/ui/onboarding/Slide.qml
+++ b/ui/onboarding/Slide.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.4
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 import "../imports"
 
 Item {
diff --git a/ui/shared/Input.qml b/ui/shared/Input.qml
index d618ceac01..9b3572bc45 100644
--- a/ui/shared/Input.qml
+++ b/ui/shared/Input.qml
@@ -1,8 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-import QtGraphicalEffects 1.12
-import "../imports"
+import QtQuick 2.13
+import QtQuick.Controls 2.13
 
 Item {
     property alias textField: inputValue
@@ -90,4 +87,3 @@ Designer {
     D{i:0;formeditorColor:"#ffffff";formeditorZoom:1.25}
 }
 ##^##*/
-