diff --git a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
index b102ef433ec206a2daebdd6df3838ff93e28bc5b..0d165c01330f8570f9b0ed799bdd02ec2fa754bc 100755
--- a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
+++ b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
@@ -35,10 +35,10 @@ DEFINES += DAP_SERVICE_NAME=\\\"CellFrameDashboardService\\\"
 DEFINES += DAP_VERSION=\\\"$$VERSION\\\"
 DEFINES += DAP_SETTINGS_FILE=\\\"settings.json\\\"
 macx {
-    ICON = res/icons/dashboard.icns
+    ICON = resources/icons/dashboard.icns
 }
 else {
-    ICON = qrc:/res/icons/icon.ico
+    ICON = qrc:/resources/icons/icon.ico
 }
 
 # You can also make your code fail to compile if you use deprecated APIs.
@@ -57,10 +57,10 @@ CONFIG(debug, debug|release) {
     DESTDIR = bin/release
 }
 
-INCLUDEPATH += $$_PRO_FILE_PWD_/../libCellFrameDashboardCommon/ \
-               $$_PRO_FILE_PWD_/../DapRPCProtocol/
+INCLUDEPATH += $$_PRO_FILE_PWD_/../dapRPCProtocol/
 
-OTHER_FILES += libdap-qt-ui-qml
+OTHER_FILES += libdap-qt-ui-qml \
+               libdap-qt-ui-chain-wallet
 
 SOURCES += \
     $$PWD/main.cpp \
@@ -80,7 +80,7 @@ include (../libdap/libdap.pri)
 include (../libdap-crypto/libdap-crypto.pri)
 include (../libdap-qt/libdap-qt.pri)
 include (../libdap-qt-ui-qml/libdap-qt-ui-qml.pri)
-include (../libdap-qt-ui-chain-wallet/ libdap-qt-ui-chain-wallet.pri)
+include (../libdap-qt-ui-chain-wallet/libdap-qt-ui-chain-wallet.pri)
 
 unix: !mac : !android {
     gui_target.files = $${BRAND}
diff --git a/CellFrameDashboardGUI/DapServiceController.h b/CellFrameDashboardGUI/DapServiceController.h
index 7383c55775bf5cf1d31fe6f0189a083b02cf96f7..abb14ecba9513f3e192b6a71009003303c9d20ff 100644
--- a/CellFrameDashboardGUI/DapServiceController.h
+++ b/CellFrameDashboardGUI/DapServiceController.h
@@ -9,25 +9,25 @@
 #include <algorithm>
 #include <QDataStream>
 
-#include "ServiceClient/DapServiceClient.h"
+#include "serviceClient/DapServiceClient.h"
 #include "DapWallet.h"
-#include "Handlers/DapAbstractCommand.h"
-#include "Handlers/DapQuitApplicationCommand.h"
-#include "Handlers/DapActivateClientCommand.h"
-#include "Handlers/DapUpdateLogsCommand.h"
-#include "Handlers/DapAddWalletCommand.h"
-#include "Handlers/DapGetListWalletsCommand.h"
-#include "Handlers/DapGetListNetworksCommand.h"
-#include "Handlers/DapExportLogCommand.h"
-#include "Handlers/DapGetWalletAddressesCommand.h"
-#include "Handlers/DapGetWalletTokenInfoCommand.h"
-#include "Models/DapWalletModel.h"
-#include "Handlers/DapCreateTransactionCommand.h"
-#include "Handlers/DapMempoolProcessCommand.h"
-#include "Handlers/DapGetWalletHistoryCommand.h"
-#include "Handlers/DapRunCmdCommand.h"
-#include "Handlers/DapGetHistoryExecutedCmdCommand.h"
-#include "Handlers/DapSaveHistoryExecutedCmdCommand.h"
+#include "handlers/DapAbstractCommand.h"
+#include "handlers/DapQuitApplicationCommand.h"
+#include "handlers/DapActivateClientCommand.h"
+#include "handlers/DapUpdateLogsCommand.h"
+#include "handlers/DapAddWalletCommand.h"
+#include "handlers/DapGetListWalletsCommand.h"
+#include "handlers/DapGetListNetworksCommand.h"
+#include "handlers/DapExportLogCommand.h"
+#include "handlers/DapGetWalletAddressesCommand.h"
+#include "handlers/DapGetWalletTokenInfoCommand.h"
+#include "models/DapWalletModel.h"
+#include "handlers/DapCreateTransactionCommand.h"
+#include "handlers/DapMempoolProcessCommand.h"
+#include "handlers/DapGetWalletHistoryCommand.h"
+#include "handlers/DapRunCmdCommand.h"
+#include "handlers/DapGetHistoryExecutedCmdCommand.h"
+#include "handlers/DapSaveHistoryExecutedCmdCommand.h"
 
 class DapServiceController : public QObject
 {
diff --git a/CellFrameDashboardGUI/main.cpp b/CellFrameDashboardGUI/main.cpp
index dd312da91458968979ee6db17585481ada0ee9d2..71b7c64693616fd0e18b2d2c5b8862c53b7add83 100644
--- a/CellFrameDashboardGUI/main.cpp
+++ b/CellFrameDashboardGUI/main.cpp
@@ -9,7 +9,7 @@
 #include <QScreen>
 
 #include "DapHalper.h"
-#include "ServiceClient/DapServiceClient.h"
+#include "serviceClient/DapServiceClient.h"
 #include "DapServiceController.h"
 #include "DapLogger.h"
 #include "DapLogMessage.h"
@@ -29,7 +29,7 @@ int main(int argc, char *argv[])
     app.setOrganizationName("DEMLABS");
     app.setOrganizationDomain("demlabs.net");
     app.setApplicationName("CellFrame Dashboard");
-    app.setWindowIcon(QIcon(":/res/icons/icon.ico"));
+    app.setWindowIcon(QIcon(":/resources/icons/icon.ico"));
 
     DapLogger dapLogger;
     /// TODO: The code is commented out at the time of developing the logging strategy in the project
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index d411d258f423b5f969a6569346605fa95db337f7..3646986e77e7754d265d02fee6d9ebff87315675 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -1,23 +1,20 @@
 <RCC>
     <qresource prefix="/">
         <file>CellFrameDashboardGUI.conf</file>
-        <file>res/fonts/roboto_light.ttf</file>
-        <file>res/fonts/roboto_medium.ttf</file>
-        <file>res/fonts/roboto_regular.ttf</file>
-        <file>res/icons/icon_console.png</file>
-        <file>res/icons/icon_console_hover.png</file>
-        <file>res/icons/icon_dashboard.png</file>
-        <file>res/icons/icon_dashboard_hover.png</file>
-        <file>res/icons/icon_exchange.png</file>
-        <file>res/icons/icon_exchange_hover.png</file>
-        <file>res/icons/icon_history.png</file>
-        <file>res/icons/icon_history_hover.png</file>
-        <file>res/icons/icon_logs.png</file>
-        <file>res/icons/icon_logs_hover.png</file>
-        <file>res/icons/icon_settings.png</file>
-        <file>res/icons/icon_settings_hover.png</file>
+        <file>resources/icons/icon_console.png</file>
+        <file>resources/icons/icon_console_hover.png</file>
+        <file>resources/icons/icon_dashboard.png</file>
+        <file>resources/icons/icon_dashboard_hover.png</file>
+        <file>resources/icons/icon_exchange.png</file>
+        <file>resources/icons/icon_exchange_hover.png</file>
+        <file>resources/icons/icon_history.png</file>
+        <file>resources/icons/icon_history_hover.png</file>
+        <file>resources/icons/icon_logs.png</file>
+        <file>resources/icons/icon_logs_hover.png</file>
+        <file>resources/icons/icon_settings.png</file>
+        <file>resources/icons/icon_settings_hover.png</file>
         <file>main.qml</file>
-        <file>res/icons/cellframe-logo-dashboard.png</file>
+        <file>resources/icons/cellframe-logo-dashboard.png</file>
         <file>screen/DapMainApplicationWindow.qml</file>
         <file>screen/DapMainApplicationWindowForm.ui.qml</file>
         <file>screen/DapAbstractTopPanel.qml</file>
@@ -76,10 +73,10 @@
         <file>screen/mobile/History/DapHistoryTopPanelForm.ui.qml</file>
         <file>screen/DapAbstractMenuTabWidget.qml</file>
         <file>screen/DapAbstractMenuTabWidgetForm.ui.qml</file>
-        <file>res/icons/new-wallet_icon_dark_hover.png</file>
-        <file>res/icons/new-wallet_icon_dark.png</file>
-        <file>res/icons/ic_arrow_drop_down.png</file>
-        <file>res/icons/ic_arrow_drop_up.png</file>
+        <file>resources/icons/new-wallet_icon_dark_hover.png</file>
+        <file>resources/icons/new-wallet_icon_dark.png</file>
+        <file>resources/icons/ic_arrow_drop_down.png</file>
+        <file>resources/icons/ic_arrow_drop_up.png</file>
         <file>screen/desktop/Logs/DapLogsTab.qml</file>
         <file>screen/desktop/Logs/DapLogsTabForm.ui.qml</file>
         <file>screen/desktop/Logs/DapLogsTopPanel.qml</file>
@@ -88,7 +85,7 @@
         <file>screen/desktop/Logs/DapLogsScreenForm.ui.qml</file>
         <file>screen/desktop/Logs/DapLogsRightPanel.qml</file>
         <file>screen/desktop/Logs/DapLogsRightPanelForm.ui.qml</file>
-        <file>res/icons/icon_export.png</file>
+        <file>resources/icons/icon_export.png</file>
         <file>screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanel.qml</file>
         <file>screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml</file>
         <file>screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanel.qml</file>
@@ -97,15 +94,15 @@
         <file>screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml</file>
         <file>screen/desktop/Dashboard/RightPanel/DapLastActionsRightPanel.qml</file>
         <file>screen/desktop/Dashboard/RightPanel/DapLastActionsRightPanelForm.ui.qml</file>
-        <file>res/icons/back_icon_hover.png</file>
-        <file>res/icons/back_icon.png</file>
-        <file>res/icons/close_icon_hover.png</file>
-        <file>res/icons/close_icon.png</file>
-        <file>res/icons/ic_arrow_drop_down_dark.png</file>
-        <file>res/icons/ic_scroll-down.png</file>
-        <file>res/icons/ic_scroll-down_hover.png</file>
-        <file>res/icons/ic_scroll-up.png</file>
-        <file>res/icons/ic_scroll-up_hover.png</file>
+        <file>resources/icons/back_icon_hover.png</file>
+        <file>resources/icons/back_icon.png</file>
+        <file>resources/icons/close_icon_hover.png</file>
+        <file>resources/icons/close_icon.png</file>
+        <file>resources/icons/ic_arrow_drop_down_dark.png</file>
+        <file>resources/icons/ic_scroll-down.png</file>
+        <file>resources/icons/ic_scroll-down_hover.png</file>
+        <file>resources/icons/ic_scroll-up.png</file>
+        <file>resources/icons/ic_scroll-up_hover.png</file>
         <file>screen/desktop/Settings/DapSettingsTab.qml</file>
         <file>screen/desktop/Settings/DapSettingsTabForm.ui.qml</file>
         <file>screen/desktop/Settings/DapSettingsTopPanel.qml</file>
@@ -122,33 +119,30 @@
         <file>screen/desktop/Console/DapConsoleScreenForm.ui.qml</file>
         <file>screen/desktop/Console/DapConsoleTopPanel.qml</file>
         <file>screen/desktop/Console/DapConsoleTopPanelForm.ui.qml</file>
-        <file>res/icons/icon.ico</file>
-        <file>res/icons/ic_flag.png</file>
-        <file>res/icons/buy_icon.png</file>
-        <file>res/icons/ic_arrow_drop_down_dark_blue.png</file>
-        <file>res/icons/ic_arrow_drop_up_dark_blue.png</file>
-        <file>res/icons/sell_icon.png</file>
-        <file>res/icons/ic_copy.png</file>
-        <file>res/icons/ic_copy_hover.png</file>
-        <file>res/icons/ic_edit.png</file>
-        <file>res/icons/ic_edit_hover.png</file>
-        <file>res/icons/ic_klvn.png</file>
-        <file>res/icons/new-payment_icon.png</file>
-        <file>res/icons/tkn2_icon.png</file>
-        <file>res/icons/tkn1_icon_light.png</file>
-        <file>res/icons/ng_icon.png</file>
+        <file>resources/icons/icon.ico</file>
+        <file>resources/icons/ic_flag.png</file>
+        <file>resources/icons/buy_icon.png</file>
+        <file>resources/icons/ic_arrow_drop_down_dark_blue.png</file>
+        <file>resources/icons/ic_arrow_drop_up_dark_blue.png</file>
+        <file>resources/icons/sell_icon.png</file>
+        <file>resources/icons/ic_copy.png</file>
+        <file>resources/icons/ic_copy_hover.png</file>
+        <file>resources/icons/ic_edit.png</file>
+        <file>resources/icons/ic_edit_hover.png</file>
+        <file>resources/icons/ic_klvn.png</file>
+        <file>resources/icons/new-payment_icon.png</file>
+        <file>resources/icons/tkn2_icon.png</file>
+        <file>resources/icons/tkn1_icon_light.png</file>
+        <file>resources/icons/ng_icon.png</file>
         <file>screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml</file>
         <file>screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml</file>
         <file>screen/desktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanel.qml</file>
         <file>screen/desktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanelForm.ui.qml</file>
-        <file>res/icons/ic_cellframe.png</file>
-        <file>res/icons/ic_search.png</file>
-        <file>res/icons/wallet.png</file>
-        <file>res/icons/trade-history_icon.png</file>
-        <file>res/icons/ic_chevron_down.png</file>
-        <file>res/icons/ic_chevron_up.png</file>
-        <file>res/fonts/roboto_black.ttf</file>
-        <file>res/fonts/roboto_thin.ttf</file>
-        <file>screen/DapFontRoboto.qml</file>
+        <file>resources/icons/ic_cellframe.png</file>
+        <file>resources/icons/ic_search.png</file>
+        <file>resources/icons/wallet.png</file>
+        <file>resources/icons/trade-history_icon.png</file>
+        <file>resources/icons/ic_chevron_down.png</file>
+        <file>resources/icons/ic_chevron_up.png</file>
     </qresource>
 </RCC>
diff --git a/CellFrameDashboardGUI/res/fonts/LICENSE.txt b/CellFrameDashboardGUI/res/fonts/LICENSE.txt
deleted file mode 100644
index d645695673349e3947e8e5ae42332d0ac3164cd7..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/res/fonts/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_black.ttf b/CellFrameDashboardGUI/res/fonts/roboto_black.ttf
deleted file mode 100644
index 51c71bbe2d565247a020319ff9b324e8c8e05353..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/res/fonts/roboto_black.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_black_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_black_italic.ttf
deleted file mode 100644
index ca20ca399981d14c441b9ea2f3decc1c88e69da4..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/res/fonts/roboto_black_italic.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_bold.ttf b/CellFrameDashboardGUI/res/fonts/roboto_bold.ttf
deleted file mode 100644
index e612852d259930d0dcc632318ac0f15ae312422b..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/res/fonts/roboto_bold.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_bold_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_bold_italic.ttf
deleted file mode 100644
index 677bc045e565c7b74c3ce0f8ad55df305bb28a29..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/res/fonts/roboto_bold_italic.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_italic.ttf
deleted file mode 100644
index 5fd05c3b645a8fdcdeffae18bffc19369514a76a..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/res/fonts/roboto_italic.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_light.ttf b/CellFrameDashboardGUI/res/fonts/roboto_light.ttf
deleted file mode 100644
index 4f1fb5805f432036d390a353c43191f06b0ad6e0..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/res/fonts/roboto_light.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_light_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_light_italic.ttf
deleted file mode 100644
index eec0ae9be8f8f74279afe5253de5286c04fc2fad..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/res/fonts/roboto_light_italic.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_medium.ttf b/CellFrameDashboardGUI/res/fonts/roboto_medium.ttf
deleted file mode 100644
index 86d1c52ed5ee125fdfa6ed63a58f5c02f08dd246..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/res/fonts/roboto_medium.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_medium_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_medium_italic.ttf
deleted file mode 100644
index 66aa174f058481c39bcd60bdb464a1b3f78e4dcc..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/res/fonts/roboto_medium_italic.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_regular.ttf b/CellFrameDashboardGUI/res/fonts/roboto_regular.ttf
deleted file mode 100644
index cb8ffcf1ad2c163bbf95ce6ff829b537d8bebd18..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/res/fonts/roboto_regular.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_thin.ttf b/CellFrameDashboardGUI/res/fonts/roboto_thin.ttf
deleted file mode 100644
index a85eb7c29505713608ec9fd8489944977914be21..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/res/fonts/roboto_thin.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_thin_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_thin_italic.ttf
deleted file mode 100644
index ac77951b80fc3ad37533dcae49c9e8085c42f1fb..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/res/fonts/roboto_thin_italic.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/res/icons/back_icon.png b/CellFrameDashboardGUI/resources/icons/back_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/back_icon.png
rename to CellFrameDashboardGUI/resources/icons/back_icon.png
diff --git a/CellFrameDashboardGUI/res/icons/back_icon_hover.png b/CellFrameDashboardGUI/resources/icons/back_icon_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/back_icon_hover.png
rename to CellFrameDashboardGUI/resources/icons/back_icon_hover.png
diff --git a/CellFrameDashboardGUI/res/icons/buy_icon.png b/CellFrameDashboardGUI/resources/icons/buy_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/buy_icon.png
rename to CellFrameDashboardGUI/resources/icons/buy_icon.png
diff --git a/CellFrameDashboardGUI/res/icons/cellframe-logo-dashboard.png b/CellFrameDashboardGUI/resources/icons/cellframe-logo-dashboard.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/cellframe-logo-dashboard.png
rename to CellFrameDashboardGUI/resources/icons/cellframe-logo-dashboard.png
diff --git a/CellFrameDashboardGUI/res/icons/close_icon.png b/CellFrameDashboardGUI/resources/icons/close_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/close_icon.png
rename to CellFrameDashboardGUI/resources/icons/close_icon.png
diff --git a/CellFrameDashboardGUI/res/icons/close_icon_hover.png b/CellFrameDashboardGUI/resources/icons/close_icon_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/close_icon_hover.png
rename to CellFrameDashboardGUI/resources/icons/close_icon_hover.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down.png b/CellFrameDashboardGUI/resources/icons/ic_arrow_drop_down.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_arrow_drop_down.png
rename to CellFrameDashboardGUI/resources/icons/ic_arrow_drop_down.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark.png b/CellFrameDashboardGUI/resources/icons/ic_arrow_drop_down_dark.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark.png
rename to CellFrameDashboardGUI/resources/icons/ic_arrow_drop_down_dark.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark_blue.png b/CellFrameDashboardGUI/resources/icons/ic_arrow_drop_down_dark_blue.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark_blue.png
rename to CellFrameDashboardGUI/resources/icons/ic_arrow_drop_down_dark_blue.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_arrow_drop_up.png b/CellFrameDashboardGUI/resources/icons/ic_arrow_drop_up.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_arrow_drop_up.png
rename to CellFrameDashboardGUI/resources/icons/ic_arrow_drop_up.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_arrow_drop_up_dark_blue.png b/CellFrameDashboardGUI/resources/icons/ic_arrow_drop_up_dark_blue.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_arrow_drop_up_dark_blue.png
rename to CellFrameDashboardGUI/resources/icons/ic_arrow_drop_up_dark_blue.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_cellframe.png b/CellFrameDashboardGUI/resources/icons/ic_cellframe.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_cellframe.png
rename to CellFrameDashboardGUI/resources/icons/ic_cellframe.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_chevron_down.png b/CellFrameDashboardGUI/resources/icons/ic_chevron_down.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_chevron_down.png
rename to CellFrameDashboardGUI/resources/icons/ic_chevron_down.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_chevron_up.png b/CellFrameDashboardGUI/resources/icons/ic_chevron_up.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_chevron_up.png
rename to CellFrameDashboardGUI/resources/icons/ic_chevron_up.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_copy.png b/CellFrameDashboardGUI/resources/icons/ic_copy.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_copy.png
rename to CellFrameDashboardGUI/resources/icons/ic_copy.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_copy_hover.png b/CellFrameDashboardGUI/resources/icons/ic_copy_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_copy_hover.png
rename to CellFrameDashboardGUI/resources/icons/ic_copy_hover.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_edit.png b/CellFrameDashboardGUI/resources/icons/ic_edit.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_edit.png
rename to CellFrameDashboardGUI/resources/icons/ic_edit.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_edit_hover.png b/CellFrameDashboardGUI/resources/icons/ic_edit_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_edit_hover.png
rename to CellFrameDashboardGUI/resources/icons/ic_edit_hover.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_flag.png b/CellFrameDashboardGUI/resources/icons/ic_flag.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_flag.png
rename to CellFrameDashboardGUI/resources/icons/ic_flag.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_klvn.png b/CellFrameDashboardGUI/resources/icons/ic_klvn.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_klvn.png
rename to CellFrameDashboardGUI/resources/icons/ic_klvn.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_scroll-down.png b/CellFrameDashboardGUI/resources/icons/ic_scroll-down.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_scroll-down.png
rename to CellFrameDashboardGUI/resources/icons/ic_scroll-down.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_scroll-down_hover.png b/CellFrameDashboardGUI/resources/icons/ic_scroll-down_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_scroll-down_hover.png
rename to CellFrameDashboardGUI/resources/icons/ic_scroll-down_hover.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_scroll-up.png b/CellFrameDashboardGUI/resources/icons/ic_scroll-up.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_scroll-up.png
rename to CellFrameDashboardGUI/resources/icons/ic_scroll-up.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_scroll-up_hover.png b/CellFrameDashboardGUI/resources/icons/ic_scroll-up_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_scroll-up_hover.png
rename to CellFrameDashboardGUI/resources/icons/ic_scroll-up_hover.png
diff --git a/CellFrameDashboardGUI/res/icons/ic_search.png b/CellFrameDashboardGUI/resources/icons/ic_search.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ic_search.png
rename to CellFrameDashboardGUI/resources/icons/ic_search.png
diff --git a/CellFrameDashboardGUI/res/icons/icon.ico b/CellFrameDashboardGUI/resources/icons/icon.ico
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon.ico
rename to CellFrameDashboardGUI/resources/icons/icon.ico
diff --git a/CellFrameDashboardGUI/res/icons/icon_console.png b/CellFrameDashboardGUI/resources/icons/icon_console.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon_console.png
rename to CellFrameDashboardGUI/resources/icons/icon_console.png
diff --git a/CellFrameDashboardGUI/res/icons/icon_console_hover.png b/CellFrameDashboardGUI/resources/icons/icon_console_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon_console_hover.png
rename to CellFrameDashboardGUI/resources/icons/icon_console_hover.png
diff --git a/CellFrameDashboardGUI/res/icons/icon_dashboard.png b/CellFrameDashboardGUI/resources/icons/icon_dashboard.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon_dashboard.png
rename to CellFrameDashboardGUI/resources/icons/icon_dashboard.png
diff --git a/CellFrameDashboardGUI/res/icons/icon_dashboard_hover.png b/CellFrameDashboardGUI/resources/icons/icon_dashboard_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon_dashboard_hover.png
rename to CellFrameDashboardGUI/resources/icons/icon_dashboard_hover.png
diff --git a/CellFrameDashboardGUI/res/icons/icon_exchange.png b/CellFrameDashboardGUI/resources/icons/icon_exchange.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon_exchange.png
rename to CellFrameDashboardGUI/resources/icons/icon_exchange.png
diff --git a/CellFrameDashboardGUI/res/icons/icon_exchange_hover.png b/CellFrameDashboardGUI/resources/icons/icon_exchange_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon_exchange_hover.png
rename to CellFrameDashboardGUI/resources/icons/icon_exchange_hover.png
diff --git a/CellFrameDashboardGUI/res/icons/icon_export.png b/CellFrameDashboardGUI/resources/icons/icon_export.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon_export.png
rename to CellFrameDashboardGUI/resources/icons/icon_export.png
diff --git a/CellFrameDashboardGUI/res/icons/icon_history.png b/CellFrameDashboardGUI/resources/icons/icon_history.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon_history.png
rename to CellFrameDashboardGUI/resources/icons/icon_history.png
diff --git a/CellFrameDashboardGUI/res/icons/icon_history_hover.png b/CellFrameDashboardGUI/resources/icons/icon_history_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon_history_hover.png
rename to CellFrameDashboardGUI/resources/icons/icon_history_hover.png
diff --git a/CellFrameDashboardGUI/res/icons/icon_logs.png b/CellFrameDashboardGUI/resources/icons/icon_logs.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon_logs.png
rename to CellFrameDashboardGUI/resources/icons/icon_logs.png
diff --git a/CellFrameDashboardGUI/res/icons/icon_logs_hover.png b/CellFrameDashboardGUI/resources/icons/icon_logs_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon_logs_hover.png
rename to CellFrameDashboardGUI/resources/icons/icon_logs_hover.png
diff --git a/CellFrameDashboardGUI/res/icons/icon_settings.png b/CellFrameDashboardGUI/resources/icons/icon_settings.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon_settings.png
rename to CellFrameDashboardGUI/resources/icons/icon_settings.png
diff --git a/CellFrameDashboardGUI/res/icons/icon_settings_hover.png b/CellFrameDashboardGUI/resources/icons/icon_settings_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/icon_settings_hover.png
rename to CellFrameDashboardGUI/resources/icons/icon_settings_hover.png
diff --git a/CellFrameDashboardGUI/res/icons/new-payment_icon.png b/CellFrameDashboardGUI/resources/icons/new-payment_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/new-payment_icon.png
rename to CellFrameDashboardGUI/resources/icons/new-payment_icon.png
diff --git a/CellFrameDashboardGUI/res/icons/new-wallet_icon_dark.png b/CellFrameDashboardGUI/resources/icons/new-wallet_icon_dark.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/new-wallet_icon_dark.png
rename to CellFrameDashboardGUI/resources/icons/new-wallet_icon_dark.png
diff --git a/CellFrameDashboardGUI/res/icons/new-wallet_icon_dark_hover.png b/CellFrameDashboardGUI/resources/icons/new-wallet_icon_dark_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/new-wallet_icon_dark_hover.png
rename to CellFrameDashboardGUI/resources/icons/new-wallet_icon_dark_hover.png
diff --git a/CellFrameDashboardGUI/res/icons/ng_icon.png b/CellFrameDashboardGUI/resources/icons/ng_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/ng_icon.png
rename to CellFrameDashboardGUI/resources/icons/ng_icon.png
diff --git a/CellFrameDashboardGUI/res/icons/sell_icon.png b/CellFrameDashboardGUI/resources/icons/sell_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/sell_icon.png
rename to CellFrameDashboardGUI/resources/icons/sell_icon.png
diff --git a/CellFrameDashboardGUI/res/icons/tkn1_icon_light.png b/CellFrameDashboardGUI/resources/icons/tkn1_icon_light.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/tkn1_icon_light.png
rename to CellFrameDashboardGUI/resources/icons/tkn1_icon_light.png
diff --git a/CellFrameDashboardGUI/res/icons/tkn2_icon.png b/CellFrameDashboardGUI/resources/icons/tkn2_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/tkn2_icon.png
rename to CellFrameDashboardGUI/resources/icons/tkn2_icon.png
diff --git a/CellFrameDashboardGUI/res/icons/trade-history_icon.png b/CellFrameDashboardGUI/resources/icons/trade-history_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/trade-history_icon.png
rename to CellFrameDashboardGUI/resources/icons/trade-history_icon.png
diff --git a/CellFrameDashboardGUI/res/icons/wallet.png b/CellFrameDashboardGUI/resources/icons/wallet.png
similarity index 100%
rename from CellFrameDashboardGUI/res/icons/wallet.png
rename to CellFrameDashboardGUI/resources/icons/wallet.png
diff --git a/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
index 256e3df3b5dfee743c0dc932a7f050b51d583fc9..1dbe2bcb7d0e226406ae7aa6ec4137125b05695e 100644
--- a/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
@@ -17,8 +17,8 @@ DapRightPanel
             widthImageButton: 16 * pt
             colorBackgroundNormal: "#F8F7FA"
             colorBackgroundHover: "#F8F7FA"
-            normalImageButton: "qrc:/res/icons/close_icon.png"
-            hoverImageButton: "qrc:/res/icons/close_icon_hover.png"
+            normalImageButton: "qrc:/resources/icons/close_icon.png"
+            hoverImageButton: "qrc:/resources/icons/close_icon_hover.png"
         }
     
     dapHeader.height: 36 * pt
diff --git a/CellFrameDashboardGUI/screen/DapFontRoboto.qml b/CellFrameDashboardGUI/screen/DapFontRoboto.qml
deleted file mode 100644
index f24922f298f36310dfeb435db4d85132cdef9b59..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/screen/DapFontRoboto.qml
+++ /dev/null
@@ -1,219 +0,0 @@
-import QtQuick 2.0
-import "qrc:/"
-
-Item
-{
-    ///@details dapMainFontTheme ID of item with all project fonts
-    property alias dapMainFontTheme: dapFontsObjects
-
-    //Add Font Loader
-    DapFont
-    {
-        id: dapFonts
-        dapFontPath: "qrc:/res/fonts/"
-        dapFontNames: ["roboto_black.ttf",
-                    "roboto_light.ttf",
-                    "roboto_medium.ttf",
-                    "roboto_regular.ttf",
-                    "roboto_thin.ttf"]
-    }
-    //Create fonts
-    QtObject
-    {
-
-        id: dapFontsObjects
-
-        ///@details dapFontRobotoBlack14 Font of Roboto font family (black, 14pt)
-        property font dapFontRobotoBlack14:                 Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[0].name,
-                                                                        bold: false,
-                                                                        italic: false,
-                                                                        pixelSize: 14
-                                                                    })
-
-        ///@details dapFontRobotoBlackCustom Font of Roboto font family (black, without parameters)
-        property font dapFontRobotoBlackCustom:             Qt.font({   family: dapFonts.dapProjectFonts[0].name })
-
-        ///@details dapFontRobotoBlackItalic14 Font of Roboto font family (black-italic, 14pt)
-        property font dapFontRobotoBlackItalic14:           Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[0].name,
-                                                                        bold: false,
-                                                                        italic: true,
-                                                                        pixelSize: 14
-                                                                    })
-
-        ///@details dapFontRobotoBlackItalicCustom Font of Roboto font family (black-italic, without parameters)
-        property font dapFontRobotoBlackItalicCustom:       Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[0].name,
-                                                                        italic: true
-                                                                    })
-
-        ///@details dapFontRobotoBold14 Font of Roboto font family (bold, 14pt)
-        property font dapFontRobotoBold14:                  Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[3].name,
-                                                                        bold: true,
-                                                                        italic: false,
-                                                                        pixelSize: 14
-                                                                    })
-
-        ///@details dapFontRobotoBoldCustom Font of Roboto font family (bold, without parameters)
-        property font dapFontRobotoBoldCustom:              Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[3].name,
-                                                                        bold: true
-                                                                    })
-
-        ///@detalis dapFontRobotoBoldItalic14 Font of Roboto font family (bold-italic, 14pt)
-        property font dapFontRobotoBoldItalic14:            Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[3].name,
-                                                                        bold: true,
-                                                                        italic: true,
-                                                                        pixelSize: 14
-                                                                    })
-
-        ///@details dapFontRobotoBoldItalicCustom Font of Roboto font family (bold-italic, without parameters)
-        property font dapFontRobotoBoldItalicCustom:        Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[3].name,
-                                                                        bold: true,
-                                                                        italic: true
-                                                                    })
-
-        ///@details dapFontRobotoLight14 Font of Roboto font family (light, 14pt)
-        property font dapFontRobotoLight14:                 Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[1].name,
-                                                                        bold: false,
-                                                                        italic: false,
-                                                                        pixelSize: 14
-                                                                    })
-
-        ///@details dapFontRobotoLightCustom Font of Roboto font family (light, without parameters)
-        property font dapFontRobotoLightCustom:             Qt.font({   family: dapFonts.dapProjectFonts[1].name })
-
-        ///@details dapFontRobotoLightItalic14 Font of Roboto font family (light-italic, 14pt)
-        property font dapFontRobotoLightItalic14:           Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[1].name,
-                                                                        bold: false,
-                                                                        italic: true,
-                                                                        pixelSize: 14
-                                                                    })
-
-        ///@details dapFontRobotoLightItalicCustom Font of Roboto font family (light-italic, without parameters)
-        property font dapFontRobotoLightItalicCustom:       Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[1].name,
-                                                                        italic: true
-                                                                    })
-        ///@details dapFontRobotoMedium14 Font of Roboto font family (medium, 14pt)
-        property font dapFontRobotoMedium14:                Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[2].name,
-                                                                        bold: false,
-                                                                        italic: false,
-                                                                        pixelSize: 14
-                                                                    })
-
-        ///@details dapFontRobotoMediumCustom Font of Roboto font family (medium, without parameters)
-        property font dapFontRobotoMediumCustom:            Qt.font({   family: dapFonts.dapProjectFonts[2].name })
-
-        ///@details dapFontRobotoMediumItalic14 Font of Roboto font family (medium-italic, 14pt)
-        property font dapFontRobotoMediumItalic14:          Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[2].name,
-                                                                        bold: false,
-                                                                        italic: true,
-                                                                        pixelSize: 14
-                                                                    })
-
-        ///@details dapFontRobotoMediumItalicCustom Font of Roboto font family (medium-italic, without parameters)
-        property font dapFontRobotoMediumItalicCustom:      Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[2].name,
-                                                                        italic: true
-                                                                    })
-
-        ///@details dapFontRobotoItalic14 Font of Roboto font family (italic, 14pt)
-        property font dapFontRobotoItalic14:                Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[3].name,
-                                                                        bold: false,
-                                                                        italic: true,
-                                                                        pixelSize: 14
-                                                                    })
-
-        ///@details dapFontRobotoItalicCustom Font of Roboto font family (italic, without parameters)
-        property font dapFontRobotoItalicCustom:            Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[3].name,
-                                                                        italic: true
-                                                                    })
-
-        ///@details dapFontRobotoRegular14 Font of Roboto font family (regular, 14pt)
-        property font dapFontRobotoRegular14:               Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[3].name,
-                                                                        bold: false,
-                                                                        italic: false,
-                                                                        pixelSize: 14
-                                                                    })
-
-        ///@details dapFontRobotoRegular12 Font of Roboto font family (regular, 12pt)
-        property font dapFontRobotoRegular12:               Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[3].name,
-                                                                        bold: false,
-                                                                        italic: false,
-                                                                        pixelSize: 12
-                                                                    })
-
-        ///@details dapFontRobotoRegular16 Font of Roboto font family (regular, 16pt)
-        property font dapFontRobotoRegular16:               Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[3].name,
-                                                                        bold: false,
-                                                                        italic: false,
-                                                                        pixelSize: 16
-                                                                    })
-
-        ///@details dapFontRobotoRegular18 Font of Roboto font family (regular, 18pt)
-        property font dapFontRobotoRegular18:               Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[3].name,
-                                                                        bold: false,
-                                                                        italic: false,
-                                                                        pixelSize: 18
-                                                                    })
-
-        ///@details dapFontRobotoRegularCustom Font of Roboto font family (regular, without parameters)
-        property font dapFontRobotoRegularCustom:           Qt.font({ family: dapFonts.dapProjectFonts[3].name })
-
-        ///@details dapFontRobotoThin14 Font of Roboto font family (thin, 14pt)
-        property font dapFontRobotoThin14:                  Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[4].name,
-                                                                        bold: false,
-                                                                        italic: false,
-                                                                        pixelSize: 14
-                                                                    })
-
-        ///@details dapFontRobotoThinCustom Font of Roboto font family (thin, without parameters)
-        property font dapFontRobotoThinCustom:              Qt.font({   family: dapFonts.dapProjectFonts[4].name })
-
-        ///@details dapFontRobotoThinItalic14 Font of Roboto font family (thin-italic, 14pt)
-        property font dapFontRobotoThinItalic14:            Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[4].name,
-                                                                        bold: false,
-                                                                        italic: true,
-                                                                        pixelSize: 14
-                                                                    })
-
-        ///@details dapFontRobotoThinItalicCustom Font of Roboto font family (thin-italic, without parameters)
-        property font dapFontRobotoThinItalicCustom:        Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[4].name,
-                                                                        italic: true
-                                                                    })
-
-        ///@details dapFontRobotoRegular11 Font of Roboto font family (regular, 11pt)
-        property font dapFontRobotoRegular11:               Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[3].name,
-                                                                        bold: false,
-                                                                        italic: false,
-                                                                        pixelSize: 11
-                                                                    })
-
-        ///@details dapFontRobotoRegular10 Font of Roboto font family (regular, 10pt)
-        property font dapFontRobotoRegular10:               Qt.font({
-                                                                        family: dapFonts.dapProjectFonts[3].name,
-                                                                        bold: false,
-                                                                        italic: false,
-                                                                        pixelSize: 10
-                                                                    })
-    }
-}
diff --git a/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml b/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
index 1974b7bdbbc604a6261205312cb06f18cb683a1a..b7affd91da13239cb9a216109220ecce3c077553 100644
--- a/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
+++ b/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.4
+import "qrc:/resources/QML"
 
 DapMainApplicationWindowForm 
 {
@@ -15,6 +16,7 @@ DapMainApplicationWindowForm
     readonly property string logsScreen: "qrc:/screen/" + device + "/Logs/DapLogsTab.qml"
     ///@detalis Path to the console tab.
     readonly property string consoleScreen: "qrc:/screen/" + device + "/Console/DapConsoleTab.qml"
+
     ///@details dapMainFonts Project font loader
     readonly property QtObject dapMainFonts: DapFontRoboto {}
 
@@ -42,43 +44,43 @@ DapMainApplicationWindowForm
             append({
                 name: qsTr("Dashboard"),
                 page: dashboardScreen,
-                normalIcon: "qrc:/res/icons/icon_dashboard.png",
-                hoverIcon: "qrc:/res/icons/icon_dashboard_hover.png"
+                normalIcon: "qrc:/resources/icons/icon_dashboard.png",
+                hoverIcon: "qrc:/resources/icons/icon_dashboard_hover.png"
             })
     
             append ({
                 name: qsTr("Exchange"),
                 page: exchangeScreen,
-                normalIcon: "qrc:/res/icons/icon_exchange.png",
-                hoverIcon: "qrc:/res/icons/icon_exchange_hover.png"
+                normalIcon: "qrc:/resources/icons/icon_exchange.png",
+                hoverIcon: "qrc:/resources/icons/icon_exchange_hover.png"
             })
     
             append ({
                 name: qsTr("History"),
                 page: historyScreen,
-                normalIcon: "qrc:/res/icons/icon_history.png",
-                hoverIcon: "qrc:/res/icons/icon_history_hover.png"
+                normalIcon: "qrc:/resources/icons/icon_history.png",
+                hoverIcon: "qrc:/resources/icons/icon_history_hover.png"
             })
 
             append ({
                 name: qsTr("Console"),
                 page: consoleScreen,
-                normalIcon: "qrc:/res/icons/icon_console.png",
-                hoverIcon: "qrc:/res/icons/icon_console_hover.png"
+                normalIcon: "qrc:/resources/icons/icon_console.png",
+                hoverIcon: "qrc:/resources/icons/icon_console_hover.png"
             })
 
             append ({
                 name: qsTr("Settings"),
                 page: settingsScreen,
-                normalIcon: "qrc:/res/icons/icon_settings.png",
-                hoverIcon: "qrc:/res/icons/icon_settings_hover.png"
+                normalIcon: "qrc:/resources/icons/icon_settings.png",
+                hoverIcon: "qrc:/resources/icons/icon_settings_hover.png"
             })
 
             append ({
                 name: qsTr("Logs"),
                 page: logsScreen,
-                normalIcon: "qrc:/res/icons/icon_logs.png",
-                hoverIcon: "qrc:/res/icons/icon_logs_hover.png"
+                normalIcon: "qrc:/resources/icons/icon_logs.png",
+                hoverIcon: "qrc:/resources/icons/icon_logs_hover.png"
              })
         }
     }
diff --git a/CellFrameDashboardGUI/screen/DapMainApplicationWindowForm.ui.qml b/CellFrameDashboardGUI/screen/DapMainApplicationWindowForm.ui.qml
index fb28865e584ea9b1658b9c5487b54ad4d6c11f6c..a389e96d3d361050f58fc55311a82e4e362dab82 100644
--- a/CellFrameDashboardGUI/screen/DapMainApplicationWindowForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/DapMainApplicationWindowForm.ui.qml
@@ -31,7 +31,7 @@ DapMainWindow
                 height: 24 * pt
                 anchors.left: parent.left
                 anchors.leftMargin: 24 * pt
-                source: "qrc:/res/icons/cellframe-logo-dashboard.png"
+                source: "qrc:/resources/icons/cellframe-logo-dashboard.png"
             }
         }
 
diff --git a/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreenForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreenForm.ui.qml
index cc441982ec8a994c4725ffb9852b838ba758bc91..a7ad7a3462f0362947eb47a45f859195cd7586b1 100644
--- a/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreenForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreenForm.ui.qml
@@ -98,10 +98,10 @@ DapAbstractScreen
     DapScrollView
     {
         id: consoleScroll
-        scrollDownButtonImageSource: "qrc:/res/icons/ic_scroll-down.png"
-        scrollDownButtonHoveredImageSource: "qrc:/res/icons/ic_scroll-down_hover.png"
-        scrollUpButtonImageSource: "qrc:/res/icons/ic_scroll-up.png"
-        scrollUpButtonHoveredImageSource: "qrc:/res/icons/ic_scroll-up_hover.png"
+        scrollDownButtonImageSource: "qrc:/resources/icons/ic_scroll-down.png"
+        scrollDownButtonHoveredImageSource: "qrc:/resources/icons/ic_scroll-down_hover.png"
+        scrollUpButtonImageSource: "qrc:/resources/icons/ic_scroll-up.png"
+        scrollUpButtonHoveredImageSource: "qrc:/resources/icons/ic_scroll-up_hover.png"
         viewData: listViewConsoleCommand
         //Assign DapScrollView with DapScrollViewHandling which must have no parent-child relationship
         onClicked: scrollHandler.scrollDirectionUp = !scrollHandler.scrollDirectionUp
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
index 31b968aea78a0cbf8b1fdf54103ded8198696148..2c785f9935c4407419d11ecbfc7b4eceb5f102c9 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
@@ -82,7 +82,7 @@ DapDashboardScreenForm
                     {
                         id: networkAddressCopyButtonImage
                         anchors.fill: parent
-                        source: parent.containsMouse ? "qrc:/res/icons/ic_copy_hover.png" : "qrc:/res/icons/ic_copy.png"
+                        source: parent.containsMouse ? "qrc:/resources/icons/ic_copy_hover.png" : "qrc:/resources/icons/ic_copy.png"
                         sourceSize.width: parent.width
                         sourceSize.height: parent.height
 
@@ -126,7 +126,7 @@ DapDashboardScreenForm
                             anchors.left: parent.left
                             height: 30 * pt
                             width: 30 * pt
-                            source: "qrc:/res/icons/ic_cellframe.png"
+                            source: "qrc:/resources/icons/ic_cellframe.png"
                             sourceSize.width: width
                             sourceSize.height: height
                             anchors.verticalCenter: parent.verticalCenter
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
index 7028e870dcecc9d3fc35e64c6a58a70f0a61a104..2286e9917007beba4e886753ca4f3cf9f6bff517 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
@@ -13,10 +13,10 @@ DapAbstractScreen
     anchors.rightMargin: 24 * pt
 
     // Paths to currency emblems
-    property string bitCoinImagePath: "qrc:/res/icons/tkn1_icon_light.png"
-    property string ethereumImagePath: "qrc:/res/icons/tkn2_icon.png"
-    property string newGoldImagePath: "qrc:/res/icons/ng_icon.png"
-    property string kelvinImagePath: "qrc:/res/icons/ic_klvn.png"
+    property string bitCoinImagePath: "qrc:/resources/icons/tkn1_icon_light.png"
+    property string ethereumImagePath: "qrc:/resources/icons/tkn2_icon.png"
+    property string newGoldImagePath: "qrc:/resources/icons/ng_icon.png"
+    property string kelvinImagePath: "qrc:/resources/icons/ic_klvn.png"
     ///@param dapButtonNewPayment Button to create a new payment.
     property alias dapButtonNewPayment: buttonNewPayment
     property alias dapListViewWallet: listViewWallet
@@ -41,7 +41,7 @@ DapAbstractScreen
             Image
             {
                 id: iconCreateWallet
-                source: "qrc:/res/icons/wallet.png"
+                source: "qrc:/resources/icons/wallet.png"
                 width: 218 * pt
                 height: 180 * pt
                 anchors.horizontalCenter: parent.horizontalCenter
@@ -75,8 +75,8 @@ DapAbstractScreen
                 colorBackgroundNormal: "#070023"
                 colorButtonTextNormal: "#FFFFFF"
                 colorButtonTextHover: "#FFFFFF"
-                normalImageButton: "qrc:/res/icons/new-wallet_icon_dark.png"
-                hoverImageButton: "qrc:/res/icons/new-wallet_icon_dark_hover.png"
+                normalImageButton: "qrc:/resources/icons/new-wallet_icon_dark.png"
+                hoverImageButton: "qrc:/resources/icons/new-wallet_icon_dark_hover.png"
                 widthImageButton: 20 * pt
                 heightImageButton: 20 * pt
                 indentImageLeftButton: 20 * pt
@@ -127,7 +127,7 @@ DapAbstractScreen
                 {
                     id: walletNameEditButtonImage
                     anchors.fill: parent
-                    source: parent.containsMouse ? "qrc:/res/icons/ic_edit_hover.png" : "qrc:/res/icons/ic_edit.png"
+                    source: parent.containsMouse ? "qrc:/resources/icons/ic_edit_hover.png" : "qrc:/resources/icons/ic_edit.png"
                     sourceSize.width: width
                     sourceSize.height: height
 
@@ -150,8 +150,8 @@ DapAbstractScreen
                 colorBackgroundNormal: "#070023"
                 colorButtonTextNormal: "#FFFFFF"
                 colorButtonTextHover: "#FFFFFF"
-                normalImageButton: "qrc:/res/icons/new-payment_icon.png"
-                hoverImageButton: "qrc:/res/icons/new-payment_icon.png"
+                normalImageButton: "qrc:/resources/icons/new-payment_icon.png"
+                hoverImageButton: "qrc:/resources/icons/new-payment_icon.png"
                 widthImageButton: 20 * pt
                 heightImageButton: 20 * pt
                 indentImageLeftButton: 20 * pt
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
index 9c88a8dc56728c46b653d1ff71f368c0b7d4df0c..adc1caba6d435b8e8d91d507498409ece58f1395 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
@@ -37,8 +37,8 @@ DapAbstractTopPanel
             model: dapModelWallets
             comboBoxTextRole: ["name"]
             mainLineText: "all wallets"
-            indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
-            indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+            indicatorImageNormal: "qrc:/resources/icons/ic_arrow_drop_down.png"
+            indicatorImageActive: "qrc:/resources/icons/ic_arrow_drop_up.png"
             sidePaddingNormal: 0 * pt
             sidePaddingActive: 16 * pt
             normalColorText: "#070023"
@@ -102,8 +102,8 @@ DapAbstractTopPanel
         anchors.right: parent.right
         anchors.rightMargin: 24 * pt
         anchors.verticalCenter: parent.verticalCenter
-        normalImageButton: "qrc:/res/icons/new-wallet_icon_dark.png"
-        hoverImageButton: "qrc:/res/icons/new-wallet_icon_dark_hover.png"
+        normalImageButton: "qrc:/resources/icons/new-wallet_icon_dark.png"
+        hoverImageButton: "qrc:/resources/icons/new-wallet_icon_dark_hover.png"
         heightButton: 24 * pt
         widthButton: 120 * pt
         widthImageButton: 28 * pt
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
index 220fcea31d353068e119ed5c451e346928b46f50..1e0d5ff8c3ec28cddc16b0db0d90d06eb2fe14e9 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
@@ -13,8 +13,8 @@ DapAbstractRightPanel
     dapButtonClose.width: 16 * pt
     dapButtonClose.heightImageButton: 16 * pt
     dapButtonClose.widthImageButton: 16 * pt
-    dapButtonClose.normalImageButton: "qrc:/res/icons/close_icon.png"
-    dapButtonClose.hoverImageButton: "qrc:/res/icons/close_icon_hover.png"
+    dapButtonClose.normalImageButton: "qrc:/resources/icons/close_icon.png"
+    dapButtonClose.hoverImageButton: "qrc:/resources/icons/close_icon_hover.png"
 
     dapHeaderData:
         Row
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
index 598f09098ce99860794c557ee1f63387baca707b..023ab7ed2540eaac1ec3990144215a716d7a8ba1 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
@@ -171,8 +171,8 @@ DapAbstractRightPanel
                     comboBoxTextRole: ["name"]
                     mainLineText: "all signature"
                     anchors.centerIn: parent
-                    indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down_dark.png"
-                    indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+                    indicatorImageNormal: "qrc:/resources/icons/ic_arrow_drop_down_dark.png"
+                    indicatorImageActive: "qrc:/resources/icons/ic_arrow_drop_up.png"
                     sidePaddingNormal: 0 * pt
                     sidePaddingActive: 20 * pt
                     normalColorText: "#070023"
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapLastActionsRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapLastActionsRightPanelForm.ui.qml
index 1ca00e3af547823182444931d3f98493d57b5d46..501a5d2392b09eacc6124e8e51679f0e7538f223 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapLastActionsRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapLastActionsRightPanelForm.ui.qml
@@ -109,10 +109,10 @@ DapAbstractRightPanel
                 id: scrollButtons
                 viewData: lastActionsView
 
-                scrollDownButtonImageSource: "qrc:/res/icons/ic_scroll-down.png"
-                scrollDownButtonHoveredImageSource: "qrc:/res/icons/ic_scroll-down_hover.png"
-                scrollUpButtonImageSource: "qrc:/res/icons/ic_scroll-up.png"
-                scrollUpButtonHoveredImageSource: "qrc:/res/icons/ic_scroll-up_hover.png"
+                scrollDownButtonImageSource: "qrc:/resources/icons/ic_scroll-down.png"
+                scrollDownButtonHoveredImageSource: "qrc:/resources/icons/ic_scroll-down_hover.png"
+                scrollUpButtonImageSource: "qrc:/resources/icons/ic_scroll-up.png"
+                scrollUpButtonHoveredImageSource: "qrc:/resources/icons/ic_scroll-up_hover.png"
             }
         }
 }
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
index 7bddfd966919cd15db524677725fd6c5ec9ca1d9..cd2e17b501db00da6f739a00cec00431cf5ff0b9 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
@@ -107,8 +107,8 @@ DapAbstractRightPanel
                             anchors.centerIn: parent
                             comboBoxTextRole: ["name", "name"]
                             mainLineText: "all tokens"
-                            indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down_dark.png"
-                            indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+                            indicatorImageNormal: "qrc:/resources/icons/ic_arrow_drop_down_dark.png"
+                            indicatorImageActive: "qrc:/resources/icons/ic_arrow_drop_up.png"
                             sidePaddingNormal: 0 * pt
                             sidePaddingActive: 20 * pt
                             normalColorText: "#070023"
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml
index 43f982c8f85dfa8313ce173ab9461dfb68bad3c1..0b193aad83f43b71a694fc21fc3787d07f08257c 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml
@@ -5,8 +5,8 @@ import "../../../"
 
 DapAbstractRightPanel
 {
-    dapButtonClose.normalImageButton: "qrc:/res/icons/back_icon.png"
-    dapButtonClose.hoverImageButton: "qrc:/res/icons/back_icon_hover.png"
+    dapButtonClose.normalImageButton: "qrc:/resources/icons/back_icon.png"
+    dapButtonClose.hoverImageButton: "qrc:/resources/icons/back_icon_hover.png"
     
     dapHeaderData:
         Rectangle
diff --git a/CellFrameDashboardGUI/screen/desktop/Exchange/DapExchangeScreen.qml b/CellFrameDashboardGUI/screen/desktop/Exchange/DapExchangeScreen.qml
index 387dd093cd584a817b39faff934ab6d716846f47..fec57156fdb02867dffa3917fe8abac96d2bcfc7 100644
--- a/CellFrameDashboardGUI/screen/desktop/Exchange/DapExchangeScreen.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Exchange/DapExchangeScreen.qml
@@ -93,8 +93,8 @@ DapExchangeScreenForm
     ListModel
     {
         id: orderModel
-        ListElement{titleOrder:"Buy"; path:"qrc:/res/icons/buy_icon.png"}
-        ListElement{titleOrder:"Sell"; path:"qrc:/res/icons/sell_icon.png"}
+        ListElement{titleOrder:"Buy"; path:"qrc:/resources/icons/buy_icon.png"}
+        ListElement{titleOrder:"Sell"; path:"qrc:/resources/icons/sell_icon.png"}
     }
 
 /************************************************************************************************
@@ -163,7 +163,7 @@ DapExchangeScreenForm
             ///@detalis candleWidth Width body candle.
             property int candleWidth: 5 * pt
             ///@detalis imageCursorPath Path icon flug current.
-            property string imageCursorPath: "qrc:/res/icons/ic_flag.png"
+            property string imageCursorPath: "qrc:/resources/icons/ic_flag.png"
             ///@detalis imageCursorWidth Width icon.
             property int imageCursorWidth: 44 * pt
             ///@detalis imageCursorHeight Height icon.
@@ -800,12 +800,12 @@ DapExchangeScreenForm
             if(dapListHistoryVisible)
             {
                 dapListHistoryVisible = false
-                dapIconHistoryButton = "qrc:/res/icons/ic_chevron_down.png"
+                dapIconHistoryButton = "qrc:/resources/icons/ic_chevron_down.png"
             }
             else
             {
                 dapListHistoryVisible = true
-                dapIconHistoryButton = "qrc:/res/icons/ic_chevron_up.png"
+                dapIconHistoryButton = "qrc:/resources/icons/ic_chevron_up.png"
             }
         }
     }
diff --git a/CellFrameDashboardGUI/screen/desktop/Exchange/DapExchangeScreenForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Exchange/DapExchangeScreenForm.ui.qml
index f3f99cfa0170704f8c6cc2bfd94f8ae629b2df04..085bf1c5f59f1ed354ca01c9cc420cf9d731188a 100644
--- a/CellFrameDashboardGUI/screen/desktop/Exchange/DapExchangeScreenForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Exchange/DapExchangeScreenForm.ui.qml
@@ -46,8 +46,8 @@ DapAbstractScreen
                 heightComboBoxNormal: 24 * pt
                 heightComboBoxActive: 44 * pt
                 bottomIntervalListElement: 6 * pt
-                indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down_dark_blue.png"
-                indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up_dark_blue.png"
+                indicatorImageNormal: "qrc:/resources/icons/ic_arrow_drop_down_dark_blue.png"
+                indicatorImageActive: "qrc:/resources/icons/ic_arrow_drop_up_dark_blue.png"
                 fontComboBox: [dapMainFonts.dapMainFontTheme.dapFontRobotoRegular14]
                 colorMainTextComboBox: [["#070023", "#070023"]]
                 colorTextComboBox: [["#070023", "#FFFFFF"]]
@@ -92,8 +92,8 @@ DapAbstractScreen
                 heightComboBoxNormal: 24 * pt
                 heightComboBoxActive: 44 * pt
                 bottomIntervalListElement: 6 * pt
-                indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down_dark_blue.png"
-                indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up_dark_blue.png"
+                indicatorImageNormal: "qrc:/resources/icons/ic_arrow_drop_down_dark_blue.png"
+                indicatorImageActive: "qrc:/resources/icons/ic_arrow_drop_up_dark_blue.png"
                 fontComboBox: [dapMainFonts.dapMainFontTheme.dapFontRobotoRegular14]
                 colorMainTextComboBox: [["#070023", "#070023"]]
                 colorTextComboBox: [["#070023", "#FFFFFF"]]
@@ -263,16 +263,17 @@ DapAbstractScreen
                 anchors.right: parent.right
                 anchors.left: parent.left
                 anchors.top: parent.top
-                anchors.topMargin: 16 * pt
-                height: 22 * pt
+                height: 50 * pt
 
                 Image
                 {
                     id: tradeHistoryIcon
                     anchors.left: parent.left
+                    anchors.top: parent.top
+                    anchors.topMargin: 16 * pt
                     width: 22 * pt
                     height: 22 * pt
-                    source: "qrc:/res/icons/trade-history_icon.png"
+                    source: "qrc:/resources/icons/trade-history_icon.png"
                     anchors.verticalCenter: parent.verticalCenter
 
                 }
@@ -281,8 +282,11 @@ DapAbstractScreen
                 {
                     id: tradeHistoryText
                     text: qsTr("Trade History")
+                    verticalAlignment: Text.AlignVCenter
                     anchors.left:  tradeHistoryIcon.right
                     anchors.leftMargin: 8 * pt
+                    anchors.top: parent.top
+                    anchors.topMargin: 16 * pt
                     width: 336 * pt
                     color: "#070023"
                     font: dapMainFonts.dapMainFontTheme.dapFontRobotoRegular16
@@ -294,6 +298,8 @@ DapAbstractScreen
                 {
                     id: buttonHistry
                     anchors.right: parent.right
+                    anchors.top: parent.top
+                    anchors.topMargin: 16 * pt
                     width: 22 * pt
                     height: 22 * pt
                     anchors.verticalCenter: parent.verticalCenter
@@ -307,7 +313,7 @@ DapAbstractScreen
                             id: tradeHistoryButtonIcon
                             width: 22 * pt
                             height: 22 * pt
-                            source: "qrc:/res/icons/ic_chevron_down.png"
+                            source: "qrc:/resources/icons/ic_chevron_down.png"
                         }
                     }
                 }
@@ -321,11 +327,15 @@ DapAbstractScreen
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.bottom: parent.bottom
-                anchors.topMargin: 16 * pt
                 visible: false
                 model: modelExchangeHistory
                 delegate: delegateExchangeHistory
                 clip: true
+                //Made to turn off the backlight on a click.
+                MouseArea
+                {
+                    anchors.fill: parent
+                }
                 header:
                     Rectangle
                     {
diff --git a/CellFrameDashboardGUI/screen/desktop/Exchange/DapExchangeTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Exchange/DapExchangeTopPanelForm.ui.qml
index 66b2d253375b398225607368d24f25f8a8a7cd2e..c4004dd603a11d99604f868b413fb4c7a3259229 100644
--- a/CellFrameDashboardGUI/screen/desktop/Exchange/DapExchangeTopPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Exchange/DapExchangeTopPanelForm.ui.qml
@@ -36,8 +36,8 @@ DapAbstractTopPanelForm
             //model: modelWallets
             comboBoxTextRole: ["text"]
             mainLineText: "all wallets"
-            indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
-            indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+            indicatorImageNormal: "qrc:/resources/icons/ic_arrow_drop_down.png"
+            indicatorImageActive: "qrc:/resources/icons/ic_arrow_drop_up.png"
             sidePaddingNormal: 0 * pt
             sidePaddingActive: 16 * pt
             normalColorText: "#070023"
diff --git a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreen.qml b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreen.qml
index a3c8e133ccab01952ed5d2f38042d9300b369d24..71b693b9b24595a1aa2c81e6725224080449d6b9 100644
--- a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreen.qml
+++ b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreen.qml
@@ -56,7 +56,7 @@ DapHistoryScreenForm
                     {
                         id: iconToken
                         anchors.fill: parent
-                        source: "qrc:/res/icons/ic_cellframe.png"
+                        source: "qrc:/resources/icons/ic_cellframe.png"
                     }
                 }
 
diff --git a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreenForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreenForm.ui.qml
index 6a6524c40676edce25d85275c73a97ea2501bad1..eb45a06dee7539953d4c900a094d09260c9ac607 100644
--- a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreenForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreenForm.ui.qml
@@ -31,10 +31,10 @@ DapAbstractScreen
     DapScrollView
     {
         id: historyListScroll
-        scrollDownButtonImageSource: "qrc:/res/icons/ic_scroll-down.png"
-        scrollDownButtonHoveredImageSource: "qrc:/res/icons/ic_scroll-down_hover.png"
-        scrollUpButtonImageSource: "qrc:/res/icons/ic_scroll-up.png"
-        scrollUpButtonHoveredImageSource: "qrc:/res/icons/ic_scroll-up_hover.png"
+        scrollDownButtonImageSource: "qrc:/resources/icons/ic_scroll-down.png"
+        scrollDownButtonHoveredImageSource: "qrc:/resources/icons/ic_scroll-down_hover.png"
+        scrollUpButtonImageSource: "qrc:/resources/icons/ic_scroll-up.png"
+        scrollUpButtonHoveredImageSource: "qrc:/resources/icons/ic_scroll-up_hover.png"
         viewData: dapListViewHistory
         //Assign DapScrollView with DapScrollViewHandling which must have no parent-child relationship
         onClicked: historyListScrollHandler.scrollDirectionUp = !historyListScrollHandler.scrollDirectionUp
diff --git a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanelForm.ui.qml
index d82c16f004da3080a68cc624f192ee844fe37d23..4abb3825f1f440ae6f20e1c6a90ba71c4cb90f51 100644
--- a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanelForm.ui.qml
@@ -25,7 +25,7 @@ DapAbstractTopPanelForm
         {
             id: iconSearch
             anchors.fill: parent
-            source: "qrc:/res/icons/ic_search.png"
+            source: "qrc:/resources/icons/ic_search.png"
         }
     }
 
@@ -114,8 +114,8 @@ DapAbstractTopPanelForm
             model: periodModel
             comboBoxTextRole: ["name"]
             mainLineText: "all time"
-            indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
-            indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+            indicatorImageNormal: "qrc:/resources/icons/ic_arrow_drop_down.png"
+            indicatorImageActive: "qrc:/resources/icons/ic_arrow_drop_up.png"
             sidePaddingNormal: 0 * pt
             sidePaddingActive: 16 * pt
             normalColorText: "#070023"
@@ -176,8 +176,8 @@ DapAbstractTopPanelForm
             model: dapModelWallets
             comboBoxTextRole: ["name"]
             mainLineText: "all wallets"
-            indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
-            indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+            indicatorImageNormal: "qrc:/resources/icons/ic_arrow_drop_down.png"
+            indicatorImageActive: "qrc:/resources/icons/ic_arrow_drop_up.png"
             sidePaddingNormal: 0 * pt
             sidePaddingActive: 16 * pt
             normalColorText: "#070023"
@@ -247,8 +247,8 @@ DapAbstractTopPanelForm
             model: statusModel
             comboBoxTextRole: ["name"]
             mainLineText: "all statuses"
-            indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
-            indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+            indicatorImageNormal: "qrc:/resources/icons/ic_arrow_drop_down.png"
+            indicatorImageActive: "qrc:/resources/icons/ic_arrow_drop_up.png"
             sidePaddingNormal: 0 * pt
             sidePaddingActive: 16 * pt
             normalColorText: "#070023"
diff --git a/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsScreenForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsScreenForm.ui.qml
index c77b9b4b7a3a7c6f06e157dc4e1271937f1ad05e..6dc4915393d09caf163f93f1c482e948abfe9616 100644
--- a/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsScreenForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsScreenForm.ui.qml
@@ -39,10 +39,10 @@ DapAbstractScreen
     DapScrollView
     {
         id: logListScroll
-        scrollDownButtonImageSource: "qrc:/res/icons/ic_scroll-down.png"
-        scrollDownButtonHoveredImageSource: "qrc:/res/icons/ic_scroll-down_hover.png"
-        scrollUpButtonImageSource: "qrc:/res/icons/ic_scroll-up.png"
-        scrollUpButtonHoveredImageSource: "qrc:/res/icons/ic_scroll-up_hover.png"
+        scrollDownButtonImageSource: "qrc:/resources/icons/ic_scroll-down.png"
+        scrollDownButtonHoveredImageSource: "qrc:/resources/icons/ic_scroll-down_hover.png"
+        scrollUpButtonImageSource: "qrc:/resources/icons/ic_scroll-up.png"
+        scrollUpButtonHoveredImageSource: "qrc:/resources/icons/ic_scroll-up_hover.png"
         viewData: dapLogsList
         //Assign DapScrollView with DapScrollViewHandling which must have no parent-child relationship
         onClicked: logListScrollHandler.scrollDirectionUp = !logListScrollHandler.scrollDirectionUp
diff --git a/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTopPanelForm.ui.qml
index 8c98e99b5c3661f614a56539c9130531abe28f97..7e658995b88f668c76b6babd614717fd0ce42cae 100644
--- a/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTopPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTopPanelForm.ui.qml
@@ -17,8 +17,8 @@ DapAbstractTopPanel
         anchors.right: parent.right
         anchors.rightMargin: 24 * pt
         anchors.verticalCenter: parent.verticalCenter
-        normalImageButton: "qrc:/res/icons/icon_export.png"
-        hoverImageButton: "qrc:/res/icons/icon_export.png"
+        normalImageButton: "qrc:/resources/icons/icon_export.png"
+        hoverImageButton: "qrc:/resources/icons/icon_export.png"
         height: 36 * pt
         width: 120 * pt
         widthImageButton: 28 * pt
diff --git a/CellFrameDashboardService/CellFrameDashboardService.pro b/CellFrameDashboardService/CellFrameDashboardService.pro
index d801cf1c940ab324740939e9d24a3a16ce48fd08..52ff5b7a926fa1588494401f9eed9d10ac9dc374 100755
--- a/CellFrameDashboardService/CellFrameDashboardService.pro
+++ b/CellFrameDashboardService/CellFrameDashboardService.pro
@@ -51,9 +51,10 @@ HEADERS += \
 include (../libdap/libdap.pri)
 include (../libdap-crypto/libdap-crypto.pri)
 include (../libdap-qt/libdap-qt.pri)
-include (../libdap-qt-ui-chain-wallet/ libdap-qt-ui-chain-wallet.pri)
+include (../libdap-qt-ui-chain-wallet/libdap-qt-ui-chain-wallet.pri)
 
 INCLUDEPATH += $$_PRO_FILE_PWD_/../cellframe-node/
+               $$_PRO_FILE_PWD_/../dapRPCProtocol/
 
 unix: !mac : !android {
     service_target.files = $${BRAND}Service
diff --git a/CellFrameDashboardService/CellFrameDashboardService.qrc b/CellFrameDashboardService/CellFrameDashboardService.qrc
index 0d81a92ecece8f3829165e12bc3800aaeeda9682..f8b4b4eee5a3ddeebc1f0d6a8cff3d124e3e6449 100644
--- a/CellFrameDashboardService/CellFrameDashboardService.qrc
+++ b/CellFrameDashboardService/CellFrameDashboardService.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>res/icons/icon.ico</file>
+        <file>resources/icons/icon.ico</file>
     </qresource>
 </RCC>
diff --git a/CellFrameDashboardService/DapServiceController.cpp b/CellFrameDashboardService/DapServiceController.cpp
index ec86d4f1a7f20659ec4a2ce4644e8b7850a36eb8..c6ab289c51ba5031af3ca9bea76059b5f0886ae8 100755
--- a/CellFrameDashboardService/DapServiceController.cpp
+++ b/CellFrameDashboardService/DapServiceController.cpp
@@ -87,7 +87,7 @@ void DapServiceController::initSystemTrayIcon()
     m_pToolTipWidget = new DapToolTipWidget();
     m_pSystemTrayIcon = new DapSystemTrayIcon(this);
     m_pSystemTrayIcon->setToolTipWidget(m_pToolTipWidget);
-    m_pSystemTrayIcon->setIcon(QIcon(":/res/icons/icon.ico"));
+    m_pSystemTrayIcon->setIcon(QIcon(":/resources/icons/icon.ico"));
     menuSystemTrayIcon = new QMenu();
     QAction * quitAction = new QAction("Quit", this);
     menuSystemTrayIcon->addAction(quitAction);
diff --git a/CellFrameDashboardService/DapServiceController.h b/CellFrameDashboardService/DapServiceController.h
index e7ca31b2ef873bf9344238f7051de937d718d5cc..40dc38cda9d920d69ed7f874f719da9bf9771efa 100755
--- a/CellFrameDashboardService/DapServiceController.h
+++ b/CellFrameDashboardService/DapServiceController.h
@@ -23,22 +23,22 @@
 typedef class DapRpcLocalServer DapUiService;
 
 
-#include "Handlers/DapAbstractCommand.h"
-#include "Handlers/DapQuitApplicationCommand.h"
-#include "Handlers/DapActivateClientCommand.h"
-#include "Handlers/DapUpdateLogsCommand.h"
-#include "Handlers/DapAddWalletCommand.h"
-#include "Handlers/DapGetListWalletsCommand.h"
-#include "Handlers/DapGetListNetworksCommand.h"
-#include "Handlers/DapGetWalletAddressesCommand.h"
-#include "Handlers/DapExportLogCommand.h"
-#include "Handlers/DapGetWalletTokenInfoCommand.h"
-#include "Handlers/DapCreateTransactionCommand.h"
-#include "Handlers/DapMempoolProcessCommand.h"
-#include "Handlers/DapGetWalletHistoryCommand.h"
-#include "Handlers/DapRunCmdCommand.h"
-#include "Handlers/DapGetHistoryExecutedCmdCommand.h"
-#include "Handlers/DapSaveHistoryExecutedCmdCommand.h"
+#include "handlers/DapAbstractCommand.h"
+#include "handlers/DapQuitApplicationCommand.h"
+#include "handlers/DapActivateClientCommand.h"
+#include "handlers/DapUpdateLogsCommand.h"
+#include "handlers/DapAddWalletCommand.h"
+#include "handlers/DapGetListWalletsCommand.h"
+#include "handlers/DapGetListNetworksCommand.h"
+#include "handlers/DapGetWalletAddressesCommand.h"
+#include "handlers/DapExportLogCommand.h"
+#include "handlers/DapGetWalletTokenInfoCommand.h"
+#include "handlers/DapCreateTransactionCommand.h"
+#include "handlers/DapMempoolProcessCommand.h"
+#include "handlers/DapGetWalletHistoryCommand.h"
+#include "handlers/DapRunCmdCommand.h"
+#include "handlers/DapGetHistoryExecutedCmdCommand.h"
+#include "handlers/DapSaveHistoryExecutedCmdCommand.h"
 #include "DapSystemTrayIcon.h"
 #include "DapToolTipWidget.h"
 
diff --git a/CellFrameDashboardService/res/icons/icon.ico b/CellFrameDashboardService/resources/icons/icon.ico
similarity index 100%
rename from CellFrameDashboardService/res/icons/icon.ico
rename to CellFrameDashboardService/resources/icons/icon.ico
diff --git a/libdap-crypto b/libdap-crypto
index 1688d69223b19de929eed4f8dc61332aaec8dd46..77f0dd9d161ac902f28d5d64b3451d7ab50fe186 160000
--- a/libdap-crypto
+++ b/libdap-crypto
@@ -1 +1 @@
-Subproject commit 1688d69223b19de929eed4f8dc61332aaec8dd46
+Subproject commit 77f0dd9d161ac902f28d5d64b3451d7ab50fe186
diff --git a/libdap-qt b/libdap-qt
index 257e9bec35db7607d1136231361d157d6d9d2c30..a4371e386dad878c3a1755637ea8e63b6d721340 160000
--- a/libdap-qt
+++ b/libdap-qt
@@ -1 +1 @@
-Subproject commit 257e9bec35db7607d1136231361d157d6d9d2c30
+Subproject commit a4371e386dad878c3a1755637ea8e63b6d721340
diff --git a/libdap-qt-ui-chain-wallet b/libdap-qt-ui-chain-wallet
index 1c3f17d2cf32a0508db1c0bd170d8fe02fb9231b..aa6a07b1167f2d75f323c664b03019e6d5b6e3b4 160000
--- a/libdap-qt-ui-chain-wallet
+++ b/libdap-qt-ui-chain-wallet
@@ -1 +1 @@
-Subproject commit 1c3f17d2cf32a0508db1c0bd170d8fe02fb9231b
+Subproject commit aa6a07b1167f2d75f323c664b03019e6d5b6e3b4