Merge pull request #2215 (again)

bf785bb build: checkout v0.14.1.0 tag (selsta)
build: checkout v0.14.1.0 tag
2026-04-02 08:37:25 -04:00 · 2019-06-25 14:33:46 -05:00 · 2019-06-14 16:15:36 +02:00
340 changed files with 63085 additions and 88552 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +0,0 @@
-*
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,177 +0,0 @@
-name: ci/gh-actions/gui
-
-on: [push, pull_request]
-
-jobs:
-  build-macos:
-    runs-on: macOS-latest
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - name: install dependencies
-      run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi zmq libpgm libsodium miniupnpc ldns expat libunwind-headers protobuf qt5 pkg-config
-    - name: build
-      run: DEV_MODE=ON make release -j3
-    - name: test qml
-      run: build/release/bin/monero-wallet-gui.app/Contents/MacOS/monero-wallet-gui --test-qml
-
-  build-ubuntu:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - name: remove bundled boost
-      run: sudo rm -rf /usr/local/share/boost
-    - name: set apt conf
-      run: |
-        echo "Acquire::Retries \"3\";" | sudo tee -a /etc/apt/apt.conf.d/80-custom
-        echo "Acquire::http::Timeout \"120\";" | sudo tee -a /etc/apt/apt.conf.d/80-custom
-        echo "Acquire::ftp::Timeout \"120\";" | sudo tee -a /etc/apt/apt.conf.d/80-custom
-    - name: update apt
-      run: sudo apt update
-    - name: install monero dependencies
-      run: sudo apt -y install build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libhidapi-dev libnorm-dev libusb-1.0-0-dev libpgm-dev libprotobuf-dev protobuf-compiler
-    - name: install monero gui dependencies
-      run: sudo apt -y install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtqml-models2 qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev libgcrypt20-dev xvfb
-    - name: build
-      run: DEV_MODE=ON make release -j3
-    - name: test qml
-      run: xvfb-run -a build/release/bin/monero-wallet-gui --test-qml
-
-  build-windows:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - uses: eine/setup-msys2@v2
-      with:
-        update: true
-        install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt
-    - name: build
-      run: DEV_MODE=ON make release-win64 -j2
-    - name: test qml
-      run: build/release/bin/monero-wallet-gui --test-qml
-
-  macos-bundle:
-    runs-on: macOS-latest
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - name: install dependencies
-      run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf pkg-config python3 p7zip
-    - name: install dependencies
-      run: pip3 install requests semantic_version lxml py7zr
-    - name: download qt
-      run: |
-          curl -O https://raw.githubusercontent.com/engnr/qt-downloader/master/qt-downloader
-          chmod +x qt-downloader
-          ./qt-downloader macos desktop 5.15.2 clang_64
-      working-directory: ../
-    - name: build
-      run: CMAKE_PREFIX_PATH=/Users/runner/work/monero-gui/5.15.2/clang_64 make release -j3
-    - name: deploy
-      run: make deploy
-      working-directory: build/release
-    - name: test qml
-      run: build/release/bin/monero-wallet-gui.app/Contents/MacOS/monero-wallet-gui --test-qml
-    - name: create .tar
-      run: tar -cf monero-wallet-gui.tar monero-wallet-gui.app
-      working-directory: build/release/bin
-    - uses: actions/upload-artifact@v2
-      with:
-        name: ${{ github.job }}
-        path: build/release/bin/monero-wallet-gui.tar
-
-  docker-linux-static:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - uses: satackey/action-docker-layer-caching@v0.0.10
-      continue-on-error: true
-      with:
-        key: docker-linux-static-{hash}
-        restore-keys: |
-          docker-linux-static-
-    - name: install dependencies
-      run: sudo apt -y install xvfb libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xkb1 libxkbcommon-x11-0
-    - name: preprare build enviroment
-      run: docker build --tag monero:build-env-linux --build-arg THREADS=3 --file Dockerfile.linux .
-    - name: build
-      run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'make release-static -j3'
-    - name: sha256sum
-      run: shasum -a256 /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui
-    - name: test qml
-      run: xvfb-run -a /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui --test-qml
-    - uses: actions/upload-artifact@v2
-      with:
-        name: ${{ github.job }}
-        path: |
-          /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui
-          /home/runner/work/monero-gui/monero-gui/build/release/bin/monerod
-
-  docker-windows-static:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - uses: satackey/action-docker-layer-caching@v0.0.10
-      continue-on-error: true
-      with:
-        key: docker-windows-static-{hash}
-        restore-keys: |
-          docker-windows-static-
-    - name: preprare build enviroment
-      run: docker build --tag monero:build-env-windows --build-arg THREADS=3 --file Dockerfile.windows .
-    - name: build
-      run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -w /monero-gui monero:build-env-windows sh -c 'make depends root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j3'
-    - name: sha256sum
-      run: shasum -a256 /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monero-wallet-gui.exe
-    - uses: actions/upload-artifact@v2
-      with:
-        name: ${{ github.job }}
-        path: |
-          /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monero-wallet-gui.exe
-          /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monerod.exe
-
-  docker-android:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - name: preprare build enviroment
-      run: docker build --tag monero:build-env-android --build-arg THREADS=3 --file Dockerfile.android .
-    - name: build
-      run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -e THREADS=3 monero:build-env-android
-    - uses: actions/upload-artifact@v2
-      with:
-        name: ${{ github.job }}
-        path: /home/runner/work/monero-gui/monero-gui/build/Android/release/android-build/monero-gui.apk
-
-  source-archive:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - name: archive
-      run: |
-        pip install git-archive-all
-        export VERSION="monero-gui-$(git describe)"
-        export OUTPUT="$VERSION.tar"
-        echo "OUTPUT=$OUTPUT" >> $GITHUB_ENV
-        /home/runner/.local/bin/git-archive-all --prefix "$VERSION/" --force-submodules "$OUTPUT"
-    - uses: actions/upload-artifact@v2
-      with:
-        name: ${{ env.OUTPUT }}
-        path: /home/runner/work/monero-gui/monero-gui/${{ env.OUTPUT }}
--- a/.gitignore
+++ b/.gitignore
@@ -13,24 +13,3 @@ monero-wallet-gui_plugin_import.cpp
 monero-wallet-gui_qml_plugin_import.cpp
 *.qmlc
 *.jsc
-qml_qmlcache.qrc
-
-### Vim ###
-# Swap
-[._]*.s[a-v][a-z]
-[._]*.sw[a-p]
-[._]s[a-rt-v][a-z]
-[._]ss[a-gi-z]
-[._]sw[a-p]
-
-# Session
-Session.vim
-
-# Temporary                                                                                                                                                                                             
-.netrwhist
-*~
-*.autosave
-# Auto-generated tag files
-tags
-# Persistent undo
-[._]*.un~
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,6 +2,3 @@
 	path = monero
 	url = https://github.com/monero-project/monero
 	ignore = all
-[submodule "external/quirc"]
-	path = external/quirc
-	url = https://github.com/dlbeer/quirc/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,567 +0,0 @@
-cmake_minimum_required(VERSION 3.12)
-project(monero-gui)
-
-message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
-
-set(VERSION_MAJOR "17")
-set(VERSION_MINOR "2")
-set(VERSION_REVISION "1")
-set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
-
-option(STATIC "Link libraries statically, requires static Qt")
-
-option(USE_DEVICE_TREZOR "Trezor support compilation" ON)
-option(ENABLE_PASS_STRENGTH_METER "Enable zxcvbn library for password strength" OFF)
-option(WITH_SCANNER "Enable webcam QR scanner" OFF)
-option(DEV_MODE "Checkout latest monero master on build" OFF)
-
-list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake")
-include(CheckCCompilerFlag)
-include(CheckCXXCompilerFlag)
-include(CheckLinkerFlag)
-include(FindCcache)
-
-if(DEBUG)
-	set(CMAKE_VERBOSE_MAKEFILE ON)
-endif()
-
-set(BUILD_GUI_DEPS ON)
-set(ARCH "x86-64" CACHE STRING "Target architecture")
-set(BUILD_64 ON CACHE BOOL "Build 64-bit binaries")
-
-if(NOT MANUAL_SUBMODULES)
-  find_package(Git)
-  if(GIT_FOUND)
-    if(NOT DEV_MODE)
-      function (check_submodule relative_path)
-        execute_process(COMMAND git rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${relative_path} OUTPUT_VARIABLE localHead)
-        execute_process(COMMAND git rev-parse "HEAD:${relative_path}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE checkedHead)
-        string(COMPARE EQUAL "${localHead}" "${checkedHead}" upToDate)
-        if (upToDate)
-          message(STATUS "Submodule '${relative_path}' is up-to-date")
-        else()
-          message(FATAL_ERROR "Submodule '${relative_path}' is not using the checked head. Please update all submodules with\ngit submodule update --init --force --recursive\nor run cmake with -DMANUAL_SUBMODULES=1,\n or if you want to build from latest master run cmake with -DDEV_MODE=ON,\n or run make devmode")
-        endif()
-      endfunction ()
-      message(STATUS "Checking submodules")
-      check_submodule(monero)
-    else()
-      execute_process(COMMAND ${GIT_EXECUTABLE} fetch WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/monero RESULT_VARIABLE GIT_FETCH_RESULT)
-      execute_process(COMMAND ${GIT_EXECUTABLE} checkout -f origin/master WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/monero RESULT_VARIABLE GIT_CHECKOUT_MASTER_RESULT)
-      execute_process(COMMAND ${GIT_EXECUTABLE} submodule sync --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/monero RESULT_VARIABLE GIT_SUBMODULE_SYNC_RESULT)
-      execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --force --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/monero RESULT_VARIABLE GIT_SUBMODULE_UPDATE_RESULT)
-      if(NOT GIT_FETCH_RESULT EQUAL "0" OR NOT GIT_CHECKOUT_MASTER_RESULT EQUAL "0" OR NOT GIT_SUBMODULE_SYNC_RESULT EQUAL "0" OR NOT GIT_SUBMODULE_UPDATE_RESULT EQUAL "0")
-        message(FATAL_ERROR "Updating git submodule to master (-DDEV_MODE=ON) failed")
-      endif()
-    endif()
-  endif()
-endif()
-
-add_subdirectory(monero)
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-
-set_property(TARGET wallet_merged PROPERTY FOLDER "monero")
-get_directory_property(ARCH_WIDTH DIRECTORY "monero" DEFINITION ARCH_WIDTH)
-get_directory_property(UNBOUND_LIBRARY DIRECTORY "monero" DEFINITION UNBOUND_LIBRARY)
-get_directory_property(DEVICE_TREZOR_READY DIRECTORY "monero" DEFINITION DEVICE_TREZOR_READY)
-get_directory_property(TREZOR_DEP_LIBS DIRECTORY "monero" DEFINITION TREZOR_DEP_LIBS)
-
-if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-  add_definitions(-DQT_NO_DEBUG)
-endif()
-
-if(STATIC)
-  message(STATUS "Initiating static build")
-  set(Boost_USE_STATIC_LIBS ON)
-  set(Boost_USE_STATIC_RUNTIME ON)
-  set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ${CMAKE_FIND_LIBRARY_SUFFIXES})
-  add_definitions(-DMONERO_GUI_STATIC)
-endif()
-
-# Include password strength library
-if(ENABLE_PASS_STRENGTH_METER)
-    message(STATUS "Building with pass strength meter support.")
-else()
-    add_definitions(-DDISABLE_PASS_STRENGTH_METER)
-endif()
-
-include(CMakePackageConfigHelpers)
-
-# force version update
-function (monero_gui_add_library_with_deps)
-  cmake_parse_arguments(MONERO_ADD_LIBRARY "" "NAME" "DEPENDS;SOURCES" ${ARGN})
-  source_group("${MONERO_ADD_LIBRARY_NAME}" FILES ${MONERO_ADD_LIBRARY_SOURCES})
-
-  # Define a ("virtual") object library and an actual library that links those
-  # objects together. The virtual libraries can be arbitrarily combined to link
-  # any subset of objects into one library archive. This is used for releasing
-  # libwallet, which combines multiple components.
-  set(objlib obj_${MONERO_ADD_LIBRARY_NAME})
-  add_library(${objlib} OBJECT ${MONERO_ADD_LIBRARY_SOURCES})
-  add_library("${MONERO_ADD_LIBRARY_NAME}" $<TARGET_OBJECTS:${objlib}>)
-  if (MONERO_ADD_LIBRARY_DEPENDS)
-    add_dependencies(${objlib} ${MONERO_ADD_LIBRARY_DEPENDS})
-  endif()
-  set_property(TARGET "${MONERO_ADD_LIBRARY_NAME}" PROPERTY FOLDER "libs")
-  target_compile_definitions(${objlib}
-    PRIVATE $<TARGET_PROPERTY:${MONERO_ADD_LIBRARY_NAME},INTERFACE_COMPILE_DEFINITIONS>)
-endfunction ()
-
-function (monero_gui_add_library name)
-    monero_gui_add_library_with_deps(NAME "${name}" SOURCES ${ARGN})
-endfunction()
-
-include_directories(${EASYLOGGING_INCLUDE})
-link_directories(${EASYLOGGING_LIBRARY_DIRS})
-
-
-include(VersionGui)
-monero_gui_add_library(gui_version SOURCES version.js DEPENDS genversiongui)
-
-message(STATUS "${CMAKE_MODULE_PATH}")
-
-# OpenSSL
-if(APPLE AND NOT OPENSSL_ROOT_DIR)
-  execute_process(COMMAND brew --prefix openssl OUTPUT_VARIABLE OPENSSL_ROOT_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
-find_package(OpenSSL REQUIRED)
-message(STATUS "OpenSSL: Version ${OPENSSL_VERSION}")
-message(STATUS "OpenSSL: include dir at ${OPENSSL_INCLUDE_DIR}")
-message(STATUS "OpenSSL: libraries at ${OPENSSL_LIBRARIES} ${OPENSSL_SSL_LIBRARIES}")
-
-if(WITH_SCANNER)
-    add_definitions(-DWITH_SCANNER)
-endif()
-
-# Sodium
-find_library(SODIUM_LIBRARY sodium)
-message(STATUS "libsodium: libraries at ${SODIUM_LIBRARY}")
-
-# LibUSB
-find_package(LibUSB)
-message(STATUS "libusb: include dir at ${LibUSB_INCLUDE_DIRS}")
-message(STATUS "libusb: libraries at ${LibUSB_LIBRARIES}")
-
-# HIDApi
-if(NOT ANDROID)
-  find_package(HIDAPI REQUIRED)
-  message(STATUS "libhidapi: include dir at ${HIDAPI_INCLUDE_DIRS}")
-  message(STATUS "libhidapi: libraries at ${HIDAPI_LIBRARIES}")
-endif()
-
-# Boost
-if(DEBUG)
-    set(Boost_DEBUG ON)
-endif()
-if(APPLE AND NOT BOOST_ROOT)
-  execute_process(COMMAND brew --prefix boost OUTPUT_VARIABLE BOOST_ROOT OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
-if(MINGW)
-  set(Boost_THREADAPI win32)
-endif()
-find_package(Boost 1.58 REQUIRED COMPONENTS
-		system
-		filesystem
-		thread
-		date_time
-		chrono
-		regex
-		serialization
-		program_options
-		locale)
-
-if(UNIX AND NOT APPLE AND NOT ANDROID)
-    set(CMAKE_SKIP_RPATH ON)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES_PREV ${CMAKE_FIND_LIBRARY_SUFFIXES})
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
-    find_package(X11 REQUIRED)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_PREV})
-    message(STATUS "X11_FOUND = ${X11_FOUND}")
-    message(STATUS "X11_INCLUDE_DIR = ${X11_INCLUDE_DIR}")
-    message(STATUS "X11_LIBRARIES = ${X11_LIBRARIES}")
-    include_directories(${X11_INCLUDE_DIR})
-    link_directories(${X11_LIBRARIES})
-    if(STATIC)
-        find_library(XCB_LIBRARY xcb)
-        message(STATUS "Found xcb library: ${XCB_LIBRARY}")
-    endif()
-endif()
-
-if(MINGW)
-    string(REGEX MATCH "^[^/]:/[^/]*" msys2_install_path "${CMAKE_C_COMPILER}")
-    message(STATUS "MSYS location: ${msys2_install_path}")
-    set(CMAKE_INCLUDE_PATH "${msys2_install_path}/mingw${ARCH_WIDTH}/include")
-    # This is necessary because otherwise CMake will make Boost libraries -lfoo
-    # rather than a full path. Unfortunately, this makes the shared libraries get
-    # linked due to a bug in CMake which misses putting -static flags around the
-    # -lfoo arguments.
-    set(DEFLIB ${msys2_install_path}/mingw${ARCH_WIDTH}/lib)
-    list(REMOVE_ITEM CMAKE_C_IMPLICIT_LINK_DIRECTORIES ${DEFLIB})
-    list(REMOVE_ITEM CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES ${DEFLIB})
-endif()
-
-set(QT5_LIBRARIES
-  Qt5Core
-  Qt5Quick
-  Qt5Gui
-  Qt5Qml
-  Qt5Svg
-  Qt5Xml
-)
-
-if(WITH_SCANNER)
-  list(APPEND QT5_LIBRARIES Qt5Multimedia)
-endif()
-
-if(APPLE)
-  list(APPEND QT5_LIBRARIES Qt5MacExtras)
-endif()
-
-if(UNIX)
-  if(NOT CMAKE_PREFIX_PATH AND DEFINED ENV{CMAKE_PREFIX_PATH})
-    message(STATUS "Using CMAKE_PREFIX_PATH environment variable: '$ENV{CMAKE_PREFIX_PATH}'")
-    set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
-  endif()
-  if(APPLE AND NOT CMAKE_PREFIX_PATH)
-    execute_process(COMMAND brew --prefix qt5 OUTPUT_VARIABLE QT5_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-    list(APPEND CMAKE_PREFIX_PATH ${QT5_DIR})
-  endif()
-endif()
-
-find_package(PkgConfig REQUIRED)
-
-# TODO: drop this once we switch to Qt 5.14+
-pkg_check_modules(Qt5QmlModels_PKG_CONFIG QUIET Qt5QmlModels)
-if(Qt5QmlModels_PKG_CONFIG_FOUND)
-  list(APPEND QT5_LIBRARIES Qt5QmlModels)
-endif()
-
-# TODO: drop this once we switch to Qt 5.12+
-find_package(Qt5XmlPatterns QUIET)
-if(Qt5XmlPatterns_FOUND)
-  list(APPEND QT5_LIBRARIES Qt5XmlPatterns)
-endif()
-
-foreach(QT5_MODULE ${QT5_LIBRARIES})
-  find_package(${QT5_MODULE} REQUIRED)
-  include_directories(${${QT5_MODULE}_INCLUDE_DIRS})
-endforeach()
-
-if(NOT (CMAKE_CROSSCOMPILING AND ANDROID))
-  pkg_check_modules(QT5_PKG_CONFIG REQUIRED ${QT5_LIBRARIES})
-else()
-  set(QT5_LIBRARIES_ABI)
-  foreach(QT5_MODULE ${QT5_LIBRARIES})
-    list(APPEND QT5_LIBRARIES_ABI "${QT5_MODULE}_${CMAKE_ANDROID_ARCH_ABI}")
-  endforeach()
-  pkg_check_modules(QT5_PKG_CONFIG REQUIRED ${QT5_LIBRARIES_ABI})
-endif()
-
-get_target_property(QMAKE_IMPORTED_LOCATION Qt5::qmake IMPORTED_LOCATION)
-get_filename_component(QT_INSTALL_PREFIX "${QMAKE_IMPORTED_LOCATION}/../.." ABSOLUTE)
-
-if(APPLE AND NOT STATIC)
-  set(CMAKE_BUILD_RPATH "${QT_INSTALL_PREFIX}/lib")
-endif()
-
-if(QT5_PKG_CONFIG_FOUND)
-  set(QT5_PKG_CONFIG "QT5_PKG_CONFIG")
-  if(STATIC)
-    set(QT5_PKG_CONFIG "${QT5_PKG_CONFIG}_STATIC")
-  endif()
-
-  if(UNIX AND CMAKE_PREFIX_PATH)
-    if(APPLE)
-      list(JOIN ${QT5_PKG_CONFIG}_LDFLAGS_OTHER " " ${QT5_PKG_CONFIG}_LDFLAGS_OTHER)
-    endif()
-    # temporal workaround for https://bugreports.qt.io/browse/QTBUG-80922
-    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${QT_INSTALL_PREFIX}" ${QT5_PKG_CONFIG}_LDFLAGS_OTHER "${${QT5_PKG_CONFIG}_LDFLAGS_OTHER}")
-    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${QT_INSTALL_PREFIX}" ${QT5_PKG_CONFIG}_LIBRARIES "${${QT5_PKG_CONFIG}_LIBRARIES}")
-    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${QT_INSTALL_PREFIX}" ${QT5_PKG_CONFIG}_INCLUDE_DIRS "${${QT5_PKG_CONFIG}_INCLUDE_DIRS}")
-    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${QT_INSTALL_PREFIX}" ${QT5_PKG_CONFIG}_LIBRARY_DIRS "${${QT5_PKG_CONFIG}_LIBRARY_DIRS}")
-  endif()
-
-  set(QT5_LIBRARIES ${${QT5_PKG_CONFIG}_LIBRARIES} ${${QT5_PKG_CONFIG}_LDFLAGS_OTHER})
-  include_directories(${${QT5_PKG_CONFIG}_INCLUDE_DIRS})
-  link_directories(${${QT5_PKG_CONFIG}_LIBRARY_DIRS})
-endif()
-
-list(APPEND QT5_LIBRARIES
-  ${Qt5Gui_PLUGINS}
-  ${Qt5Svg_PLUGINS}
-  ${Qt5Qml_PLUGINS}
-  ${Qt5Network_PLUGINS}
-)
-
-if(STATIC)
-  set(QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/Qt/labs/folderlistmodel)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/Qt/labs/settings)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtGraphicalEffects)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtGraphicalEffects/private)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtMultimedia)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQml)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQml/Models.2)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick.2)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Controls)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Controls.2)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Dialogs)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Dialogs/Private)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Layouts)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/PrivateWidgets)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Templates.2)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Window.2)
-  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/XmlListModel)
-
-  set(QT5_EXTRA_LIBRARIES_LIST
-    qtquicktemplates2plugin
-    Qt5QuickTemplates2
-    qtquickcontrols2plugin
-    Qt5QuickControls2
-    dialogplugin
-    dialogsprivateplugin
-    qmlfolderlistmodelplugin
-    qmlsettingsplugin
-    qmlxmllistmodelplugin
-    qquicklayoutsplugin
-    modelsplugin
-  )
-
-  if(WITH_SCANNER)
-    list(APPEND QT5_EXTRA_LIBRARIES_LIST
-      declarative_multimedia
-      Qt5MultimediaQuick_p
-    )
-  endif()
-
-  list(APPEND QT5_EXTRA_LIBRARIES_LIST
-    qtgraphicaleffectsplugin
-    qtgraphicaleffectsprivate
-    qtquick2plugin
-    qtquickcontrolsplugin
-    widgetsplugin
-    windowplugin
-  )
-
-  if(NOT ${Qt5Core_VERSION} VERSION_LESS 5.14)
-     list(APPEND QT5_EXTRA_LIBRARIES_LIST qmlplugin)
-  endif()
-
-  set(QT5_EXTRA_LIBRARIES)
-  foreach(LIBRARY ${QT5_EXTRA_LIBRARIES_LIST})
-    find_library(${LIBRARY}_LIBRARY ${LIBRARY} PATHS ${QT5_EXTRA_PATHS} REQUIRED)
-    list(APPEND QT5_EXTRA_LIBRARIES ${${LIBRARY}_LIBRARY})
-  endforeach()
-
-  if(MINGW)
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-      list(APPEND QT5_EXTRA_LIBRARIES D3D11 Dwrite D2d1)
-    endif()
-  endif()
-
-  set(QT5_LIBRARIES
-    ${QT5_EXTRA_LIBRARIES}
-    ${QT5_LIBRARIES}
-  )
-
-  set(QT5_INTEGRATION_LIBRARIES_LIST
-    Qt5EventDispatcherSupport
-    Qt5PacketProtocol
-    Qt5ThemeSupport
-    Qt5FontDatabaseSupport
-  )
-
-  if(UNIX AND NOT APPLE)
-    list(APPEND QT5_INTEGRATION_LIBRARIES_LIST
-      Qt5XcbQpa
-      Qt5ServiceSupport
-      Qt5GlxSupport
-    )
-  elseif(MINGW)
-    list(APPEND QT5_INTEGRATION_LIBRARIES_LIST qtfreetype)
-  endif()
-
-  foreach(LIBRARY ${QT5_INTEGRATION_LIBRARIES_LIST})
-    find_library(${LIBRARY}_LIBRARY ${LIBRARY} PATHS ${QT5_EXTRA_PATHS} REQUIRED)
-    list(APPEND QT5_LIBRARIES ${${LIBRARY}_LIBRARY})
-  endforeach()
-
-  if(UNIX AND NOT APPLE)
-    pkg_check_modules(X11XCB_XCBGLX REQUIRED x11-xcb xcb-glx)
-    list(APPEND QT5_LIBRARIES ${X11XCB_XCBGLX_LIBRARIES})
-    pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
-    list(APPEND QT5_LIBRARIES ${FONTCONFIG_STATIC_LIBRARIES})
-  endif()
-endif()
-
-if(ANDROID)
-  set(QT5_EXTRA_LIBRARIES_LIST
-    GLESv2
-    log
-    z
-    jnigraphics
-    android
-    EGL
-    Qt5VirtualKeyboard_${CMAKE_ANDROID_ARCH_ABI}
-    c++_shared
-  )
-  foreach(LIBRARY ${QT5_EXTRA_LIBRARIES_LIST})
-    find_library(${LIBRARY}_LIBRARY ${LIBRARY} PATHS "${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/${ANDROID_PLATFORM_LEVEL}" REQUIRED)
-    list(APPEND QT5_LIBRARIES ${${LIBRARY}_LIBRARY})
-  endforeach()
-endif()
-
-message(STATUS "Using Boost include dir at ${Boost_INCLUDE_DIRS}")
-message(STATUS "Using Boost libraries at ${Boost_LIBRARIES}")
-
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-if(MINGW)
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
-  set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32;bcrypt)
-  if(DEPENDS)
-    set(ICU_LIBRARIES icuio icui18n icuuc icudata icutu iconv)
-  else()
-    set(ICU_LIBRARIES icuio icuin icuuc icudt icutu iconv)
-  endif()
-elseif(APPLE)
-  set(EXTRA_LIBRARIES "-framework AppKit")
-elseif(OPENBSD OR ANDROID)
-  set(EXTRA_LIBRARIES "")
-elseif(FREEBSD)
-  set(EXTRA_LIBRARIES execinfo)
-elseif(DRAGONFLY)
-  find_library(COMPAT compat)
-  set(EXTRA_LIBRARIES execinfo ${COMPAT})
-elseif(CMAKE_SYSTEM_NAME MATCHES "(SunOS|Solaris)")
-  set(EXTRA_LIBRARIES socket nsl resolv)
-elseif(NOT MSVC AND NOT DEPENDS)
-  find_library(RT rt)
-  set(EXTRA_LIBRARIES ${RT})
-endif()
-
-list(APPEND EXTRA_LIBRARIES ${CMAKE_DL_LIBS})
-
-if(APPLE)
-  include_directories(SYSTEM /usr/include/malloc)
-  if(POLICY CMP0042)
-    cmake_policy(SET CMP0042 NEW)
-  endif()
-endif()
-
-if (APPLE AND NOT IOS)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -fvisibility=default -std=c++11")
-endif()
-
-if(APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default -DGTEST_HAS_TR1_TUPLE=0")
-endif()
-
-# warnings
-add_c_flag_if_supported(-Werror C_SECURITY_FLAGS)
-add_cxx_flag_if_supported(-Werror CXX_SECURITY_FLAGS)
-add_c_flag_if_supported(-Wformat C_SECURITY_FLAGS)
-add_cxx_flag_if_supported(-Wformat CXX_SECURITY_FLAGS)
-add_c_flag_if_supported(-Wformat-security C_SECURITY_FLAGS)
-add_cxx_flag_if_supported(-Wformat-security CXX_SECURITY_FLAGS)
-
-# -fstack-protector
-if (NOT OPENBSD AND NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1)))
-  add_c_flag_if_supported(-fstack-protector C_SECURITY_FLAGS)
-  add_cxx_flag_if_supported(-fstack-protector CXX_SECURITY_FLAGS)
-  add_c_flag_if_supported(-fstack-protector-strong C_SECURITY_FLAGS)
-  add_cxx_flag_if_supported(-fstack-protector-strong CXX_SECURITY_FLAGS)
-endif()
-
-# New in GCC 8.2
-if (NOT OPENBSD AND NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1)))
-  add_c_flag_if_supported(-fcf-protection=full C_SECURITY_FLAGS)
-  add_cxx_flag_if_supported(-fcf-protection=full CXX_SECURITY_FLAGS)
-endif()
-if (NOT WIN32 AND NOT OPENBSD)
-  add_c_flag_if_supported(-fstack-clash-protection C_SECURITY_FLAGS)
-  add_cxx_flag_if_supported(-fstack-clash-protection CXX_SECURITY_FLAGS)
-endif()
-
-# Removed in GCC 9.1 (or before ?), but still accepted, so spams the output
-if (NOT (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1))
-  add_c_flag_if_supported(-mmitigate-rop C_SECURITY_FLAGS)
-  add_cxx_flag_if_supported(-mmitigate-rop CXX_SECURITY_FLAGS)
-endif()
-
-# linker
-if (APPLE)
-  add_linker_flag_if_supported(-Wl,-bind_at_load LD_SECURITY_FLAGS)
-  add_linker_flag_if_supported(-Wl,-dead_strip LD_SECURITY_FLAGS)
-  add_linker_flag_if_supported(-Wl,-dead_strip_dylibs LD_SECURITY_FLAGS)
-endif()
-if (NOT APPLE AND NOT (WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "GNU"))
-  # Windows binaries die on startup with PIE when compiled with GCC
-  add_linker_flag_if_supported(-pie LD_SECURITY_FLAGS)
-endif()
-add_linker_flag_if_supported(-Wl,-z,relro LD_SECURITY_FLAGS)
-add_linker_flag_if_supported(-Wl,-z,now LD_SECURITY_FLAGS)
-add_linker_flag_if_supported(-Wl,-z,noexecstack noexecstack_SUPPORTED)
-if (noexecstack_SUPPORTED)
-  set(LD_SECURITY_FLAGS "${LD_SECURITY_FLAGS} -Wl,-z,noexecstack")
-endif()
-add_linker_flag_if_supported(-Wl,-z,noexecheap noexecheap_SUPPORTED)
-if (noexecheap_SUPPORTED)
-  set(LD_SECURITY_FLAGS "${LD_SECURITY_FLAGS} -Wl,-z,noexecheap")
-endif()
-
-# some windows linker bits
-if (WIN32)
-  add_linker_flag_if_supported(-Wl,--dynamicbase LD_SECURITY_FLAGS)
-  add_linker_flag_if_supported(-Wl,--nxcompat LD_SECURITY_FLAGS)
-  add_linker_flag_if_supported(-Wl,--high-entropy-va LD_SECURITY_FLAGS)
-endif()
-
-if(STATIC)
-  add_linker_flag_if_supported(-static-libgcc STATIC_FLAGS)
-  add_linker_flag_if_supported(-static-libstdc++ STATIC_FLAGS)
-  if(MINGW)
-    add_linker_flag_if_supported(-static STATIC_FLAGS)
-  endif()
-endif()
-
-# With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
-# is fixed in the code (Issue #847), force compiler to be conservative.
-add_c_flag_if_supported(-fno-strict-aliasing C_SECURITY_FLAGS)
-add_cxx_flag_if_supported(-fno-strict-aliasing CXX_SECURITY_FLAGS)
-
-add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
-add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-
-message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
-message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
-message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-
-if (HIDAPI_FOUND OR LibUSB_COMPILE_TEST_PASSED)
-  if (APPLE)
-    if(DEPENDS)
-      list(APPEND EXTRA_LIBRARIES "-framework Foundation -framework IOKit")
-    else()
-      find_library(COREFOUNDATION CoreFoundation)
-      find_library(IOKIT IOKit)
-      list(APPEND EXTRA_LIBRARIES ${IOKIT})
-      list(APPEND EXTRA_LIBRARIES ${COREFOUNDATION})
-    endif()
-  endif()
-  if (WIN32)
-    find_library(VERSION_LIBRARY version PATHS /usr/x86_64-w64-mingw32/lib)
-    if(VERSION_LIBRARY STREQUAL "VERSION_LIBRARY-NOTFOUND")
-      set(VERSION_LIBRARY Version)
-    endif()
-    list(APPEND EXTRA_LIBRARIES setupapi ${VERSION_LIBRARY})
-  endif()
-endif()
-
-add_subdirectory(external)
-add_subdirectory(translations)
-add_subdirectory(src)
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -1,42 +0,0 @@
-# macOS:
-
-Use macOS 10.12 - 10.13 for better backwards compability.
-
-1. `HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" brew install boost zmq libpgm miniupnpc libsodium expat libunwind-headers protobuf libgcrypt hidapi`
-
-2. Get the latest LTS from here: https://www.qt.io/offline-installers and install
-
-3. `git clone --recursive -b v0.X.Y.Z --depth 1 https://github.com/monero-project/monero-gui` 
-
-4. `CMAKE_PREFIX_PATH=~/Qt5.12.8/5.12.8/clang_64 make release`
-
-5. `cd build/release && make deploy`
-
-6. Replace the `monerod` binary inside `monero-wallet-gui.app/Contents/MacOS/` with one built using deterministic builds / gitian.
-
-## Codesigning and notarizing
-
-1. Save the following text as `entitlements.plist`
-
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>com.apple.security.cs.disable-executable-page-protection</key>
-        <true/>
-</dict>
-</plist>
-```
-
-2. `codesign --deep --force --verify --verbose --options runtime --timestamp --entitlements entitlements.plist --sign 'XXXXXXXXXX' monero-wallet-gui.app`
-
-You can check if this step worked by using `codesign -dvvv monero-wallet-gui.app`
-
-3. `hdiutil create -fs HFS+ -srcfolder monero-gui-v0.X.Y.Z -volname monero-wallet-gui monero-gui-mac-x64-v0.X.Y.Z.dmg`
-
-4. `xcrun altool -t osx --file monero-gui-mac-x64-v0.X.Y.Z.dmg --primary-bundle-id org.monero-project.monero-wallet-gui.dmg --notarize-app --username email@address.org`
-
-5. `xcrun altool --notarization-info aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee -u email@address.org`
-
-6. `xcrun stapler staple -v monero-gui-mac-x64-v0.X.Y.Z.dmg`
--- a/Dockerfile.android
+++ b/Dockerfile.android
@@ -1,207 +0,0 @@
-FROM debian:stretch
-
-ARG THREADS=1
-ARG ANDROID_NDK_REVISION=21d
-ARG ANDROID_NDK_HASH=bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d
-ARG ANDROID_SDK_REVISION=4333796
-ARG ANDROID_SDK_HASH=92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
-ARG QT_VERSION=5.15.2
-
-WORKDIR /opt/android
-ENV WORKDIR=/opt/android
-
-ENV ANDROID_NATIVE_API_LEVEL=28
-ENV ANDROID_API=android-${ANDROID_NATIVE_API_LEVEL}
-ENV ANDROID_CLANG=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang
-ENV ANDROID_CLANGPP=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang++
-ENV ANDROID_NDK_ROOT=${WORKDIR}/android-ndk-r${ANDROID_NDK_REVISION}
-ENV ANDROID_SDK_ROOT=${WORKDIR}/tools
-ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-ENV PATH=${JAVA_HOME}/bin:${PATH}
-ENV PREFIX=${WORKDIR}/prefix
-ENV TOOLCHAIN_DIR=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
-
-RUN apt-get update \
-    && apt-get install -y ant automake build-essential ca-certificates-java file gettext git libc6 libncurses5 \
-    libssl-dev libstdc++6 libtinfo5 libtool libz1 openjdk-8-jdk-headless openjdk-8-jre-headless pkg-config python3 \
-    unzip wget
-
-RUN wget -q https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_REVISION}.zip \
-    && unzip -q sdk-tools-linux-${ANDROID_SDK_REVISION}.zip \
-    && rm -f sdk-tools-linux-${ANDROID_SDK_REVISION}.zip
-
-RUN wget -q https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip \
-    && unzip -q android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip \
-    && rm -f android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip
-
-RUN cd ${ANDROID_SDK_ROOT} && echo y | ./bin/sdkmanager "platform-tools" "platforms;${ANDROID_API}" "tools" > /dev/null
-RUN cp -r ${WORKDIR}/platforms ${WORKDIR}/platform-tools ${ANDROID_SDK_ROOT}
-
-ENV HOST_PATH=${PATH}
-ENV PATH=${TOOLCHAIN_DIR}/aarch64-linux-android/bin:${TOOLCHAIN_DIR}/bin:${PATH}
-
-ARG ZLIB_VERSION=1.2.11
-ARG ZLIB_HASH=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
-RUN wget -q https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \
-    && tar -xzf zlib-${ZLIB_VERSION}.tar.gz \
-    && rm zlib-${ZLIB_VERSION}.tar.gz \
-    && cd zlib-${ZLIB_VERSION} \
-    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --prefix=${PREFIX} --static \
-    && make -j${THREADS} \
-    && make -j${THREADS} install \
-    && rm -rf $(pwd)
-
-RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 \
-    && cd qt5 \
-    && perl init-repository --module-subset=default,-qtwebengine \
-    && PATH=${HOST_PATH} ./configure -v -developer-build -release \
-    -xplatform android-clang \
-    -android-ndk-platform ${ANDROID_API} \
-    -android-ndk ${ANDROID_NDK_ROOT} \
-    -android-sdk ${ANDROID_SDK_ROOT} \
-    -android-ndk-host linux-x86_64 \
-    -no-dbus \
-    -opengl es2 \
-    -no-use-gold-linker \
-    -no-sql-mysql \
-    -opensource -confirm-license \
-    -android-arch arm64-v8a \
-    -prefix ${PREFIX} \
-    -nomake tools -nomake tests -nomake examples \
-    -skip qtwebengine \
-    -skip qtserialport \
-    -skip qtconnectivity \
-    -skip qttranslations \
-    -skip qtpurchasing \
-    -skip qtgamepad -skip qtscript -skip qtdoc \
-    -no-warnings-are-errors \
-    && sed -i '213,215d' qtbase/src/3rdparty/pcre2/src/sljit/sljitConfigInternal.h \
-    && PATH=${HOST_PATH} make -j${THREADS} \
-    && PATH=${HOST_PATH} make -j${THREADS} install \
-    && cd qttools/src/linguist/lrelease \
-    && ../../../../qtbase/bin/qmake \
-    && PATH=${HOST_PATH} make -j${THREADS} install \
-    && cd ../../../.. \
-    && rm -rf $(pwd)
-
-ARG ICONV_VERSION=1.16
-ARG ICONV_HASH=e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
-RUN wget -q http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz \
-    && echo "${ICONV_HASH}  libiconv-${ICONV_VERSION}.tar.gz" | sha256sum -c \
-    && tar -xzf libiconv-${ICONV_VERSION}.tar.gz \
-    && rm -f libiconv-${ICONV_VERSION}.tar.gz \
-    && cd libiconv-${ICONV_VERSION} \
-    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --build=x86_64-linux-gnu --host=aarch64 --prefix=${PREFIX} --disable-rpath \
-    && make -j${THREADS} \
-    && make -j${THREADS} install
-
-ARG BOOST_VERSION=1_74_0
-ARG BOOST_VERSION_DOT=1.74.0
-ARG BOOST_HASH=83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1
-RUN wget -q https://dl.bintray.com/boostorg/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
-    && echo "${BOOST_HASH}  boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \
-    && tar -xf boost_${BOOST_VERSION}.tar.bz2 \
-    && rm -f boost_${BOOST_VERSION}.tar.bz2 \
-    && cd boost_${BOOST_VERSION} \
-    && PATH=${HOST_PATH} ./bootstrap.sh --prefix=${PREFIX} \
-    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} ./b2 --build-type=minimal link=static runtime-link=static \
-    --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization \
-    --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi \
-    threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} \
-    cflags='--target=aarch64-linux-android' \
-    cxxflags='--target=aarch64-linux-android' \
-    linkflags='--target=aarch64-linux-android --sysroot=${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm64 ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so -nostdlib++' \
-    install -j${THREADS} \
-    && rm -rf $(pwd)
-
-ARG OPENSSL_VERSION=1.1.1g
-ARG OPENSSL_HASH=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
-RUN wget -q https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
-    && tar -xzf openssl-${OPENSSL_VERSION}.tar.gz \
-    && rm openssl-${OPENSSL_VERSION}.tar.gz \
-    && cd openssl-${OPENSSL_VERSION} \
-    && ANDROID_NDK_HOME=${ANDROID_NDK_ROOT} ./Configure CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} \
-    android-arm64 no-asm no-shared --static \
-    --with-zlib-include=${PREFIX}/include --with-zlib-lib=${PREFIX}/lib \
-    --prefix=${PREFIX} --openssldir=${PREFIX} \
-    && sed -i 's/CNF_EX_LIBS=-ldl -pthread//g;s/BIN_CFLAGS=-pie $(CNF_CFLAGS) $(CFLAGS)//g' Makefile \
-    && ANDROID_NDK_HOME=${ANDROID_NDK_ROOT} make -j${THREADS} \
-    && make -j${THREADS} install \
-    && rm -rf $(pwd)
-
-ARG ZMQ_VERSION=v4.3.3
-ARG ZMQ_HASH=04f5bbedee58c538934374dc45182d8fc5926fa3
-RUN git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} --depth 1 \
-    && cd libzmq \
-    && git checkout ${ZMQ_HASH} \
-    && ./autogen.sh \
-    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --prefix=${PREFIX} --host=aarch64-linux-android \
-    --enable-static --disable-shared \
-    && make -j${THREADS} \
-    && make -j${THREADS} install \
-    && rm -rf $(pwd)
-
-ARG SODIUM_VERSION=1.0.18
-ARG SODIUM_HASH=4f5e89fa84ce1d178a6765b8b46f2b6f91216677
-RUN set -ex \
-    && git clone https://github.com/jedisct1/libsodium.git -b ${SODIUM_VERSION} --depth 1 \
-    && cd libsodium \
-    && test `git rev-parse HEAD` = ${SODIUM_HASH} || exit 1 \
-    && ./autogen.sh \
-    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --prefix=${PREFIX} --host=aarch64-linux-android --enable-static --disable-shared \
-    && make -j${THREADS} install \
-    && rm -rf $(pwd)
-
-RUN git clone -b libgpg-error-1.38 --depth 1 git://git.gnupg.org/libgpg-error.git \
-    && cd libgpg-error \
-    && git reset --hard 71d278824c5fe61865f7927a2ed1aa3115f9e439 \
-    && ./autogen.sh \
-    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --host=aarch64-linux-android --prefix=${PREFIX} --disable-rpath --disable-shared --enable-static --disable-doc --disable-tests \
-    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} make -j${THREADS} \
-    && make -j${THREADS} install \
-    && rm -rf $(pwd)
-
-RUN git clone -b libgcrypt-1.8.5 --depth 1 git://git.gnupg.org/libgcrypt.git \
-    && cd libgcrypt \
-    && git reset --hard 56606331bc2a80536db9fc11ad53695126007298 \
-    && ./autogen.sh \
-    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --host=aarch64-linux-android --prefix=${PREFIX} --with-gpg-error-prefix=${PREFIX} --disable-shared --enable-static --disable-doc --disable-tests \
-    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} make -j${THREADS} \
-    && make -j${THREADS} install \
-    && rm -rf $(pwd)
-
-RUN cd tools \
-    && wget -q http://dl-ssl.google.com/android/repository/tools_r25.2.5-linux.zip \
-    && unzip -q tools_r25.2.5-linux.zip \
-    && rm -f tools_r25.2.5-linux.zip \
-    && echo y | ${ANDROID_SDK_ROOT}/tools/android update sdk --no-ui --all --filter build-tools-28.0.3
-
-RUN git clone -b v3.19.7 --depth 1 https://github.com/Kitware/CMake \
-    && cd CMake \
-    && git reset --hard 22612dd53a46c7f9b4c3f4b7dbe5c78f9afd9581 \
-    && PATH=${HOST_PATH} ./bootstrap \
-    && PATH=${HOST_PATH} make -j${THREADS} \
-    && PATH=${HOST_PATH} make -j${THREADS} install \
-    && rm -rf $(pwd)
-
-CMD set -ex \
-    && cd /monero-gui \
-    && mkdir -p build/Android/release \
-    && cd build/Android/release \
-    && cmake \
-    -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake" \
-    -DCMAKE_PREFIX_PATH="${PREFIX}" \
-    -DCMAKE_FIND_ROOT_PATH="${PREFIX}" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DARCH="armv8-a" \
-    -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} \
-    -DANDROID_ABI="arm64-v8a" \
-    -DANDROID_TOOLCHAIN=clang \
-    -DBoost_USE_STATIC_RUNTIME=ON \
-    -DLRELEASE_PATH="${PREFIX}/bin" \
-    -DQT_ANDROID_APPLICATION_BINARY="monero-wallet-gui" \
-    -DWITH_SCANNER=ON \
-    ../../.. \
-    && PATH=${HOST_PATH} make generate_translations_header \
-    && make -j${THREADS} -C src \
-    && make -j${THREADS} apk
--- a/Dockerfile.linux
+++ b/Dockerfile.linux
@@ -1,284 +0,0 @@
-FROM ubuntu:16.04
-
-ARG THREADS=1
-ARG QT_VERSION=5.15.2
-
-ENV CFLAGS="-fPIC"
-ENV CPPFLAGS="-fPIC"
-ENV CXXFLAGS="-fPIC"
-ENV SOURCE_DATE_EPOCH=1397818193
-
-RUN apt update
-
-RUN apt install -y automake git pkg-config python xutils-dev && \
-    git clone -b xorgproto-2020.1 --depth 1 https://gitlab.freedesktop.org/xorg/proto/xorgproto && \
-    cd xorgproto && \
-    git reset --hard c62e8203402cafafa5ba0357b6d1c019156c9f36 && \
-    ./autogen.sh && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b 1.12 --depth 1 https://gitlab.freedesktop.org/xorg/proto/xcbproto && \
-    cd xcbproto && \
-    git reset --hard 6398e42131eedddde0d98759067dde933191f049 && \
-    ./autogen.sh && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN apt install -y libtool-bin && \
-    git clone -b libXau-1.0.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxau && \
-    cd libxau && \
-    git reset --hard d9443b2c57b512cfb250b35707378654d86c7dea && \
-    ./autogen.sh --enable-shared --disable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN apt install -y libpthread-stubs0-dev && \
-    git clone -b 1.12 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb && \
-    cd libxcb && \
-    git reset --hard d34785a34f28fa6a00f8ce00d87e3132ff0f6467 && \
-    ./autogen.sh --enable-shared --disable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    make -j$THREADS clean && \
-    rm /usr/local/lib/libxcb-xinerama.so && \
-    ./autogen.sh --disable-shared --enable-static && \
-    make -j$THREADS && \
-    cp src/.libs/libxcb-xinerama.a /usr/local/lib/ && \
-    rm -rf $(pwd)
-
-RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-util && \
-    cd libxcb-util && \
-    git reset --hard acf790d7752f36e450d476ad79807d4012ec863b && \
-    git submodule init && \
-    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
-    git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
-    ./autogen.sh --enable-shared --disable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-image && \
-    cd libxcb-image && \
-    git reset --hard d882052fb2ce439c6483fce944ba8f16f7294639 && \
-    git submodule init && \
-    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
-    git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
-    ./autogen.sh --enable-shared --disable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms && \
-    cd libxcb-keysyms && \
-    git reset --hard 0e51ee5570a6a80bdf98770b975dfe8a57f4eeb1 && \
-    git submodule init && \
-    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
-    git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
-    ./autogen.sh --enable-shared --disable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b 0.3.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util && \
-    cd libxcb-render-util && \
-    git reset --hard 0317caf63de532fd7a0493ed6afa871a67253747 && \
-    git submodule init && \
-    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
-    git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
-    ./autogen.sh --enable-shared --disable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b 0.4.1 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-wm && \
-    cd libxcb-wm && \
-    git reset --hard 24eb17df2e1245885e72c9d4bbb0a0f69f0700f2 && \
-    git submodule init && \
-    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
-    git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
-    ./autogen.sh --enable-shared --disable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN apt install -y bison && \
-    git clone -b xkbcommon-0.5.0 --depth 1 https://github.com/xkbcommon/libxkbcommon && \
-    cd libxkbcommon && \
-    git reset --hard c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 && \
-    ./autogen.sh --prefix=/usr --enable-shared --disable-static --enable-x11 --disable-docs && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b v1.2.11 --depth 1 https://github.com/madler/zlib && \
-    cd zlib && \
-    git reset --hard cacf7f1d4e3d44d871b605da3b647f07d718623f && \
-    ./configure --static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b VER-2-10-2 --depth 1 https://git.savannah.gnu.org/git/freetype/freetype2.git && \
-    cd freetype2 && \
-    git reset --hard 132f19b779828b194b3fede187cee719785db4d8 && \
-    ./autogen.sh && \
-    ./configure --disable-shared --enable-static --with-zlib=no && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b R_2_2_9 --depth 1 https://github.com/libexpat/libexpat && \
-    cd libexpat/expat && \
-    git reset --hard a7bc26b69768f7fb24f0c7976fae24b157b85b13 && \
-    ./buildconf.sh && \
-    ./configure --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN apt install -y autopoint gettext gperf libpng12-dev && \
-    git clone -b 2.13.92 --depth 1 https://gitlab.freedesktop.org/fontconfig/fontconfig && \
-    cd fontconfig && \
-    git reset --hard b1df1101a643ae16cdfa1d83b939de2497b1bf27 && \
-    ./autogen.sh --disable-shared --enable-static --sysconfdir=/etc --localstatedir=/var && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b release-64-2 --depth 1 https://github.com/unicode-org/icu && \
-    cd icu/icu4c/source && \
-    git reset --hard e2d85306162d3a0691b070b4f0a73e4012433444 && \
-    ./configure --disable-shared --enable-static --disable-tests --disable-samples && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN apt install -y wget && \
-    wget https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz && \
-    echo "9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf boost_1_73_0.tar.gz" | sha256sum -c && \
-    tar -xzf boost_1_73_0.tar.gz && \
-    rm boost_1_73_0.tar.gz && \
-    cd boost_1_73_0 && \
-    ./bootstrap.sh && \
-    ./b2 --with-atomic --with-system --with-filesystem --with-thread --with-date_time --with-chrono --with-regex --with-serialization --with-program_options --with-locale variant=release link=static runtime-link=static cflags="${CFLAGS}" cxxflags="${CXXFLAGS}" install -a --prefix=/usr && \
-    rm -rf $(pwd)
-
-RUN wget https://www.openssl.org/source/openssl-1.1.1g.tar.gz && \
-    echo "ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 openssl-1.1.1g.tar.gz" | sha256sum -c && \
-    tar -xzf openssl-1.1.1g.tar.gz && \
-    rm openssl-1.1.1g.tar.gz && \
-    cd openssl-1.1.1g && \
-    ./config no-asm no-shared no-zlib-dynamic --openssldir=/usr && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN apt install -y libgl1-mesa-dev libglib2.0-dev mesa-common-dev && \
-    rm /usr/lib/x86_64-linux-gnu/libX11.a && \
-    rm /usr/lib/x86_64-linux-gnu/libXext.a && \
-    rm /usr/lib/x86_64-linux-gnu/libX11-xcb.a && \
-    git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
-    cd qt5 && \
-    git clone git://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtdeclarative.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtgraphicaleffects.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtimageformats.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtmultimedia.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtquickcontrols.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtquickcontrols2.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtsvg.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qttools.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qttranslations.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtx11extras.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtxmlpatterns.git -b ${QT_VERSION} --depth 1 && \
-    sed -ri s/\(Libs:.*\)/\\1\ -lexpat/ /usr/local/lib/pkgconfig/fontconfig.pc && \
-    sed -ri s/\(Libs:.*\)/\\1\ -lz/ /usr/local/lib/pkgconfig/freetype2.pc && \
-    sed -ri s/\(Libs:.*\)/\\1\ -lXau/ /usr/local/lib/pkgconfig/xcb.pc && \
-    sed -i s/\\/usr\\/X11R6\\/lib64/\\/usr\\/local\\/lib/ qtbase/mkspecs/linux-g++-64/qmake.conf && \
-    ./configure --prefix=/usr -platform linux-g++-64 -opensource -confirm-license -release -static -no-avx \
-    -opengl desktop -qpa xcb -xcb -xcb-xlib -feature-xlib -system-freetype -fontconfig -glib \
-    -no-dbus -no-feature-qml-worker-script -no-linuxfb -no-openssl -no-sql-sqlite -no-kms -no-use-gold-linker \
-    -qt-harfbuzz -qt-libjpeg -qt-libpng -qt-pcre -qt-zlib \
-    -skip qt3d -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d \
-    -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtmacextras -skip qtnetworkauth -skip qtpurchasing \
-    -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttools \
-    -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview \
-    -skip qtwinextras -skip qtx11extras -skip gamepad -skip serialbus -skip location -skip webengine \
-    -nomake examples -nomake tests -nomake tools && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    cd qttools/src/linguist/lrelease && \
-    ../../../../qtbase/bin/qmake && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    cd ../../../.. && \
-    rm -rf $(pwd)
-
-RUN apt install -y libudev-dev && \
-    git clone -b v1.0.23 --depth 1 https://github.com/libusb/libusb && \
-    cd libusb && \
-    git reset --hard e782eeb2514266f6738e242cdcb18e3ae1ed06fa && \
-    ./autogen.sh --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b hidapi-0.9.0 --depth 1 https://github.com/libusb/hidapi && \
-    cd hidapi && \
-    git reset --hard 7da5cc91fc0d2dbe4df4f08cd31f6ca1a262418f && \
-    ./bootstrap && \
-    ./configure --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN apt install -y libsodium-dev && \
-    git clone -b v4.3.2 --depth 1 https://github.com/zeromq/libzmq && \
-    cd libzmq && \
-    git reset --hard a84ffa12b2eb3569ced199660bac5ad128bff1f0 && \
-    ./autogen.sh && \
-    ./configure --disable-shared --enable-static --disable-libunwind --with-libsodium && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b libgpg-error-1.38 --depth 1 git://git.gnupg.org/libgpg-error.git && \
-    cd libgpg-error && \
-    git reset --hard 71d278824c5fe61865f7927a2ed1aa3115f9e439 && \
-    ./autogen.sh && \
-    ./configure --disable-shared --enable-static --disable-doc --disable-tests && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b libgcrypt-1.8.5 --depth 1 git://git.gnupg.org/libgcrypt.git && \
-    cd libgcrypt && \
-    git reset --hard 56606331bc2a80536db9fc11ad53695126007298 && \
-    ./autogen.sh && \
-    ./configure --disable-shared --enable-static --disable-doc && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b v3.10.0 --depth 1 https://github.com/protocolbuffers/protobuf && \
-    cd protobuf && \
-    git reset --hard 6d4e7fd7966c989e38024a8ea693db83758944f1 && \
-    ./autogen.sh && \
-    ./configure --enable-static --disable-shared && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b v3.18.4 --depth 1 https://github.com/Kitware/CMake && \
-    cd CMake && \
-    git reset --hard 3cc3d42aba879fff5e85b363ae8f21386a3f9f9b && \
-    ./bootstrap && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN apt install -y libusb-1.0-0-dev
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -1,82 +0,0 @@
-FROM ubuntu:20.04
-
-ARG THREADS=1
-ARG QT_VERSION=5.15.2
-ENV SOURCE_DATE_EPOCH=1397818193
-
-RUN apt update && \
-    DEBIAN_FRONTEND=noninteractive apt install -y build-essential cmake g++-mingw-w64 gettext git libtool pkg-config \
-    python && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN update-alternatives --set x86_64-w64-mingw32-g++ $(which x86_64-w64-mingw32-g++-posix) && \
-    update-alternatives --set x86_64-w64-mingw32-gcc $(which x86_64-w64-mingw32-gcc-posix)
-
-RUN git clone -b v0.17.0.0 --depth 1 https://github.com/monero-project/monero && \
-    cd monero && \
-    git reset --hard d27d4526fe89b7cdeb4b296280c4a6cf7efe21f8 && \
-    cp -a contrib/depends / && \
-    cd .. && \
-    rm -rf monero
-
-RUN make -j$THREADS -C /depends HOST=x86_64-w64-mingw32 NO_QT=1
-
-RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
-    cd qt5 && \
-    git clone git://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtdeclarative.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtgraphicaleffects.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtimageformats.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtmultimedia.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtquickcontrols.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtquickcontrols2.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtsvg.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qttools.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qttranslations.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtxmlpatterns.git -b ${QT_VERSION} --depth 1 && \
-    ./configure --prefix=/depends/x86_64-w64-mingw32 -xplatform win32-g++ \
-    -device-option CROSS_COMPILE=/usr/bin/x86_64-w64-mingw32- \
-    -I $(pwd)/qtbase/src/3rdparty/angle/include \
-    -opensource -confirm-license -release -static -static-runtime -opengl dynamic -no-angle \
-    -no-avx -no-openssl -no-sql-sqlite \
-    -no-feature-qml-worker-script -no-openssl -no-sql-sqlite \
-    -qt-freetype -qt-harfbuzz -qt-libjpeg -qt-libpng -qt-pcre -qt-zlib \
-    -skip gamepad -skip location -skip qt3d -skip qtactiveqt -skip qtandroidextras \
-    -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdoc \
-    -skip qtgamepad -skip qtlocation -skip qtmacextras -skip qtnetworkauth -skip qtpurchasing \
-    -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport \
-    -skip qtspeech -skip qttools -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel \
-    -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtwinextras -skip qtx11extras \
-    -skip serialbus -skip webengine \
-    -nomake examples -nomake tests -nomake tools && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    cd qttools/src/linguist/lrelease && \
-    ../../../../qtbase/bin/qmake && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    cd ../../../.. && \
-    rm -rf $(pwd)
-
-RUN git clone -b libgpg-error-1.38 --depth 1 git://git.gnupg.org/libgpg-error.git && \
-    cd libgpg-error && \
-    git reset --hard 71d278824c5fe61865f7927a2ed1aa3115f9e439 && \
-    ./autogen.sh && \
-    ./configure --disable-shared --enable-static --disable-doc --disable-tests \
-    --host=x86_64-w64-mingw32 --prefix=/depends/x86_64-w64-mingw32 && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    cd .. && \
-    rm -rf libgpg-error
-
-RUN git clone -b libgcrypt-1.8.5 --depth 1 git://git.gnupg.org/libgcrypt.git && \
-    cd libgcrypt && \
-    git reset --hard 56606331bc2a80536db9fc11ad53695126007298 && \
-    ./autogen.sh && \
-    ./configure --disable-shared --enable-static --disable-doc \
-    --host=x86_64-w64-mingw32 --prefix=/depends/x86_64-w64-mingw32 \
-    --with-gpg-error-prefix=/depends/x86_64-w64-mingw32 && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    cd .. && \
-    rm -rf libgcrypt
--- a/LeftPanel.qml
+++ b/LeftPanel.qml
@@ -40,17 +40,17 @@ import "components/effects/" as MoneroEffects
 Rectangle {
    id: panel

-    property int currentAccountIndex
-    property alias currentAccountLabel: accountLabel.text
-    property string balanceString: "?.??"
-    property string balanceUnlockedString: "?.??"
-    property string balanceFiatString: "?.??"
-    property string minutesToUnlock: ""
-    property bool isSyncing: false
+    property alias unlockedBalanceText: unlockedBalanceText.text
+    property alias unlockedBalanceVisible: unlockedBalanceText.visible
+    property alias unlockedBalanceLabelVisible: unlockedBalanceLabel.visible
+    property alias balanceLabelText: balanceLabel.text
+    property alias balanceText: balanceText.text
+    property alias balanceTextFiat: balanceTextFiat.text
+    property alias unlockedBalanceTextFiat: unlockedBalanceTextFiat.text
    property alias networkStatus : networkStatus
    property alias progressBar : progressBar
    property alias daemonProgressBar : daemonProgressBar
-
+    property alias minutesToUnlockTxt: unlockedBalanceLabel.text
    property int titleBarHeight: 50
    property string copyValue: ""
    Clipboard { id: clipboard }
@@ -58,9 +58,13 @@ Rectangle {
    signal historyClicked()
    signal transferClicked()
    signal receiveClicked()
-    signal advancedClicked()
+    signal txkeyClicked()
+    signal sharedringdbClicked()
    signal settingsClicked()
    signal addressBookClicked()
+    signal miningClicked()
+    signal signClicked()
+    signal merchantClicked()
    signal accountClicked()

    function selectItem(pos) {
@@ -68,14 +72,19 @@ Rectangle {
        if(pos === "History") menuColumn.previousButton = historyButton
        else if(pos === "Transfer") menuColumn.previousButton = transferButton
        else if(pos === "Receive")  menuColumn.previousButton = receiveButton
+        else if(pos === "Merchant")  menuColumn.previousButton = merchantButton
        else if(pos === "AddressBook") menuColumn.previousButton = addressBookButton
+        else if(pos === "Mining") menuColumn.previousButton = miningButton
+        else if(pos === "TxKey")  menuColumn.previousButton = txkeyButton
+        else if(pos === "SharedRingDB")  menuColumn.previousButton = sharedringdbButton
+        else if(pos === "Sign") menuColumn.previousButton = signButton
        else if(pos === "Settings") menuColumn.previousButton = settingsButton
        else if(pos === "Advanced") menuColumn.previousButton = advancedButton
        else if(pos === "Account") menuColumn.previousButton = accountButton
        menuColumn.previousButton.checked = true
    }

-    width: 300
+    width: (isMobile)? appWindow.width : 300
    color: "transparent"
    anchors.bottom: parent.bottom
    anchors.top: parent.top
@@ -99,18 +108,19 @@ Rectangle {
        visible: true
        z: 2
        id: column1
-        height: 175
+        height: 210
        anchors.left: parent.left
        anchors.right: parent.right
        anchors.top: parent.top
        anchors.topMargin: (persistentSettings.customDecorations)? 50 : 0

-        Item {
+        RowLayout {
            Item {
                anchors.left: parent.left
                anchors.top: parent.top
                anchors.topMargin: 20
                anchors.leftMargin: 20
+                anchors.verticalCenter: parent.verticalCenter
                height: 490
                width: 260

@@ -118,9 +128,9 @@ Rectangle {
                    id: card
                    visible: !isOpenGL || MoneroComponents.Style.blackTheme
                    width: 260
-                    height: 135
+                    height: 170
                    fillMode: Image.PreserveAspectFit
-                    source: MoneroComponents.Style.blackTheme ? "qrc:///images/card-background-black.png" : "qrc:///images/card-background-white.png"
+                    source: "qrc:///images/card-background.png"
                }

                DropShadow {
@@ -162,6 +172,57 @@ Rectangle {
                    color: "#ff9323"
                    themeTransition: false
                }
+
+                Rectangle {
+                    height: (logoutImage.height + 8)
+                    width: (logoutImage.width + 8)
+                    color: "transparent"
+                    anchors.right: parent.right
+                    anchors.rightMargin: 8
+                    anchors.top: parent.top
+                    anchors.topMargin: 25
+
+                    Image {
+                        id: logoutImage
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        height: 16
+                        width: 13
+                        source: "qrc:///images/logout.png"
+                    }
+
+                    MouseArea{
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: {
+                            middlePanel.addressBookView.clearFields();
+                            middlePanel.transferView.clearFields();
+                            middlePanel.receiveView.clearFields();
+                            appWindow.showWizard();
+                        }
+                    }
+                }
+                MoneroComponents.Label {
+                    fontSize: 20
+                    text: "¥"
+                    color: "white"
+                    visible: persistentSettings.fiatPriceEnabled
+                    anchors.right: parent.right
+                    anchors.rightMargin: 45
+                    anchors.top: parent.top
+                    anchors.topMargin: 28
+                    themeTransition: false
+
+                    MouseArea{
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: {
+                            persistentSettings.fiatPriceToggle = !persistentSettings.fiatPriceToggle
+                        }
+                    }
+                }
            }

            Item {
@@ -169,149 +230,181 @@ Rectangle {
                anchors.top: parent.top
                anchors.topMargin: 20
                anchors.leftMargin: 20
+                anchors.verticalCenter: parent.verticalCenter
                height: 490
                width: 50

-                MoneroComponents.Label {
-                    fontSize: 12
-                    id: accountIndex
-                    text: qsTr("Account") + translationManager.emptyString + " #" + currentAccountIndex
-                    color: MoneroComponents.Style.blackTheme ? "white" : "black"
-                    anchors.left: parent.left
-                    anchors.leftMargin: 60
-                    anchors.top: parent.top
-                    anchors.topMargin: 23
-                    themeTransition: false
-
-                    MouseArea{
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: appWindow.showPageRequest("Account")
-                    }
-                }
-
-                MoneroComponents.Label {
-                    fontSize: 16
-                    id: accountLabel
-                    textWidth: 170
-                    color: MoneroComponents.Style.blackTheme ? "white" : "black"
-                    anchors.left: parent.left
-                    anchors.leftMargin: 60
-                    anchors.top: parent.top
-                    anchors.topMargin: 36
-                    themeTransition: false
-                    elide: Text.ElideRight
-
-                    MouseArea {
-                        hoverEnabled: true
-                        anchors.fill: parent
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: appWindow.showPageRequest("Account")
-                    }
-                }
-
-                MoneroComponents.Label {
-                    fontSize: 16
-                    visible: isSyncing
-                    text: qsTr("Syncing...") + translationManager.emptyString
-                    color: MoneroComponents.Style.blackTheme ? "white" : "black"
-                    anchors.left: parent.left
-                    anchors.leftMargin: 20
-                    anchors.bottom: currencyLabel.top
-                    anchors.bottomMargin: 15
-                    themeTransition: false
-                }
-
                MoneroComponents.TextPlain {
-                    id: currencyLabel
-                    font.pixelSize: 16
-                    text: {
-                        if (persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle) {
-                            return appWindow.fiatApiCurrencySymbol();
-                        } else {
-                            return "XMR"
-                        }
-                    }
-                    color: MoneroComponents.Style.blackTheme ? "white" : "black"
+                    visible: !(persistentSettings.fiatPriceToggle && persistentSettings.fiatPriceEnabled)
+                    id: balanceText
+                    themeTransition: false
                    anchors.left: parent.left
                    anchors.leftMargin: 20
                    anchors.top: parent.top
-                    anchors.topMargin: 100
-                    themeTransition: false
-
-                    MouseArea {
-                        hoverEnabled: true
-                        anchors.fill: parent
-                        visible: persistentSettings.fiatPriceEnabled
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: persistentSettings.fiatPriceToggle = !persistentSettings.fiatPriceToggle
-                    }
-                }
-
-                MoneroComponents.TextPlain {
-                    id: balancePart1
-                    themeTransition: false
-                    anchors.left: parent.left
-                    anchors.leftMargin: 58
-                    anchors.baseline: currencyLabel.baseline
-                    color: MoneroComponents.Style.blackTheme ? "white" : "black"
-                    Binding on color {
-                        when: balancePart1MouseArea.containsMouse || balancePart2MouseArea.containsMouse
-                        value: MoneroComponents.Style.orange
-                    }
-                    text: {
-                        if (persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle) {
-                            return balanceFiatString.split('.')[0] + "."
-                        } else {
-                            return balanceString.split('.')[0] + "."
-                        }
-                    }
+                    anchors.topMargin: 76
+                    font.family: "Arial"
+                    color: "#FFFFFF"
+                    text: "N/A"
+                    // dynamically adjust text size
                    font.pixelSize: {
-                        var defaultSize = 29;
-                        var digits = (balancePart1.text.length - 1)
-                        if (digits > 2 && !(persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle)) {
-                            return defaultSize - 1.1 * digits
-                        } else {
-                            return defaultSize
+                        if (persistentSettings.hideBalance) {
+                            return 20;
                        }
+                        var digits = text.split('.')[0].length
+                        var defaultSize = 22;
+                        if(digits > 2) {
+                            return defaultSize - 1.1*digits
+                        }
+                        return defaultSize;
                    }
+
                    MouseArea {
-                        id: balancePart1MouseArea
                        hoverEnabled: true
                        anchors.fill: parent
                        cursorShape: Qt.PointingHandCursor
+                        onEntered: {
+                            parent.color = MoneroComponents.Style.orange
+                        }
+                        onExited: {
+                            parent.color = MoneroComponents.Style.white
+                        }
                        onClicked: {
                                console.log("Copied to clipboard");
-                                clipboard.setText(balancePart1.text + balancePart2.text);
+                                clipboard.setText(parent.text);
                                appWindow.showStatusMessage(qsTr("Copied to clipboard"),3)
                        }
                    }
                }
+
                MoneroComponents.TextPlain {
-                    id: balancePart2
+                    visible: !balanceText.visible
+                    id: balanceTextFiat
                    themeTransition: false
-                    anchors.left: balancePart1.right
-                    anchors.leftMargin: 2
-                    anchors.baseline: currencyLabel.baseline
-                    color: balancePart1.color
-                    text: {
-                        if (persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle) {
-                            return balanceFiatString.split('.')[1]
-                        } else {
-                            return balanceString.split('.')[1]
-                        }
-                    }
-                    font.pixelSize: 16
+                    anchors.left: parent.left
+                    anchors.leftMargin: 20
+                    anchors.top: parent.top
+                    anchors.topMargin: 76
+                    font.family: "Arial"
+                    color: "#FFFFFF"
+                    text: "N/A"
+                    font.pixelSize: balanceText.font.pixelSize
                    MouseArea {
-                        id: balancePart2MouseArea
                        hoverEnabled: true
                        anchors.fill: parent
                        cursorShape: Qt.PointingHandCursor
-                        onClicked: balancePart1MouseArea.clicked(mouse)
+                        onEntered: {
+                            parent.color = MoneroComponents.Style.orange
+                        }
+                        onExited: {
+                            parent.color = MoneroComponents.Style.white
+                        }
+                        onClicked: {
+                                console.log("Copied to clipboard");
+                                clipboard.setText(parent.text);
+                                appWindow.showStatusMessage(qsTr("Copied to clipboard"),3)
+                        }
                    }
                }

+                MoneroComponents.TextPlain {
+                    id: unlockedBalanceText
+                    visible: !(persistentSettings.fiatPriceToggle && persistentSettings.fiatPriceEnabled)
+                    themeTransition: false
+                    anchors.left: parent.left
+                    anchors.leftMargin: 20
+                    anchors.top: parent.top
+                    anchors.topMargin: 126
+                    font.family: "Arial"
+                    color: "#FFFFFF"
+                    text: "N/A"
+                    // dynamically adjust text size
+                    font.pixelSize: {
+                        if (persistentSettings.hideBalance) {
+                            return 20;
+                        }
+                        var digits = text.split('.')[0].length
+                        var defaultSize = 20;
+                        if(digits > 3) {
+                            return defaultSize - 0.6*digits
+                        }
+                        return defaultSize;
+                    }
+
+                    MouseArea {
+                        hoverEnabled: true
+                        anchors.fill: parent
+                        cursorShape: Qt.PointingHandCursor
+                        onEntered: {
+                            parent.color = MoneroComponents.Style.orange
+                        }
+                        onExited: {
+                            parent.color = MoneroComponents.Style.white
+                        }
+                        onClicked: {
+                                console.log("Copied to clipboard");
+                                clipboard.setText(parent.text);
+                                appWindow.showStatusMessage(qsTr("Copied to clipboard"),3)
+                        }
+                    }
+                }
+
+                MoneroComponents.TextPlain {
+                    id: unlockedBalanceTextFiat
+                    themeTransition: false
+                    visible: !unlockedBalanceText.visible
+                    anchors.left: parent.left
+                    anchors.leftMargin: 20
+                    anchors.top: parent.top
+                    anchors.topMargin: 126
+                    font.family: "Arial"
+                    color: "#FFFFFF"
+                    text: "N/A"
+                    font.pixelSize: unlockedBalanceText.font.pixelSize
+                    MouseArea {
+                        hoverEnabled: true
+                        anchors.fill: parent
+                        cursorShape: Qt.PointingHandCursor
+                        onEntered: {
+                            parent.color = MoneroComponents.Style.orange
+                        }
+                        onExited: {
+                            parent.color = MoneroComponents.Style.white
+                        }
+                        onClicked: {
+                                console.log("Copied to clipboard");
+                                clipboard.setText(parent.text);
+                                appWindow.showStatusMessage(qsTr("Copied to clipboard"),3)
+                        }
+                    }
+                }
+
+                MoneroComponents.Label {
+                    id: unlockedBalanceLabel
+                    visible: true
+                    text: qsTr("Unlocked balance") + translationManager.emptyString
+                    color: "white"
+                    fontSize: 14
+                    anchors.left: parent.left
+                    anchors.leftMargin: 20
+                    anchors.top: parent.top
+                    anchors.topMargin: 110
+                    themeTransition: false
+                }
+
+                MoneroComponents.Label {
+                    visible: !isMobile
+                    id: balanceLabel
+                    text: qsTr("Balance") + translationManager.emptyString
+                    color: "white"
+                    fontSize: 14
+                    anchors.left: parent.left
+                    anchors.leftMargin: 20
+                    anchors.top: parent.top
+                    anchors.topMargin: 60
+                    elide: Text.ElideRight
+                    textWidth: 238
+                    themeTransition: false
+                }
                Item { //separator
                    anchors.left: parent.left
                    anchors.right: parent.right
@@ -327,16 +420,15 @@ Rectangle {
        anchors.left: parent.left
        anchors.right: parent.right
        anchors.bottom: parent.bottom
-        anchors.top: column1.bottom
+        anchors.top: (isMobile)? parent.top : column1.bottom
        color: "transparent"

        Flickable {
            id:flicker
            contentHeight: menuColumn.height
            anchors.top: parent.top
-            anchors.bottom: progressBar.visible ? progressBar.top : networkStatus.top
+            anchors.bottom: networkStatus.top
            width: parent.width
-            boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
            clip: true

        Column {
@@ -351,7 +443,7 @@ Rectangle {
            MoneroComponents.MenuButtonDivider {
                anchors.left: parent.left
                anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
            }

            // ------------- Account tab ---------------
@@ -361,6 +453,7 @@ Rectangle {
                anchors.right: parent.right
                text: qsTr("Account") + translationManager.emptyString
                symbol: qsTr("T") + translationManager.emptyString
+                dotColor: "#44AAFF"
                onClicked: {
                    parent.previousButton.checked = false
                    parent.previousButton = accountButton
@@ -372,7 +465,7 @@ Rectangle {
                visible: accountButton.present
                anchors.left: parent.left
                anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
            }

            // ------------- Transfer tab ---------------
@@ -382,6 +475,7 @@ Rectangle {
                anchors.right: parent.right
                text: qsTr("Send") + translationManager.emptyString
                symbol: qsTr("S") + translationManager.emptyString
+                dotColor: "#FF6C3C"
                onClicked: {
                    parent.previousButton.checked = false
                    parent.previousButton = transferButton
@@ -393,7 +487,7 @@ Rectangle {
                visible: transferButton.present
                anchors.left: parent.left
                anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
            }

            // ------------- AddressBook tab ---------------
@@ -404,6 +498,7 @@ Rectangle {
                anchors.right: parent.right
                text: qsTr("Address book") + translationManager.emptyString
                symbol: qsTr("B") + translationManager.emptyString
+                dotColor: "#FF4F41"
                under: transferButton
                onClicked: {
                    parent.previousButton.checked = false
@@ -416,7 +511,7 @@ Rectangle {
                visible: addressBookButton.present
                anchors.left: parent.left
                anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
            }

            // ------------- Receive tab ---------------
@@ -426,6 +521,7 @@ Rectangle {
                anchors.right: parent.right
                text: qsTr("Receive") + translationManager.emptyString
                symbol: qsTr("R") + translationManager.emptyString
+                dotColor: "#AAFFBB"
                onClicked: {
                    parent.previousButton.checked = false
                    parent.previousButton = receiveButton
@@ -437,7 +533,32 @@ Rectangle {
                visible: receiveButton.present
                anchors.left: parent.left
                anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
+            }
+
+            // ------------- Merchant tab ---------------
+
+            MoneroComponents.MenuButton {
+                id: merchantButton
+                visible: appWindow.walletMode >= 2
+                anchors.left: parent.left
+                anchors.right: parent.right
+                text: qsTr("Merchant") + translationManager.emptyString
+                symbol: qsTr("U") + translationManager.emptyString
+                dotColor: "#FF4F41"
+                under: receiveButton
+                onClicked: {
+                    parent.previousButton.checked = false
+                    parent.previousButton = merchantButton
+                    panel.merchantClicked()
+                }
+            }
+
+            MoneroComponents.MenuButtonDivider {
+                visible: merchantButton.present && appWindow.walletMode >= 2
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.leftMargin: 16
            }

            // ------------- History tab ---------------
@@ -448,6 +569,7 @@ Rectangle {
                anchors.right: parent.right
                text: qsTr("Transactions") + translationManager.emptyString
                symbol: qsTr("H") + translationManager.emptyString
+                dotColor: "#6B0072"
                onClicked: {
                    parent.previousButton.checked = false
                    parent.previousButton = historyButton
@@ -459,7 +581,7 @@ Rectangle {
                visible: historyButton.present
                anchors.left: parent.left
                anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
            }

            // ------------- Advanced tab ---------------
@@ -470,10 +592,10 @@ Rectangle {
                anchors.right: parent.right
                text: qsTr("Advanced") + translationManager.emptyString
                symbol: qsTr("D") + translationManager.emptyString
+                dotColor: "#FFD781"
                onClicked: {
                    parent.previousButton.checked = false
                    parent.previousButton = advancedButton
-                    panel.advancedClicked()
                }
            }

@@ -481,7 +603,103 @@ Rectangle {
                visible: advancedButton.present && appWindow.walletMode >= 2
                anchors.left: parent.left
                anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
+            }
+
+            // ------------- Mining tab ---------------
+            MoneroComponents.MenuButton {
+                id: miningButton
+                visible: !isAndroid && !isIOS && appWindow.walletMode >= 2
+                anchors.left: parent.left
+                anchors.right: parent.right
+                text: qsTr("Mining") + translationManager.emptyString
+                symbol: qsTr("M") + translationManager.emptyString
+                dotColor: "#FFD781"
+                under: advancedButton
+                onClicked: {
+                    parent.previousButton.checked = false
+                    parent.previousButton = miningButton
+                    panel.miningClicked()
+                }
+            }
+
+            MoneroComponents.MenuButtonDivider {
+                visible: miningButton.present && appWindow.walletMode >= 2
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.leftMargin: 16
+            }
+
+            // ------------- TxKey tab ---------------
+            MoneroComponents.MenuButton {
+                id: txkeyButton
+                visible: appWindow.walletMode >= 2
+                anchors.left: parent.left
+                anchors.right: parent.right
+                text: qsTr("Prove/check") + translationManager.emptyString
+                symbol: qsTr("K") + translationManager.emptyString
+                dotColor: "#FFD781"
+                under: advancedButton
+                onClicked: {
+                    parent.previousButton.checked = false
+                    parent.previousButton = txkeyButton
+                    panel.txkeyClicked()
+                }
+            }
+
+            MoneroComponents.MenuButtonDivider {
+                visible: txkeyButton.present && appWindow.walletMode >= 2
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.leftMargin: 16
+            }
+
+            // ------------- Shared RingDB tab ---------------
+            MoneroComponents.MenuButton {
+                id: sharedringdbButton
+                visible: appWindow.walletMode >= 2
+                anchors.left: parent.left
+                anchors.right: parent.right
+                text: qsTr("Shared RingDB") + translationManager.emptyString
+                symbol: qsTr("G") + translationManager.emptyString
+                dotColor: "#FFD781"
+                under: advancedButton
+                onClicked: {
+                    parent.previousButton.checked = false
+                    parent.previousButton = sharedringdbButton
+                    panel.sharedringdbClicked()
+                }
+            }
+
+            MoneroComponents.MenuButtonDivider {
+                visible: sharedringdbButton.present && appWindow.walletMode >= 2
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.leftMargin: 16
+            }
+
+            // ------------- Sign/verify tab ---------------
+            MoneroComponents.MenuButton {
+                id: signButton
+                visible: appWindow.walletMode >= 2
+                anchors.left: parent.left
+                anchors.right: parent.right
+                text: qsTr("Sign/verify") + translationManager.emptyString
+                symbol: qsTr("I") + translationManager.emptyString
+                dotColor: "#FFD781"
+                under: advancedButton
+                onClicked: {
+                    parent.previousButton.checked = false
+                    parent.previousButton = signButton
+                    panel.signClicked()
+                }
+            }
+
+            MoneroComponents.MenuButtonDivider {
+                visible: signButton.present && appWindow.walletMode >= 2
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.leftMargin: 16
            }

            // ------------- Settings tab ---------------
@@ -491,6 +709,7 @@ Rectangle {
                anchors.right: parent.right
                text: qsTr("Settings") + translationManager.emptyString
                symbol: qsTr("E") + translationManager.emptyString
+                dotColor: "#36B25C"
                onClicked: {
                    parent.previousButton.checked = false
                    parent.previousButton = settingsButton
@@ -502,7 +721,7 @@ Rectangle {
                visible: settingsButton.present
                anchors.left: parent.left
                anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
            }

        } // Column
@@ -515,11 +734,22 @@ Rectangle {
            anchors.right: parent.right
            anchors.leftMargin: 0
            anchors.rightMargin: 0
-            anchors.bottom: progressBar.visible ? progressBar.top : networkStatus.top
+            anchors.bottom: networkStatus.top;
            height: 10
            color: "transparent"
        }

+        MoneroComponents.NetworkStatusItem {
+            id: networkStatus
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.leftMargin: 5
+            anchors.rightMargin: 0
+            anchors.bottom: (progressBar.visible)? progressBar.top : parent.bottom;
+            connected: Wallet.ConnectionStatus_Disconnected
+            height: 48
+        }
+
        MoneroComponents.ProgressBar {
            id: progressBar
            anchors.left: parent.left
@@ -527,29 +757,17 @@ Rectangle {
            anchors.bottom: daemonProgressBar.top
            height: 48
            syncType: qsTr("Wallet") + translationManager.emptyString
-            visible: !appWindow.disconnected
+            visible: networkStatus.connected
        }

        MoneroComponents.ProgressBar {
            id: daemonProgressBar
            anchors.left: parent.left
            anchors.right: parent.right
-            anchors.bottom: networkStatus.top
-            syncType: qsTr("Daemon") + translationManager.emptyString
-            visible: !appWindow.disconnected
-            height: 62
-        }
-        
-        MoneroComponents.NetworkStatusItem {
-            id: networkStatus
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.leftMargin: 5
-            anchors.rightMargin: 0
            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 5
-            connected: Wallet.ConnectionStatus_Disconnected
-            height: 48
+            syncType: qsTr("Daemon") + translationManager.emptyString
+            visible: networkStatus.connected
+            height: 62
        }
    }
 }
--- a/src/main/Logger.cpp
+++ b/src/main/Logger.cpp
@@ -26,8 +26,6 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#include "Logger.h"
-
 #include <QCoreApplication>
 #include <QStandardPaths>
 #include <QFileInfo>
@@ -35,11 +33,8 @@
 #include <QDir>
 #include <QDebug>

-#include <easylogging++.h>
-#include <wallet/api/wallet2_api.h>
-
-#include "qt/MoneroSettings.h"
-#include "qt/TailsOS.h"
+#include "Logger.h"
+#include "wallet/api/wallet2_api.h"

 // default log path by OS (should be writable)
 static const QString defaultLogName = "monero-wallet-gui.log";
@@ -67,21 +62,12 @@ static const QString defaultLogName = "monero-wallet-gui.log";


 // return the absolute path of the logfile and ensure path folder exists
-const QString getLogPath(const QString &userDefinedLogFilePath, bool portable)
+const QString getLogPath(const QString logPath)
 {
-    const QFileInfo fi(userDefinedLogFilePath);
-    if (!userDefinedLogFilePath.isEmpty() && !fi.isDir())
-    {
+    const QFileInfo fi(logPath);
+
+    if(!logPath.isEmpty() && !fi.isDir())
        return fi.absoluteFilePath();
-    }
-
-    if (portable)
-    {
-        return QDir(MoneroSettings::portableFolderName()).filePath(defaultLogName);
-    }
-
-    if(TailsOS::detect() && TailsOS::usePersistence)
-        return QDir::homePath() + "/Persistent/Monero/logs/" + defaultLogName;
    else {
        QDir appDir(osPath + "/" + appFolder);
        if(!appDir.exists())
@@ -108,27 +94,3 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt
    }
 }

-Logger::Logger(QCoreApplication &parent, QString userDefinedLogFilePath)
-    : QObject(&parent)
-    , m_applicationFilePath(parent.applicationFilePath().toStdString())
-    , m_userDefinedLogFilePath(std::move(userDefinedLogFilePath))
-{
-    el::Configurations c;
-    c.setGlobally(el::ConfigurationType::ToFile, "false");
-    c.setGlobally(el::ConfigurationType::ToStandardOutput, "true");
-    el::Loggers::setDefaultConfigurations(c, true);
-    qInstallMessageHandler(messageHandler);
-}
-
-void Logger::resetLogFilePath(bool portable)
-{
-    m_logFilePath = QDir::toNativeSeparators(getLogPath(m_userDefinedLogFilePath, portable));
-    Monero::Wallet::init(m_applicationFilePath.c_str(), "monero-wallet-gui", m_logFilePath.toStdString(), true);
-    qWarning() << "Logging to" << m_logFilePath;
-    emit logFilePathChanged();
-}
-
-QString Logger::logFilePath() const
-{
-    return m_logFilePath;
-}
--- a/src/qt/macoshelper.h
+++ b/src/qt/macoshelper.h
@@ -26,20 +26,11 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#ifndef MACOSHELPER_H
-#define MACOSHELPER_H
+#ifndef LOGGER_H
+#define LOGGER_H

-#include <QPixmap>
+const QString getLogPath(const QString logPath);
+void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message);

-class MacOSHelper
-{
-    MacOSHelper() {}
+#endif // LOGGER_H

-public:
-    static bool isCapsLock();
-    static bool openFolderAndSelectItem(const QUrl &path);
-    static QPixmap screenshot();
-    static QString bundlePath();
-};
-
-#endif //MACOSHELPER_H
--- a/src/main/MainApp.cpp
+++ b/src/main/MainApp.cpp
--- a/src/main/MainApp.h
+++ b/src/main/MainApp.h
--- a/69
+++ b/69
@@ -1,69 +0,0 @@
-ANDROID_STANDALONE_TOOLCHAIN_PATH ?= /usr/local/toolchain
-MANUAL_SUBMODULES ?= OFF
-
-dotgit=$(shell ls -d .git/config)
-ifeq ($(dotgit), .git/config)
-  ifeq ($(shell git --version > /dev/null 2>&1 ; echo $$?), 0)
-	git = yes
-  else
-    $(warning git command not found)
-  endif
-endif
-
-builddir := build
-topdir := ../..
-ifeq ($(USE_SINGLE_BUILDDIR), OFF)
-  os := $(shell echo  `uname | sed -e 's|[:/\\ \(\)]|_|g'`)
-  builddir := $(builddir)/$(os)
-  topdir := $(topdir)/..
-
-  ifdef git
-    branch := $(shell git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g')
-    builddir := $(builddir)/$(branch)
-    topdir := $(topdir)/..
-  endif
-
-  deldirs := $(builddir)
-else
-  deldirs := $(builddir)/debug $(builddir)/release $(builddir)/fuzz
-endif
-
-default:
-	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
-debug:
-	mkdir -p build && cd build && cmake -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} .. && $(MAKE) VERBOSE=1
-
-depends:
-	mkdir -p build/$(target)/release
-	cd build/$(target)/release && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D BUILD_TAG=$(tag) -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake ../../.. && $(MAKE)
-
-devmode:
-	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
-clean:
-	mkdir -p build && cd build && rm -rf *
-scanner:
-	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D WITH_SCANNER=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
-
-release:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
-
-release-linux-armv8:
-	mkdir -p $(builddir)/release
-	cd $(builddir)/release
-	cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="armv8-a" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="linux-armv8" $(topdir) && $(MAKE)
-
-release-static:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
-
-debug-static-win64:
-	mkdir -p $(builddir)/debug && cd $(builddir)/debug && cmake -D STATIC=ON -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Debug -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
-
-debug-static-mac64:
-	mkdir -p $(builddir)/debug
-	cd $(builddir)/debug && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D BUILD_TAG="mac-x64" $(topdir) && $(MAKE)
-
-release-static-win64:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
-
-release-win64:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=OFF -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -46,24 +46,29 @@ Rectangle {

    property Item currentView
    property Item previousView
+    property bool basicMode : isMobile
+    property string balanceLabelText: qsTr("Balance") + translationManager.emptyString
+    property string balanceText
+    property string unlockedBalanceLabelText: qsTr("Unlocked Balance") + translationManager.emptyString
+    property string unlockedBalanceText
    property int minHeight: (appWindow.height > 800) ? appWindow.height : 800
    property alias contentHeight: mainFlickable.contentHeight
    property alias flickable: mainFlickable

-    property Transfer transferView: Transfer {
-        onPaymentClicked: root.paymentClicked(recipients, paymentId, mixinCount, priority, description)
-        onSweepUnmixableClicked: root.sweepUnmixableClicked()
-    }
+    property Transfer transferView: Transfer { }
    property Receive receiveView: Receive { }
    property Merchant merchantView: Merchant { }
+    property TxKey txkeyView: TxKey { }
+    property SharedRingDB sharedringdbView: SharedRingDB { }
    property History historyView: History { }
-    property Advanced advancedView: Advanced { }
+    property Sign signView: Sign { }
    property Settings settingsView: Settings { }
+    property Mining miningView: Mining { }
    property AddressBook addressBookView: AddressBook { }
    property Keys keysView: Keys { }
    property Account accountView: Account { }

-    signal paymentClicked(var recipients, string paymentId, int mixinCount, int priority, string description)
+    signal paymentClicked(string address, string paymentId, string amount, int mixinCount, int priority, string description)
    signal sweepUnmixableClicked()
    signal generatePaymentIdInvoked()
    signal getProofClicked(string txid, string address, string message);
@@ -133,18 +138,30 @@ Rectangle {
                name: "Merchant"
                PropertyChanges { target: root; currentView: merchantView }
                PropertyChanges { target: mainFlickable; contentHeight: merchantView.merchantHeight + 80 }
+            }, State {
+                name: "TxKey"
+                PropertyChanges { target: root; currentView: txkeyView }
+                PropertyChanges { target: mainFlickable; contentHeight: txkeyView.txkeyHeight + 80 }
+            }, State {
+                name: "SharedRingDB"
+                PropertyChanges { target: root; currentView: sharedringdbView }
+                PropertyChanges { target: mainFlickable; contentHeight: sharedringdbView.panelHeight + 80  }
            }, State {
                name: "AddressBook"
                PropertyChanges { target: root; currentView: addressBookView }
                PropertyChanges { target: mainFlickable; contentHeight: addressBookView.addressbookHeight + 80 }
            }, State {
-                name: "Advanced"
-                PropertyChanges { target: root; currentView: advancedView }
-                PropertyChanges { target: mainFlickable; contentHeight: advancedView.panelHeight }
+                name: "Sign"
+                PropertyChanges { target: root; currentView: signView }
+                PropertyChanges { target: mainFlickable; contentHeight: signView.signHeight + 80 }
            }, State {
                name: "Settings"
                PropertyChanges { target: root; currentView: settingsView }
                PropertyChanges { target: mainFlickable; contentHeight: settingsView.settingsHeight }
+            }, State {
+                name: "Mining"
+                PropertyChanges { target: root; currentView: miningView }
+                PropertyChanges { target: mainFlickable; contentHeight: miningView.miningHeight + 80 }
            }, State {
                name: "Keys"
                PropertyChanges { target: root; currentView: keysView }
@@ -153,9 +170,26 @@ Rectangle {
                name: "Account"
                PropertyChanges { target: root; currentView: accountView }
                PropertyChanges { target: mainFlickable; contentHeight: accountView.accountHeight + 80 }
-            }
+            }	
        ]

+    // color stripe at the top
+    Row {
+        id: styledRow
+        visible: currentView !== merchantView
+        height: 4
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        z: parent.z + 1
+
+        Rectangle { height: 4; width: parent.width / 5; color: "#FFE00A" }
+        Rectangle { height: 4; width: parent.width / 5; color: "#6B0072" }
+        Rectangle { height: 4; width: parent.width / 5; color: "#FF6C3C" }
+        Rectangle { height: 4; width: parent.width / 5; color: "#FFD781" }
+        Rectangle { height: 4; width: parent.width / 5; color: "#FF4F41" }
+    }
+
    ColumnLayout {
        anchors.fill: parent
        anchors.margins: {
@@ -166,7 +200,6 @@ Rectangle {
        }

        anchors.topMargin: appWindow.persistentSettings.customDecorations ? 50 : 0
-        anchors.bottomMargin: 0
        spacing: 0

        Flickable {
@@ -174,17 +207,15 @@ Rectangle {
            Layout.fillWidth: true
            Layout.fillHeight: true
            clip: true
-            boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds

            ScrollBar.vertical: ScrollBar {
-                parent: root
+                parent: mainFlickable.parent
                anchors.left: parent.right
-                anchors.leftMargin: -14 // 10 margin + 4 scrollbar width
+                anchors.leftMargin: 3
                anchors.top: parent.top
-                anchors.topMargin: persistentSettings.customDecorations ? 60 : 10
+                anchors.topMargin: 4
                anchors.bottom: parent.bottom
-                anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10
-                onActiveChanged: if (!active && !isMac) active = true
+                anchors.bottomMargin: persistentSettings.customDecorations ? 4 : 0 
            }

            onFlickingChanged: {
@@ -227,7 +258,7 @@ Rectangle {
    Rectangle {
        id: borderLeft
        visible: middlePanel.state !== "Merchant"
-        anchors.top: parent.top
+        anchors.top: styledRow.bottom
        anchors.bottom: parent.bottom
        anchors.left: parent.left
        width: 1
@@ -248,4 +279,18 @@ Rectangle {
        anchors.bottom: parent.bottom
        anchors.left: borderLeft.right
    }
+
+    /* connect "payment" click */
+    Connections {
+        ignoreUnknownSignals: false
+        target: transferView
+        onPaymentClicked : {
+            console.log("MiddlePanel: paymentClicked")
+            paymentClicked(address, paymentId, amount, mixinCount, priority, description)
+        }
+        onSweepUnmixableClicked : {
+            console.log("MiddlePanel: sweepUnmixableClicked")
+            sweepUnmixableClicked()
+        }
+    }
 }
--- a/README.md
+++ b/README.md
@@ -5,11 +5,11 @@ Copyright (c) 2014-2019, The Monero Project
 ## Development resources

 - Web: [getmonero.org](https://getmonero.org)
+- Forum: [forum.getmonero.org](https://forum.getmonero.org)
 - Mail: [dev@getmonero.org](mailto:dev@getmonero.org)
 - Github: [https://github.com/monero-project/monero-gui](https://github.com/monero-project/monero-gui)
 - IRC: [#monero-dev on Freenode](irc://chat.freenode.net/#monero-dev)
- Translation platform (Weblate): [translate.getmonero.org](https://translate.getmonero.org)
- UI Design: [Monero-GUI on Figma](https://www.figma.com/file/DplJ2DDQfIKiuRvolHX2hN/Monero-GUI)
+- Translation platform (Pootle): [translate.getmonero.org](https://translate.getmonero.org)

 ## Vulnerability response

@@ -36,17 +36,19 @@ As with many development projects, the repository on Github is considered to be

 Monero is a 100% community-sponsored endeavor. If you want to join our efforts, the easiest thing you can do is support the project financially. Both Monero and Bitcoin donations can be made to **donate.getmonero.org** if using a client that supports the [OpenAlias](https://openalias.org) standard.

-The Monero donation address is: `888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwMVgN5S9cQUiyoogDavup3H` (viewkey: `f359631075708155cc3d92a32b75a7d02a5dcf27756707b47a2b31b21c389501`)
+The Monero donation address is: `44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A` (viewkey: `f359631075708155cc3d92a32b75a7d02a5dcf27756707b47a2b31b21c389501`)

 The Bitcoin donation address is: `1KTexdemPdxSBcG55heUuTjDRYqbC5ZL8H`

-GUI development funding and/or some supporting services are also graciously provided by [sponsors](https://www.getmonero.org/community/sponsorships/):
+GUI development funding and/or some supporting services are also graciously provided by sponsors:

-[<img width="150" src="https://www.getmonero.org/img/sponsors/tarilabs.png"/>](https://tarilabs.com/)
-[<img width="150" src="https://www.getmonero.org/img/sponsors/globee.png"/>](https://globee.com/)
-[<img width="150" src="https://www.getmonero.org/img/sponsors/symas.png"/>](https://symas.com/)
-[<img width="150" src="https://www.getmonero.org/img/sponsors/forked_logo.png"/>](http://www.forked.net/)
-[<img width="150" src="https://www.getmonero.org/img/sponsors/macstadium.png"/>](https://www.macstadium.com/)
+[<img width="80" src="https://static.getmonero.org/images/sponsors/mymonero.png"/>](https://mymonero.com)
+[<img width="150" src="https://static.getmonero.org/images/sponsors/kitware.png?1"/>](http://kitware.com)
+[<img width="100" src="https://static.getmonero.org/images/sponsors/dome9.png"/>](http://dome9.com)
+[<img width="150" src="https://static.getmonero.org/images/sponsors/araxis.png"/>](http://araxis.com)
+[<img width="150" src="https://static.getmonero.org/images/sponsors/jetbrains.png"/>](http://www.jetbrains.com/)
+[<img width="150" src="https://static.getmonero.org/images/sponsors/navicat.png"/>](http://www.navicat.com/)
+[<img width="150" src="https://static.getmonero.org/images/sponsors/symas.png"/>](http://www.symas.com/)

 There are also several mining pools that kindly donate a portion of their fees, [a list of them can be found on our Bitcointalk post](https://bitcointalk.org/index.php?topic=583449.0).

@@ -56,130 +58,23 @@ See [LICENSE](LICENSE).

 ## Translations

-Do you speak a second language and would like to help translate the Monero GUI? Check out Weblate, our localization platform, at [translate.getmonero.org](https://translate.getmonero.org/). Choose the language and suggest a translation for a string or review an existing one. The Localization Workgroup made [a guide with step-by-step instructions](https://github.com/monero-ecosystem/monero-translations/blob/master/weblate.md) for Weblate.
+Do you speak a second language and would like to help translate the Monero GUI? Check out Pootle, our localization platform, at [translate.getmonero.org](https://translate.getmonero.org/projects/monero-gui/). Choose the language and suggest a translation for a string or review an existing one. The Localization Workgroup made [a guide with step-by-step instructions](https://github.com/monero-ecosystem/monero-translations/blob/master/pootle.md) for Pootle.
+&nbsp;

 If you need help/support or any info you can contact the localization workgroup on the IRC channel #monero-translations (relayed on matrix/riot and MatterMost) or by email at translate[at]getmonero[dot]org. For more info about the Localization workgroup: [github.com/monero-ecosystem/monero-translations](https://github.com/monero-ecosystem/monero-translations)

-Status of the translations:  
-<a href="https://translate.getmonero.org/engage/monero/?utm_source=widget">
-<img src="https://translate.getmonero.org/widgets/monero/-/gui-wallet/horizontal-auto.svg" alt="Translation status" />
-</a>
-
 ## Installing the Monero GUI from a package

 Packages are available for
-* Arch Linux: [monero-gui](https://www.archlinux.org/packages/community/x86_64/monero-gui/)
-* Debian: See the [whonix/monero-gui repository](https://gitlab.com/whonix/monero-gui#how-to-install-monero-using-apt-get)
-* Void Linux: `xbps-install -S monero-gui`
-* GuixSD: `guix package -i monero-gui`
-* macOS (homebrew): `brew install --cask monero-wallet`
+
+* Arch Linux via AUR: [monero-wallet-qt](https://aur.archlinux.org/packages/monero-wallet-qt/)
+* Void Linux: xbps-install -S monero-core
+* GuixSD: guix package -i monero-core

 Packaging for your favorite distribution would be a welcome contribution!

 ## Compiling the Monero GUI from source

-*Note*: Qt 5.9.7 is the minimum version required to build the GUI.
-
-### Building Reproducible Windows static binaries with Docker (any OS)
-
-1. Install Docker [https://docs.docker.com/engine/install/](https://docs.docker.com/engine/install/)
-2. Clone the repository
-   ```
-   git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
-   ```
-   \* `master` - replace with the desired version tag (e.g. `v0.17.1.9`) to build the release binaries.
-3. Prepare build environment
-   ```
-   cd monero-gui
-   docker build --tag monero:build-env-windows --build-arg THREADS=4 --file Dockerfile.windows .
-   ```
-   \* `4` - number of CPU threads to use
-
-4. Build
-   ```
-   docker run --rm -it -v <MONERO_GUI_DIR_FULL_PATH>:/monero-gui -w /monero-gui monero:build-env-windows sh -c 'make depends root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j4'
-   ```
-   \* `<MONERO_GUI_DIR_FULL_PATH>` - absolute path to `monero-gui` directory  
-   \* `4` - number of CPU threads to use
-5. Monero GUI Windows static binaries will be placed in  `monero-gui/build/x86_64-w64-mingw32/release/bin` directory
-
-### Building Reproducible Linux static binaries with Docker (any OS)
-
-1. Install Docker [https://docs.docker.com/engine/install/](https://docs.docker.com/engine/install/)
-2. Clone the repository
-   ```
-   git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
-   ```
-   \* `master` - replace with the desired version tag (e.g. `v0.17.1.9`) to build the release binaries.
-3. Prepare build environment
-   ```
-   cd monero-gui
-   docker build --tag monero:build-env-linux --build-arg THREADS=4 --file Dockerfile.linux .
-   ```
-   \* `4` - number of CPU threads to use
-
-4. Build
-   ```
-   docker run --rm -it -v <MONERO_GUI_DIR_FULL_PATH>:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'make release-static -j4'
-   ```
-   \* `<MONERO_GUI_DIR_FULL_PATH>` - absolute path to `monero-gui` directory  
-   \* `4` - number of CPU threads to use
-5. Monero GUI Linux static binaries will be placed in  `monero-gui/build/release/bin` directory
-6. (*Optional*) Compare `monero-wallet-gui` SHA-256 hash to the one obtained from a trusted source
-   ```
-   docker run --rm -it -v <MONERO_GUI_DIR_FULL_PATH>:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'shasum -a 256 /monero-gui/build/release/bin/monero-wallet-gui'
-   ```
-   \* `<MONERO_GUI_DIR_FULL_PATH>` - absolute path to `monero-gui` directory  
-
-### Building Android APK with Docker (any OS) *Experimental*
- - Minimum Android 9 Pie (API 28)
- - ARMv8-A 64-bit CPU
-1. Install Docker [https://docs.docker.com/engine/install/](https://docs.docker.com/engine/install/)
-2. Clone the repository
-   ```
-   git clone --recursive https://github.com/monero-project/monero-gui.git
-   ```
-3. Prepare build environment
-   ```
-   cd monero-gui
-   docker build --tag monero:build-env-android --build-arg THREADS=4 --file Dockerfile.android .
-   ```
-   \* `4` - number of CPU threads to use
-
-4. Build
-   ```
-   docker run --rm -it -v <MONERO_GUI_DIR_FULL_PATH>:/monero-gui -e THREADS=4 monero:build-env-android
-   ```
-   \* `<MONERO_GUI_DIR_FULL_PATH>` - absolute path to `monero-gui` directory  
-   \* `4` - number of CPU threads to use
-5. Monero GUI APK will be placed in  `monero-gui/build/Android/release/android-build` directory
-6. Deploy
-   * Using ADB (Android debugger bridge)
-     - [Enable adb debugging on your device](https://developer.android.com/studio/command-line/adb.html#Enabling)
-      * Connect your device with USB and install Monero GUI APK with adb:
-      ```
-      adb install build/Android/release/android-build/monero-gui.apk
-      ```
-      * Troubleshooting:
-      ```
-      adb devices -l
-      adb logcat
-      ```
-      * If using adb inside docker, make sure you did
-      ```
-      docker run -v /dev/bus/usb:/dev/bus/usb --privileged
-      ```
-   * Using a web server
-      ```
-      mkdir /usr/tmp
-      cp build/Android/release/android-build/monero-gui.apk /usr/tmp
-      docker run -d -v /usr/tmp:/usr/share/nginx/html:ro -p 8080:80 nginx
-      ```
-      Now it should be accessible through a web browser at
-      ```
-      http://<your.local.ip>:8080/QtApp-debug.apk
-      ```
-
 ### On Linux:

 (Tested on Ubuntu 17.10 x64, Ubuntu 18.04 x64 and Gentoo x64)
@@ -188,19 +83,19 @@ Packaging for your favorite distribution would be a welcome contribution!

  - For Debian distributions (Debian, Ubuntu, Mint, Tails...)

-	`sudo apt install build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libhidapi-dev libnorm-dev libusb-1.0-0-dev libpgm-dev libprotobuf-dev protobuf-compiler libgcrypt20-dev`
+	`sudo apt install build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libhidapi-dev`

  - For Gentoo

-	`sudo emerge app-arch/xz-utils app-doc/doxygen dev-cpp/gtest dev-libs/boost dev-libs/expat dev-libs/openssl dev-util/cmake media-gfx/graphviz net-dns/unbound net-libs/ldns net-libs/miniupnpc net-libs/zeromq sys-libs/libunwind dev-libs/libsodium dev-libs/hidapi dev-libs/libgcrypt`
+	`sudo emerge app-arch/xz-utils app-doc/doxygen dev-cpp/gtest dev-libs/boost dev-libs/expat dev-libs/openssl dev-util/cmake media-gfx/graphviz net-dns/unbound net-libs/ldns net-libs/miniupnpc net-libs/zeromq sys-libs/libunwind dev-libs/libsodium dev-libs/hidapi`

  - For Fedora

-	`sudo dnf install make automake cmake gcc-c++ boost-devel miniupnpc-devel graphviz doxygen unbound-devel libunwind-devel pkgconfig openssl-devel libcurl-devel hidapi-devel libusb-devel zeromq-devel libgcrypt-devel`
+	`sudo dnf install make automake cmake gcc-c++ boost-devel miniupnpc-devel graphviz doxygen unbound-devel libunwind-devel pkgconfig openssl-devel libcurl-devel hidapi-devel libusb-devel`

 2. Install Qt:

-  *Note*: The Qt 5.9.7 or newer requirement makes **some** distributions (mostly based on debian, like Ubuntu 16.x or Linux Mint 18.x) obsolete due to their repositories containing an older Qt version.
+  *Note*: Qt 5.9.7 is the minimum version required to build the GUI. This makes **some** distributions (mostly based on debian, like Ubuntu 16.x or Linux Mint 18.x) obsolete due to their repositories containing an older Qt version.

 The recommended way is to install 5.9.7 from the [official Qt installer](https://www.qt.io/download-qt-installer) or [compiling it yourself](https://wiki.qt.io/Install_Qt_5_on_Ubuntu). This ensures you have the correct version. Higher versions *can* work but as it differs from our production build target, slight differences may occur.

@@ -208,7 +103,7 @@ The following instructions will fetch Qt from your distribution's repositories i

  - For Ubuntu 17.10+

-    `sudo apt install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtqml-models2 qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev`
+    `sudo apt install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev`

  - For Gentoo

@@ -218,29 +113,25 @@ The following instructions will fetch Qt from your distribution's repositories i

    - For Ubuntu

-      `sudo apt install qtmultimedia5-dev qml-module-qtmultimedia`
+      `sudo apt install qtmultimedia5-dev qml-module-qtmultimedia libzbar-dev`

    - For Gentoo

      The *qml* USE flag must be enabled.

-      `emerge dev-qt/qtmultimedia:5`
+      `emerge dev-qt/qtmultimedia:5 media-gfx/zbar`


 3. Clone repository

-    ```
-    git clone --recursive https://github.com/monero-project/monero-gui.git
-    cd monero-gui
-    ```
+    `git clone https://github.com/monero-project/monero-gui.git`

 4. Build

    ```
-    make release -j4
+    cd monero-gui
+    QT_SELECT=5 ./build.sh
    ```
-    \* `4` - number of CPU threads to use  
-    \* Add `CMAKE_PREFIX_PATH` enviroment variable to set a custom Qt install directory, e.g. `CMAKE_PREFIX_PATH=$HOME/Qt/5.9.7/gcc_64 make release -j4`

 The executable can be found in the build/release/bin folder.

@@ -252,30 +143,58 @@ The executable can be found in the build/release/bin folder.

 3. Install [monero](https://github.com/monero-project/monero) dependencies:

-  `brew install boost hidapi zmq libpgm libsodium miniupnpc ldns expat libunwind-headers protobuf libgcrypt`
+  `brew install boost`
+
+  `brew install openssl` - to install openssl headers
+
+  `brew install pkgconfig`
+
+  `brew install cmake`
+
+  `brew install zeromq`
+
+  *Note*: If cmake can not find zmq.hpp file on OS X, installing `zmq.hpp` from https://github.com/zeromq/cppzmq to `/usr/local/include` should fix that error.

 4. Install Qt:

  `brew install qt5`  (or download QT 5.9.7+ from [qt.io](https://www.qt.io/download-open-source/))

-5. Grab an up-to-date copy of the monero-gui repository
+  If you have an older version of Qt installed via homebrew, you can force it to use 5.x like so:
+  
+  `brew link --force --overwrite qt5`

-   ```
-   git clone --recursive https://github.com/monero-project/monero-gui.git
-   cd monero-gui
-   ```
+5. Add the Qt bin directory to your path

-6. Start the build
+    Example: `export PATH=$PATH:$HOME/Qt/5.9.7/clang_64/bin`

-    ```
-    make release -j4
-    ```
-    \* `4` - number of CPU threads to use  
-    \* Add `CMAKE_PREFIX_PATH` enviroment variable to set a custom Qt install directory, e.g. `CMAKE_PREFIX_PATH=$HOME/Qt/5.9.7/clang_64 make release -j4`
+    This is the directory where Qt 5.x is installed on **your** system
+
+6. Grab an up-to-date copy of the monero-gui repository
+
+  `git clone https://github.com/monero-project/monero-gui.git`
+
+7. Go into the repository
+
+  `cd monero-gui`
+
+8. Start the build
+
+  `./build.sh`

 The executable can be found in the `build/release/bin` folder.

-For building an application bundle see `DEPLOY.md`.
+**Note:** Workaround for "ERROR: Xcode not set up properly"
+
+Edit `$HOME/Qt/5.9.7/clang_64/mkspecs/features/mac/default_pre.prf`
+
+replace
+`isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null")))`
+
+with
+`isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null")))`
+
+More info: http://stackoverflow.com/a/35098040/1683164
+

 ### On Windows:

@@ -288,9 +207,15 @@ The Monero GUI on Windows is 64 bits only; 32-bit Windows GUI builds are not off
 3. Install MSYS2 packages for Monero dependencies; the needed 64-bit packages have `x86_64` in their names

    ```
-    pacman -S mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-libgcrypt
+    pacman -S mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb
    ```

+    Optional : To build the flag `WITH_SCANNER`
+
+      ```
+      pacman -S mingw-w64-x86_64-zbar
+      ```
+
    You find more details about those dependencies in the [Monero documentation](https://github.com/monero-project/monero). Note that that there is no more need to compile Boost from source; like everything else, you can install it now with a MSYS2 package.

 4. Install Qt5
@@ -310,17 +235,18 @@ The Monero GUI on Windows is 64 bits only; 32-bit Windows GUI builds are not off
 6. Clone repository

    ```
-    git clone --recursive https://github.com/monero-project/monero-gui.git
-    cd monero-gui
+    git clone https://github.com/monero-project/monero-gui.git
    ```

 7. Build

    ```
-    make release-win64 -j4
-    cd build/release
+    cd monero-gui
+    source ./build.sh release-static
+    cd build
    make deploy
    ```
-    \* `4` - number of CPU threads to use

-The executable can be found in the `.\bin` directory.
+    **Note:** The use of `source` above is a dirty workaround for a suspected bug in the current QT version 5.11.2-3 available in the MSYS2 packaging system, see https://github.com/monero-project/monero-gui/issues/1559 for more info.
+
+The executable can be found in the `.\release\bin` directory.
--- a/src/TranslationManager.cpp
+++ b/src/TranslationManager.cpp
--- a/src/TranslationManager.h
+++ b/src/TranslationManager.h
--- a/android/README.md
+++ b/android/README.md
@@ -0,0 +1,53 @@
+Copyright (c) 2014-2018, The Monero Project
+
+
+## Current status : ALPHA
+
+ - Minimum Android 5.0 (api level 21)
+ - Modal dialogs can appear in background giving the feeling that the application is frozen (Work around : turn screen off/on or switch to another app and back)
+
+## Build using Docker
+
+# Base environnement
+
+        cd monero/utils/build_scripts
+        docker build -f android32.Dockerfile -t monero-android .
+        cd ..
+
+# Build GUI
+
+        cd android/docker
+        docker build -t monero-gui-android .
+        docker create -it --name monero-gui-android monero-gui-android bash
+
+# Get the apk
+
+        docker cp monero-gui-android:/opt/android/monero-gui/build/release/bin/bin/QtApp-debug.apk .
+       
+## Deployment
+
+- Using ADB (Android debugger bridge) : 
+
+  First, see section [Enable adb debugging on your device](https://developer.android.com/studio/command-line/adb.html#Enabling)
+  The only place where we are allowed to play is `/data/local/tmp`. So : 
+
+        adb  push /opt/android/monero-gui/build/release/bin/bin/QtApp-debug.apk /data/local/tmp
+        adb  shell pm install -r /data/local/tmp/QtApp-debug.apk
+   
+  - Troubleshooting: 
+  
+        adb devices -l
+        adb logcat
+	
+    if using adb inside docker, make sure you did "docker run -v /dev/bus/usb:/dev/bus/usb --privileged"
+	
+- Using a web server
+
+        mkdir /usr/tmp
+        cp QtApp-debug.apk /usr/tmp
+        docker run -d -v /usr/tmp:/usr/share/nginx/html:ro -p 8080:80 nginx
+
+  Now it should be accessible through a web browser at 
+  
+        http://<your.local.ip>:8080/QtApp-debug.apk
+  
--- a/android/docker/Dockerfile
+++ b/android/docker/Dockerfile
@@ -0,0 +1,107 @@
+FROM monero-android
+
+#INSTALL JAVA
+RUN echo "deb http://ftp.fr.debian.org/debian/ jessie-backports main contrib non-free" >> /etc/apt/sources.list
+RUN dpkg --add-architecture i386 \
+    && apt-get update \
+    && apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 libz1:i386 \
+    && apt-get install -y -t jessie-backports ca-certificates-java openjdk-8-jdk-headless openjdk-8-jre-headless ant
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV PATH $JAVA_HOME/bin:$PATH
+
+#Get Qt
+ENV QT_VERSION 5.8
+
+RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} \
+    && cd qt5 \
+    && perl init-repository 
+
+## Note: Need to use libc++ but Qt does not provide mkspec for libc++.
+## Their support of it is quite recent and they claim they don't use it by default
+## [only because it produces bigger binary objects](https://bugreports.qt.io/browse/QTBUG-50724).
+
+#Create new mkspec for clang + libc++
+RUN cp -r qt5/qtbase/mkspecs/android-clang qt5/qtbase/mkspecs/android-clang-libc \
+    && cd qt5/qtbase/mkspecs/android-clang-libc \
+    && sed -i '16i ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH' qmake.conf \
+    && sed -i '17i ANDROID_SOURCES_CXX_STL_INCDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/include' qmake.conf \
+    && echo "QMAKE_LIBS_PRIVATE      = -lc++_shared -llog -lz -lm -ldl -lc -lgcc " >> qmake.conf \
+    && echo "QMAKE_CFLAGS -= -mfpu=vfp " >> qmake.conf \
+    && echo "QMAKE_CXXFLAGS -= -mfpu=vfp " >> qmake.conf \ 
+    && echo "QMAKE_CFLAGS += -mfpu=vfp4 " >> qmake.conf \
+    && echo "QMAKE_CXXFLAGS += -mfpu=vfp4 " >> qmake.conf 
+
+ENV ANDROID_API android-21
+    
+#ANDROID SDK TOOLS
+RUN echo y | $ANDROID_SDK_ROOT/tools/android update sdk --no-ui --all --filter platform-tools 
+RUN echo y | $ANDROID_SDK_ROOT/tools/android update sdk --no-ui --all --filter ${ANDROID_API}
+RUN echo y | $ANDROID_SDK_ROOT/tools/android update sdk --no-ui --all --filter build-tools-25.0.1 
+
+ENV CLEAN_PATH $JAVA_HOME/bin:/usr/cmake-3.6.3-Linux-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+#build Qt
+RUN cd qt5 && PATH=${CLEAN_PATH} ./configure -developer-build -release \
+    -xplatform android-clang-libc \
+    -android-ndk-platform ${ANDROID_API} \
+    -android-ndk $ANDROID_NDK_ROOT \
+    -android-sdk $ANDROID_SDK_ROOT \
+    -opensource -confirm-license \
+    -prefix ${WORKDIR}/Qt-${QT_VERSION} \
+    -nomake tests -nomake examples \
+    -skip qtserialport \
+    -skip qtconnectivity \
+    -skip qttranslations \
+    -skip qtgamepad -skip qtscript -skip qtdoc
+
+# build Qt tools : gnustl_shared.so is hard-coded in androiddeployqt
+# replace it with libc++_shared.so
+COPY androiddeployqt.patch qt5/qttools/androiddeployqt.patch
+RUN cd qt5/qttools \
+    && git apply androiddeployqt.patch \
+    && cd .. \
+    && PATH=${CLEAN_PATH} make -j4 \
+    && PATH=${CLEAN_PATH} make install
+
+# Get iconv and ZBar
+ENV ICONV_VERSION 1.14
+RUN git clone https://github.com/ZBar/ZBar.git \
+    && curl -s -O http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz \
+    && tar -xzf libiconv-${ICONV_VERSION}.tar.gz \
+    && cd libiconv-${ICONV_VERSION} \
+    && CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ ./configure --build=x86_64-linux-gnu --host=arm-eabi --prefix=${WORKDIR}/libiconv --disable-rpath
+
+ENV PATH $ANDROID_SDK_ROOT/tools:$ANDROID_SDK_ROOT/platform-tools:${WORKDIR}/Qt-${QT_VERSION}/bin:$PATH
+
+#Build libiconv.a and libzbarjni.a
+COPY android.mk.patch ZBar/android.mk.patch
+RUN cd ZBar \
+    && git apply android.mk.patch \
+    && echo \
+"APP_ABI := armeabi-v7a \n\
+APP_STL := c++_shared \n\
+TARGET_PLATFORM := ${ANDROID_API} \n\
+TARGET_ARCH_ABI := armeabi-v7a \n\
+APP_CFLAGS +=  -target armv7-none-linux-androideabi -fexceptions -fstack-protector-strong -fno-limit-debug-info -mfloat-abi=softfp -mfpu=vfp -fno-builtin-memmove -fno-omit-frame-pointer -fno-stack-protector\n"\
+        >> android/jni/Application.mk \
+    && cd android \
+    && android update project --path . -t "${ANDROID_API}" \
+    && CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ ant -Dndk.dir=${ANDROID_NDK_ROOT} -Diconv.src=${WORKDIR}/libiconv-${ICONV_VERSION} zbar-clean zbar-ndk-build
+
+RUN cp openssl/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib
+RUN cp boost_${BOOST_VERSION}/android32/lib/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib
+RUN cp ZBar/android/obj/local/armeabi-v7a/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib
+
+RUN git clone https://github.com/monero-project/monero-gui.git \
+    && cd monero-gui \
+    && git submodule update \
+    && CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ BOOST_ROOT=/opt/android/boost_1_62_0 \
+         BOOST_LIBRARYDIR=${WORKDIR}/boost_${BOOST_VERSION}/android32/lib/ \
+         OPENSSL_ROOT_DIR=${WORKDIR}/openssl/ \
+         CMAKE_INCLUDE_PATH=${WORKDIR}/cppzmq/ \
+         CMAKE_LIBRARY_PATH=${WORKDIR}/zeromq4-1/.libs \
+         CXXFLAGS="-I ${WORKDIR}/zeromq4-1/include/" \
+         ./build.sh release-android \
+    && cd build \
+    && make deploy
+
--- a/android/docker/android.mk.patch
+++ b/android/docker/android.mk.patch
@@ -0,0 +1,61 @@
+diff --git a/android/jni/Android.mk b/android/jni/Android.mk
+index e442b07..158afd5 100644
+--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
+@@ -12,14 +12,18 @@ LOCAL_PATH := $(ICONV_SRC)
+ 
+ LOCAL_MODULE := libiconv
+ 
+LOCAL_ARM_MODE := arm
+LOCAL_CPP_FEATURES := exceptions rtti features
+ LOCAL_CFLAGS := \
+     -Wno-multichar \
+     -D_ANDROID \
+-    -DLIBDIR="c" \
+    -DLIBDIR="\".\"" \
+     -DBUILDING_LIBICONV \
+     -DBUILDING_LIBCHARSET \
+     -DIN_LIBRARY
+ 
+LOCAL_CFLAGS += -fno-stack-protector
+
+ LOCAL_SRC_FILES := \
+ 	lib/iconv.c \
+ 	libcharset/lib/localcharset.c \
+@@ -30,13 +34,14 @@ LOCAL_C_INCLUDES := \
+ 	$(ICONV_SRC)/libcharset \
+ 	$(ICONV_SRC)/libcharset/include
+ 
+-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
+ 
+ LOCAL_LDLIBS := -llog -lcharset
+ 
+ # libzbarjni
+ include $(CLEAR_VARS)
+ 
+
+ LOCAL_PATH := $(MY_LOCAL_PATH)
+ LOCAL_MODULE := zbarjni
+ LOCAL_SRC_FILES := ../../java/zbarjni.c \
+@@ -71,6 +76,17 @@ LOCAL_C_INCLUDES := ../include \
+ 		    ../zbar \
+ 		    $(ICONV_SRC)/include 
+ 
+-LOCAL_SHARED_LIBRARIES := libiconv
+LOCAL_STATIC_LIBRARIES := libiconv
+LOCAL_ARM_MODE := arm
+LOCAL_CPP_FEATURES := exceptions rtti features
+
+LOCAL_CFLAGS := \
+    -Wno-multichar \
+    -D_ANDROID \
+    -DLIBDIR="\".\"" \
+    -DBUILDING_LIBICONV \
+    -DBUILDING_LIBCHARSET \
+    -DIN_LIBRARY
+
+ 
+-include $(BUILD_SHARED_LIBRARY)
+\ No newline at end of file
+include $(BUILD_STATIC_LIBRARY)
--- a/android/docker/androiddeployqt.patch
+++ b/android/docker/androiddeployqt.patch
@@ -0,0 +1,62 @@
+diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
+index 8a8e591..71d693e 100644
+--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
+@@ -1122,7 +1122,7 @@ bool updateLibsXml(const Options &options)
+ 
+     QString libsPath = QLatin1String("libs/") + options.architecture + QLatin1Char('/');
+ 
+-    QString qtLibs = QLatin1String("<item>gnustl_shared</item>\n");
+    QString qtLibs = QLatin1String("<item>c++_shared</item>\n");
+     QString bundledInLibs;
+     QString bundledInAssets;
+     foreach (Options::BundledFile bundledFile, options.bundledFiles) {
+@@ -2519,6 +2519,39 @@ bool installApk(const Options &options)
+     return true;
+ }
+ 
+bool copyStl(Options *options)
+{
+    if (options->deploymentMechanism == Options::Debug && !options->installApk)
+        return true;
+
+    if (options->verbose)
+        fprintf(stdout, "Copying LIBC++ STL library\n");
+
+    QString filePath = options->ndkPath
+            + QLatin1String("/sources/cxx-stl/llvm-libc++")
+            + QLatin1String("/libs/")
+            + options->architecture
+            + QLatin1String("/libc++_shared.so");
+    if (!QFile::exists(filePath)) {
+        fprintf(stderr, "LIBC STL library does not exist at %s\n", qPrintable(filePath));
+        return false;
+    }
+
+    QString destinationDirectory =
+            options->deploymentMechanism == Options::Debug
+            ? options->temporaryDirectoryName + QLatin1String("/lib")
+            : options->outputDirectory + QLatin1String("/libs/") + options->architecture;
+
+    if (!copyFileIfNewer(filePath, destinationDirectory
+                                   + QLatin1String("/libc++_shared.so"), options->verbose)) {
+        return false;
+    }
+
+    if (options->deploymentMechanism == Options::Debug && !deployToLocalTmp(options, QLatin1String("/lib/libc++_shared.so")))
+        return false;
+
+    return true;
+}
+ bool copyGnuStl(Options *options)
+ {
+     if (options->deploymentMechanism == Options::Debug && !options->installApk)
+@@ -2870,7 +2903,7 @@ int main(int argc, char *argv[])
+     if (Q_UNLIKELY(options.timing))
+         fprintf(stdout, "[TIMING] %d ms: Read dependencies\n", options.timer.elapsed());
+ 
+-    if (options.deploymentMechanism != Options::Ministro && !copyGnuStl(&options))
+    if (options.deploymentMechanism != Options::Ministro && !copyStl(&options))
+         return CannotCopyGnuStl;
+ 
+     if (Q_UNLIKELY(options.timing))
--- a/build.sh
+++ b/build.sh
@@ -0,0 +1,124 @@
+#!/bin/bash
+
+BUILD_TYPE=$1
+BUILD_TREZOR=${BUILD_TREZOR-true}
+source ./utils.sh
+platform=$(get_platform)
+# default build type
+if [ -z $BUILD_TYPE ]; then
+    BUILD_TYPE=release
+fi
+
+# Return 0 if the command exists, 1 if it does not.
+exists() {
+    command -v "$1" &>/dev/null
+}
+
+# Return the first value in $@ that's a runnable command.
+find_command() {
+    for arg in "$@"; do
+        if exists "$arg"; then
+           echo "$arg"
+           return 0
+        fi
+    done
+    return 1
+}
+
+if [ "$BUILD_TYPE" == "release" ]; then
+    echo "Building release"
+    CONFIG="CONFIG+=release";
+    BIN_PATH=release/bin
+elif [ "$BUILD_TYPE" == "release-static" ]; then
+    echo "Building release-static"
+    if [ "$platform" != "darwin" ]; then
+	    CONFIG="CONFIG+=release static";
+    else
+        # OS X: build static libwallet but dynamic Qt. 
+        echo "OS X: Building Qt project without static flag"
+        CONFIG="CONFIG+=release";
+    fi    
+    BIN_PATH=release/bin
+elif [ "$BUILD_TYPE" == "release-android" ]; then
+    echo "Building release for ANDROID"
+    CONFIG="CONFIG+=release static WITH_SCANNER DISABLE_PASS_STRENGTH_METER";
+    ANDROID=true
+    BIN_PATH=release/bin
+    DISABLE_PASS_STRENGTH_METER=true
+elif [ "$BUILD_TYPE" == "debug-android" ]; then
+    echo "Building debug for ANDROID : ultra INSECURE !!"
+    CONFIG="CONFIG+=debug qml_debug WITH_SCANNER DISABLE_PASS_STRENGTH_METER";
+    ANDROID=true
+    BIN_PATH=debug/bin
+    DISABLE_PASS_STRENGTH_METER=true
+elif [ "$BUILD_TYPE" == "debug" ]; then
+    echo "Building debug"
+	CONFIG="CONFIG+=debug"
+    BIN_PATH=debug/bin
+else
+    echo "Valid build types are release, release-static, release-android, debug-android and debug"
+    exit 1;
+fi
+
+
+source ./utils.sh
+pushd $(pwd)
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+MONERO_DIR=monero
+MONEROD_EXEC=monerod
+
+MAKE='make'
+if [[ $platform == *bsd* ]]; then
+    MAKE='gmake'
+fi
+
+# build libwallet
+export BUILD_TREZOR
+./get_libwallet_api.sh $BUILD_TYPE
+ 
+# build zxcvbn
+if [ "$DISABLE_PASS_STRENGTH_METER" != true ]; then
+    $MAKE -C src/zxcvbn-c || exit
+fi
+
+if [ ! -d build ]; then mkdir build; fi
+
+
+# Platform indepenent settings
+if [ "$ANDROID" != true ] && ([ "$platform" == "linux32" ] || [ "$platform" == "linux64" ]); then
+    exists lsb_release && distro="$(lsb_release -is)"
+    if [ "$distro" = "Ubuntu" ] || [ "$distro" = "Fedora" ] || test -f /etc/fedora-release; then
+        CONFIG="$CONFIG libunwind_off"
+    fi
+fi
+
+if [ "$platform" == "darwin" ]; then
+    BIN_PATH=$BIN_PATH/monero-wallet-gui.app/Contents/MacOS/
+elif [ "$platform" == "mingw64" ] || [ "$platform" == "mingw32" ]; then
+    MONEROD_EXEC=monerod.exe
+fi
+
+# force version update
+get_tag
+echo "var GUI_VERSION = \"$TAGNAME\"" > version.js
+pushd "$MONERO_DIR"
+get_tag
+popd
+echo "var GUI_MONERO_VERSION = \"$TAGNAME\"" >> version.js
+
+cd build
+if ! QMAKE=$(find_command qmake qmake-qt5); then
+    echo "Failed to find suitable qmake command."
+    exit 1
+fi
+$QMAKE ../monero-wallet-gui.pro "$CONFIG" || exit
+$MAKE || exit 
+
+# Copy monerod to bin folder
+if [ "$platform" != "mingw32" ] && [ "$ANDROID" != true ]; then
+cp ../$MONERO_DIR/bin/$MONEROD_EXEC $BIN_PATH
+fi
+
+# make deploy
+popd
+
--- a/src/main/clipboardAdapter.cpp
+++ b/src/main/clipboardAdapter.cpp
--- a/src/main/clipboardAdapter.h
+++ b/src/main/clipboardAdapter.h
--- a/cmake/32-bit-toolchain.cmake
+++ b/cmake/32-bit-toolchain.cmake
@@ -1,50 +0,0 @@
-# Copyright (c) 2014-2019, The Monero Project
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other
-#    materials provided with the distribution.
-# 
-# 3. Neither the name of the copyright holder nor the names of its contributors may be
-#    used to endorse or promote products derived from this software without specific
-#    prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-if (NOT CMAKE_HOST_WIN32)
-  set (CMAKE_SYSTEM_NAME Windows)
-endif()
-
-set (GCC_PREFIX i686-w64-mingw32)
-set (CMAKE_C_COMPILER ${GCC_PREFIX}-gcc)
-set (CMAKE_CXX_COMPILER ${GCC_PREFIX}-g++)
-set (CMAKE_AR ar CACHE FILEPATH "" FORCE)
-set (CMAKE_NM nm CACHE FILEPATH "" FORCE)
-set (CMAKE_LINKER ld CACHE FILEPATH "" FORCE)
-#set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE)
-set (CMAKE_RC_COMPILER windres)
-
-set (CMAKE_FIND_ROOT_PATH "${MSYS2_FOLDER}/mingw32")
-
-# Ensure cmake doesn't find things in the wrong places
-set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host
-set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) # Find libs in target
-set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # Find includes in target
-
-set (MINGW_FLAG "-m32")
-set (USE_LTO_DEFAULT false)
--- a/cmake/64-bit-toolchain.cmake
+++ b/cmake/64-bit-toolchain.cmake
@@ -1,50 +0,0 @@
-# Copyright (c) 2014-2019, The Monero Project
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other
-#    materials provided with the distribution.
-# 
-# 3. Neither the name of the copyright holder nor the names of its contributors may be
-#    used to endorse or promote products derived from this software without specific
-#    prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-if (NOT CMAKE_HOST_WIN32)
-  set (CMAKE_SYSTEM_NAME Windows)
-endif()
-
-set (GCC_PREFIX x86_64-w64-mingw32)
-set (CMAKE_C_COMPILER ${GCC_PREFIX}-gcc)
-set (CMAKE_CXX_COMPILER ${GCC_PREFIX}-g++)
-set (CMAKE_AR ar CACHE FILEPATH "" FORCE)
-set (CMAKE_NM nm CACHE FILEPATH "" FORCE)
-set (CMAKE_LINKER ld CACHE FILEPATH "" FORCE)
-#set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE)
-set (CMAKE_RC_COMPILER windres)
-
-set (CMAKE_FIND_ROOT_PATH "${MSYS2_FOLDER}/mingw64")
-
-# Ensure cmake doesn't find things in the wrong places
-set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host
-set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) # Find libs in target
-set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # Find includes in target
-
-set (MINGW_FLAG "-m64")
-set (USE_LTO_DEFAULT false)
--- a/cmake/CheckLinkerFlag.c
+++ b/cmake/CheckLinkerFlag.c
@@ -1,14 +0,0 @@
-#ifdef __CLASSIC_C__
-int main()
-{
-  int ac;
-  char* av[];
-#else
-int main(int ac, char* av[])
-{
-#endif
-  if (ac > 1000) {
-    return *av[0];
-  }
-  return 0;
-}
--- a/cmake/CheckLinkerFlag.cmake
+++ b/cmake/CheckLinkerFlag.cmake
@@ -1,47 +0,0 @@
-include(CheckCCompilerFlag)
-
-macro(CHECK_LINKER_FLAG flag VARIABLE)
-  if(NOT DEFINED "${VARIABLE}")
-    if(NOT CMAKE_REQUIRED_QUIET)
-      message(STATUS "Looking for ${flag} linker flag")
-    endif()
-
-    set(_cle_source ${CMAKE_SOURCE_DIR}/cmake/CheckLinkerFlag.c)
-
-    set(saved_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
-    set(CMAKE_C_FLAGS "${flag}")
-    try_compile(${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      ${_cle_source}
-      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${flag}
-      CMAKE_FLAGS
-      OUTPUT_VARIABLE OUTPUT)
-    unset(_cle_source)
-    set(CMAKE_C_FLAGS ${saved_CMAKE_C_FLAGS})
-    unset(saved_CMAKE_C_FLAGS)
-
-    if ("${OUTPUT}" MATCHES "warning.*ignored")
-      set(${VARIABLE} 0)
-    endif()
-
-    if(${VARIABLE})
-      if(NOT CMAKE_REQUIRED_QUIET)
-        message(STATUS "Looking for ${flag} linker flag - found")
-      endif()
-      set(${VARIABLE} 1 CACHE INTERNAL "Have linker flag ${flag}")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Determining if the ${flag} linker flag is supported "
-        "passed with the following output:\n"
-        "${OUTPUT}\n\n")
-    else()
-      if(NOT CMAKE_REQUIRED_QUIET)
-        message(STATUS "Looking for ${flag} linker flag - not found")
-      endif()
-      set(${VARIABLE} "" CACHE INTERNAL "Have linker flag ${flag}")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-        "Determining if the ${flag} linker flag is supported "
-        "failed with the following output:\n"
-        "${OUTPUT}\n\n")
-    endif()
-  endif()
-endmacro()
--- a/cmake/Deploy.cmake
+++ b/cmake/Deploy.cmake
@@ -1,103 +0,0 @@
-if(APPLE OR (WIN32 AND NOT STATIC))
-    add_custom_target(deploy)
-    get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
-    get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
-
-    if(APPLE AND NOT IOS)
-        find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${_qt_bin_dir}")
-        add_custom_command(TARGET deploy
-                           POST_BUILD
-                           COMMAND "${MACDEPLOYQT_EXECUTABLE}" "$<TARGET_FILE_DIR:monero-wallet-gui>/../.." -always-overwrite -qmldir="${CMAKE_SOURCE_DIR}"
-                           COMMENT "Running macdeployqt..."
-        )
-
-        # workaround for a Qt bug that requires manually adding libqsvg.dylib to bundle
-        find_file(_qt_svg_dylib "libqsvg.dylib" PATHS "${CMAKE_PREFIX_PATH}/plugins/imageformats" NO_DEFAULT_PATH)
-        if(_qt_svg_dylib)
-            add_custom_command(TARGET deploy
-                               POST_BUILD
-                               COMMAND ${CMAKE_COMMAND} -E copy ${_qt_svg_dylib} $<TARGET_FILE_DIR:monero-wallet-gui>/../PlugIns/imageformats/
-                               COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtGui.framework/Versions/5/QtGui" "@executable_path/../Frameworks/QtGui.fr    amework/Versions/5/QtGui" $<TARGET_FILE_DIR:monero-wallet-gui>/../PlugIns/imageformats/libqsvg.dylib
-                               COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtWidgets.framework/Versions/5/QtWidgets" "@executable_path/../Frameworks/    QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:monero-wallet-gui>/../PlugIns/imageformats/libqsvg.dylib
-                               COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtSvg.framework/Versions/5/QtSvg" "@executable_path/../Frameworks/QtGui.fr    amework/Versions/5/QtGui" $<TARGET_FILE_DIR:monero-wallet-gui>/../PlugIns/imageformats/libqsvg.dylib
-                               COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtCore.framework/Versions/5/QtCore" "@executable_path/../Frameworks/QtGui.    framework/Versions/5/QtGui" $<TARGET_FILE_DIR:monero-wallet-gui>/../PlugIns/imageformats/libqsvg.dylib
-                               COMMENT "Copying libqsvg.dylib, running install_name_tool"
-            )
-        endif()
-
-    elseif(WIN32)
-        find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
-        add_custom_command(TARGET monero-wallet-gui POST_BUILD
-                           COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}" "$<TARGET_FILE:monero-wallet-gui>" -no-translations -qmldir="${CMAKE_SOURCE_DIR}"
-                           COMMENT "Running windeployqt..."
-        )
-        set(WIN_DEPLOY_DLLS
-            libboost_chrono-mt.dll
-            libboost_filesystem-mt.dll
-            libboost_locale-mt.dll
-            libboost_program_options-mt.dll
-            libboost_regex-mt.dll
-            libboost_serialization-mt.dll
-            libboost_thread-mt.dll
-            libprotobuf.dll
-            libbrotlicommon.dll
-            libbrotlidec.dll
-            libusb-1.0.dll
-            zlib1.dll
-            libzstd.dll
-            libwinpthread-1.dll
-            libtiff-5.dll
-            libstdc++-6.dll
-            libpng16-16.dll
-            libpcre16-0.dll
-            libpcre-1.dll
-            libmng-2.dll
-            liblzma-5.dll
-            liblcms2-2.dll
-            libjpeg-8.dll
-            libintl-8.dll
-            libiconv-2.dll
-            libharfbuzz-0.dll
-            libgraphite2.dll
-            libglib-2.0-0.dll
-            libfreetype-6.dll
-            libbz2-1.dll
-            libssp-0.dll
-            libpcre2-16-0.dll
-            libhidapi-0.dll
-            libdouble-conversion.dll
-            libgcrypt-20.dll
-            libgpg-error-0.dll
-            libsodium-23.dll
-            libzmq.dll
-            #platform files
-            libgcc_s_seh-1.dll
-            #openssl files
-            libssl-1_1-x64.dll
-            libcrypto-1_1-x64.dll
-        )
-        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-            list(APPEND WIN_DEPLOY_DLLS
-                libicudtd67.dll
-                libicuind67.dll
-                libicuiod67.dll
-                libicutud67.dll
-                libicuucd67.dll
-            )
-        else() # assume release
-            list(APPEND WIN_DEPLOY_DLLS
-                libicudt67.dll
-                libicuin67.dll
-                libicuio67.dll
-                libicutu67.dll
-                libicuuc67.dll
-            )
-        endif()
-        list(TRANSFORM WIN_DEPLOY_DLLS PREPEND "$ENV{MSYSTEM_PREFIX}/bin/")
-        add_custom_command(TARGET deploy
-                           POST_BUILD
-                           COMMAND ${CMAKE_COMMAND} -E copy ${WIN_DEPLOY_DLLS} "$<TARGET_FILE_DIR:monero-wallet-gui>"
-                           COMMENT "Copying DLLs to target folder"
-        )
-    endif()
-endif()
--- a/cmake/FindCcache.cmake
+++ b/cmake/FindCcache.cmake
@@ -1,56 +0,0 @@
-# Copyright (c) 2014-2020, The Monero Project
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other
-#    materials provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be
-#    used to endorse or promote products derived from this software without specific
-#    prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# - Try to find readline include dirs and libraries
-#
-# Automatically finds ccache build accelerator, if it's found in PATH.
-#
-# Usage of this module as follows:
-#
-#     project(monero)
-#     include(FindCcache) # Include AFTER the project() macro to be able to reach the CMAKE_CXX_COMPILER variable
-#
-# Properties modified by this module:
-#
-#  GLOBAL PROPERTY RULE_LAUNCH_COMPILE     set to ccache, when ccache found
-#  GLOBAL PROPERTY RULE_LAUNCH_LINK        set to ccache, when ccache found
-
-find_program(CCACHE_FOUND ccache)
-if (CCACHE_FOUND)
-	set(TEMP_CPP_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/test-program.cpp")
-	file(WRITE "${TEMP_CPP_FILE}" "int main() { return 0; }")
-	execute_process(COMMAND "${CCACHE_FOUND}" "${CMAKE_CXX_COMPILER}" "${TEMP_CPP_FILE}"  RESULT_VARIABLE RET)
-	if (${RET} EQUAL 0)
-		message("found usable ccache: ${CCACHE_FOUND}")
-		set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_FOUND}")
-		set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK    "${CCACHE_FOUND}")
-	else()
-		message("found ccache ${CCACHE_FOUND}, but is UNUSABLE! Return code: ${RET}")
-	endif()
-else()
-	message("ccache NOT found!")
-endif()
--- a/cmake/FindHIDAPI.cmake
+++ b/cmake/FindHIDAPI.cmake
@@ -1,60 +0,0 @@
-# - try to find HIDAPI library
-# from http://www.signal11.us/oss/hidapi/
-#
-# Cache Variables: (probably not for direct use in your scripts)
-#  HIDAPI_INCLUDE_DIR
-#  HIDAPI_LIBRARY
-#
-# Non-cache variables you might use in your CMakeLists.txt:
-#  HIDAPI_FOUND
-#  HIDAPI_INCLUDE_DIRS
-#  HIDAPI_LIBRARIES
-#
-# Requires these CMake modules:
-#  FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-find_library(HIDAPI_LIBRARY
-  NAMES hidapi hidapi-libusb)
-
-find_path(HIDAPI_INCLUDE_DIR
-  NAMES hidapi.h
-  PATH_SUFFIXES
-  hidapi)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(HIDAPI
-  DEFAULT_MSG
-  HIDAPI_LIBRARY
-  HIDAPI_INCLUDE_DIR)
-
-if(HIDAPI_FOUND)
-  set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARY}")
-  if((STATIC AND UNIX AND NOT APPLE) OR (DEPENDS AND CMAKE_SYSTEM_NAME STREQUAL "Linux"))
-    find_library(LIBUSB-1.0_LIBRARY usb-1.0)
-    find_library(LIBUDEV_LIBRARY udev)
-    if(LIBUSB-1.0_LIBRARY)
-      set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARIES};${LIBUSB-1.0_LIBRARY}")
-      if(LIBUDEV_LIBRARY)
-        set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARIES};${LIBUDEV_LIBRARY}")
-      else()
-        message(WARNING "libudev library not found, binaries may fail to link.")
-      endif()
-    else()
-      message(WARNING "libusb-1.0 library not found, binaries may fail to link.")
-    endif()
-  endif()
-
-  set(HIDAPI_INCLUDE_DIRS "${HIDAPI_INCLUDE_DIR}")
-endif()
-
-mark_as_advanced(HIDAPI_INCLUDE_DIR HIDAPI_LIBRARY)
--- a/cmake/FindLibUSB.cmake
+++ b/cmake/FindLibUSB.cmake
@@ -1,149 +0,0 @@
-# - Find libusb for portable USB support
-# This module will find libusb as published by
-#  http://libusb.sf.net and
-#  http://libusb-win32.sf.net
-#
-# It will use PkgConfig if present and supported, else search
-# it on its own. If the LibUSB_ROOT_DIR environment variable
-# is defined, it will be used as base path.
-# The following standard variables get defined:
-#  LibUSB_FOUND:        true if LibUSB was found
-#  LibUSB_HEADER_FILE:  the location of the C header file
-#  LibUSB_INCLUDE_DIRS: the directory that contains the include file
-#  LibUSB_LIBRARIES:    the library
-# source: https://github.com/IntelRealSense/librealsense
-
-include ( CheckLibraryExists )
-include ( CheckIncludeFile )
-
-find_package ( PkgConfig )
-if ( PKG_CONFIG_FOUND )
-    pkg_check_modules ( PKGCONFIG_LIBUSB libusb-1.0 )
-    if ( NOT PKGCONFIG_LIBUSB_FOUND )
-        pkg_check_modules ( PKGCONFIG_LIBUSB libusb )
-    endif ( NOT PKGCONFIG_LIBUSB_FOUND )
-endif ( PKG_CONFIG_FOUND )
-
-if ( PKGCONFIG_LIBUSB_FOUND )
-    set ( LibUSB_INCLUDE_DIRS ${PKGCONFIG_LIBUSB_INCLUDE_DIRS} )
-    foreach ( i ${PKGCONFIG_LIBUSB_LIBRARIES} )
-        string ( REGEX MATCH "[^-]*" ibase "${i}" )
-        find_library ( ${ibase}_LIBRARY
-                NAMES ${i}
-                PATHS ${PKGCONFIG_LIBUSB_LIBRARY_DIRS}
-                )
-        if ( ${ibase}_LIBRARY )
-            list ( APPEND LibUSB_LIBRARIES ${${ibase}_LIBRARY} )
-        endif ( ${ibase}_LIBRARY )
-        mark_as_advanced ( ${ibase}_LIBRARY )
-    endforeach ( i )
-
-else ( PKGCONFIG_LIBUSB_FOUND )
-    find_file ( LibUSB_HEADER_FILE
-            NAMES
-            libusb.h usb.h
-            PATHS
-            $ENV{ProgramFiles}/LibUSB-Win32
-            $ENV{LibUSB_ROOT_DIR}
-            PATH_SUFFIXES
-            include
-            libusb-1.0
-            include/libusb-1.0
-            )
-    mark_as_advanced ( LibUSB_HEADER_FILE )
-    get_filename_component ( LibUSB_INCLUDE_DIRS "${LibUSB_HEADER_FILE}" PATH )
-
-    if ( ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" )
-        # LibUSB-Win32 binary distribution contains several libs.
-        # Use the lib that got compiled with the same compiler.
-        if ( MSVC )
-            if ( WIN32 )
-                set ( LibUSB_LIBRARY_PATH_SUFFIX lib/msvc )
-            else ( WIN32 )
-                set ( LibUSB_LIBRARY_PATH_SUFFIX lib/msvc_x64 )
-            endif ( WIN32 )
-        elseif ( BORLAND )
-            set ( LibUSB_LIBRARY_PATH_SUFFIX lib/bcc )
-        elseif ( CMAKE_COMPILER_IS_GNUCC )
-            set ( LibUSB_LIBRARY_PATH_SUFFIX lib/gcc )
-        endif ( MSVC )
-    endif ( ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" )
-
-    find_library ( usb_LIBRARY
-            NAMES
-            usb-1.0 libusb usb
-            PATHS
-            $ENV{ProgramFiles}/LibUSB-Win32
-            $ENV{LibUSB_ROOT_DIR}
-            PATH_SUFFIXES
-            ${LibUSB_LIBRARY_PATH_SUFFIX}
-            )
-    mark_as_advanced ( usb_LIBRARY )
-    if ( usb_LIBRARY )
-        set ( LibUSB_LIBRARIES ${usb_LIBRARY} )
-    endif ( usb_LIBRARY )
-
-endif ( PKGCONFIG_LIBUSB_FOUND )
-
-if ( LibUSB_INCLUDE_DIRS AND LibUSB_LIBRARIES )
-    set ( LibUSB_FOUND true )
-endif ( LibUSB_INCLUDE_DIRS AND LibUSB_LIBRARIES )
-
-if ( LibUSB_FOUND )
-    set ( CMAKE_REQUIRED_INCLUDES "${LibUSB_INCLUDE_DIRS}" )
-    check_include_file ( "${LibUSB_HEADER_FILE}" LibUSB_FOUND )
-endif ( LibUSB_FOUND )
-
-if ( LibUSB_FOUND )
-    check_library_exists ( "${LibUSB_LIBRARIES}" usb_open "" LibUSB_FOUND )
-    check_library_exists ( "${LibUSB_LIBRARIES}" libusb_get_device_list "" LibUSB_VERSION_1.0 )
-    check_library_exists ( "${LibUSB_LIBRARIES}" libusb_get_port_numbers "" LibUSB_VERSION_1.0.16 )
-
-    if((STATIC AND UNIX AND NOT APPLE) OR (DEPENDS AND CMAKE_SYSTEM_NAME STREQUAL "Linux"))
-        find_library(LIBUDEV_LIBRARY udev)
-        if(LIBUDEV_LIBRARY)
-            set(LibUSB_LIBRARIES "${LibUSB_LIBRARIES};${LIBUDEV_LIBRARY}")
-        else()
-            message(WARNING "libudev library not found, binaries may fail to link.")
-        endif()
-    endif()
-
-    # Library 1.0.16+ compilation test.
-    # The check_library_exists does not work well on Apple with shared libs.
-    if (APPLE OR LibUSB_VERSION_1.0.16 OR STATIC)
-        if (APPLE)
-            if(DEPENDS)
-                list(APPEND TEST_COMPILE_EXTRA_LIBRARIES "-framework Foundation -framework IOKit")
-            else()
-                find_library(COREFOUNDATION CoreFoundation)
-                find_library(IOKIT IOKit)
-                list(APPEND TEST_COMPILE_EXTRA_LIBRARIES ${IOKIT})
-                list(APPEND TEST_COMPILE_EXTRA_LIBRARIES ${COREFOUNDATION})
-            endif()
-        endif()
-        if (WIN32)
-            list(APPEND TEST_COMPILE_EXTRA_LIBRARIES setupapi)
-        endif()
-        list(APPEND TEST_COMPILE_EXTRA_LIBRARIES ${LibUSB_LIBRARIES})
-
-        try_compile(LibUSB_COMPILE_TEST_PASSED
-                ${CMAKE_BINARY_DIR}
-                "${CMAKE_SOURCE_DIR}/cmake/test-libusb-version.c"
-                CMAKE_FLAGS
-                    "-DINCLUDE_DIRECTORIES=${LibUSB_INCLUDE_DIRS}"
-                    "-DLINK_DIRECTORIES=${LibUSB_LIBRARIES}"
-                LINK_LIBRARIES ${TEST_COMPILE_EXTRA_LIBRARIES}
-                OUTPUT_VARIABLE OUTPUT)
-        unset(TEST_COMPILE_EXTRA_LIBRARIES)
-        message(STATUS "LibUSB Compilation test: ${LibUSB_COMPILE_TEST_PASSED}")
-    endif()
-endif ( LibUSB_FOUND )
-
-if ( NOT LibUSB_FOUND )
-    if ( NOT LibUSB_FIND_QUIETLY )
-        message ( STATUS "LibUSB not found, try setting LibUSB_ROOT_DIR environment variable." )
-    endif ( NOT LibUSB_FIND_QUIETLY )
-    if ( LibUSB_FIND_REQUIRED )
-        message ( FATAL_ERROR "" )
-    endif ( LibUSB_FIND_REQUIRED )
-endif ( NOT LibUSB_FOUND )
--- a/cmake/GitGetVersionTag.cmake
+++ b/cmake/GitGetVersionTag.cmake
@@ -1,67 +0,0 @@
-# Copyright (c) 2014-2019, The Monero Project
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other
-#    materials provided with the distribution.
-# 
-# 3. Neither the name of the copyright holder nor the names of its contributors may be
-#    used to endorse or promote products derived from this software without specific
-#    prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
-
-function (git_get_version_tag git directory result_var)
-  execute_process(COMMAND "${git}" rev-parse --short HEAD
-    WORKING_DIRECTORY ${directory}
-    OUTPUT_VARIABLE COMMIT
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if(NOT COMMIT)
-    message(WARNING "${directory}: cannot determine current commit. Make sure that you are building from a Git working tree")
-    set(${result_var} "unknown" PARENT_SCOPE)
-    return()
-  endif()
-
-  execute_process(COMMAND "${git}" describe --tags --exact-match
-    WORKING_DIRECTORY ${directory}
-    OUTPUT_VARIABLE TAG
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if(TAG)
-    message(STATUS "${directory}: building tagged release ${TAG}-${COMMIT}")
-    set(${result_var} "${TAG}-${COMMIT}" PARENT_SCOPE)
-    return()
-  endif()
-
-  execute_process(COMMAND "${git}" describe --tags --long
-    WORKING_DIRECTORY ${directory}
-    OUTPUT_VARIABLE MOST_RECENT_TAG
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if(MOST_RECENT_TAG)
-    message(STATUS "${directory}: ahead of or behind a tagged release, building ${MOST_RECENT_TAG}")
-    set(${result_var} "${MOST_RECENT_TAG}" PARENT_SCOPE)
-    return()
-  endif()
-
-  message(STATUS "${directory}: building ${COMMIT} commit")
-  set(${result_var} "${COMMIT}" PARENT_SCOPE)
-endfunction()
--- a/cmake/VersionGui.cmake
+++ b/cmake/VersionGui.cmake
@@ -1,49 +0,0 @@
-# Copyright (c) 2014-2019, The Monero Project
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other
-#    materials provided with the distribution.
-# 
-# 3. Neither the name of the copyright holder nor the names of its contributors may be
-#    used to endorse or promote products derived from this software without specific
-#    prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-function (write_static_version_header VERSION_TAG_GUI)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/version.js.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.js")
-endfunction ()
-
-find_package(Git QUIET)
-if ("$Format:$" STREQUAL "")
-  # We're in a tarball; use hard-coded variables.
-  write_static_version_header("release")
-elseif (GIT_FOUND OR Git_FOUND)
-  message(STATUS "Found Git: ${GIT_EXECUTABLE}")
-
-  include(GitGetVersionTag)
-  git_get_version_tag(${GIT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} VERSION_TAG_GUI)
-  STRING(REGEX REPLACE "^v([0-9])" "\\1" VERSION_TAG_GUI ${VERSION_TAG_GUI})
-  write_static_version_header(${VERSION_TAG_GUI})
-else()
-  message(STATUS "WARNING: Git was not found!")
-  write_static_version_header("unknown")
-endif ()
-add_custom_target(genversiongui ALL
-    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/version.js")
--- a/components/AdvancedOptionsItem.qml
+++ b/components/AdvancedOptionsItem.qml
@@ -1,106 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Layouts 1.1
-import FontAwesome 1.0
-
-import "../components" as MoneroComponents
-
-RowLayout {
-    id: advancedOptionsItem
-    
-    property alias title: title.text
-    property alias button1: button1
-    property alias button2: button2
-    property alias button3: button3
-    property alias helpTextLarge: helpTextLarge
-    property alias helpTextSmall: helpTextSmall
-      
-    RowLayout {
-        id: titlecolumn
-        Layout.alignment: Qt.AlignTop | Qt.AlignLeft
-        Layout.preferredWidth: 195
-        Layout.maximumWidth: 195
-        Layout.leftMargin: 10
-
-        MoneroComponents.Label {
-            id: title
-            fontSize: 14
-        }
-
-        MoneroComponents.Label {
-            id: iconLabel
-            fontSize: 12
-            text: FontAwesome.questionCircle
-            fontFamily: FontAwesome.fontFamily
-            opacity: 0.3
-            MouseArea {
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                onClicked: helpText.visible = !helpText.visible
-                onEntered: parent.opacity = 0.4
-                onExited: parent.opacity = 0.3
-            }  
-        }
-        
-        Rectangle {
-            id: separator
-            Layout.fillWidth: true
-            height: 10
-            color: "transparent"
-        }
-    }
-
-    ColumnLayout {
-        Layout.fillWidth: false
-        Layout.alignment: Qt.AlignTop | Qt.AlignLeft
-        spacing: 4
-                
-        RowLayout {
-            Layout.fillWidth: false
-            spacing: 12
-            Layout.alignment: Qt.AlignTop | Qt.AlignLeft
-            
-            StandardButton {
-                id: button1
-                small: true
-                visible: button1.text
-            }
-    
-            StandardButton {
-                id: button2
-                small: true
-                visible: button2.text
-            }
-            
-            StandardButton {
-                id: button3
-                small: true
-                visible: button3.text
-            }
-        }
-        
-        ColumnLayout {
-            id: helpText
-            visible: false     
-            Layout.alignment: Qt.AlignTop | Qt.AlignLeft
-            
-            MoneroComponents.TextPlain {
-                id: helpTextLarge
-                visible: helpTextLarge.text
-                font.family: MoneroComponents.Style.fontRegular.name
-                font.pixelSize: 13
-                color: MoneroComponents.Style.defaultFontColor
-            }
-            
-            MoneroComponents.TextPlain {
-                id: helpTextSmall
-                visible: helpTextSmall.text
-                Layout.leftMargin: 5
-                textFormat: Text.RichText
-                font.family: MoneroComponents.Style.fontRegular.name
-                font.pixelSize: 12
-                color: MoneroComponents.Style.defaultFontColor
-            }
-        }
-    }
-}
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -1,47 +0,0 @@
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-###
-
-#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defines.h.cmake
-#               ${CMAKE_CURRENT_BINARY_DIR}/defines.h)
-
-file(GLOB_RECURSE UI_FILES *.ui)
-file(GLOB_RECURSE CODE_FILES *.cpp)
-
-qt5_wrap_ui(UI_HEADERS ${UI_FILES})
-#qt5_add_resources(RESOURCE_FILES ../resources/resources.qrc)
-
-# Windows application icon
-if (WIN32)
-  set(WINDOWS_RES_FILE ${CMAKE_CURRENT_BINARY_DIR}/resources.obj)
-  if (MSVC)
-    add_custom_command(OUTPUT ${WINDOWS_RES_FILE}
-      COMMAND rc.exe /fo ${WINDOWS_RES_FILE} resources.rc
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/win
-    )
-  else()
-    add_custom_command(OUTPUT ${WINDOWS_RES_FILE}
-      COMMAND windres.exe resources.rc ${WINDOWS_RES_FILE}
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/win
-    )
-  endif()
-endif()
-
-add_executable(${CMAKE_PROJECT_NAME} WIN32
-  ${UI_HEADERS}
-  ${CODE_FILES}
-  ${RESOURCE_FILES}
-  ${WINDOWS_RES_FILE}
-)
-target_link_libraries(${CMAKE_PROJECT_NAME}
-  Qt5::Widgets
-)
-
-if (UNIX)
-  install(TARGETS ${CMAKE_PROJECT_NAME}
-          RUNTIME DESTINATION bin)
-elseif (WIN32)
-  install(TARGETS ${CMAKE_PROJECT_NAME}
-          DESTINATION .)
-endif()
--- a/components/CheckBox.qml
+++ b/components/CheckBox.qml
@@ -38,10 +38,8 @@ Item {
    property alias text: label.text
    property string checkedIcon: "qrc:///images/check-white.svg"
    property string uncheckedIcon
-    property bool fontAwesomeIcons: false
    property int imgWidth: 13
    property int imgHeight: 13
-    property bool toggleOnClick: true
    property bool checked: false
    property alias background: backgroundRect.color
    property bool border: true
@@ -49,26 +47,18 @@ Item {
    property alias fontColor: label.color
    property bool iconOnTheLeft: true
    signal clicked()
-
    height: 25
    width: checkBoxLayout.width
-    opacity: enabled ? 1 : 0.7
-
-    Keys.onEnterPressed: toggle()
-    Keys.onReturnPressed: Keys.onEnterPressed(event)
-    Keys.onSpacePressed: Keys.onEnterPressed(event)

    function toggle(){
-        if (checkBox.toggleOnClick) {
-            checkBox.checked = !checkBox.checked
-        }
+        checkBox.checked = !checkBox.checked
        checkBox.clicked()
    }

    RowLayout {
        id: checkBoxLayout
        layoutDirection: iconOnTheLeft ? Qt.LeftToRight : Qt.RightToLeft
-        spacing: 10
+        spacing: (!isMobile ? 10 : 8)

        Item {
            id: checkMark
@@ -80,9 +70,9 @@ Item {
                visible: checkBox.border
                anchors.fill: parent
                radius: 3
-                color: checkBox.enabled ? "transparent" : MoneroComponents.Style.inputBoxBackgroundDisabled
+                color: "transparent"
                border.color:
-                    if (checkBox.activeFocus) {
+                    if(checkBox.checked){
                        return MoneroComponents.Style.inputBorderColorActive;
                    } else {
                        return MoneroComponents.Style.inputBorderColorInActive;
@@ -96,11 +86,9 @@ Item {
                width: checkBox.imgWidth
                height: checkBox.imgHeight
                color: MoneroComponents.Style.defaultFontColor
-                fontAwesomeFallbackIcon: checkBox.fontAwesomeIcons ? getIcon() : FontAwesome.plus
+                fontAwesomeFallbackIcon: FontAwesome.plus
                fontAwesomeFallbackSize: 14
-                image: checkBox.fontAwesomeIcons ? "" : getIcon()
-
-                function getIcon() {
+                image: {
                    if (checkBox.checked || checkBox.uncheckedIcon == "")
                        return checkBox.checkedIcon;
                    return checkBox.uncheckedIcon;
@@ -114,8 +102,7 @@ Item {
            font.pixelSize: checkBox.fontSize
            color: MoneroComponents.Style.defaultFontColor
            textFormat: Text.RichText
-            wrapMode: Text.NoWrap
-            visible: text != ""
+            wrapMode: Text.Wrap
        }
    }

--- a/components/ContextMenu.qml
+++ b/components/ContextMenu.qml
@@ -1,40 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-
-import FontAwesome 1.0
-import "../components" as MoneroComponents
-
-MouseArea {
-    signal paste()
-
-    id: root
-    acceptedButtons: Qt.RightButton
-    anchors.fill: parent
-    onClicked: {
-        if (mouse.button === Qt.RightButton)
-            contextMenu.open()
-    }
-
-    Menu {
-        id: contextMenu
-
-        background: Rectangle {
-            border.color: MoneroComponents.Style.buttonBackgroundColorDisabledHover
-            border.width: 1
-            radius: 2
-            color: MoneroComponents.Style.buttonBackgroundColorDisabled
-        }
-
-        padding: 1
-        width: 100
-        x: root.mouseX
-        y: root.mouseY
-
-        MoneroComponents.ContextMenuItem {
-            enabled: root.parent.canPaste === true
-            glyphIcon: FontAwesome.paste
-            onTriggered: root.paste()
-            text: qsTr("Paste") + translationManager.emptyString
-        }
-    }
-}
--- a/components/ContextMenuItem.qml
+++ b/components/ContextMenuItem.qml
@@ -1,52 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.1
-
-import FontAwesome 1.0
-import "../components" as MoneroComponents
-
-MenuItem {
-    id: menuItem
-
-    property bool glyphIconSolid: true
-    property alias glyphIcon: glyphIcon.text
-
-    background: Rectangle {
-        color: MoneroComponents.Style.buttonBackgroundColorDisabledHover
-        opacity: mouse.containsMouse ? 1 : 0
-
-        MouseArea {
-            id: mouse
-
-            anchors.fill: parent
-            hoverEnabled: true
-            onClicked: menuItem.triggered()
-            visible: menuItem.enabled
-        }
-    }
-
-    contentItem: RowLayout {
-        anchors.fill: parent
-        anchors.leftMargin: 10
-        anchors.rightMargin: 10
-        opacity: menuItem.enabled ? 1 : 0.4
-        spacing: 8
-
-        Text {
-            id: glyphIcon
-
-            color: MoneroComponents.Style.buttonTextColor
-            font.family: glyphIconSolid ? FontAwesome.fontFamilySolid : FontAwesome.fontFamily
-            font.pixelSize: 14
-            font.styleName: glyphIconSolid ? "Solid" : "Regular"
-        }
-
-        Text {
-            color: MoneroComponents.Style.buttonTextColor
-            font.family: MoneroComponents.Style.fontRegular.name
-            font.pixelSize: 14
-            Layout.fillWidth: true
-            text: menuItem.text
-        }
-    }
-}
--- a/components/DaemonConsole.qml
+++ b/components/DaemonConsole.qml
@@ -0,0 +1,216 @@
+// Copyright (c) 2014-2018, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import QtQuick 2.9
+import QtQuick.Controls 2.0
+import QtQuick.Dialogs 1.2
+import QtQuick.Layouts 1.1
+import QtQuick.Controls.Styles 1.4
+import QtQuick.Window 2.2
+
+import "." as MoneroComponents
+import "effects/" as MoneroEffects
+import "../js/Windows.js" as Windows
+import "../js/Utils.js" as Utils
+
+Window {
+    id: root
+    modality: Qt.ApplicationModal
+    color: "black"
+    flags: Windows.flags
+    property alias text: dialogContent.text
+    property alias content: root.text
+    property alias textArea: dialogContent
+    property var icon
+
+    // same signals as Dialog has
+    signal accepted()
+    signal rejected()
+
+    onClosing: {
+        inactiveOverlay.visible = false;
+    }
+
+    function open() {
+        inactiveOverlay.visible = true;
+        show();
+    }
+
+    // TODO: implement without hardcoding sizes
+    width:  480
+    height: 280
+
+    // background
+    MoneroEffects.GradientBackground {
+        anchors.fill: parent
+        fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor
+        initialStartColor: MoneroComponents.Style.middlePanelBackgroundGradientStart
+        initialStopColor: MoneroComponents.Style.middlePanelBackgroundGradientStop
+        blackColorStart: MoneroComponents.Style._b_middlePanelBackgroundGradientStart
+        blackColorStop: MoneroComponents.Style._b_middlePanelBackgroundGradientStop
+        whiteColorStart: MoneroComponents.Style._w_middlePanelBackgroundGradientStart
+        whiteColorStop: MoneroComponents.Style._w_middlePanelBackgroundGradientStop
+        start: Qt.point(0, 0)
+        end: Qt.point(height, width)
+    }
+
+    // Make window draggable
+    MouseArea {
+        anchors.fill: parent
+        property point lastMousePos: Qt.point(0, 0)
+        onPressed: { lastMousePos = Qt.point(mouseX, mouseY); }
+        onMouseXChanged: root.x += (mouseX - lastMousePos.x)
+        onMouseYChanged: root.y += (mouseY - lastMousePos.y)
+    }
+
+    ColumnLayout {
+        id: mainLayout
+
+        anchors.fill: parent
+        anchors.topMargin: 20
+        anchors.margins: 35
+        spacing: 20
+
+        Item {
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+
+            Rectangle {
+                anchors.fill: parent
+                color: "transparent"
+                border.color: MoneroComponents.Style.inputBorderColorActive
+                border.width: 1
+                radius: 4
+            }
+
+            Flickable {
+                id: flickable
+                anchors.fill: parent
+
+                TextArea.flickable: TextArea {
+                    id : dialogContent
+                    textFormat: TextEdit.RichText
+                    selectByMouse: true
+                    selectByKeyboard: true
+                    font.family: MoneroComponents.Style.defaultFontColor
+                    font.pixelSize: 14
+                    color: MoneroComponents.Style.defaultFontColor
+                    selectionColor: MoneroComponents.Style.textSelectionColor
+                    wrapMode: TextEdit.Wrap
+                    readOnly: true
+                    function logCommand(msg){
+                        msg = log_color(msg, MoneroComponents.Style.blackTheme ? "lime" : "#009100");
+                        textArea.append(msg);
+                    }
+                    function logMessage(msg){
+                        msg = msg.trim();
+                        var color = MoneroComponents.Style.defaultFontColor;
+                        if(msg.toLowerCase().indexOf('error') >= 0){
+                            color = MoneroComponents.Style.errorColor;
+                        } else if (msg.toLowerCase().indexOf('warning') >= 0){
+                            color = MoneroComponents.Style.warningColor;
+                        }
+
+                        // format multi-lines
+                        if(msg.split("\n").length >= 2){
+                            msg = msg.split("\n").join('<br>');
+                        }
+
+                        log(msg, color);
+                    }
+                    function log_color(msg, color){
+                        return "<span style='color: " + color +  ";' >" + msg + "</span>";
+                    }
+                    function log(msg, color){
+                        var timestamp = Utils.formatDate(new Date(), {
+                            weekday: undefined,
+                            month: "numeric",
+                            timeZoneName: undefined
+                        });
+
+                        var _timestamp = log_color("[" + timestamp + "]", "#FFFFFF");
+                        var _msg = log_color(msg, color);
+                        textArea.append(_timestamp + " " + _msg);
+
+                        // scroll to bottom
+                        //if(flickable.contentHeight > content.height){
+                        //    flickable.contentY = flickable.contentHeight + 20;
+                        //}
+                    }
+                }
+
+                ScrollBar.vertical: ScrollBar {}
+            }
+        }
+
+        RowLayout {
+            Layout.fillWidth: true
+
+            MoneroComponents.LineEdit {
+                id: sendCommandText
+                Layout.fillWidth: true
+                placeholderText: qsTr("command + enter (e.g help)") + translationManager.emptyString
+                onAccepted: {
+                    if(text.length > 0) {
+                        textArea.logCommand(">>> " + text)
+                        daemonManager.sendCommand(text, currentWallet.nettype);
+                    }
+                    text = ""
+                }
+            }
+        }
+    }
+
+    // window borders
+    Rectangle {
+        anchors.bottom: parent.bottom
+        anchors.top: parent.top
+        anchors.left: parent.left
+        width:1
+        color: "#2F2F2F"
+        z: 2
+    }
+
+    Rectangle {
+        anchors.bottom: parent.bottom
+        anchors.top: parent.top
+        anchors.right: parent.right
+        width:1
+        color: "#2F2F2F"
+        z: 2
+    }
+
+    Rectangle {
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+        height:1
+        color: "#2F2F2F"
+        z: 2
+    }
+}
--- a/components/DaemonManagerDialog.qml
+++ b/components/DaemonManagerDialog.qml
@@ -52,7 +52,6 @@ Window {
    // TODO: implement without hardcoding sizes
    width: 480
    height: 200
-    color: MoneroComponents.Style.middlePanelBackgroundColor

    // Make window draggable
    MouseArea {
@@ -97,7 +96,7 @@ Window {
                Layout.fillWidth: true
                horizontalAlignment: Text.AlignHCenter
                themeTransition: false
-                color: MoneroComponents.Style.defaultFontColor
+                color: "black"
            }

        }
--- a/components/DatePicker.qml
+++ b/components/DatePicker.qml
@@ -28,7 +28,6 @@

 import QtQuick 2.9
 import QtQuick.Controls 1.2
-import QtQuick.Controls 2.2 as QtQuickControls2
 import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 import QtQuick.Controls.Styles 1.2
@@ -38,7 +37,8 @@ import "effects/" as MoneroEffects

 Item {
    id: datePicker
-    readonly property alias expanded: popup.visible
+    z: parent.z + 1
+    property bool expanded: false
    property date currentDate
    property bool showCurrentDate: true
    property color backgroundColor : MoneroComponents.Style.appWindowBorderColor
@@ -52,6 +52,19 @@ Item {

    onExpandedChanged: if(expanded) appWindow.currentItem = datePicker

+    function hide() { datePicker.expanded = false }
+    function containsPoint(px, py) {
+        if(px < 0)
+            return false
+        if(px > width)
+            return false
+        if(py < 0)
+            return false
+        if(py > height + calendarRect.height)
+            return false
+        return true
+    }
+
    Rectangle {
        id: inputLabelRect
        color: "transparent"
@@ -117,7 +130,7 @@ Item {

            Connections {
                target: datePicker
-                function onCurrentDateChanged() {
+                onCurrentDateChanged: {
                    dateInput.setDate(datePicker.currentDate)
                }
            }
@@ -240,7 +253,7 @@ Item {

                MouseArea {
                    anchors.fill: parent
-                    onClicked: datePicker.expanded ? popup.close() : popup.open()
+                    onClicked: datePicker.expanded = !datePicker.expanded
                    hoverEnabled: true
                    cursorShape: Qt.PointingHandCursor
                }
@@ -248,205 +261,195 @@ Item {
        }
    }

-    QtQuickControls2.Popup {
-        id: popup
-        padding: 0
-        closePolicy: QtQuickControls2.Popup.CloseOnEscape | QtQuickControls2.Popup.CloseOnPressOutsideParent
+    Rectangle {
+        id: calendarRect
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: head.bottom
+        anchors.topMargin: 10
+        color: MoneroComponents.Style.middlePanelBackgroundColor
+        border.width: 1
+        border.color: MoneroComponents.Style.appWindowBorderColor
+        height: datePicker.expanded ? calendar.height + 2 : 0
+        clip: true
+
+        Behavior on height {
+            NumberAnimation { duration: 100; easing.type: Easing.InQuad }
+        }

        Rectangle {
-            id: calendarRect
-            width: head.width
-            x: head.x
-            y: head.y + head.height + 10
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.leftMargin: 1
+            anchors.rightMargin: 1
+            anchors.top: parent.top
+            color: MoneroComponents.Style.appWindowBorderColor
+            height: 1
+        }

-            color: MoneroComponents.Style.middlePanelBackgroundColor
-            border.width: 1
-            border.color: MoneroComponents.Style.appWindowBorderColor
-            height: datePicker.expanded ? calendar.height + 2 : 0
-            clip: true
+        Calendar {
+            id: calendar
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.top: parent.top
+            anchors.margins: 1
+            anchors.bottomMargin: 10
+            height: 220
+            frameVisible: false

-            Behavior on height {
-                NumberAnimation { duration: 100; easing.type: Easing.InQuad }
-            }
+            style: CalendarStyle {
+                gridVisible: false
+                background: Rectangle { color: MoneroComponents.Style.middlePanelBackgroundColor }
+                dayDelegate: Item {
+                    z: parent.z + 1
+                    implicitHeight: implicitWidth
+                    implicitWidth: calendar.width / 7

-            MouseArea {
-                anchors.fill: parent
-            }
+                    Rectangle {
+                        id: dayRect
+                        anchors.fill: parent
+                        radius: parent.implicitHeight / 2
+                        color: {
+                            if(dayArea.pressed && styleData.visibleMonth)
+                                return MoneroComponents.Style.blackTheme ? "#20FFFFFF" : "#10000000"
+                            return "transparent";
+                        }
+                    }

-            Rectangle {
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.leftMargin: 1
-                anchors.rightMargin: 1
-                anchors.top: parent.top
-                color: MoneroComponents.Style.appWindowBorderColor
-                height: 1
-            }
+                    MoneroComponents.TextPlain {
+                        id: dayText
+                        anchors.centerIn: parent
+                        font.family: MoneroComponents.Style.fontMonoRegular.name
+                        font.pixelSize: {
+                            if(!styleData.visibleMonth) return 12
+                            return 14
+                        }
+                        font.bold: {
+                            if(dayArea.pressed || styleData.visibleMonth) return true;
+                            return false;
+                        }
+                        text: styleData.date.getDate()
+                        themeTransition: false
+                        color: {
+                            if(!styleData.visibleMonth) return MoneroComponents.Style.lightGreyFontColor
+                            if(dayArea.pressed) return MoneroComponents.Style.defaultFontColor
+                            if(styleData.today) return MoneroComponents.Style.orange
+                            return MoneroComponents.Style.defaultFontColor
+                        }
+                    }

-            Calendar {
-                id: calendar
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.margins: 1
-                anchors.bottomMargin: 10
-                height: 220
-                frameVisible: false
-
-                style: CalendarStyle {
-                    gridVisible: false
-                    background: Rectangle { color: MoneroComponents.Style.middlePanelBackgroundColor }
-                    dayDelegate: Item {
-                        z: parent.z + 1
-                        implicitHeight: implicitWidth
-                        implicitWidth: calendar.width / 7
-
-                        Rectangle {
-                            id: dayRect
-                            anchors.fill: parent
-                            radius: parent.implicitHeight / 2
-                            color: {
-                                if(dayArea.pressed && styleData.visibleMonth)
-                                    return MoneroComponents.Style.blackTheme ? "#20FFFFFF" : "#10000000"
-                                return "transparent";
+                    MouseArea {
+                        id: dayArea
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        onEntered: dayRect.color = MoneroComponents.Style.blackTheme ? "#20FFFFFF" : "#10000000"
+                        onExited: dayRect.color = "transparent"
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: {
+                            if(styleData.visibleMonth) {
+                                currentDate = styleData.date
+                                datePicker.expanded = false
+                            } else {
+                                var date = styleData.date
+                                if(date.getMonth() > calendar.visibleMonth)
+                                    calendar.showNextMonth()
+                                else calendar.showPreviousMonth()
                            }
+
+                            datePicker.dateChanged();
+                        }
+                    }
+                }
+
+                dayOfWeekDelegate: Item {
+                    implicitHeight: 20
+                    implicitWidth: calendar.width / 7
+
+                    MoneroComponents.TextPlain {
+                        anchors.centerIn: parent
+                        elide: Text.ElideRight
+                        font.family: MoneroComponents.Style.fontMonoRegular.name
+                        font.pixelSize: 12
+                        color: MoneroComponents.Style.lightGreyFontColor
+                        themeTransition: false
+                        text: {
+                            var locale = Qt.locale()
+                            return locale.dayName(styleData.dayOfWeek, Locale.ShortFormat)
+                        }
+                    }
+                }
+
+                navigationBar: Rectangle {
+                    color: MoneroComponents.Style.middlePanelBackgroundColor
+                    implicitWidth: calendar.width
+                    implicitHeight: 30
+
+                    MoneroComponents.TextPlain {
+                        anchors.centerIn: parent
+                        font.family: MoneroComponents.Style.fontMonoRegular.name
+                        font.pixelSize: 14
+                        color: MoneroComponents.Style.dimmedFontColor
+                        themeTransition: false
+                        text: styleData.title
+                    }
+
+
+                    Item {
+                        anchors.left: parent.left
+                        anchors.leftMargin: 4
+                        anchors.top: parent.top
+                        anchors.bottom: parent.bottom
+                        width: height
+
+                        Image {
+                            id: prevMonthIcon
+                            anchors.centerIn: parent
+                            source: "qrc:///images/prevMonth.png"
+                            visible: false
                        }

-                        MoneroComponents.TextPlain {
-                            id: dayText
-                            anchors.centerIn: parent
-                            font.family: MoneroComponents.Style.fontMonoRegular.name
-                            font.pixelSize: {
-                                if(!styleData.visibleMonth) return 12
-                                return 14
-                            }
-                            font.bold: {
-                                if(dayArea.pressed || styleData.visibleMonth) return true;
-                                return false;
-                            }
-                            text: styleData.date.getDate()
-                            themeTransition: false
-                            color: {
-                                if(!styleData.visibleMonth) return MoneroComponents.Style.lightGreyFontColor
-                                if(dayArea.pressed) return MoneroComponents.Style.defaultFontColor
-                                if(styleData.today) return MoneroComponents.Style.orange
-                                return MoneroComponents.Style.defaultFontColor
-                            }
+                        ColorOverlay {
+                            source: prevMonthIcon
+                            anchors.fill: prevMonthIcon
+                            color: MoneroComponents.Style.defaultFontColor
+                            opacity: 0.5
                        }

                        MouseArea {
-                            id: dayArea
-                            anchors.fill: parent
                            hoverEnabled: true
-                            onEntered: dayRect.color = MoneroComponents.Style.blackTheme ? "#20FFFFFF" : "#10000000"
-                            onExited: dayRect.color = "transparent"
                            cursorShape: Qt.PointingHandCursor
-                            onClicked: {
-                                if(styleData.visibleMonth) {
-                                    currentDate = styleData.date
-                                    popup.close()
-                                } else {
-                                    var date = styleData.date
-                                    if(date.getMonth() > calendar.visibleMonth)
-                                        calendar.showNextMonth()
-                                    else calendar.showPreviousMonth()
-                                }
-
-                                datePicker.dateChanged();
-                            }
+                            anchors.fill: parent
+                            onClicked: calendar.showPreviousMonth()
                        }
                    }

-                    dayOfWeekDelegate: Item {
-                        implicitHeight: 20
-                        implicitWidth: calendar.width / 7
+                    Item {
+                        anchors.right: parent.right
+                        anchors.rightMargin: 4
+                        anchors.top: parent.top
+                        anchors.bottom: parent.bottom
+                        width: height

-                        MoneroComponents.TextPlain {
+                        Image {
+                            id: nextMonthIcon
                            anchors.centerIn: parent
-                            elide: Text.ElideRight
-                            font.family: MoneroComponents.Style.fontMonoRegular.name
-                            font.pixelSize: 12
-                            color: MoneroComponents.Style.lightGreyFontColor
-                            themeTransition: false
-                            text: {
-                                var locale = Qt.locale()
-                                return locale.dayName(styleData.dayOfWeek, Locale.ShortFormat)
-                            }
-                        }
-                    }
-
-                    navigationBar: Rectangle {
-                        color: MoneroComponents.Style.middlePanelBackgroundColor
-                        implicitWidth: calendar.width
-                        implicitHeight: 30
-
-                        MoneroComponents.TextPlain {
-                            anchors.centerIn: parent
-                            font.family: MoneroComponents.Style.fontMonoRegular.name
-                            font.pixelSize: 14
-                            color: MoneroComponents.Style.dimmedFontColor
-                            themeTransition: false
-                            text: styleData.title
+                            source: "qrc:///images/prevMonth.png"
+                            visible: false
                        }

-
-                        Item {
-                            anchors.left: parent.left
-                            anchors.leftMargin: 4
-                            anchors.top: parent.top
-                            anchors.bottom: parent.bottom
-                            width: height
-
-                            Image {
-                                id: prevMonthIcon
-                                anchors.centerIn: parent
-                                source: "qrc:///images/prevMonth.png"
-                                visible: false
-                            }
-
-                            ColorOverlay {
-                                source: prevMonthIcon
-                                anchors.fill: prevMonthIcon
-                                color: MoneroComponents.Style.defaultFontColor
-                                opacity: 0.5
-                            }
-
-                            MouseArea {
-                                hoverEnabled: true
-                                cursorShape: Qt.PointingHandCursor
-                                anchors.fill: parent
-                                onClicked: calendar.showPreviousMonth()
-                            }
+                        ColorOverlay {
+                            source: nextMonthIcon
+                            anchors.fill: nextMonthIcon
+                            color: MoneroComponents.Style.defaultFontColor
+                            opacity: 0.5
+                            rotation: 180
                        }

-                        Item {
-                            anchors.right: parent.right
-                            anchors.rightMargin: 4
-                            anchors.top: parent.top
-                            anchors.bottom: parent.bottom
-                            width: height
-
-                            Image {
-                                id: nextMonthIcon
-                                anchors.centerIn: parent
-                                source: "qrc:///images/prevMonth.png"
-                                visible: false
-                            }
-
-                            ColorOverlay {
-                                source: nextMonthIcon
-                                anchors.fill: nextMonthIcon
-                                color: MoneroComponents.Style.defaultFontColor
-                                opacity: 0.5
-                                rotation: 180
-                            }
-
-                            MouseArea {
-                                hoverEnabled: true
-                                cursorShape: Qt.PointingHandCursor
-                                anchors.fill: parent
-                                onClicked: calendar.showNextMonth()
-                            }
+                        MouseArea {
+                            hoverEnabled: true
+                            cursorShape: Qt.PointingHandCursor
+                            anchors.fill: parent
+                            onClicked: calendar.showNextMonth()
                        }
                    }
                }
--- a/components/DevicePassphraseDialog.qml
+++ b/components/DevicePassphraseDialog.qml
@@ -1,104 +0,0 @@
-// Copyright (c) 2014-2020, The Monero Project
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import QtQuick 2.9
-import "." as MoneroComponents
-
-Item {
-    id: root
-
-    property var onAcceptedCallback
-    property var onWalletEntryCallback
-    property var onRejectedCallback
-
-    function open(canEnterOnDevice_) {
-        var canEnterOnDevice = canEnterOnDevice_ !== null ? canEnterOnDevice_ : canEnterOnDevice
-        root.visible = true;
-
-        if (canEnterOnDevice) {
-            entryChooserDialog.okText = qsTr("Hardware wallet")
-            entryChooserDialog.cancelText = qsTr("Computer")
-            entryChooserDialog.open()
-        } else {
-            openPassphraseDialog()
-        }
-    }
-
-    function openPassphraseDialog() {
-        root.visible = true
-        passphraseDialog.openPassphraseDialog()
-    }
-
-    function close() {
-        root.visible = false;
-        if (entryChooserDialog.visible)
-            entryChooserDialog.close()
-        if (passphraseDialog.visible)
-            passphraseDialog.close()
-    }
-
-    StandardDialog {
-        id: entryChooserDialog
-        title: qsTr("Hardware wallet passphrase") + translationManager.emptyString
-        text: qsTr("Please select where you want to enter passphrase.\nIt is recommended to enter passphrase on the hardware wallet for better security.") + translationManager.emptyString
-
-        onAccepted: {
-            if (onWalletEntryCallback){
-                onWalletEntryCallback()
-            }
-        }
-
-        onRejected: {
-            openPassphraseDialog()
-        }
-
-        onCloseCallback: {
-            root.close()
-        }
-    }
-
-    PasswordDialog {
-        id: passphraseDialog
-        anchors.fill: parent
-        passphraseDialogMode: true
-
-        onAcceptedPassphrase: {
-            if (onAcceptedCallback)
-                onAcceptedCallback(passphraseDialog.password);
-        }
-
-        onRejectedPassphrase: {
-            if (onRejectedCallback)
-                onRejectedCallback();
-        }
-
-        onCloseCallback: {
-            root.close()
-        }
-    }
-}
--- a/components/InlineButton.qml
+++ b/components/InlineButton.qml
@@ -30,25 +30,29 @@ import QtQuick 2.9
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0

-import FontAwesome 1.0
-
 import "." as MoneroComponents
 import "./effects/" as MoneroEffects

 Item {
    id: inlineButton
+    height: parent.height
+    anchors.top: parent.top
+    anchors.bottom: parent.bottom

    property bool small: false
+    property string shadowPressedColor: "#B32D00"
+    property string shadowReleasedColor: "#FF4304"
+    property string pressedColor: "#FF4304"
+    property string releasedColor: "#FF6C3C"
+    property string icon: ""
    property string textColor: MoneroComponents.Style.inlineButtonTextColor
+    property int fontSize: small ? 14 : 16
+    property int rectHeight: small ? 24 : 24
+    property int rectHMargin: small ? 16 : 22
    property alias text: inlineText.text
    property alias fontPixelSize: inlineText.font.pixelSize
    property alias fontFamily: inlineText.font.family
-    property bool isFontAwesomeIcon: fontFamily == FontAwesome.fontFamily || fontFamily == FontAwesome.fontFamilySolid
    property alias buttonColor: rect.color
-
-    height: isFontAwesomeIcon ? 30 : 24
-    width: isFontAwesomeIcon ? height : inlineText.width + 16
-
    signal clicked()

    function doClick() {
@@ -59,16 +63,20 @@ Item {

    Rectangle{
        id: rect
-        anchors.fill: parent
        color: MoneroComponents.Style.buttonInlineBackgroundColor
+        height: 24
+        width: inlineText.text ? (inlineText.width + 16) : inlineButton.icon ? (inlineImage.width + 16) : rect.height
        radius: 4

+        anchors.verticalCenter: parent.verticalCenter
+        anchors.right: parent.right
+        anchors.rightMargin: 4

        MoneroComponents.TextPlain {
            id: inlineText
            font.family: MoneroComponents.Style.fontBold.name
            font.bold: true
-            font.pixelSize: inlineButton.isFontAwesomeIcon ? 22 : inlineButton.small ? 14 : 16
+            font.pixelSize: inlineButton.fontSize
            color: inlineButton.textColor
            anchors.verticalCenter: parent.verticalCenter
            anchors.horizontalCenter: parent.horizontalCenter
@@ -81,6 +89,13 @@ Item {
            }
        }

+        Image {
+            id: inlineImage
+            visible: inlineButton.icon !== ""
+            anchors.centerIn: parent
+            source: inlineButton.icon
+        }
+
        MouseArea {
            id: buttonArea
            cursorShape: rect.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
@@ -110,8 +125,6 @@ Item {
        source: rect
    }

-    Keys.enabled: inlineButton.visible
    Keys.onSpacePressed: doClick()
-    Keys.onEnterPressed: Keys.onReturnPressed(event)
    Keys.onReturnPressed: doClick()
 }
--- a/components/Input.qml
+++ b/components/Input.qml
@@ -32,7 +32,6 @@ import QtQuick 2.9
 import "../components" as MoneroComponents

 TextField {
-    id: textField
    font.family: MoneroComponents.Style.fontRegular.name
    font.pixelSize: 18
    font.bold: true
@@ -45,12 +44,4 @@ TextField {
    background: Rectangle {
        color: "transparent"
    }
-
-    MoneroComponents.ContextMenu {
-        cursorShape: Qt.IBeamCursor
-        onPaste: {
-            textField.clear();
-            textField.paste();
-        }
-    }
 }
--- a/components/InputDialog.qml
+++ b/components/InputDialog.qml
@@ -45,16 +45,18 @@ Item {
    signal accepted()
    signal rejected()

-    function open(prepopulate) {
+    function open() {
+        inactiveOverlay.visible = true
        leftPanel.enabled = false
        middlePanel.enabled = false
        titleBar.state = "essentials"
        root.visible = true;
        input.focus = true;
-        input.text = prepopulate ? prepopulate : "";
+        input.text = "";
    }

    function close() {
+        inactiveOverlay.visible = false
        leftPanel.enabled = true
        middlePanel.enabled = true
        titleBar.state = "default"
@@ -84,7 +86,7 @@ Item {
                color: MoneroComponents.Style.defaultFontColor
            }

-            MoneroComponents.Input {
+            TextField {
                id : input
                focus: true
                Layout.topMargin: 6
@@ -108,8 +110,6 @@ Item {
                    color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
                }

-                Keys.enabled: root.visible
-                Keys.onEnterPressed: Keys.onReturnPressed(event)
                Keys.onReturnPressed: {
                    root.close()
                    root.accepted()
--- a/components/InputMulti.qml
+++ b/components/InputMulti.qml
@@ -57,10 +57,6 @@ TextArea {
    onTextChanged: {
        if(addressValidation){
            // js replacement for `RegExpValidator { regExp: /[0-9A-Fa-f]{95}/g }`
-            if (textArea.text.startsWith("monero:")) {
-                error = false;
-                return;
-            }
            textArea.text = textArea.text.replace(/[^a-z0-9.@\-]/gi,'');
            var address_ok = TxUtils.checkAddress(textArea.text, appWindow.persistentSettings.nettype) || TxUtils.isValidOpenAliasAddress(textArea.text);
            if(!address_ok) error = true;
@@ -68,12 +64,4 @@ TextArea {
            TextArea.cursorPosition = textArea.text.length;
        }
    }
-
-    MoneroComponents.ContextMenu {
-        cursorShape: Qt.IBeamCursor
-        onPaste: {
-            textArea.clear();
-            textArea.paste();
-        }
-    }
 }
--- a/components/Label.qml
+++ b/components/Label.qml
@@ -45,7 +45,6 @@ Item {
    property alias horizontalAlignment: label.horizontalAlignment
    property alias elide: label.elide
    property alias textWidth: label.width
-    property alias styleName: label.font.styleName
    property alias themeTransition: label.themeTransition
    signal linkActivated()
    height: label.height
@@ -69,10 +68,5 @@ Item {
        color: fontColor
        onLinkActivated: item.linkActivated()
        textFormat: parent.textFormat
-        MouseArea {
-            anchors.fill: parent
-            acceptedButtons: Qt.NoButton
-            cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
-        }
    }
 }
--- a/components/LabelSubheader.qml
+++ b/components/LabelSubheader.qml
@@ -34,6 +34,8 @@ import "../components/effects/" as MoneroEffects
 Label {
    id: item
    fontSize: 18
+    anchors.left: parent.left
+    anchors.right: parent.right

    Rectangle {
        anchors.top: item.bottom
--- a/components/LanguageSidebar.qml
+++ b/components/LanguageSidebar.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -53,7 +53,7 @@ Drawer {
    y: titleBar.height

    background: Rectangle {
-        color: MoneroComponents.Style.blackTheme ? "#0d0d0d" : "white"
+        color: "#0d0d0d"
        width: parent.width
    }

@@ -79,24 +79,9 @@ Drawer {
                width: sideBar.width
                height: 32

-                Rectangle {
-                    id: flagRect
-                    height: 24
-                    width: 24
-                    anchors.left: parent.left
-                    anchors.leftMargin: 4
-                    anchors.verticalCenter: parent.verticalCenter
-                    color: "transparent"
-
-                    Image {
-                        anchors.fill: parent
-                        source: flag
-                    }
-                }
-
                MoneroComponents.TextPlain {
                    anchors.left: parent.left
-                    anchors.leftMargin: 30
+                    anchors.leftMargin: 16
                    font.bold: true
                    font.pixelSize: 14
                    color: MoneroComponents.Style.defaultFontColor
@@ -131,12 +116,10 @@ Drawer {
                            translationManager.setLanguage(locale_spl[0]);

                            // set wizard language settings
-                            persistentSettings.locale = locale;
-                            persistentSettings.language = display_name;
-                            persistentSettings.language_wallet = wallet_language;
-
-                            appWindow.showStatusMessage(qsTr("Language changed."), 3);
-                            appWindow.toggleLanguageView();
+                            wizard.language_locale = locale;
+                            wizard.language_wallet = wallet_language;
+                            wizard.language_language = display_name + " (" + locale_spl[1] + ") ";
+                            sideBar.close()
                        }
                        hoverEnabled: true
                        onEntered: {
@@ -151,8 +134,15 @@ Drawer {
                }
            }

-            ScrollBar.vertical: ScrollBar {
-                onActiveChanged: if (!active && !isMac) active = true
+            ScrollIndicator.vertical: ScrollIndicator {
+                // @TODO: QT 5.9 introduces `policy: ScrollBar.AlwaysOn`
+                active: true
+                contentItem.opacity: 0.7
+                onActiveChanged: {
+                    if (!active) {
+                        active = true;
+                    }
+                }
            }
        }
    }
--- a/components/LineEdit.qml
+++ b/components/LineEdit.qml
@@ -26,25 +26,16 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-import FontAwesome 1.0
 import QtQuick 2.9
 import QtGraphicalEffects 1.0
-import QtQuick.Layouts 1.1

 import "../components" as MoneroComponents

 Item {
    id: item
-
-    default property alias content: inlineButtons.children
-
    property alias input: input
    property alias text: input.text

-    property bool password: false
-    property bool passwordHidden: true
-    property var passwordLinked: null
-
    property alias placeholderText: placeholderLabel.text
    property bool placeholderCenter: false
    property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name
@@ -52,24 +43,16 @@ Item {
    property int placeholderFontSize: 18
    property string placeholderColor: MoneroComponents.Style.defaultFontColor
    property real placeholderOpacity: 0.35
-    property real placeholderLeftMargin: {
-        if (placeholderCenter) {
-            return undefined;
-        } else if (inlineIcon.visible) {
-            return inlineIcon.width + inlineIcon.anchors.leftMargin + inputPadding;
-        } else {
-            return inputPadding;
-        }
-    }

    property alias acceptableInput: input.acceptableInput
    property alias validator: input.validator
    property alias readOnly : input.readOnly
    property alias cursorPosition: input.cursorPosition
+    property alias echoMode: input.echoMode
+    property alias inlineButton: inlineButtonId
+    property alias inlineButtonText: inlineButtonId.text
    property alias inlineIcon: inlineIcon.visible
    property bool copyButton: false
-    property alias copyButtonText: copyButtonId.text
-    property alias copyButtonEnabled: copyButtonId.enabled

    property bool borderDisabled: false
    property string borderColor: {
@@ -82,7 +65,6 @@ Item {
        }
    }

-    property string fontFamily: MoneroComponents.Style.fontRegular.name
    property int fontSize: 18
    property bool fontBold: false
    property alias fontColor: input.color
@@ -98,16 +80,14 @@ Item {
    property alias labelHorizontalAlignment: inputLabel.horizontalAlignment
    property bool showingHeader: inputLabel.text !== "" || copyButton
    property int inputHeight: 42
-    property int inputPadding: 10

    signal labelLinkActivated(); // input label, rich text <a> signal
    signal editingFinished();
    signal accepted();
    signal textUpdated();

-    height: showingHeader ? (inputLabel.height + inputItem.height + 2) : inputHeight
+    height: showingHeader ? (inputLabel.height + inputItem.height + 2) : 42

-    onActiveFocusChanged: activeFocus && input.forceActiveFocus()
    onTextUpdated: {
        // check to remove placeholder text when there is content
        if(item.isEmpty()){
@@ -127,31 +107,6 @@ Item {
        }
    }

-    function isPasswordHidden() {
-        if (password) {
-            return passwordHidden;
-        }
-        if (passwordLinked) {
-            return passwordLinked.passwordHidden;
-        }
-        return false;
-    }
-
-    function reset() {
-        text = "";
-        if (!passwordLinked) {
-            passwordHidden = true;
-        }
-    }
-
-    function passwordToggle() {
-        if (passwordLinked) {
-            passwordLinked.passwordHidden = !passwordLinked.passwordHidden;
-        } else {
-            passwordHidden = !passwordHidden;
-        }
-    }
-
    MoneroComponents.TextPlain {
        id: inputLabel
        anchors.top: parent.top
@@ -188,7 +143,7 @@ Item {
        id: inputItem
        height: inputHeight
        anchors.top: showingHeader ? inputLabel.bottom : parent.top
-        anchors.topMargin: showingHeader ? 12 : 0
+        anchors.topMargin: showingHeader ? 12 : 2
        width: parent.width
        clip: true

@@ -198,7 +153,13 @@ Item {
            anchors.verticalCenter: parent.verticalCenter
            anchors.horizontalCenter: placeholderCenter ? parent.horizontalCenter : undefined
            anchors.left: placeholderCenter ? undefined : parent.left
-            anchors.leftMargin: placeholderLeftMargin
+            anchors.leftMargin: {
+                if(placeholderCenter){
+                    return undefined;
+                }
+                else if(inlineIcon.visible){ return 50; }
+                else { return 10; }
+            }

            opacity: item.placeholderOpacity
            color: item.placeholderColor
@@ -212,7 +173,7 @@ Item {
        Rectangle {
            anchors.fill: parent
            anchors.topMargin: 1
-            color: item.enabled ? "transparent" : MoneroComponents.Style.inputBoxBackgroundDisabled
+            color: "transparent"
        }

        Rectangle {
@@ -240,50 +201,20 @@ Item {
            id: input
            anchors.fill: parent
            anchors.leftMargin: inlineIcon.visible ? 44 : 0
-            font.family: item.fontFamily
            font.pixelSize: item.fontSize
            font.bold: item.fontBold
-            KeyNavigation.backtab: item.KeyNavigation.backtab
-            KeyNavigation.tab: item.KeyNavigation.tab
            onEditingFinished: item.editingFinished()
            onAccepted: item.accepted();
            onTextChanged: item.textUpdated()
-            leftPadding: inputPadding
-            rightPadding: (inlineButtons.width > 0 ? inlineButtons.width + inlineButtons.spacing : 0) + inputPadding
-            topPadding: inputPadding
-            bottomPadding: inputPadding
-            echoMode: isPasswordHidden() ? TextInput.Password : TextInput.Normal
+            topPadding: 10
+            bottomPadding: 10
+        }

-            MoneroComponents.Label {
-                visible: password || passwordLinked
-                fontSize: 20
-                text: isPasswordHidden() ? FontAwesome.eye : FontAwesome.eyeSlash
-                opacity: eyeMouseArea.containsMouse ? 0.9 : 0.7
-                fontFamily: FontAwesome.fontFamily
-                anchors.right: parent.right
-                anchors.rightMargin: 15
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.verticalCenterOffset: 1
-
-                MouseArea {
-                    id: eyeMouseArea
-                    anchors.fill: parent
-                    cursorShape: Qt.PointingHandCursor
-                    hoverEnabled: true
-                    onClicked: passwordToggle()
-                }
-            }
-
-            RowLayout {
-                id: inlineButtons
-                anchors.bottom: parent.bottom
-                anchors.top: parent.top
-                anchors.right: parent.right
-                anchors.topMargin: inputPadding
-                anchors.bottomMargin: inputPadding
-                anchors.rightMargin: inputPadding
-                spacing: 4
-            }
+        MoneroComponents.InlineButton {
+            id: inlineButtonId
+            visible: item.inlineButtonText ? true : false
+            anchors.right: parent.right
+            anchors.rightMargin: 8
        }
    }
 }
--- a/components/LineEditMulti.qml
+++ b/components/LineEditMulti.qml
@@ -36,8 +36,6 @@ ColumnLayout {

    Layout.fillWidth: true

-    default property alias content: inlineButtons.children
-
    property alias text: input.text
    property alias labelText: inputLabel.text
    property alias labelButtonText: labelButton.text
@@ -75,7 +73,6 @@ ColumnLayout {
    property bool labelButtonVisible: false

    property string fontColor: MoneroComponents.Style.defaultFontColor
-    property string fontFamily: MoneroComponents.Style.fontRegular.name
    property bool fontBold: false
    property int fontSize: 16

@@ -83,17 +80,21 @@ ColumnLayout {
    property alias readOnly: input.readOnly
    property bool copyButton: false
    property bool pasteButton: false
+    property var onPaste: function(clipboardText) {
+        item.text = clipboardText;
+    }
    property bool showingHeader: labelText != "" || copyButton || pasteButton
    property var wrapMode: Text.NoWrap
    property alias addressValidation: input.addressValidation
    property string backgroundColor: "" // mock

+    property alias inlineButton: inlineButtonId
+    property bool inlineButtonVisible: false
+
    signal labelButtonClicked();
    signal inputLabelLinkActivated();
    signal editingFinished();

-    onActiveFocusChanged: activeFocus && input.forceActiveFocus()
-
    spacing: 0
    Rectangle {
        id: inputLabelRect
@@ -145,10 +146,7 @@ ColumnLayout {

            MoneroComponents.LabelButton {
                id: pasteButtonId
-                onClicked: {
-                    input.clear();
-                    input.paste();
-                }
+                onClicked: item.onPaste(clipboard.text())
                text: qsTr("Paste") + translationManager.emptyString
                visible: pasteButton
            }
@@ -159,18 +157,14 @@ ColumnLayout {
        id: input
        readOnly: false
        addressValidation: false
-        KeyNavigation.backtab: item.KeyNavigation.backtab
-        KeyNavigation.priority: KeyNavigation.BeforeItem
-        KeyNavigation.tab: item.KeyNavigation.tab
        Layout.fillWidth: true
-
+        
        leftPadding: item.inputPaddingLeft
-        rightPadding: (inlineButtons.width > 0 ? inlineButtons.width + inlineButtons.spacing : 0) + inputPaddingRight
+        rightPadding: item.inputPaddingRight
        topPadding: item.inputPaddingTop
        bottomPadding: item.inputPaddingBottom

        wrapMode: item.wrapMode
-        font.family: item.fontFamily
        fontSize: item.fontSize
        fontBold: item.fontBold
        fontColor: item.fontColor
@@ -202,12 +196,11 @@ ColumnLayout {
            visible: !item.borderDisabled
        }

-        RowLayout {
-            id: inlineButtons
-            anchors.verticalCenter: parent.verticalCenter
+        MoneroComponents.InlineButton {
+            id: inlineButtonId
+            visible: (inlineButtonId.text || inlineButtonId.icon) && inlineButtonVisible ? true : false
            anchors.right: parent.right
-            anchors.rightMargin: inputPaddingRight
-            spacing: 4
+            anchors.rightMargin: 8
        }
    }
 }
--- a/components/MenuButton.qml
+++ b/components/MenuButton.qml
@@ -36,6 +36,7 @@ Rectangle {
    id: button
    property alias text: label.text
    property bool checked: false
+    property alias dotColor: dot.color
    property alias symbol: symbolText.text
    property int numSelectedChildren: 0
    property var under: null
@@ -62,7 +63,7 @@ Rectangle {
    height: present ? ((appWindow.height >= 800) ? 44  : 38 ) : 0

    LinearGradient {
-        visible: isOpenGL && (button.checked || buttonArea.containsMouse)
+        visible: isOpenGL && button.checked
        height: parent.height
        width: 260
        anchors.verticalCenter: parent.verticalCenter
@@ -75,24 +76,39 @@ Rectangle {
            GradientStop { position: 0.0; color: MoneroComponents.Style.menuButtonGradientStart }
            GradientStop { position: 1.0; color: MoneroComponents.Style.menuButtonGradientStop }
        }
-        opacity: button.checked ? 1 : 0.3
    }

    // fallback hover effect when opengl is not available
    Rectangle {
-        visible: !isOpenGL && (button.checked || buttonArea.containsMouse)
+        visible: !isOpenGL && button.checked
        anchors.fill: parent
        color: MoneroComponents.Style.menuButtonFallbackBackgroundColor
-        opacity: button.checked ? 1 : 0.3
    }

    // button decorations that are subject to leftMargin offsets
    Rectangle {
        anchors.left: parent.left
-        anchors.leftMargin: 20
+        anchors.leftMargin: parent.getOffset() + 20
        height: parent.height
-        width: 2
-        color: button.checked ? MoneroComponents.Style.buttonBackgroundColor : "transparent"
+        width: button.checked ? 20: 10
+        color: "transparent"
+
+        // dot if unchecked
+        Rectangle {
+            id: dot
+            anchors.centerIn: parent
+            width: button.checked ? 20 : 8
+            height: button.checked ? 20 : 8
+            radius: button.checked ? 20 : 4
+            color: button.dotColor
+            // arrow if checked
+            Image {
+                anchors.centerIn: parent
+                anchors.left: parent.left
+                source: MoneroComponents.Style.menuButtonImageDotArrowSource
+                visible: button.checked
+            }
+        }

        // button text
        MoneroComponents.TextPlain {
@@ -102,7 +118,7 @@ Rectangle {
            themeTransitionWhiteColor: MoneroComponents.Style._w_menuButtonTextColor
            anchors.verticalCenter: parent.verticalCenter
            anchors.left: parent.right
-            anchors.leftMargin: button.getOffset() + 8
+            anchors.leftMargin: 8
            font.bold: true
            font.pixelSize: 14
        }
@@ -128,7 +144,7 @@ Rectangle {
        anchors.verticalCenter: parent.verticalCenter
        font.pixelSize: 12
        font.bold: true
-        color: MoneroComponents.Style.menuButtonTextColor
+        color: button.checked || buttonArea.containsMouse ? MoneroComponents.Style.menuButtonTextColor : dot.color
        visible: appWindow.ctrlPressed
        themeTransition: false
    }
--- a/components/MobileHeader.qml
+++ b/components/MobileHeader.qml
@@ -0,0 +1,118 @@
+import QtQuick 2.9
+import QtGraphicalEffects 1.0
+import QtQuick.Layouts 1.1
+
+import moneroComponents.Wallet 1.0
+import "../components" as MoneroComponents
+
+// BasicPanel header
+Rectangle {
+    id: header
+    anchors.leftMargin: 1
+    anchors.rightMargin: 1
+    Layout.fillWidth: true
+    Layout.preferredHeight: 64
+    color: "#FFFFFF"
+
+    Image {
+        id: logo
+        visible: appWindow.width > 460
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.verticalCenterOffset: -5
+        anchors.left: parent.left
+        anchors.leftMargin: 50
+        source: "qrc:///images/moneroLogo2.png"
+    }
+
+    Image {
+        id: icon
+        visible: !logo.visible
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.left: parent.left
+        anchors.leftMargin: 40
+        source: "qrc:///images/moneroIcon.png"
+    }
+
+    Grid {
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.top: parent.top
+        anchors.right: parent.right
+        anchors.topMargin: 10
+        width: 256
+        columns: 3
+
+        MoneroComponents.TextPlain {
+            id: balanceLabel
+            width: 116
+            height: 20
+            font.family: "Arial"
+            font.pixelSize: 12
+            font.letterSpacing: -1
+            elide: Text.ElideRight
+            horizontalAlignment: Text.AlignLeft
+            verticalAlignment: Text.AlignBottom
+            color: "#535353"
+            text: leftPanel.balanceLabelText + ":"
+        }
+
+        MoneroComponents.TextPlain {
+            id: balanceText
+            width: 110
+            height: 20
+            font.family: "Arial"
+            font.pixelSize: 18
+            font.letterSpacing: -1
+            elide: Text.ElideRight
+            horizontalAlignment: Text.AlignLeft
+            verticalAlignment: Text.AlignBottom
+            color: "#000000"
+            text: leftPanel.balanceText
+        }
+
+        Item {
+            height: 20
+            width: 20
+
+            Image {
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: parent.left
+                source: "qrc:///images/lockIcon.png"
+            }
+        }
+
+        MoneroComponents.TextPlain {
+            width: 116
+            height: 20
+            font.family: "Arial"
+            font.pixelSize: 12
+            font.letterSpacing: -1
+            elide: Text.ElideRight
+            horizontalAlignment: Text.AlignLeft
+            verticalAlignment: Text.AlignBottom
+            color: "#535353"
+            text: qsTr("Unlocked Balance:")
+        }
+
+        MoneroComponents.TextPlain {
+            id: availableBalanceText
+            width: 110
+            height: 20
+            font.family: "Arial"
+            font.pixelSize: 14
+            font.letterSpacing: -1
+            elide: Text.ElideRight
+            horizontalAlignment: Text.AlignLeft
+            verticalAlignment: Text.AlignBottom
+            color: "#000000"
+            text: leftPanel.unlockedBalanceText
+        }
+    }
+
+    Rectangle {
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        height: 1
+        color: "#DBDBDB"
+    }
+}
--- a/components/Navbar.qml
+++ b/components/Navbar.qml
@@ -1,207 +0,0 @@
-// Copyright (c) 2014-2021, The Monero Project
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-// 
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import QtQuick 2.9
-import QtQuick.Layouts 1.1
-import "." as MoneroComponents
-
-Rectangle {
-    default property list<MoneroComponents.NavbarItem> items
-
-    color: "transparent"
-    height: grid.height
-    width: grid.width
-
-    GridLayout {
-        id: grid
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.horizontalCenter: parent.horizontalCenter
-        columnSpacing: 0
-        property string fontColorActive: MoneroComponents.Style.blackTheme ? "white" : "white"
-        property string fontColorInActive: MoneroComponents.Style.blackTheme ? "white" : MoneroComponents.Style.dimmedFontColor
-        property int fontSize: 15
-        property bool fontBold: true
-        property var fontFamily: MoneroComponents.Style.fontRegular.name
-        property string borderColor: MoneroComponents.Style.blackTheme ? "#808080" : "#B9B9B9"
-        property int textMargin: {
-            // left-right margins for a given cell
-            if(appWindow.width < 890){
-                return 32;
-            } else {
-                return 64;
-            }
-        }
-
-        Rectangle {
-            // navbar left side border
-            id: navBarLeft
-            Layout.preferredWidth: 2
-            Layout.preferredHeight: 32
-            color: "transparent"
-
-            Rectangle {
-                anchors.left: parent.left
-                anchors.verticalCenter: parent.verticalCenter
-                width: 1
-                height: parent.height - 2
-                color: grid.borderColor
-            }
-
-            ColumnLayout {
-                anchors.top: parent.top
-                anchors.bottom: parent.bottom
-                anchors.right: parent.right
-                width: 1
-                spacing: 0
-
-                Rectangle {
-                    Layout.preferredHeight: 1
-                    Layout.preferredWidth: 1
-                    color: grid.borderColor
-                }
-
-                Rectangle {
-                    Layout.fillHeight: true
-                    width: 1
-                    color: items.length > 0 && items[0].active ? grid.borderColor : "transparent";
-                }
-
-                Rectangle {
-                    color: grid.borderColor
-                    Layout.preferredHeight: 1
-                    Layout.preferredWidth: 1
-                }
-            }
-        }
-
-        Repeater {
-            model: items.length
-
-            RowLayout {
-                spacing: 0
-
-                Rectangle {
-                    Layout.preferredWidth: 1
-                    Layout.preferredHeight: 32
-                    color: grid.borderColor
-                    visible: index > 0 && items[index - 1].visible
-                }
-
-                ColumnLayout {
-                    Layout.minimumWidth: 72
-                    Layout.preferredHeight: 32
-                    Layout.fillWidth: true
-                    spacing: 0
-                    visible: items[index].visible
-
-                    Rectangle {
-                        color: grid.borderColor
-                        Layout.preferredHeight: 1
-                        Layout.fillWidth: true
-                    }
-
-                    Rectangle {
-                        Layout.minimumHeight: 30
-                        color: items[index].active ? grid.borderColor : "transparent"
-                        height: children[0].height
-                        width: children[0].width
-
-                        MoneroComponents.TextPlain {
-                            anchors.verticalCenter: parent.verticalCenter
-                            font.family: grid.fontFamily
-                            font.pixelSize: grid.fontSize
-                            font.bold: grid.fontBold
-                            leftPadding: grid.textMargin / 2
-                            rightPadding: grid.textMargin / 2
-                            text: items[index].text
-                            color: items[index].active ? grid.fontColorActive : grid.fontColorInActive
-                            themeTransition: false
-                        }
-
-                        MouseArea {
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-
-                            onClicked: items[index].selected()
-                        }
-                    }
-
-                    Rectangle {
-                        color: grid.borderColor
-                        Layout.preferredHeight: 1
-                        Layout.fillWidth: true
-                    }
-                }
-            }
-        }
-
-        Rectangle {
-            // navbar right side border
-            id: navBarRight
-            Layout.preferredWidth: 2
-            Layout.preferredHeight: 32
-            color: "transparent"
-            rotation: 180
-
-            Rectangle {
-                anchors.left: parent.left
-                anchors.verticalCenter: parent.verticalCenter
-                width: 1
-                height: parent.height - 2
-                color: grid.borderColor
-            }
-
-            ColumnLayout {
-                anchors.top: parent.top
-                anchors.bottom: parent.bottom
-                anchors.right: parent.right
-                width: 1
-                spacing: 0
-
-                Rectangle {
-                    Layout.preferredHeight: 1
-                    Layout.preferredWidth: 1
-                    color: grid.borderColor
-                }
-
-                Rectangle {
-                    Layout.fillHeight: true
-                    width: 1
-                    color: items.length > 0 && items[items.length - 1].active ? grid.borderColor : "transparent"
-                }
-
-                Rectangle {
-                    color: grid.borderColor
-                    Layout.preferredHeight: 1
-                    Layout.preferredWidth: 1
-                }
-            }
-        }
-    }
-}
--- a/components/NetworkStatusItem.qml
+++ b/components/NetworkStatusItem.qml
@@ -29,7 +29,6 @@
 import QtQuick 2.9
 import QtQuick.Layouts 1.1

-import FontAwesome 1.0
 import moneroComponents.Wallet 1.0
 import "../components" as MoneroComponents

@@ -39,34 +38,23 @@ Rectangle {
    property var connected: Wallet.ConnectionStatus_Disconnected

    function getConnectionStatusString(status) {
-        switch (appWindow.daemonStartStopInProgress)
-        {
-            case 1:
-                return qsTr("Starting the node");
-            case 2:
-                return qsTr("Stopping the node");
-            default:
-                break;
+        if (status == Wallet.ConnectionStatus_Connected) {
+            if(!appWindow.daemonSynced)
+                return qsTr("Synchronizing")
+            if(persistentSettings.useRemoteNode)
+                return qsTr("Remote node")
+            return appWindow.isMining ? qsTr("Connected") + " + " + qsTr("Mining"): qsTr("Connected")
        }
-        switch (status) {
-            case Wallet.ConnectionStatus_Connected:
-                if (!appWindow.daemonSynced)
-                    return qsTr("Synchronizing");
-                if (persistentSettings.useRemoteNode)
-                    return qsTr("Remote node");
-                return appWindow.isMining ? qsTr("Connected") + " + " + qsTr("Mining"): qsTr("Connected");
-            case Wallet.ConnectionStatus_WrongVersion:
-                return qsTr("Wrong version");
-            case Wallet.ConnectionStatus_Disconnected:
-                if (appWindow.walletMode <= 1) {
-                    return qsTr("Searching node") + translationManager.emptyString;
-                }
-                return qsTr("Disconnected");
-            case Wallet.ConnectionStatus_Connecting:
-                return qsTr("Connecting");
-            default:
-                return qsTr("Invalid connection status");
+        if (status == Wallet.ConnectionStatus_WrongVersion)
+            return qsTr("Wrong version")
+        if (status == Wallet.ConnectionStatus_Disconnected){
+            if(appWindow.walletMode <= 1){
+                return qsTr("Searching node") + translationManager.emptyString;
+            }
+            return qsTr("Disconnected")
        }
+
+        return qsTr("Invalid connection status")
    }

    RowLayout {
@@ -100,7 +88,6 @@ Rectangle {
                }
                MouseArea {
                    anchors.fill: parent
-                    visible: appWindow.walletMode >= 2
                    cursorShape: Qt.PointingHandCursor
                    onClicked: {
                        if(!appWindow.isMining) {
@@ -146,7 +133,6 @@ Rectangle {

                MouseArea {
                    anchors.fill: parent
-                    visible: appWindow.walletMode >= 2
                    cursorShape: Qt.PointingHandCursor
                    onClicked: {
                        if(!appWindow.isMining) {
@@ -158,50 +144,6 @@ Rectangle {
                    }
                }
            }
-
-            Text {
-                anchors.left: statusTextVal.right
-                anchors.leftMargin: 16
-                anchors.verticalCenter: parent.verticalCenter
-                color: refreshMouseArea.containsMouse ?  MoneroComponents.Style.dimmedFontColor : MoneroComponents.Style.defaultFontColor
-                font.family: FontAwesome.fontFamilySolid
-                font.pixelSize: 24
-                font.styleName: "Solid"
-                opacity: iconItem.opacity * (refreshMouseArea.visible ? 1 : 0.5)
-                text: FontAwesome.random
-                visible: (
-                    !appWindow.disconnected &&
-                    !persistentSettings.useRemoteNode &&
-                    (persistentSettings.bootstrapNodeAddress == "auto" || persistentSettings.walletMode < 2)
-                )
-
-                MouseArea {
-                    id: refreshMouseArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    visible: true
-                    onClicked: {
-                        const callback = function(result) {
-                            refreshMouseArea.visible = true;
-                            if (result) {
-                                appWindow.showStatusMessage(qsTr("Successfully switched to another public node"), 3);
-                                appWindow.currentWallet.refreshHeightAsync();
-                            } else {
-                                appWindow.showStatusMessage(qsTr("Failed to switch public node"), 3);
-                            }
-                        };
-
-                        daemonManager.sendCommandAsync(
-                            ["set_bootstrap_daemon", "auto"],
-                            appWindow.currentWallet.nettype,
-                            callback);
-
-                        refreshMouseArea.visible = false;
-                        appWindow.showStatusMessage(qsTr("Switching to another public node"), 3);
-                    }
-                }
-            }
        }
    }
 }
--- a/components/NewPasswordDialog.qml
+++ b/components/NewPasswordDialog.qml
@@ -0,0 +1,287 @@
+// Copyright (c) 2014-2019, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import QtQuick 2.9
+import QtQuick.Controls 2.0
+import QtQuick.Dialogs 1.2
+import QtQuick.Layouts 1.1
+import QtQuick.Controls.Styles 1.4
+import QtQuick.Window 2.0
+import FontAwesome 1.0
+
+import "../components" as MoneroComponents
+
+Item {
+    id: root
+    visible: false
+    z: parent.z + 2
+
+    property bool isHidden: true
+    property alias password: passwordInput1.text
+
+    // same signals as Dialog has
+    signal accepted()
+    signal rejected()
+    signal closeCallback()
+
+    function open() {
+        isHidden = true
+        passwordInput1.echoMode = TextInput.Password;
+        passwordInput2.echoMode = TextInput.Password;
+        inactiveOverlay.visible = true
+        leftPanel.enabled = false
+        middlePanel.enabled = false
+        titleBar.state = "essentials"
+        root.visible = true;
+        passwordInput1.text = "";
+        passwordInput2.text = "";
+        passwordInput1.focus = true
+    }
+
+    function close() {
+        inactiveOverlay.visible = false
+        leftPanel.enabled = true
+        middlePanel.enabled = true
+        titleBar.state = "default"
+        root.visible = false;
+        closeCallback();
+    }
+    
+    function toggleIsHidden() {
+        passwordInput1.echoMode = isHidden ? TextInput.Normal : TextInput.Password;
+        passwordInput2.echoMode = isHidden ? TextInput.Normal : TextInput.Password;
+        isHidden = !isHidden;
+    }
+
+    // TODO: implement without hardcoding sizes
+    width: 480
+    height: 360
+
+    ColumnLayout {
+        z: inactiveOverlay.z + 1
+        id: mainLayout
+        spacing: 10
+        anchors { fill: parent; margins: 35 }
+
+        ColumnLayout {
+            id: column
+
+            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignHCenter
+            Layout.maximumWidth: 400
+
+            Label {
+                text: qsTr("Please enter new password") + translationManager.emptyString
+                Layout.fillWidth: true
+
+                font.pixelSize: 16
+                font.family: MoneroComponents.Style.fontLight.name
+
+                color: MoneroComponents.Style.defaultFontColor
+            }
+
+            TextField {
+                id : passwordInput1
+                Layout.topMargin: 6
+                Layout.fillWidth: true
+                horizontalAlignment: TextInput.AlignLeft
+                verticalAlignment: TextInput.AlignVCenter
+                font.family: MoneroComponents.Style.fontLight.name
+                font.pixelSize: 24
+                echoMode: TextInput.Password
+                bottomPadding: 10
+                leftPadding: 10
+                topPadding: 10
+                color: MoneroComponents.Style.defaultFontColor
+                selectionColor: MoneroComponents.Style.textSelectionColor
+                selectedTextColor: MoneroComponents.Style.textSelectedColor
+                KeyNavigation.tab: passwordInput2
+
+                background: Rectangle {
+                    radius: 2
+                    border.color: MoneroComponents.Style.inputBorderColorInActive
+                    border.width: 1
+                    color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
+
+                    MoneroComponents.Label {
+                        fontSize: 20
+                        text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
+                        opacity: 0.7
+                        fontFamily: FontAwesome.fontFamily
+                        anchors.right: parent.right
+                        anchors.rightMargin: 15
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.verticalCenterOffset: 1
+
+                        MouseArea {
+                            anchors.fill: parent
+                            cursorShape: Qt.PointingHandCursor
+                            hoverEnabled: true
+                            onClicked: {
+                                toggleIsHidden()
+                            }
+                            onEntered: {
+                                parent.opacity = 0.9
+                                parent.fontSize = 24
+                            }
+                            onExited: {
+                                parent.opacity = 0.7
+                                parent.fontSize = 20
+                            }
+                        }
+                    }
+                }
+
+                Keys.onEscapePressed: {
+                    root.close()
+                    root.rejected()
+                }
+            }
+
+            // padding
+            Rectangle {
+                Layout.fillWidth: true
+                Layout.alignment: Qt.AlignHCenter
+                height: 10
+                opacity: 0
+                color: "black"
+            }
+
+            Label {
+                text: qsTr("Please confirm new password") + translationManager.emptyString
+                Layout.fillWidth: true
+
+                font.pixelSize: 16
+                font.family: MoneroComponents.Style.fontLight.name
+
+                color: MoneroComponents.Style.defaultFontColor
+            }
+
+            TextField {
+                id : passwordInput2
+                Layout.topMargin: 6
+                Layout.fillWidth: true
+                horizontalAlignment: TextInput.AlignLeft
+                verticalAlignment: TextInput.AlignVCenter
+                font.family: MoneroComponents.Style.fontLight.name
+                font.pixelSize: 24
+                echoMode: TextInput.Password
+                KeyNavigation.tab: okButton
+                bottomPadding: 10
+                leftPadding: 10
+                topPadding: 10
+                color: MoneroComponents.Style.defaultFontColor
+                selectionColor: MoneroComponents.Style.textSelectionColor
+                selectedTextColor: MoneroComponents.Style.textSelectedColor
+
+                background: Rectangle {
+                    radius: 2
+                    border.color: MoneroComponents.Style.inputBorderColorInActive
+                    border.width: 1
+                    color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
+
+                    MoneroComponents.Label {
+                        fontSize: 20
+                        text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
+                        opacity: 0.7
+                        fontFamily: FontAwesome.fontFamily
+                        anchors.right: parent.right
+                        anchors.rightMargin: 15
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.verticalCenterOffset: 1
+
+                        MouseArea {
+                            anchors.fill: parent
+                            cursorShape: Qt.PointingHandCursor
+                            hoverEnabled: true
+                            onClicked: {
+                                toggleIsHidden()
+                            }
+                            onEntered: {
+                                parent.opacity = 0.9
+                                parent.fontSize = 24
+                            }
+                            onExited: {
+                                parent.opacity = 0.7
+                                parent.fontSize = 20
+                            }
+                        }
+                    }
+                }
+
+                Keys.onReturnPressed: {
+                    if (passwordInput1.text === passwordInput2.text) {
+                        root.close()
+                        root.accepted()
+                    }
+                }
+                Keys.onEscapePressed: {
+                    root.close()
+                    root.rejected()
+                }
+            }
+
+            // padding
+            Rectangle {
+                Layout.fillWidth: true
+                Layout.alignment: Qt.AlignHCenter
+                height: 10
+                opacity: 0
+                color: "black"
+            }
+
+            // Ok/Cancel buttons
+            RowLayout {
+                id: buttons
+                spacing: 16
+                Layout.topMargin: 16
+                Layout.alignment: Qt.AlignRight
+
+                MoneroComponents.StandardButton {
+                    id: cancelButton
+                    text: qsTr("Cancel") + translationManager.emptyString
+                    KeyNavigation.tab: passwordInput1
+                    onClicked: {
+                        root.close()
+                        root.rejected()
+                    }
+                }
+                MoneroComponents.StandardButton {
+                    id: okButton
+                    text: qsTr("Continue") + translationManager.emptyString
+                    KeyNavigation.tab: cancelButton
+                    enabled: passwordInput1.text === passwordInput2.text
+                    onClicked: {
+                        root.close()
+                        root.accepted()
+                    }
+                }
+            }
+        }
+    }
+}
--- a/components/Notifier.qml
+++ b/components/Notifier.qml
@@ -1,21 +1,21 @@
-// Copyright (c) 2021, The Monero Project
-//
+// Copyright (c) 2017-2018, The Monero Project
+// 
 // All rights reserved.
-//
+// 
 // Redistribution and use in source and binary forms, with or without modification, are
 // permitted provided that the following conditions are met:
-//
+// 
 // 1. Redistributions of source code must retain the above copyright notice, this list of
 //    conditions and the following disclaimer.
-//
+// 
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list
 //    of conditions and the following disclaimer in the documentation and/or other
 //    materials provided with the distribution.
-//
+// 
 // 3. Neither the name of the copyright holder nor the names of its contributors may be
 //    used to endorse or promote products derived from this software without specific
 //    prior written permission.
-//
+// 
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
@@ -27,40 +27,59 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.1
-
+import QtQuick.Controls 1.4
+import moneroComponents.Wallet 1.0
 import "." as MoneroComponents

-Popup {
-    id: dialog
+Item {
+    id: item
+    property string message: ""
+    property bool active: false
+    height: 180
+    width: 320
+    property int margin: 15
+    x: parent.width - width - margin
+    y: parent.height - height * scale.yScale - margin * scale.yScale

-    default property alias content: mainLayout.children
-    property alias title: header.text
+    Rectangle {
+        color: "#FF6C3C"
+        border.color: "black"
+        anchors.fill: parent

-    background: Rectangle {
-        border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25)
-        border.width: 1
-        color: MoneroComponents.Style.blackTheme ? "black" : "white"
-        radius: 10
-    }
-    closePolicy: Popup.CloseOnEscape
-    focus: true
-    padding: 20
-    x: (appWindow.width - width) / 2
-    y: (appWindow.height - height) / 2
-
-    ColumnLayout {
-        id: mainLayout
-        spacing: dialog.padding
-
-        Text {
-            id: header
-            color: MoneroComponents.Style.defaultFontColor
-            font.bold: true
+        TextArea {
+            id:versionText
+            readOnly: true
+            backgroundVisible: false
+            textFormat: TextEdit.AutoText
+            anchors.fill: parent
            font.family: MoneroComponents.Style.fontRegular.name
-            font.pixelSize: 18
-            visible: text != ""
+            font.pixelSize: 12
+            textMargin: 20
+            textColor: "white"
+            text: item.message
+            wrapMode: Text.WrapAnywhere
        }
    }
+
+    transform: Scale {
+        id: scale
+        yScale: item.active ? 1 : 0
+
+        Behavior on yScale {
+            NumberAnimation { duration: 500; easing.type: Easing.InOutCubic }
+        }
+    }
+
+    Timer {
+        id: hider
+        interval: 30000; running: false; repeat: false
+        onTriggered: { item.active = false }
+    }
+
+    function show(message) {
+        item.visible = true
+        item.message = message
+        item.active = true
+        hider.running = true
+    }
 }
--- a/components/PassphraseDialog.qml
+++ b/components/PassphraseDialog.qml
@@ -0,0 +1,321 @@
+// Copyright (c) 2014-2019, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+import QtQuick.Dialogs 1.2
+import QtQuick.Layouts 1.1
+import QtQuick.Controls.Styles 1.4
+import QtQuick.Window 2.0
+import FontAwesome 1.0
+
+import "../components" as MoneroComponents
+
+Item {
+    id: root
+    visible: false
+    z: parent.z + 2
+
+    property bool isHidden: true
+    property alias passphrase: passphaseInput1.text
+    property string walletName
+    property string errorText
+
+    // same signals as Dialog has
+    signal accepted()
+    signal rejected()
+    signal closeCallback()
+
+    function open(walletName, errorText) {
+        isHidden = true
+        passphaseInput1.echoMode = TextInput.Password;
+        passphaseInput2.echoMode = TextInput.Password;
+
+        inactiveOverlay.visible = true
+
+        root.walletName = walletName ? walletName : ""
+        root.errorText = errorText ? errorText : "";
+
+        leftPanel.enabled = false
+        middlePanel.enabled = false
+        titleBar.state = "essentials"
+
+        root.visible = true;
+        passphaseInput1.text = "";
+        passphaseInput2.text = "";
+        passphaseInput1.focus = true
+    }
+
+    function close() {
+        inactiveOverlay.visible = false
+        leftPanel.enabled = true
+        middlePanel.enabled = true
+        titleBar.state = "default"
+        root.visible = false;
+        closeCallback();
+    }
+    
+    function toggleIsHidden() {
+        passphaseInput1.echoMode = isHidden ? TextInput.Normal : TextInput.Password;
+        passphaseInput2.echoMode = isHidden ? TextInput.Normal : TextInput.Password;
+        isHidden = !isHidden;
+    }
+
+    function showError(errorText) {
+        open(root.walletName, errorText);
+    }
+
+    // TODO: implement without hardcoding sizes
+    width: 480
+    height: 360
+
+    ColumnLayout {
+        z: inactiveOverlay.z + 1
+        id: mainLayout
+        spacing: 10
+        anchors { fill: parent; margins: 35 }
+
+        ColumnLayout {
+            id: column
+
+            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignHCenter
+            Layout.maximumWidth: 400
+
+            Label {
+                text: (root.walletName.length > 0 ? qsTr("Please enter wallet device passphrase for: ") + root.walletName : qsTr("Please enter wallet device passphrase")) + translationManager.emptyString
+                Layout.fillWidth: true
+
+                font.pixelSize: 16
+                font.family: MoneroComponents.Style.fontLight.name
+
+                color: MoneroComponents.Style.defaultFontColor
+            }
+
+            Label {
+                text: qsTr("Warning: passphrase entry on host is a security risk as it can be captured by malware. It is advised to prefer device-based passphrase entry.") + translationManager.emptyString
+                Layout.fillWidth: true
+                wrapMode: Text.Wrap
+
+                font.pixelSize: 14
+                font.family: MoneroComponents.Style.fontLight.name
+
+                color: MoneroComponents.Style.warningColor
+            }
+
+            Label {
+                text: root.errorText
+                visible: root.errorText
+
+                color: MoneroComponents.Style.errorColor
+                font.pixelSize: 16
+                font.family: MoneroComponents.Style.fontLight.name
+                Layout.fillWidth: true
+                wrapMode: Text.Wrap
+            }
+
+            TextField {
+                id : passphaseInput1
+                Layout.topMargin: 6
+                Layout.fillWidth: true
+                horizontalAlignment: TextInput.AlignLeft
+                verticalAlignment: TextInput.AlignVCenter
+                font.family: MoneroComponents.Style.fontLight.name
+                font.pixelSize: 24
+                echoMode: TextInput.Password
+                bottomPadding: 10
+                leftPadding: 10
+                topPadding: 10
+                color: MoneroComponents.Style.defaultFontColor
+                selectionColor: MoneroComponents.Style.textSelectionColor
+                selectedTextColor: MoneroComponents.Style.textSelectedColor
+                KeyNavigation.tab: passphaseInput2
+
+                background: Rectangle {
+                    radius: 2
+                    border.color: MoneroComponents.Style.inputBorderColorInActive
+                    border.width: 1
+                    color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
+
+                    MoneroComponents.Label {
+                        fontSize: 20
+                        text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
+                        opacity: 0.7
+                        fontFamily: FontAwesome.fontFamily
+                        anchors.right: parent.right
+                        anchors.rightMargin: 15
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.verticalCenterOffset: 1
+
+                        MouseArea {
+                            anchors.fill: parent
+                            cursorShape: Qt.PointingHandCursor
+                            hoverEnabled: true
+                            onClicked: {
+                                toggleIsHidden()
+                            }
+                            onEntered: {
+                                parent.opacity = 0.9
+                                parent.fontSize = 24
+                            }
+                            onExited: {
+                                parent.opacity = 0.7
+                                parent.fontSize = 20
+                            }
+                        }
+                    }
+                }
+
+                Keys.onEscapePressed: {
+                    root.close()
+                    root.rejected()
+                }
+            }
+
+            // padding
+            Rectangle {
+                Layout.fillWidth: true
+                Layout.alignment: Qt.AlignHCenter
+                height: 10
+                opacity: 0
+                color: "transparent"
+            }
+
+            Label {
+                text: qsTr("Please re-enter") + translationManager.emptyString
+                Layout.fillWidth: true
+
+                font.pixelSize: 16
+                font.family: MoneroComponents.Style.fontLight.name
+
+                color: MoneroComponents.Style.defaultFontColor
+            }
+
+            TextField {
+                id : passphaseInput2
+                Layout.topMargin: 6
+                Layout.fillWidth: true
+                horizontalAlignment: TextInput.AlignLeft
+                verticalAlignment: TextInput.AlignVCenter
+                font.family: MoneroComponents.Style.fontLight.name
+                font.pixelSize: 24
+                echoMode: TextInput.Password
+                KeyNavigation.tab: okButton
+                bottomPadding: 10
+                leftPadding: 10
+                topPadding: 10
+                color: MoneroComponents.Style.defaultFontColor
+                selectionColor: MoneroComponents.Style.dimmedFontColor
+                selectedTextColor: MoneroComponents.Style.defaultFontColor
+
+                background: Rectangle {
+                    radius: 2
+                    border.color: MoneroComponents.Style.inputBorderColorInActive
+                    border.width: 1
+                    color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
+
+                    MoneroComponents.Label {
+                        fontSize: 20
+                        text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
+                        opacity: 0.7
+                        fontFamily: FontAwesome.fontFamily
+                        anchors.right: parent.right
+                        anchors.rightMargin: 15
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.verticalCenterOffset: 1
+
+                        MouseArea {
+                            anchors.fill: parent
+                            cursorShape: Qt.PointingHandCursor
+                            hoverEnabled: true
+                            onClicked: {
+                                toggleIsHidden()
+                            }
+                            onEntered: {
+                                parent.opacity = 0.9
+                                parent.fontSize = 24
+                            }
+                            onExited: {
+                                parent.opacity = 0.7
+                                parent.fontSize = 20
+                            }
+                        }
+                    }
+                }
+
+                Keys.onReturnPressed: {
+                    if (passphaseInput1.text === passphaseInput2.text) {
+                        root.close()
+                        root.accepted()
+                    }
+                }
+                Keys.onEscapePressed: {
+                    root.close()
+                    root.rejected()
+                }
+            }
+
+            // padding
+            Rectangle {
+                Layout.fillWidth: true
+                Layout.alignment: Qt.AlignHCenter
+                height: 10
+                opacity: 0
+                color: "black"
+            }
+
+            // Ok/Cancel buttons
+            RowLayout {
+                id: buttons
+                spacing: 16
+                Layout.topMargin: 16
+                Layout.alignment: Qt.AlignRight
+
+                MoneroComponents.StandardButton {
+                    id: cancelButton
+                    text: qsTr("Cancel") + translationManager.emptyString
+                    KeyNavigation.tab: passphaseInput1
+                    onClicked: {
+                        root.close()
+                        root.rejected()
+                    }
+                }
+                MoneroComponents.StandardButton {
+                    id: okButton
+                    text: qsTr("Continue") + translationManager.emptyString
+                    KeyNavigation.tab: cancelButton
+                    enabled: passphaseInput1.text === passphaseInput2.text
+                    onClicked: {
+                        root.close()
+                        root.accepted()
+                    }
+                }
+            }
+        }
+    }
+}
--- a/components/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -41,73 +41,45 @@ import "../js/Utils.js" as Utils
 Item {
    id: root
    visible: false
+    z: parent.z + 2

-    property alias password: passwordInput1.text
+    property bool isHidden: true
+    property alias password: passwordInput.text
    property string walletName
-    property var okButtonText
-    property string okButtonIcon
    property string errorText
-    property bool passwordDialogMode
-    property bool passphraseDialogMode
-    property bool newPasswordDialogMode
+    property bool shiftIsPressed: false
+    property bool isCapsLocksActive: false
+    property bool backspaceIsPressed: false

    // same signals as Dialog has
    signal accepted()
-    signal acceptedNewPassword()
-    signal acceptedPassphrase()
    signal rejected()
-    signal rejectedNewPassword()
-    signal rejectedPassphrase()
    signal closeCallback()

-    function _openInit(walletName, errorText) {
-        capsLockTextLabel.visible = oshelper.isCapsLock();
-        passwordInput1.reset();
-        passwordInput2.reset();
-        if(!appWindow.currentWallet || appWindow.active)
-            passwordInput1.input.forceActiveFocus();
+    function open(walletName, errorText) {
+        isHidden = true
+        passwordInput.echoMode = TextInput.Password
+        passwordInput.text = ""
+        passwordInput.forceActiveFocus();
+        inactiveOverlay.visible = true // draw appwindow inactive
        root.walletName = walletName ? walletName : ""
        errorTextLabel.text = errorText ? errorText : "";
        leftPanel.enabled = false
        middlePanel.enabled = false
-        wizard.enabled = false
        titleBar.state = "essentials"
        root.visible = true;
        appWindow.hideBalanceForced = true;
        appWindow.updateBalance();
    }

-    function open(walletName, errorText, okButtonText, okButtonIcon) {
-        passwordDialogMode = true;
-        passphraseDialogMode = false;
-        newPasswordDialogMode = false;
-        root.okButtonText = okButtonText;
-        root.okButtonIcon = okButtonIcon ? okButtonIcon : "";
-        _openInit(walletName, errorText);
-    }
-
-    function openPassphraseDialog() {
-        passwordDialogMode = false;
-        passphraseDialogMode = true;
-        newPasswordDialogMode = false;
-        _openInit("", "");
-    }
-
-    function openNewPasswordDialog() {
-        passwordDialogMode = false;
-        passphraseDialogMode = false;
-        newPasswordDialogMode = true;
-        _openInit("", "");
-    }
-
    function showError(errorText) {
        open(root.walletName, errorText);
    }

    function close() {
+        inactiveOverlay.visible = false
        leftPanel.enabled = true
        middlePanel.enabled = true
-        wizard.enabled = true
        titleBar.state = "default"

        root.visible = false;
@@ -116,32 +88,8 @@ Item {
        closeCallback();
    }

-    function onOk() {
-        if (!passwordDialogMode && passwordInput1.text !== passwordInput2.text) {
-            return;
-        }
-        root.close()
-        if (passwordDialogMode) {
-            root.accepted()
-        } else if (newPasswordDialogMode) {
-            root.acceptedNewPassword()
-        } else if (passphraseDialogMode) {
-            root.acceptedPassphrase()
-        }
-    }
-
-    function onCancel() {
-        root.close()
-        if (passwordDialogMode) {
-            root.rejected()
-        } else if (newPasswordDialogMode) {
-            root.rejectedNewPassword()
-        } else if (passphraseDialogMode) {
-            root.rejectedPassphrase()
-        }
-    }
-
    ColumnLayout {
+        z: inactiveOverlay.z + 1
        id: mainLayout
        spacing: 10
        anchors { fill: parent; margins: 35 }
@@ -154,14 +102,7 @@ Item {
            Layout.maximumWidth: 400

            Label {
-                text: {
-                    if (newPasswordDialogMode) {
-                        return qsTr("Please enter new wallet password") + translationManager.emptyString;
-                    } else {
-                        var device = passwordDialogMode ? qsTr("wallet password") : qsTr("wallet device passphrase");
-                        return (root.walletName.length > 0 ? qsTr("Please enter %1 for: ").arg(device) + root.walletName : qsTr("Please enter %1").arg(device)) + translationManager.emptyString;
-                    }
-                }
+                text: (root.walletName.length > 0 ? qsTr("Please enter wallet password for: ") + root.walletName : qsTr("Please enter wallet password")) + translationManager.emptyString
                Layout.fillWidth: true

                font.pixelSize: 16
@@ -170,103 +111,112 @@ Item {
                color: MoneroComponents.Style.defaultFontColor
            }

-            Label {
-                text: qsTr("Warning: passphrase entry on host is a security risk as it can be captured by malware. It is advised to prefer device-based passphrase entry.") + translationManager.emptyString
-                visible: passphraseDialogMode
-                Layout.fillWidth: true
-                wrapMode: Text.Wrap
-
-                font.pixelSize: 14
-                font.family: MoneroComponents.Style.fontLight.name
-
-                color: MoneroComponents.Style.warningColor
-            }
-
            Label {
                id: errorTextLabel
                visible: root.errorText || text !== ""
+
                color: MoneroComponents.Style.errorColor
                font.pixelSize: 16
-                font.family: MoneroComponents.Style.fontLight.name
+                font.family: MoneroComponents.Style.fontLight.name                
                Layout.fillWidth: true
                wrapMode: Text.Wrap
            }

-            Label {
-                id: capsLockTextLabel
-                visible: false
-                color: MoneroComponents.Style.errorColor
-                font.pixelSize: 16
-                font.family: MoneroComponents.Style.fontLight.name
-                Layout.fillWidth: true
-                wrapMode: Text.Wrap
-                text: qsTr("CAPSLOCKS IS ON.") + translationManager.emptyString;
-            }
-
-            MoneroComponents.LineEdit {
-                id: passwordInput1
-                password: true
+            TextField {
+                id : passwordInput
                Layout.topMargin: 6
                Layout.fillWidth: true
-                KeyNavigation.tab: {
-                    if (passwordDialogMode) {
-                        return okButton
-                    } else {
-                        return passwordInput2
+                horizontalAlignment: TextInput.AlignLeft
+                verticalAlignment: TextInput.AlignVCenter
+                font.family: MoneroComponents.Style.fontLight.name
+                font.pixelSize: 24
+                echoMode: TextInput.Password
+                KeyNavigation.tab: okButton
+                bottomPadding: 10
+                leftPadding: 10
+                topPadding: 10
+                color: MoneroComponents.Style.defaultFontColor
+                selectionColor: MoneroComponents.Style.textSelectionColor
+                selectedTextColor: MoneroComponents.Style.textSelectedColor
+
+                onTextChanged: {
+                    var letter = text[passwordInput.text.length - 1];
+                    isCapsLocksActive = Utils.isUpperLock(shiftIsPressed, letter);
+                    if(isCapsLocksActive && !backspaceIsPressed){
+                        errorTextLabel.text = qsTr("CAPSLOCKS IS ON.") + translationManager.emptyString;
+                    }
+                    else{
+                        errorTextLabel.text = "";
+                    }
+                }
+
+                background: Rectangle {
+                    radius: 2
+                    color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
+                    border.color: MoneroComponents.Style.inputBorderColorInActive
+                    border.width: 1
+
+                    MoneroEffects.ColorTransition {
+                        targetObj: parent
+                        blackColor: "black"
+                        whiteColor: "#A9FFFFFF"
+                    }
+
+                    MoneroComponents.Label {
+                        fontSize: 20
+                        text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
+                        opacity: 0.7
+                        fontFamily: FontAwesome.fontFamily
+                        anchors.right: parent.right
+                        anchors.rightMargin: 15
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.verticalCenterOffset: 1
+
+                        MouseArea {
+                            anchors.fill: parent
+                            cursorShape: Qt.PointingHandCursor
+                            hoverEnabled: true
+                            onClicked: {
+                                passwordInput.echoMode = isHidden ? TextInput.Normal : TextInput.Password;
+                                isHidden = !isHidden;
+                            }
+                            onEntered: {
+                                parent.opacity = 0.9
+                                parent.fontSize = 24
+                            }
+                            onExited: {
+                                parent.opacity = 0.7
+                                parent.fontSize = 20
+                            }
+                        }
                    }
                }
-                onTextChanged: capsLockTextLabel.visible = oshelper.isCapsLock();

                Keys.enabled: root.visible
-                Keys.onEnterPressed: root.onOk()
-                Keys.onReturnPressed: root.onOk()
-                Keys.onEscapePressed: root.onCancel()
-            }
-
-            // padding
-            Rectangle {
-                visible: !passwordDialogMode
-                Layout.fillWidth: true
-                Layout.alignment: Qt.AlignHCenter
-                height: 10
-                opacity: 0
-                color: "black"
-            }
-
-            Label {
-                visible: !passwordDialogMode
-                text: newPasswordDialogMode ? qsTr("Please confirm new password") : qsTr("Please confirm wallet device passphrase") + translationManager.emptyString
-                Layout.fillWidth: true
-
-                font.pixelSize: 16
-                font.family: MoneroComponents.Style.fontLight.name
-
-                color: MoneroComponents.Style.defaultFontColor
-            }
-
-            MoneroComponents.LineEdit {
-                id: passwordInput2
-                passwordLinked: passwordInput1
-                visible: !passwordDialogMode
-                Layout.topMargin: 6
-                Layout.fillWidth: true
-                KeyNavigation.tab: okButton
-                onTextChanged: capsLockTextLabel.visible = oshelper.isCapsLock();
-
-                Keys.enabled: root.visible
-                Keys.onEnterPressed: root.onOk()
-                Keys.onReturnPressed: root.onOk()
-                Keys.onEscapePressed: root.onCancel()
-            }
-
-            // padding
-            Rectangle {
-                visible: !passwordDialogMode
-                Layout.fillWidth: true
-                Layout.alignment: Qt.AlignHCenter
-                height: 10
-                opacity: 0
-                color: "black"
+                Keys.onReturnPressed: {
+                    root.close()
+                    root.accepted()
+                }
+                Keys.onEscapePressed: {
+                    root.close()
+                    root.rejected()
+                }
+                Keys.onPressed: {
+                    if(event.key === Qt.Key_Shift){
+                        shiftIsPressed = true;
+                    }
+                    if(event.key === Qt.Key_Backspace){
+                        backspaceIsPressed = true;
+                    }
+                }
+                Keys.onReleased: {
+                    if(event.key === Qt.Key_Shift){
+                        shiftIsPressed = false;
+                    }
+                    if(event.key === Qt.Key_Backspace){
+                        backspaceIsPressed =false;
+                    }
+                }
            }

            // Ok/Cancel buttons
@@ -278,24 +228,27 @@ Item {

                MoneroComponents.StandardButton {
                    id: cancelButton
-                    primary: false
                    small: true
-                    text: qsTr("Cancel") + translationManager.emptyString
-                    KeyNavigation.tab: passwordInput1
-                    onClicked: onCancel()
+                    text: root.walletName.length > 0 ? qsTr("Change wallet") + translationManager.emptyString : qsTr("Cancel") + translationManager.emptyString
+                    KeyNavigation.tab: passwordInput
+                    onClicked: {
+                        root.close()
+                        root.rejected()
+                    }
                }

                MoneroComponents.StandardButton {
                    id: okButton
-                    fontAwesomeIcon: true
-                    rightIcon: okButtonIcon
                    small: true
-                    text: okButtonText ? okButtonText : qsTr("Ok") + translationManager.emptyString
+                    text: qsTr("Continue") + translationManager.emptyString
                    KeyNavigation.tab: cancelButton
-                    enabled: (passwordDialogMode == true) ? true : passwordInput1.text === passwordInput2.text
-                    onClicked: onOk()
+                    onClicked: {
+                        root.close()
+                        root.accepted()
+                    }
                }
            }
+
        }
    }
 }
--- a/components/ProcessingSplash.qml
+++ b/components/ProcessingSplash.qml
@@ -29,23 +29,21 @@
 import QtQuick 2.9
 import QtQuick.Window 2.1
 import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.1

 import "../components" as MoneroComponents

 Rectangle {
    id: root
-    color: MoneroComponents.Style.blackTheme ? "black" : "white"
+    color: MoneroComponents.Style.blackTheme ? "white" : "transparent"
    visible: false
-    radius: 10
-    border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25)
-    border.width: 1
    z: 11
    property alias messageText: messageTitle.text
+    property alias heightProgressText : heightProgress.text

-    width: 100
-    height: 50
+    width: 200
+    height: 100
+    opacity: 0.7

    function show() {
        root.visible = true;
@@ -58,55 +56,44 @@ Rectangle {
    ColumnLayout {
        id: rootLayout

-        anchors.centerIn: parent
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter

        anchors.leftMargin: 30
        anchors.rightMargin: 30

-        spacing: 21
+        spacing: 12

-        Item {
+        BusyIndicator {
+            running: parent.visible
            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
-            Layout.preferredHeight: 80
-
-            Image {
-                id: imgLogo
-                width: 60
-                height: 60
-                anchors.centerIn: parent
-                source: "qrc:///images/monero-vector.svg"
-                mipmap: true
-            }
-
-            BusyIndicator {
-                running: parent.visible
-                anchors.centerIn: imgLogo
-                style: BusyIndicatorStyle {
-                    indicator: Image {
-                        visible: control.running
-                        source: "qrc:///images/busy-indicator.png"
-                        RotationAnimator on rotation {
-                            running: control.running
-                            loops: Animation.Infinite
-                            duration: 1000
-                            from: 0
-                            to: 360
-                        }
-                    }
-                }
-            }
        }

-
        MoneroComponents.TextPlain {
            id: messageTitle
-            text: qsTr("Please wait...") + translationManager.emptyString
-            font.pixelSize: 24
+            text: "Please wait..."
+            font {
+                pixelSize: 22
+            }
            horizontalAlignment: Text.AlignHCenter
            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
            Layout.fillWidth: true
            themeTransition: false
-            color: MoneroComponents.Style.defaultFontColor
+            color: "black"
+        }
+
+
+        MoneroComponents.TextPlain {
+            id: heightProgress
+            font {
+                pixelSize: 18
+            }
+            horizontalAlignment: Text.AlignHCenter
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.fillWidth: true
+            themeTransition: false
+            color: "black"
        }
    }
 }
--- a/components/ProgressBar.qml
+++ b/components/ProgressBar.qml
@@ -42,7 +42,7 @@ Rectangle {
    function updateProgress(currentBlock,targetBlock, blocksToSync, statusTxt){
        if(targetBlock > 0) {
            var remaining = (currentBlock < targetBlock) ? targetBlock - currentBlock : 0
-            var progressLevel = (blocksToSync > 0 ) ? (100*(blocksToSync - remaining)/blocksToSync).toFixed(0) : 100
+            var progressLevel = (blocksToSync > 0 && blocksToSync != remaining) ? (100*(blocksToSync - remaining)/blocksToSync).toFixed(0) : (100*(currentBlock / targetBlock)).toFixed(0)
            fillLevel = progressLevel
            if(typeof statusTxt != "undefined" && statusTxt != "") {
                progressText.text = statusTxt;
--- a/components/QRCodeScanner.qml
+++ b/components/QRCodeScanner.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 //
 // All rights reserved.
 //
@@ -53,7 +53,6 @@ Rectangle {
                script: {
 		    root.visible = true
                    camera.captureMode = Camera.CaptureStillImage
-                    camera.cameraState = Camera.ActiveState
                    camera.start()
                    finder.enabled = true
                }
@@ -66,7 +65,6 @@ Rectangle {
                    camera.stop()
 		    root.visible = false
                    finder.enabled = false
-                    camera.cameraState = Camera.UnloadedState
                }
            }
        }
@@ -76,7 +74,6 @@ Rectangle {
        id: camera
        objectName: "qrCameraQML"
        captureMode: Camera.CaptureStillImage
-        cameraState: Camera.UnloadedState

        focus {
            focusMode: Camera.FocusContinuous
@@ -86,14 +83,9 @@ Rectangle {
        id : finder
        objectName: "QrFinder"
        onDecoded : {
-            const parsed = walletManager.parse_uri_to_object(data);
-            if (!parsed.error) {
-                root.qrcode_decoded(parsed.address, parsed.payment_id, parsed.amount, parsed.tx_description, parsed.recipient_name, parsed.extra_parameters);
-                root.state = "Stopped";
-            } else {
-                onNotifyError(parsed.error);
-            }
-        }
+            root.qrcode_decoded(address, payment_id, amount, tx_description, recipient_name, extra_parameters)
+            root.state = "Stopped"
+	}
        onNotifyError : {
            if( warning )
                messageDialog.icon = StandardIcon.Critical
--- a/components/RadioButton.qml
+++ b/components/RadioButton.qml
@@ -74,7 +74,7 @@ Item {

        MoneroComponents.TextPlain {
            id: label
-            Layout.leftMargin: 10
+            Layout.leftMargin: (!isMobile ? 10 : 8)
            color: MoneroComponents.Style.defaultFontColor
            font.family: MoneroComponents.Style.fontRegular.name
            font.pixelSize: radioButton.fontSize
--- a/components/RemoteNodeDialog.qml
+++ b/components/RemoteNodeDialog.qml
@@ -1,153 +0,0 @@
-// Copyright (c) 2021, The Monero Project
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.1
-
-import "." as MoneroComponents
-
-MoneroComponents.Dialog {
-    id: root
-    title: (editMode ? qsTr("Edit remote node") : qsTr("Add remote node")) + translationManager.emptyString
-
-    property var callbackOnSuccess: null
-    property bool editMode: false
-    property bool success: false
-
-    onActiveFocusChanged: activeFocus && remoteNodeAddress.forceActiveFocus()
-
-    function add(callbackOnSuccess) {
-        root.editMode = false;
-        root.callbackOnSuccess = callbackOnSuccess;
-
-        open();
-    }
-
-    function edit(remoteNode, callbackOnSuccess) {
-        const hostPort = remoteNode.address.match(/^(.*?)(?:\:?(\d*))$/);
-        if (hostPort) {
-            remoteNodeAddress.daemonAddrText = hostPort[1];
-            remoteNodeAddress.daemonPortText = hostPort[2];
-        }
-        daemonUsername.text = remoteNode.username;
-        daemonPassword.text = remoteNode.password;
-        setTrustedDaemonCheckBox.checked = remoteNode.trusted;
-        root.callbackOnSuccess = callbackOnSuccess;
-        root.editMode = true;
-
-        open();
-    }
-
-    onClosed: {
-        if (root.success && callbackOnSuccess) {
-            callbackOnSuccess({
-                address: remoteNodeAddress.getAddress(),
-                username: daemonUsername.text,
-                password: daemonPassword.text,
-                trusted: setTrustedDaemonCheckBox.checked,
-            });
-        }
-
-        remoteNodeAddress.daemonAddrText = "";
-        remoteNodeAddress.daemonPortText = "";
-        daemonUsername.text = "";
-        daemonPassword.text = "";
-        setTrustedDaemonCheckBox.checked = false;
-        root.success = false;
-    }
-
-    MoneroComponents.RemoteNodeEdit {
-        id: remoteNodeAddress
-        Layout.fillWidth: true
-        placeholderFontSize: 15
-
-        daemonAddrLabelText: qsTr("Address") + translationManager.emptyString
-        daemonPortLabelText: qsTr("Port") + translationManager.emptyString
-    }
-
-    RowLayout {
-        Layout.fillWidth: true
-        spacing: 32
-
-        MoneroComponents.LineEdit {
-            id: daemonUsername
-            Layout.fillWidth: true
-            Layout.minimumWidth: 220
-            labelText: qsTr("Daemon username") + translationManager.emptyString
-            placeholderText: qsTr("(optional)") + translationManager.emptyString
-            placeholderFontSize: 15
-            labelFontSize: 14
-            fontSize: 15
-        }
-
-        MoneroComponents.LineEdit {
-            id: daemonPassword
-            Layout.fillWidth: true
-            Layout.minimumWidth: 220
-            labelText: qsTr("Daemon password") + translationManager.emptyString
-            placeholderText: qsTr("Password") + translationManager.emptyString
-            password: true
-            placeholderFontSize: 15
-            labelFontSize: 14
-            fontSize: 15
-        }
-    }
-
-    MoneroComponents.CheckBox {
-        id: setTrustedDaemonCheckBox
-        activeFocusOnTab: true
-        text: qsTr("Mark as Trusted Daemon") + translationManager.emptyString
-    }
-
-    RowLayout {
-        Layout.alignment: Qt.AlignRight
-        spacing: parent.spacing
-
-        MoneroComponents.StandardButton {
-            activeFocusOnTab: true
-            fontBold: false
-            primary: false
-            text: qsTr("Cancel")  + translationManager.emptyString
-
-            onClicked: root.close()
-        }
-
-        MoneroComponents.StandardButton {
-            activeFocusOnTab: true
-            fontBold: false
-            enabled: remoteNodeAddress.getAddress() != ""
-            text: qsTr("Ok") + translationManager.emptyString
-
-            onClicked: {
-                root.success = true;
-                root.close();
-            }
-        }
-    }
-}
--- a/components/RemoteNodeEdit.qml
+++ b/components/RemoteNodeEdit.qml
@@ -35,7 +35,7 @@ import "../js/Utils.js" as Utils
 import "../components" as MoneroComponents

 GridLayout {
-    columns: 2
+    columns: (isMobile) ? 1 : 2
    columnSpacing: 32
    id: root
    property alias daemonAddrText: daemonAddr.text
@@ -43,9 +43,6 @@ GridLayout {
    property alias daemonAddrLabelText: daemonAddr.labelText
    property alias daemonPortLabelText: daemonPort.labelText

-    property string initialAddress: ""
-    property var initialHostPort: initialAddress.match(/^(.*?)(?:\:?(\d*))$/)
-
    // TODO: LEGACY; remove these placeHolder variables when
    // the wizards get redesigned to the black-theme
    property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name
@@ -56,18 +53,14 @@ GridLayout {
    property int labelFontSize: 14

    property string lineEditBackgroundColor: "transparent"
+    property string lineEditBorderColor: MoneroComponents.Style.inputBorderColorInActive
    property string lineEditFontColor: MoneroComponents.Style.defaultFontColor
    property bool lineEditFontBold: false
    property int lineEditFontSize: 15

-    // Author: David M. Syzdek https://github.com/syzdek https://gist.github.com/syzdek/6086792
-    readonly property var ipv6Regex: /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe08:(:[0-9a-fA-F]{1,4}){2,2}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/
-
    signal editingFinished()
    signal textChanged()

-    onActiveFocusChanged: activeFocus && daemonAddr.forceActiveFocus()
-
    function isValid() {
        return daemonAddr.text.trim().length > 0 && daemonPort.acceptableInput
    }
@@ -93,16 +86,13 @@ GridLayout {
        placeholderColor: root.placeholderColor
        placeholderOpacity: root.placeholderOpacity
        labelFontSize: root.labelFontSize
+        borderColor: lineEditBorderColor
        backgroundColor: lineEditBackgroundColor
        fontColor: lineEditFontColor
        fontBold: lineEditFontBold
        fontSize: lineEditFontSize
-        onEditingFinished: {
-            text = text.replace(ipv6Regex, "[$1]");
-            root.editingFinished();
-        }
+        onEditingFinished: root.editingFinished()
        onTextChanged: root.textChanged()
-        text: initialHostPort[1]
    }

    LineEdit {
@@ -115,6 +105,7 @@ GridLayout {
        placeholderColor: root.placeholderColor
        placeholderOpacity: root.placeholderOpacity
        labelFontSize: root.labelFontSize
+        borderColor: lineEditBorderColor
        backgroundColor: lineEditBackgroundColor
        fontColor: lineEditFontColor
        fontBold: lineEditFontBold
@@ -123,6 +114,5 @@ GridLayout {

        onEditingFinished: root.editingFinished()
        onTextChanged: root.textChanged()
-        text: initialHostPort[2]
    }
 }
--- a/components/LanguageButton.qml
+++ b/components/LanguageButton.qml
@@ -1,21 +1,21 @@
-// Copyright (c) 2020, The Monero Project
-//
+// Copyright (c) 2014-2018, The Monero Project
+// 
 // All rights reserved.
-//
+// 
 // Redistribution and use in source and binary forms, with or without modification, are
 // permitted provided that the following conditions are met:
-//
+// 
 // 1. Redistributions of source code must retain the above copyright notice, this list of
 //    conditions and the following disclaimer.
-//
+// 
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list
 //    of conditions and the following disclaimer in the documentation and/or other
 //    materials provided with the distribution.
-//
+// 
 // 3. Neither the name of the copyright holder nor the names of its contributors may be
 //    used to endorse or promote products derived from this software without specific
 //    prior written permission.
-//
+// 
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
@@ -27,41 +27,63 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 import QtQuick 2.9
-import QtQuick.Layouts 1.3
-
-import FontAwesome 1.0
-
-import "../components" as MoneroComponents
+import "." as MoneroComponents

 Item {
-    implicitHeight: layout.height
-    implicitWidth: layout.width
+    id: scrollItem
+    property var flickable
+    property alias scrollColor: scroll.color
+    property alias scrollWidth: scroll.width
+    property alias scrollRadius: scroll.radius
+    width: 15
+    z: 1

-    RowLayout {
-        id: layout
-        opacity: mouseArea.containsMouse ? 1 : 0.85
-        spacing: 10
+    function flickableContentYChanged() {
+        if(flickable === undefined)
+            return

-        MoneroComponents.Label {
-            Layout.bottomMargin: 5
-            fontColor: MoneroComponents.Style.defaultFontColor
-            fontFamily: FontAwesome.fontFamilySolid
-            fontSize: 26
-            styleName: "Solid"
-            text: FontAwesome.language
-        }
-
-        MoneroComponents.TextPlain {
-            font.pixelSize: 14
-            text: persistentSettings.language
-        }
+        var t = flickable.height - scroll.height
+        scroll.y = (flickable.contentY / (flickable.contentHeight - flickable.height)) * t
    }

    MouseArea {
-        id: mouseArea
+        id: scrollArea
        anchors.fill: parent
-        cursorShape: Qt.PointingHandCursor
        hoverEnabled: true
-        onClicked: appWindow.toggleLanguageView()
+    }
+
+    Rectangle {
+        id: scroll
+
+        width: 4
+        radius: width / 2
+        height: {
+            var t = (flickable.height * flickable.height) / flickable.contentHeight
+            return t < 50 ? 50 : t
+        }
+        y: 0; x: 0
+        color: MoneroComponents.Style.orange
+        opacity: flickable.moving || handleArea.pressed || scrollArea.containsMouse ? 0.8 : 0
+        visible: flickable.contentHeight > flickable.height
+
+        Behavior on opacity {
+            NumberAnimation { duration: 200; easing.type: Easing.InQuad }
+        }
+
+        MouseArea {
+            id: handleArea
+            anchors.fill: parent
+            drag.target: scroll
+            drag.axis: Drag.YAxis
+            drag.minimumY: 0
+            drag.maximumY: flickable.height - height
+            propagateComposedEvents: true
+
+            onPositionChanged: {
+                if(!pressed) return
+                var dy = scroll.y / (flickable.height - scroll.height)
+                flickable.contentY = (flickable.contentHeight - flickable.height) * dy
+            }
+        }
    }
 }
--- a/components/SettingsListItem.qml
+++ b/components/SettingsListItem.qml
@@ -1,115 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Layouts 1.1
-import FontAwesome 1.0
-
-import "../components" as MoneroComponents
-
-ColumnLayout {
-    id: settingsListItem
-    property alias iconText: iconLabel.text
-    property alias description: area.text
-    property alias title: header.text
-    property bool isLast: false
-    signal clicked()
-
-    Layout.fillWidth: true
-    spacing: 0
-
-    Rectangle {
-        id: root
-        Layout.fillWidth: true
-        Layout.minimumHeight: 75
-        Layout.preferredHeight: rect.height + 15
-        color: "transparent"
-
-        Rectangle {
-            id: divider
-            anchors.topMargin: 0
-            anchors.left: parent.left
-            anchors.right: parent.right
-            height: 1
-            color: MoneroComponents.Style.dividerColor
-            opacity: MoneroComponents.Style.dividerOpacity
-        }
-
-        Rectangle {
-            id: rect
-            width: parent.width
-            height: header.height + area.contentHeight
-            color: "transparent";
-            anchors.left: parent.left
-            anchors.bottomMargin: 4
-            anchors.topMargin: 4
-            anchors.verticalCenter: parent.verticalCenter
-
-            Rectangle {
-                id: icon
-                color: "transparent"
-                height: 32
-                width: 32
-                anchors.left: parent.left
-                anchors.leftMargin: 16
-                anchors.verticalCenter: parent.verticalCenter
-
-                MoneroComponents.Label {
-                    id: iconLabel
-                    fontSize: 32
-                    fontFamily: FontAwesome.fontFamilySolid
-                    anchors.centerIn: parent
-                    fontColor: MoneroComponents.Style.defaultFontColor
-                    styleName: "Solid"
-                }
-            }
-
-            MoneroComponents.TextPlain {
-                id: header
-                anchors.left: icon.right
-                anchors.leftMargin: 16
-                anchors.top: parent.top
-                color: MoneroComponents.Style.defaultFontColor
-                opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8
-                font.bold: true
-                font.family: MoneroComponents.Style.fontRegular.name
-                font.pixelSize: 16
-            }
-
-            Text {
-                id: area
-                anchors.top: header.bottom
-                anchors.topMargin: 4
-                anchors.left: icon.right
-                anchors.leftMargin: 16
-                color: MoneroComponents.Style.dimmedFontColor
-                font.family: MoneroComponents.Style.fontRegular.name
-                font.pixelSize: 15
-                horizontalAlignment: TextInput.AlignLeft
-                wrapMode: Text.WordWrap;
-                leftPadding: 0
-                topPadding: 0
-                width: parent.width - (icon.width + icon.anchors.leftMargin + anchors.leftMargin)
-            }
-        }
-
-        Rectangle {
-            id: bottomDivider
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
-            height: 1
-            color: MoneroComponents.Style.dividerColor
-            opacity: MoneroComponents.Style.dividerOpacity
-            visible: settingsListItem.isLast
-        }
-
-        MouseArea {
-            cursorShape: Qt.PointingHandCursor
-            anchors.fill: parent
-            hoverEnabled: true
-            onEntered: root.color = MoneroComponents.Style.titleBarButtonHoverColor
-            onExited: root.color = "transparent"
-            onClicked: {
-                settingsListItem.clicked()
-            }
-        }
-    }
-}
--- a/components/Slider.qml
+++ b/components/Slider.qml
@@ -1,68 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.0 as QtQuickControls
-import QtQuick.Layouts 1.1
-
-import "../components" as MoneroComponents
-
-ColumnLayout {
-    property alias from: slider.from
-    property alias stepSize: slider.stepSize
-    property alias to: slider.to
-    property alias value: slider.value
-
-    property alias text: label.text
-
-    signal moved()
-
-    spacing: 0
-
-    Text {
-        id: label
-        color: MoneroComponents.Style.defaultFontColor
-        font.pixelSize: 14
-        Layout.fillWidth: true
-    }
-
-    QtQuickControls.Slider {
-        id: slider
-        leftPadding: 0
-        snapMode: QtQuickControls.Slider.SnapAlways
-
-        background: Rectangle {
-            x: parent.leftPadding
-            y: parent.topPadding + parent.availableHeight / 2 - height / 2
-            implicitWidth: 200
-            implicitHeight: 4
-            width: parent.availableWidth
-            height: implicitHeight
-            radius: 2
-            color: MoneroComponents.Style.progressBarBackgroundColor
-
-            Rectangle {
-                width: parent.visualPosition * parent.width
-                height: parent.height
-                color: MoneroComponents.Style.green
-                radius: 2
-            }
-        }
-
-        handle: Rectangle {
-            x: parent.leftPadding + parent.visualPosition * (parent.availableWidth - width)
-            y: parent.topPadding + parent.availableHeight / 2 - height / 2
-            implicitWidth: 18
-            implicitHeight: 18
-            radius: 8
-            color: parent.pressed ? "#f0f0f0" : "#f6f6f6"
-            border.color: MoneroComponents.Style.grey
-        }
-
-        onMoved: parent.moved()
-
-        MouseArea {
-            anchors.fill: parent
-            acceptedButtons: Qt.NoButton
-            hoverEnabled: true
-            cursorShape: Qt.PointingHandCursor
-        }
-    }
-}
--- a/components/StandardButton.qml
+++ b/components/StandardButton.qml
@@ -29,24 +29,15 @@
 import QtQuick 2.9
 import QtQuick.Layouts 1.1

-import FontAwesome 1.0
-
 import "../components" as MoneroComponents

 Item {
    id: button
-    property bool fontAwesomeIcon: false
-    property bool primary: true
    property string rightIcon: ""
    property string rightIconInactive: ""
-    property color textColor: !button.enabled
-        ? MoneroComponents.Style.buttonTextColorDisabled
-        : primary
-        ? MoneroComponents.Style.buttonTextColor
-        : MoneroComponents.Style.buttonSecondaryTextColor;
+    property string textColor: button.enabled? MoneroComponents.Style.buttonTextColor: MoneroComponents.Style.buttonTextColorDisabled
    property bool small: false
    property alias text: label.text
-    property alias fontBold: label.font.bold
    property int fontSize: {
        if(small) return 14;
        else return 16;
@@ -68,7 +59,7 @@ Item {
        id: buttonRect
        anchors.fill: parent
        radius: 3
-        border.width: parent.focus && parent.enabled ? 1 : 0
+        border.width: parent.focus ? 1 : 0

        state: button.enabled ? "active" : "disabled"
        Component.onCompleted: state = state
@@ -76,12 +67,10 @@ Item {
        states: [
            State {
                name: "hover"
-                when: button.enabled && (buttonArea.containsMouse || button.focus)
+                when: buttonArea.containsMouse || button.focus
                PropertyChanges {
                    target: buttonRect
-                    color: primary
-                        ? MoneroComponents.Style.buttonBackgroundColorHover
-                        : MoneroComponents.Style.buttonSecondaryBackgroundColorHover
+                    color: MoneroComponents.Style.buttonBackgroundColorHover
                }
            },
            State {
@@ -89,9 +78,7 @@ Item {
                when: button.enabled
                PropertyChanges {
                    target: buttonRect
-                    color: primary
-                        ? MoneroComponents.Style.buttonBackgroundColor
-                        : MoneroComponents.Style.buttonSecondaryBackgroundColor
+                    color: MoneroComponents.Style.buttonBackgroundColor
                }
            },
            State {
@@ -138,7 +125,7 @@ Item {
        }

        Image {
-            visible: !fontAwesomeIcon && button.rightIcon !== ""
+            visible: button.rightIcon !== ""
            Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
            width: button.small ? 16 : 20
            height: button.small ? 16 : 20
@@ -149,16 +136,6 @@ Item {
                return button.rightIcon;
            }
        }
-
-        Text {
-            Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-            color: MoneroComponents.Style.defaultFontColor
-            font.family: FontAwesome.fontFamilySolid
-            font.pixelSize: button.small ? 16 : 20
-            font.styleName: "Solid"
-            text: button.rightIcon
-            visible: fontAwesomeIcon && button.rightIcon !== ""
-        }
    }

    MouseArea {
@@ -169,8 +146,6 @@ Item {
        cursorShape: Qt.PointingHandCursor
    }

-    Keys.enabled: button.visible
    Keys.onSpacePressed: doClick()
-    Keys.onEnterPressed: Keys.onReturnPressed(event)
    Keys.onReturnPressed: doClick()
 }
--- a/components/StandardDialog.qml
+++ b/components/StandardDialog.qml
@@ -82,30 +82,28 @@ Rectangle {

    function open() {
        // Center
-        root.x = parent.width/2 - root.width/2
-        root.y = 100
+        if(!isMobile) {
+            root.x = parent.width/2 - root.width/2
+            root.y = 100
+        }
        root.z = 11
        root.visible = true;
    }

    function close() {
        root.visible = false;
-        // reset button text
-        okButton.text = qsTr("OK")
-        cancelButton.text = qsTr("Cancel")
-
        closeCallback();
    }

    // TODO: implement without hardcoding sizes
-    width: 520
-    height: 380
+    width: isMobile ? screenWidth : 520
+    height: isMobile ? screenHeight : 380

    ColumnLayout {
        id: mainLayout
        spacing: 10
        anchors.fill: parent
-        anchors.margins: 20
+        anchors.margins: (isMobile? 17 : 20)

        RowLayout {
            id: column
@@ -128,10 +126,7 @@ Rectangle {
            Flickable {
                id: flickable
                anchors.fill: parent
-                ScrollBar.vertical: ScrollBar {
-                    onActiveChanged: if (!active && !isMac) active = true
-                }
-                boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+                ScrollBar.vertical: ScrollBar { }

                TextArea.flickable: TextArea {
                    id: dialogContent
--- a/components/StandardDropdown.qml
+++ b/components/StandardDropdown.qml
@@ -27,7 +27,6 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 import QtQuick 2.9
-import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0

 import "../components" as MoneroComponents
@@ -43,7 +42,7 @@ Item {
    property string releasedColor: MoneroComponents.Style.titleBarButtonHoverColor
    property string textColor: MoneroComponents.Style.defaultFontColor
    property alias currentIndex: columnid.currentIndex
-    readonly property alias expanded: popup.visible
+    property bool expanded: false
    property int dropdownHeight: 42
    property int fontHeaderSize: 16
    property int fontItemSize: 14
@@ -57,6 +56,23 @@ Item {
    signal changed();

    onExpandedChanged: if(expanded) appWindow.currentItem = dropdown
+    function hide() { dropdown.expanded = false }
+    function containsPoint(px, py) {
+        if(px < 0)
+            return false
+        if(px > width)
+            return false
+        if(py < 0)
+            return false
+        if(py > height + droplist.height)
+            return false
+        return true
+    }
+
+    // Workaroud for suspected memory leak in 5.8 causing malloc crash on app exit
+    function update() {
+        firstColText.text = columnid.currentIndex < repeater.model.rowCount() ? qsTr(repeater.model.get(columnid.currentIndex).column1) + translationManager.emptyString : ""
+    }

    Item {
        id: head
@@ -75,17 +91,15 @@ Item {
        }

        MoneroComponents.TextPlain {
+            id: firstColText
            anchors.verticalCenter: parent.verticalCenter
            anchors.left: parent.left
            anchors.leftMargin: 12
-            anchors.right: dropIndicator.left
-            anchors.rightMargin: 12
            elide: Text.ElideRight
            font.family: MoneroComponents.Style.fontRegular.name
            font.bold: dropdown.headerFontBold
            font.pixelSize: dropdown.fontHeaderSize
            color: dropdown.textColor
-            text: columnid.currentIndex < repeater.model.count ? qsTr(repeater.model.get(columnid.currentIndex).column1) + translationManager.emptyString : ""
        }

        Item {
@@ -93,8 +107,7 @@ Item {
            anchors.top: parent.top
            anchors.bottom: parent.bottom
            anchors.right: parent.right
-            anchors.rightMargin: 12
-            width: dropdownIcon.width
+            width: 32

            Image {
                id: dropdownIcon
@@ -115,104 +128,118 @@ Item {
        MouseArea {
            id: dropArea
            anchors.fill: parent
-            onClicked: dropdown.expanded ? popup.close() : popup.open()
+            onClicked: dropdown.expanded = !dropdown.expanded
            hoverEnabled: true
            cursorShape: Qt.PointingHandCursor
        }
    }

-    Popup {
-        id: popup
-        padding: 0
-        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
+    Rectangle {
+        id: droplist
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: head.bottom
+        clip: true
+        height: dropdown.expanded ? columnid.height : 0
+        color: dropdown.pressedColor

        Rectangle {
-            id: droplist
-            x: dropdown.x
-            width: dropdown.width
-            y: head.y + head.height
-            clip: true
-            height: dropdown.expanded ? columnid.height : 0
+            anchors.left: parent.left
+            anchors.top: parent.top
+            width: 3; height: 3
            color: dropdown.pressedColor
+        }

-            Behavior on height {
-                NumberAnimation { duration: 100; easing.type: Easing.InQuad }
-            }
+        Rectangle {
+            anchors.right: parent.right
+            anchors.top: parent.top
+            width: 3; height: 3
+            color: dropdown.pressedColor
+        }

-            Column {
-                id: columnid
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                property int currentIndex: 0
+        Behavior on height {
+            NumberAnimation { duration: 100; easing.type: Easing.InQuad }
+        }

-                Repeater {
-                    id: repeater
+        Column {
+            id: columnid
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.top: parent.top
+            property int currentIndex: 0

-                    // Workaround for translations in listElements. All translated strings needs to be listed in this file.
-                    property string stringAutomatic: qsTr("Automatic") + translationManager.emptyString
-                    property string stringSlow: qsTr("Slow (x0.2 fee)") + translationManager.emptyString
-                    property string stringNormal: qsTr("Normal (x1 fee)")  + translationManager.emptyString
-                    property string stringFast: qsTr("Fast (x5 fee)")  + translationManager.emptyString
-                    property string stringFastest: qsTr("Fastest (x200 fee)") + translationManager.emptyString
+            Repeater {
+                id: repeater

-                    delegate: Rectangle {
+                // Workaround for translations in listElements. All translated strings needs to be listed in this file.
+                property string stringLow: qsTr("Low (x1 fee)") + translationManager.emptyString
+                property string stringMedium:  qsTr("Medium (x20 fee)") + translationManager.emptyString
+                property string stringHigh:  qsTr("High (x166 fee)") + translationManager.emptyString
+                property string stringSlow: qsTr("Slow (x0.25 fee)") + translationManager.emptyString
+                property string stringDefault: qsTr("Default (x1 fee)") + translationManager.emptyString
+                property string stringFast: qsTr("Fast (x5 fee)") + translationManager.emptyString
+                property string stringFastest: qsTr("Fastest (x41.5 fee)") + translationManager.emptyString
+                property string stringAll:  qsTr("All") + translationManager.emptyString
+                property string stringSent:  qsTr("Sent") + translationManager.emptyString
+                property string stringReceived:  qsTr("Received") + translationManager.emptyString
+
+                delegate: Rectangle {
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    height: (dropdown.dropdownHeight * 0.75)
+                    //radius: index === repeater.count - 1 ? 4 : 0
+                    color: itemArea.containsMouse || index === columnid.currentIndex || itemArea.containsMouse ? dropdown.releasedColor : dropdown.pressedColor
+
+                    MoneroComponents.TextPlain {
+                        id: col1Text
+                        anchors.verticalCenter: parent.verticalCenter
                        anchors.left: parent.left
+                        anchors.right: col2Text.left
+                        anchors.leftMargin: 12
+                        anchors.rightMargin: 0
+                        font.family: MoneroComponents.Style.fontRegular.name
+                        font.bold: true
+                        font.pixelSize: fontItemSize
+                        color: itemArea.containsMouse || index === columnid.currentIndex || itemArea.containsMouse ? "#FA6800" : "#FFFFFF"
+                        text: qsTr(column1) + translationManager.emptyString
+                    }
+
+                    MoneroComponents.TextPlain {
+                        id: col2Text
+                        anchors.verticalCenter: parent.verticalCenter
                        anchors.right: parent.right
-                        height: (dropdown.dropdownHeight * 0.75)
-                        //radius: index === repeater.count - 1 ? 4 : 0
-                        color: itemArea.containsMouse || index === columnid.currentIndex || itemArea.containsMouse ? dropdown.releasedColor : dropdown.pressedColor
+                        anchors.rightMargin: 45
+                        font.family: MoneroComponents.Style.fontRegular.name
+                        font.pixelSize: 14
+                        color: "#FFFFFF"
+                        text: ""
+                    }

-                        MoneroComponents.TextPlain {
-                            id: col1Text
-                            anchors.verticalCenter: parent.verticalCenter
-                            anchors.left: parent.left
-                            anchors.right: col2Text.left
-                            anchors.leftMargin: 12
-                            anchors.rightMargin: 0
-                            font.family: MoneroComponents.Style.fontRegular.name
-                            font.bold: true
-                            font.pixelSize: fontItemSize
-                            color: itemArea.containsMouse || index === columnid.currentIndex || itemArea.containsMouse ? "#FA6800" : "#FFFFFF"
-                            text: qsTr(column1) + translationManager.emptyString
-                        }
+                    Rectangle {
+                        anchors.left: parent.left
+                        anchors.top: parent.top
+                        width: 3; height: 3
+                        color: parent.color
+                    }

-                        MoneroComponents.TextPlain {
-                            id: col2Text
-                            anchors.verticalCenter: parent.verticalCenter
-                            anchors.right: parent.right
-                            anchors.rightMargin: 45
-                            font.family: MoneroComponents.Style.fontRegular.name
-                            font.pixelSize: 14
-                            color: "#FFFFFF"
-                            text: ""
-                        }
+                    Rectangle {
+                        anchors.right: parent.right
+                        anchors.top: parent.top
+                        width: 3; height: 3
+                        color: parent.color
+                    }

-                        Rectangle {
-                            anchors.left: parent.left
-                            anchors.top: parent.top
-                            width: 3; height: 3
-                            color: parent.color
-                        }
+                    MouseArea {
+                        id: itemArea
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor

-                        Rectangle {
-                            anchors.right: parent.right
-                            anchors.top: parent.top
-                            width: 3; height: 3
-                            color: parent.color
-                        }
-
-                        MouseArea {
-                            id: itemArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-
-                            onClicked: {
-                                popup.close()
-                                columnid.currentIndex = index
-                                changed();
-                            }
+                        onClicked: {
+                            dropdown.expanded = false
+                            columnid.currentIndex = index
+                            changed();
+                            dropdown.update()
                        }
                    }
                }
--- a/components/Style.qml
+++ b/components/Style.qml
@@ -29,7 +29,6 @@ QtObject {
    property string textSelectedColor: blackTheme ? _b_textSelectedColor : _w_textSelectedColor

    property string inputBoxBackground: blackTheme ? _b_inputBoxBackground : _w_inputBoxBackground
-    property string inputBoxBackgroundDisabled: blackTheme ? _b_inputBoxBackgroundDisabled : _w_inputBoxBackgroundDisabled
    property string inputBoxBackgroundError: blackTheme ? _b_inputBoxBackgroundError : _w_inputBoxBackgroundError
    property string inputBoxColor: blackTheme ? _b_inputBoxColor : _w_inputBoxColor
    property string legacy_placeholderFontColor: blackTheme ? _b_legacy_placeholderFontColor : _w_legacy_placeholderFontColor
@@ -44,9 +43,6 @@ QtObject {
    property string buttonInlineBackgroundColor: blackTheme ? _b_buttonInlineBackgroundColor : _w_buttonInlineBackgroundColor
    property string buttonTextColor: blackTheme ? _b_buttonTextColor : _w_buttonTextColor
    property string buttonTextColorDisabled: blackTheme ? _b_buttonTextColorDisabled : _w_buttonTextColorDisabled
-    property string buttonSecondaryBackgroundColor: "#d9d9d9"
-    property string buttonSecondaryBackgroundColorHover: "#a6a6a6"
-    property string buttonSecondaryTextColor: "#4d4d4d"
    property string dividerColor: blackTheme ? _b_dividerColor : _w_dividerColor
    property real dividerOpacity: blackTheme ? _b_dividerOpacity : _w_dividerOpacity

@@ -55,6 +51,7 @@ QtObject {
    property string titleBarBackgroundBorderColor: blackTheme ? _b_titleBarBackgroundBorderColor : _w_titleBarBackgroundBorderColor
    property string titleBarLogoSource: blackTheme ? _b_titleBarLogoSource : _w_titleBarLogoSource
    property string titleBarMinimizeSource: blackTheme ? _b_titleBarMinimizeSource : _w_titleBarMinimizeSource
+    property string titleBarExpandSource: blackTheme ? _b_titleBarExpandSource : _w_titleBarExpandSource
    property string titleBarFullscreenSource: blackTheme ? _b_titleBarFullscreenSource : _w_titleBarFullscreenSource
    property string titleBarCloseSource: blackTheme ? _b_titleBarCloseSource : _w_titleBarCloseSource
    property string titleBarButtonHoverColor: blackTheme ? _b_titleBarButtonHoverColor : _w_titleBarButtonHoverColor
@@ -89,7 +86,6 @@ QtObject {
    property string _b_textSelectedColor: "white"

    property string _b_inputBoxBackground: "black"
-    property string _b_inputBoxBackgroundDisabled: Qt.rgba(255, 255, 255, 0.10)
    property string _b_inputBoxBackgroundError: "#FFDDDD"
    property string _b_inputBoxColor: "white"
    property string _b_legacy_placeholderFontColor: "#BABABA"
@@ -112,6 +108,7 @@ QtObject {
    property string _b_titleBarBackgroundBorderColor: "#2f2f2f"
    property string _b_titleBarLogoSource: "qrc:///images/titlebarLogo.png"
    property string _b_titleBarMinimizeSource: "qrc:///images/minimize.svg"
+    property string _b_titleBarExpandSource: "qrc:///images/sidebar.svg"
    property string _b_titleBarFullscreenSource: "qrc:///images/fullscreen.svg"
    property string _b_titleBarCloseSource: "qrc:///images/close.svg"
    property string _b_titleBarButtonHoverColor: "#10FFFFFF"
@@ -128,7 +125,7 @@ QtObject {
    property string _b_menuButtonImageRightColor: "white"
    property string _b_menuButtonImageRightSource: "qrc:///images/right.svg"
    property string _b_menuButtonImageDotArrowSource: "qrc:///images/arrow-right-medium-white.png"
-    property string _b_inlineButtonTextColor: "white"
+    property string _b_inlineButtonTextColor: "black"
    property string _b_inlineButtonBorderColor: "black"
    property string _b_appWindowBackgroundColor: "white"
    property string _b_appWindowBorderColor: "#313131"
@@ -146,7 +143,6 @@ QtObject {
    property string _w_textSelectedColor: "black"

    property string _w_inputBoxBackground: "white"
-    property string _w_inputBoxBackgroundDisabled: Qt.rgba(0, 0, 0, 0.20)
    property string _w_inputBoxBackgroundError: "#FFDDDD"
    property string _w_inputBoxColor: "black"
    property string _w_legacy_placeholderFontColor: "#BABABA"
@@ -169,6 +165,7 @@ QtObject {
    property string _w_titleBarBackgroundBorderColor: "#DEDEDE"
    property string _w_titleBarLogoSource: "qrc:///images/themes/white/titlebarLogo.png"
    property string _w_titleBarMinimizeSource: "qrc:///images/themes/white/minimize.svg"
+    property string _w_titleBarExpandSource: "qrc:///images/themes/white/expand.svg"
    property string _w_titleBarFullscreenSource: "qrc:///images/themes/white/fullscreen.svg"
    property string _w_titleBarCloseSource: "qrc:///images/themes/white/close.svg"
    property string _w_titleBarButtonHoverColor: "#11000000"
@@ -185,7 +182,7 @@ QtObject {
    property string _w_menuButtonImageRightColorActive: "#FA6800"
    property string _w_menuButtonImageRightColor: "#808080"
    property string _w_menuButtonImageDotArrowSource: "qrc:///images/arrow-right-medium-white.png"
-    property string _w_inlineButtonTextColor: "black"
+    property string _w_inlineButtonTextColor: "white"
    property string _w_inlineButtonBorderColor: "transparent"
    property string _w_appWindowBackgroundColor: "black"
    property string _w_appWindowBorderColor: "#dedede"
--- a/components/SuccessfulTxDialog.qml
+++ b/components/SuccessfulTxDialog.qml
@@ -1,167 +0,0 @@
-// Copyright (c) 2014-2020, The Monero Project
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import QtQuick 2.9
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.1
-
-import moneroComponents.Clipboard 1.0
-import "../components" as MoneroComponents
-
-Rectangle {
-    id: root
-    x: parent.width/2 - root.width/2
-    y: parent.height/2 - root.height/2
-    // TODO: implement without hardcoding sizes
-    width: 580
-    height: 400
-    color: MoneroComponents.Style.blackTheme ? "black" : "white"
-    visible: false
-    radius: 10
-    border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25)
-    border.width: 1
-    Keys.enabled: true
-    Keys.onEscapePressed: {
-        root.close()
-        root.rejected()
-    }
-    KeyNavigation.tab: doneButton
-
-    Clipboard { id: clipboard }
-
-    property var transactionID;
-
-    // same signals as Dialog has
-    signal accepted()
-    signal rejected()
-
-    function open(txid) {
-        root.transactionID = txid;
-        root.visible = true;
-    }
-
-    function close() {
-        root.visible = false;
-    }
-
-    ColumnLayout {
-        spacing: 10
-        anchors.fill: parent
-        anchors.margins: 25
-
-        ColumnLayout{
-            Layout.topMargin: 10
-            Layout.leftMargin: 0
-            Layout.fillWidth: true
-            Layout.alignment: Qt.AlignCenter
-
-            MoneroComponents.Label {
-                fontSize: 18
-                fontFamily: "Arial"
-                horizontalAlignment: Text.AlignHCenter
-                text: {
-                    if (appWindow.viewOnly){
-                        return qsTr("Transaction file successfully saved!") + translationManager.emptyString;
-                    } else {
-                        return  qsTr("Transaction successfully sent!") + translationManager.emptyString;
-                    }
-                }
-            }
-        }
-
-        Image {
-            id: successImage
-            Layout.alignment: Qt.AlignCenter
-            width: 140
-            height: 140
-            source: "qrc:///images/success.png"
-
-            SequentialAnimation{
-                running: successImage.visible
-                ScaleAnimator { target: successImage; from: 0.4; to: 1.3; duration: 125}
-                ScaleAnimator { target: successImage; from: 1.3; to: 1; duration: 80}
-            }
-        }
-
-        MoneroComponents.LineEditMulti {
-            visible: !appWindow.viewOnly
-            Layout.leftMargin: 25
-            Layout.rightMargin: 25
-            borderDisabled: true
-            readOnly: true
-            copyButton: true
-            wrapMode: Text.Wrap
-            labelText: qsTr("Transaction ID:") + translationManager.emptyString
-            text: root.transactionID ? root.transactionID : "";
-            fontSize: 16
-        }
-
-        MoneroComponents.LineEditMulti {
-            visible: appWindow.viewOnly
-            Layout.leftMargin: 25
-            borderDisabled: true
-            readOnly: true
-            wrapMode: Text.Wrap
-            labelText: qsTr("Transaction file location:") + translationManager.emptyString
-            text: walletManager.urlToLocalPath(saveTxDialog.fileUrl)
-            fontSize: 16
-        }
-
-        // open folder / done buttons
-        RowLayout {
-            id: buttons
-            spacing: 70
-            Layout.alignment: Qt.AlignBottom | Qt.AlignHCenter
-            Layout.fillWidth: true
-            Layout.preferredHeight: 50
-
-            MoneroComponents.StandardButton {
-                id: openFolderButton
-                visible: appWindow.viewOnly
-                text: qsTr("Open folder") + translationManager.emptyString;
-                width: 200
-                KeyNavigation.tab: doneButton
-                onClicked: {
-                    oshelper.openContainingFolder(walletManager.urlToLocalPath(saveTxDialog.fileUrl))
-                }
-            }
-
-            MoneroComponents.StandardButton {
-                id: doneButton
-                text: qsTr("Done") + translationManager.emptyString;
-                width: 200
-                focus: root.visible
-                KeyNavigation.tab: openFolderButton
-                onClicked: {
-                    root.close()
-                    root.accepted()
-                }
-            }
-        }
-    }
-}
--- a/components/TitleBar.qml
+++ b/components/TitleBar.qml
@@ -38,14 +38,14 @@ import "effects/" as MoneroEffects
 Rectangle {
    id: root
    property int mouseX: 0
+    property bool basicButtonVisible: false
    property bool customDecorations: persistentSettings.customDecorations
    property bool showMinimizeButton: true
    property bool showMaximizeButton: true
    property bool showCloseButton: true
-    property string walletName: ""

    height: {
-        if(!persistentSettings.customDecorations) return 0;
+        if(!persistentSettings.customDecorations || isMobile) return 0;
        return 50;
    }

@@ -56,18 +56,18 @@ Rectangle {
    signal maximizeClicked
    signal minimizeClicked
    signal languageClicked
-    signal closeWalletClicked
+    signal goToBasicVersion(bool yes)

    state: "default"
    states: [
        State {
            name: "default";
-            PropertyChanges { target: btnCloseWallet; visible: true}
+            PropertyChanges { target: btnSidebarCollapse; visible: true}
            PropertyChanges { target: btnLanguageToggle; visible: true}
        }, State {
            // show only theme switcher and window controls
            name: "essentials";
-            PropertyChanges { target: btnCloseWallet; visible: false}
+            PropertyChanges { target: btnSidebarCollapse; visible: false}
            PropertyChanges { target: btnLanguageToggle; visible: false}
        }
    ]
@@ -93,20 +93,22 @@ Rectangle {

        // collapse sidebar
        Rectangle {
-            id: btnCloseWallet
+            id: btnSidebarCollapse
+            visible: root.basicButtonVisible
            color: "transparent"
            Layout.preferredWidth: parent.height
            Layout.preferredHeight: parent.height

-
-            Text {
-                text: FontAwesome.signOutAlt
-                font.family: FontAwesome.fontFamilySolid
-                font.pixelSize: 16
-                color: MoneroComponents.Style.defaultFontColor
-                font.styleName: "Solid"
+            MoneroEffects.ImageMask {
                anchors.verticalCenter: parent.verticalCenter
                anchors.horizontalCenter: parent.horizontalCenter
+                height: 14
+                width: 14
+                image: MoneroComponents.Style.titleBarExpandSource
+                color: MoneroComponents.Style.defaultFontColor
+                fontAwesomeFallbackIcon: FontAwesome.cube
+                fontAwesomeFallbackSize: 14
+                fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.9
                opacity: 0.75
            }

@@ -116,7 +118,7 @@ Rectangle {
                cursorShape: Qt.PointingHandCursor
                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
                onExited: parent.color = "transparent"
-                onClicked: root.closeWalletClicked(leftPanel.visible)
+                onClicked: root.goToBasicVersion(leftPanel.visible)
            }
        }

@@ -129,10 +131,9 @@ Rectangle {

            Text {
                text: FontAwesome.globe
-                font.family: FontAwesome.fontFamilySolid
+                font.family: FontAwesome.fontFamily
                font.pixelSize: 16
                color: MoneroComponents.Style.defaultFontColor
-                font.styleName: "Solid"
                anchors.verticalCenter: parent.verticalCenter
                anchors.horizontalCenter: parent.horizontalCenter
                opacity: 0.75
@@ -155,10 +156,9 @@ Rectangle {
            Layout.preferredHeight: parent.height

            Text {
-                text: FontAwesome.moonO
-                font.family: MoneroComponents.Style.blackTheme ? FontAwesome.fontFamilySolid : FontAwesome.fontFamily
-                font.styleName: MoneroComponents.Style.blackTheme ? "Solid" : "Regular"
-                font.pixelSize: 15
+                text: MoneroComponents.Style.blackTheme ? FontAwesome.lightbulbO : FontAwesome.moonO
+                font.family: FontAwesome.fontFamily
+                font.pixelSize: 16
                color: MoneroComponents.Style.defaultFontColor
                anchors.verticalCenter: parent.verticalCenter
                anchors.horizontalCenter: parent.horizontalCenter
@@ -189,7 +189,6 @@ Rectangle {

        // monero logo
        Item {
-            visible: walletName.length === 0
            Layout.fillWidth: true
            Layout.preferredHeight: parent.height

@@ -217,22 +216,6 @@ Rectangle {
            }
        }

-        Item {
-            visible: walletName.length > 0
-            Layout.fillWidth: true
-            Layout.preferredHeight: parent.height
-
-            MoneroComponents.TextPlain {
-                font.pixelSize: 20
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-                width: parent.width
-                height: parent.height
-                elide: Text.ElideRight
-                text: walletName
-            }
-        }
-
        // minimize
        Rectangle {
            color: "transparent"
@@ -309,8 +292,8 @@ Rectangle {
                width: 16
                image: MoneroComponents.Style.titleBarCloseSource
                color: MoneroComponents.Style.defaultFontColor
-                fontAwesomeFallbackIcon: FontAwesome.times
-                fontAwesomeFallbackSize: 21
+                fontAwesomeFallbackIcon: FontAwesome.timesRectangle
+                fontAwesomeFallbackSize: 18
                fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 0.8 : 0.6
                opacity: 0.75
            }
--- a/components/TxConfirmationDialog.qml
+++ b/components/TxConfirmationDialog.qml
@@ -1,440 +0,0 @@
-// Copyright (c) 2014-2020, The Monero Project
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import QtQuick 2.9
-import QtQuick.Controls 1.4 as QtQuickControls1
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.1
-
-import "../components" as MoneroComponents
-import FontAwesome 1.0
-
-Rectangle {
-    id: root
-
-    property int margins: 25
-
-    x: parent.width/2 - root.width/2
-    y: parent.height/2 - root.height/2
-    // TODO: implement without hardcoding sizes
-    width: 590
-    height: layout.height + layout.anchors.margins * 2
-    color: MoneroComponents.Style.blackTheme ? "black" : "white"
-    visible: false
-    radius: 10
-    border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25)
-    border.width: 1
-    Keys.enabled: true
-    Keys.onEscapePressed: {
-        root.close()
-        root.clearFields()
-        root.rejected()
-    }
-    KeyNavigation.tab: confirmButton
-
-    property var recipients: []
-    property var transactionAmount: ""
-    property var transactionDescription: ""
-    property var transactionFee: ""
-    property var transactionPriority: ""
-    property bool sweepUnmixable: false
-    property alias errorText: errorText
-    property alias confirmButton: confirmButton
-    property alias backButton: backButton
-    property alias bottomText: bottomText
-    property alias bottomTextAnimation: bottomTextAnimation
-
-    state: "default"
-    states: [
-        State {
-            // waiting for user action, show tx details + back and confirm buttons
-            name: "default";
-            when: errorText.text == "" && bottomText.text == ""
-            PropertyChanges { target: errorText; visible: false }
-            PropertyChanges { target: txAmountText; visible: root.transactionAmount !== "(all)" || (root.transactionAmount === "(all)" && currentWallet.isHwBacked() === true) }
-            PropertyChanges { target: txAmountBusyIndicator; visible: !txAmountText.visible }
-            PropertyChanges { target: txFiatAmountText; visible: txAmountText.visible && persistentSettings.fiatPriceEnabled && root.transactionAmount !== "(all)" }
-            PropertyChanges { target: txDetails; visible: true }
-            PropertyChanges { target: bottom; visible: true }
-            PropertyChanges { target: bottomMessage; visible: false }
-            PropertyChanges { target: buttons; visible: true }
-            PropertyChanges { target: backButton; visible: true; primary: false }
-            PropertyChanges { target: confirmButton; visible: true; focus: true }
-        }, State {
-            // error message being displayed, show only back button
-            name: "error";
-            when: errorText.text !== ""
-            PropertyChanges { target: dialogTitle; text: "Error" }
-            PropertyChanges { target: errorText; visible: true }
-            PropertyChanges { target: txAmountText; visible: false }
-            PropertyChanges { target: txAmountBusyIndicator; visible: false }
-            PropertyChanges { target: txFiatAmountText; visible: false }
-            PropertyChanges { target: txDetails; visible: false }
-            PropertyChanges { target: bottom; visible: true }
-            PropertyChanges { target: bottomMessage; visible: false }
-            PropertyChanges { target: buttons; visible: true }
-            PropertyChanges { target: backButton; visible: true; primary: true; focus: true }
-            PropertyChanges { target: confirmButton; visible: false }
-        }, State {
-            // creating or sending transaction, show tx details and don't show any button
-            name: "bottomText";
-            when: errorText.text == "" && bottomText.text !== ""
-            PropertyChanges { target: errorText; visible: false }
-            PropertyChanges { target: txAmountText; visible: root.transactionAmount !== "(all)" || (root.transactionAmount === "(all)" && currentWallet.isHwBacked() === true) }
-            PropertyChanges { target: txAmountBusyIndicator; visible: !txAmountText.visible }
-            PropertyChanges { target: txFiatAmountText; visible: txAmountText.visible && persistentSettings.fiatPriceEnabled && root.transactionAmount !== "(all)" }
-            PropertyChanges { target: txDetails; visible: true }
-            PropertyChanges { target: bottom; visible: true }
-            PropertyChanges { target: bottomMessage; visible: true }
-            PropertyChanges { target: buttons; visible: false }
-        }
-    ]
-
-    // same signals as Dialog has
-    signal accepted()
-    signal rejected()
-
-    function open() {
-        root.visible = true;
-
-        //clean previous error message
-        errorText.text = "";
-    }
-
-    function close() {
-        root.visible = false;
-    }
-
-    function clearFields() {
-        root.recipients = [];
-        root.transactionAmount = "";
-        root.transactionDescription = "";
-        root.transactionFee = "";
-        root.transactionPriority = "";
-        root.sweepUnmixable = false;
-    }
-
-    function showFiatConversion(valueXMR) {
-        const fiatFee = fiatApiConvertToFiat(valueXMR);
-        return "%1 %2".arg(fiatFee < 0.01 ? "<0.01" : "~" + fiatFee).arg(fiatApiCurrencySymbol());
-    }
-
-    ColumnLayout {
-        id: layout
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.margins: parent.margins
-        spacing: 10
-
-        RowLayout {
-            Layout.topMargin: 10
-            Layout.fillWidth: true
-
-            MoneroComponents.Label {
-                id: dialogTitle
-                Layout.fillWidth: true
-                fontSize: 18
-                fontFamily: "Arial"
-                horizontalAlignment: Text.AlignHCenter
-                text: {
-                    if (appWindow.viewOnly) {
-                        return qsTr("Create transaction file") + translationManager.emptyString;
-                    } else if (root.sweepUnmixable) {
-                        return qsTr("Sweep unmixable outputs") + translationManager.emptyString;
-                    } else {
-                        return qsTr("Confirm send") + translationManager.emptyString;
-                    }
-                }
-            }
-        }
-
-        Text {
-            id: errorText
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            color: MoneroComponents.Style.defaultFontColor
-            wrapMode: Text.Wrap
-            font.pixelSize: 15
-        }
-
-        ColumnLayout {
-            spacing: 0
-            Layout.fillWidth: true
-            Layout.preferredHeight: 71
-
-            QtQuickControls1.BusyIndicator {
-                id: txAmountBusyIndicator
-                Layout.fillHeight: true
-                Layout.fillWidth: true
-                running: root.transactionAmount == "(all)"
-            }
-
-            Text {
-                id: txAmountText
-                Layout.fillWidth: true
-                horizontalAlignment: Text.AlignHCenter
-                font.pixelSize: root.transactionAmount == "(all)" && currentWallet.isHwBacked() === true ? 32 : 42
-                color: MoneroComponents.Style.defaultFontColor
-                text: {
-                    if (root.transactionAmount == "(all)" && currentWallet.isHwBacked() === true) {
-                        return qsTr("All unlocked balance") +  translationManager.emptyString;
-                    } else {
-                        return root.transactionAmount + " XMR " +  translationManager.emptyString;
-                    }
-                }
-            }
-
-            Text {
-                id: txFiatAmountText
-                Layout.fillWidth: true
-                horizontalAlignment: Text.AlignHCenter
-                font.pixelSize: 20
-                color: MoneroComponents.Style.buttonSecondaryTextColor
-                text: showFiatConversion(transactionAmount) + translationManager.emptyString
-            }
-        }
-
-        GridLayout {
-            columns: 2
-            id: txDetails
-            Layout.fillWidth: true
-            columnSpacing: 15
-            rowSpacing: 16
-
-            Text {
-                color: MoneroComponents.Style.dimmedFontColor
-                text: qsTr("From") + ":" + translationManager.emptyString
-                font.pixelSize: 15
-            }
-
-            ColumnLayout {
-                Layout.fillWidth: true
-                spacing: 16
-
-                Text {
-                    Layout.fillWidth: true
-                    font.pixelSize: 15
-                    color: MoneroComponents.Style.defaultFontColor
-                    text: {
-                        if (currentWallet) {
-                            var walletTitle = function() {
-                                if (currentWallet.isLedger()) {
-                                    return "Ledger";
-                                } else if (currentWallet.isTrezor()) {
-                                    return "Trezor";
-                                } else {
-                                    return qsTr("My wallet");
-                                }
-                            }
-                            var walletName = appWindow.walletName;
-                            if (appWindow.currentWallet.numSubaddressAccounts() > 1) {
-                                var currentSubaddressAccount = currentWallet.currentSubaddressAccount;
-                                var currentAccountLabel =  currentWallet.getSubaddressLabel(currentWallet.currentSubaddressAccount, 0);
-                                return walletTitle() + " (" + walletName + ")" + "<br>" + qsTr("Account #") + currentSubaddressAccount + (currentAccountLabel !== "" ? " (" + currentAccountLabel + ")" : "") + translationManager.emptyString;
-                            } else {
-                                return walletTitle() + " (" + walletName + ")" + translationManager.emptyString;
-                            }
-                        } else {
-                            return "";
-                        }
-                    }
-                }
-            }
-
-            Text {
-                font.pixelSize: 15
-                color: MoneroComponents.Style.dimmedFontColor
-                text: qsTr("To") + ":" + translationManager.emptyString
-            }
-
-            Flickable {
-                id: flickable
-                property int linesInMultipleRecipientsMode: 7
-                Layout.fillWidth: true
-                Layout.preferredHeight: recipients.length > 1
-                    ? linesInMultipleRecipientsMode * (recipientsArea.contentHeight / recipientsArea.lineCount)
-                    : recipientsArea.contentHeight
-                boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
-                clip: true
-
-                TextArea.flickable: TextArea {
-                    id : recipientsArea
-                    color: MoneroComponents.Style.defaultFontColor
-                    font.family: MoneroComponents.Style.fontMonoRegular.name
-                    font.pixelSize: 14
-                    topPadding: 0
-                    bottomPadding: 0
-                    leftPadding: 0
-                    textMargin: 0
-                    readOnly: true
-                    selectByKeyboard: true
-                    selectByMouse: true
-                    selectionColor: MoneroComponents.Style.textSelectionColor
-                    textFormat: TextEdit.RichText
-                    wrapMode: TextEdit.Wrap
-                    text: {
-                        return recipients.map(function (recipient, index) {
-                            var addressBookName = null;
-                            if (currentWallet) {
-                                addressBookName = currentWallet.addressBook.getDescription(recipient.address);
-                            }
-                            var title;
-                            if (addressBookName) {
-                                title = FontAwesome.addressBook + " " + addressBookName;
-                            } else {
-                                title = qsTr("Monero address") + translationManager.emptyString;
-                            }
-                            if (recipients.length > 1) {
-                                title = "%1. %2 - %3 XMR".arg(index + 1).arg(title).arg(recipient.amount);
-                                if (persistentSettings.fiatPriceEnabled) {
-                                    title += " (%1)".arg(showFiatConversion(recipient.amount));
-                                }
-                            }
-                            const spacedaddress = recipient.address.match(/.{1,4}/g).join(' ');
-                            return title + "<br>" + spacedaddress;
-                        }).join("<br><br>");
-                    }
-                }
-
-                ScrollBar.vertical: ScrollBar {
-                    policy: recipientsArea.contentHeight > flickable.height ? ScrollBar.AlwaysOn : ScrollBar.AlwaysOff
-                }
-            }
-
-            Text {
-                color: MoneroComponents.Style.dimmedFontColor
-                text: qsTr("Fee") + ":" + translationManager.emptyString
-                font.pixelSize: 15
-            }
-
-            RowLayout {
-                Layout.fillWidth: true
-                spacing: 16
-
-                Text {
-                    color: MoneroComponents.Style.defaultFontColor
-                    font.pixelSize: 15
-                    text: {
-                        if (currentWallet) {
-                            if (!root.transactionFee) {
-                                if (currentWallet.isHwBacked() === true) {
-                                    return qsTr("See on device") +  translationManager.emptyString;
-                                } else {
-                                    return qsTr("Calculating fee") + "..." +  translationManager.emptyString;
-                                }
-                            } else {
-                                return root.transactionFee + " XMR"
-                            }
-                        } else {
-                            return "";
-                        }
-                    }
-                }
-
-                Text {
-                    Layout.fillWidth: true
-                    Layout.leftMargin: 8
-                    color: MoneroComponents.Style.buttonSecondaryTextColor
-                    visible: persistentSettings.fiatPriceEnabled && root.transactionFee
-                    font.pixelSize: 15
-                    text: showFiatConversion(root.transactionFee)
-                }
-            }
-        }
-
-        ColumnLayout {
-            id: bottom
-            Layout.alignment: Qt.AlignBottom | Qt.AlignHCenter
-            Layout.fillWidth: true
-
-            RowLayout {
-                id: bottomMessage
-                Layout.fillWidth: true
-                Layout.preferredHeight: 50
-
-                QtQuickControls1.BusyIndicator {
-                    visible: !bottomTextAnimation.running
-                    running: !bottomTextAnimation.running
-                    scale: .5
-                }
-
-                Text {
-                    id: bottomText
-                    color: MoneroComponents.Style.defaultFontColor
-                    text: ""
-                    horizontalAlignment: Text.AlignHCenter
-                    wrapMode: Text.Wrap
-                    font.pixelSize: 17
-                    opacity: 1
-
-                    SequentialAnimation{
-                        id:bottomTextAnimation
-                        running: false
-                        loops: Animation.Infinite
-                        alwaysRunToEnd: true
-                        NumberAnimation { target: bottomText; property: "opacity"; to: 0; duration: 500}
-                        NumberAnimation { target: bottomText; property: "opacity"; to: 1; duration: 500}
-                    }
-                }
-            }
-
-            RowLayout {
-                id: buttons
-                spacing: 70
-                Layout.fillWidth: true
-                Layout.preferredHeight: 50
-
-                MoneroComponents.StandardButton {
-                    id: backButton
-                    text: qsTr("Back") + translationManager.emptyString;
-                    width: 200
-                    primary: false
-                    KeyNavigation.tab: confirmButton
-                    onClicked: {
-                        root.close()
-                        root.clearFields()
-                        root.rejected()
-                    }
-                }
-
-                MoneroComponents.StandardButton {
-                    id: confirmButton
-                    text: qsTr("Confirm") + translationManager.emptyString;
-                    rightIcon: "qrc:///images/rightArrow.png"
-                    width: 200
-                    KeyNavigation.tab: backButton
-                    onClicked: {
-                        root.close()
-                        root.accepted()
-                    }
-                }
-            }
-        }
-    }
-}
--- a/components/UpdateDialog.qml
+++ b/components/UpdateDialog.qml
@@ -1,204 +0,0 @@
-// Copyright (c) 2020, The Monero Project
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.1
-
-import moneroComponents.Downloader 1.0
-
-import "../components" as MoneroComponents
-
-Popup {
-    id: updateDialog
-
-    property bool active: false
-    property bool allowed: true
-    property string error: ""
-    property string filename: ""
-    property string hash: ""
-    property double progress: url && downloader.total > 0 ? downloader.loaded * 100 / downloader.total : 0
-    property string url: ""
-    property bool valid: false
-    property string version: ""
-
-    background: Rectangle {
-        border.color: MoneroComponents.Style.appWindowBorderColor
-        border.width: 1
-        color: MoneroComponents.Style.middlePanelBackgroundColor
-    }
-    closePolicy: Popup.NoAutoClose
-    padding: 20
-    visible: active && allowed
-
-    function show(version, url, hash) {
-        updateDialog.error = "";
-        updateDialog.hash = hash;
-        updateDialog.url = url;
-        updateDialog.valid = false;
-        updateDialog.version = version;
-        updateDialog.active = true;
-    }
-
-    ColumnLayout {
-        id: mainLayout
-        spacing: updateDialog.padding
-
-        Text {
-            color: MoneroComponents.Style.defaultFontColor
-            font.bold: true
-            font.family: MoneroComponents.Style.fontRegular.name
-            font.pixelSize: 18
-            text: qsTr("New Monero version v%1 is available.").arg(updateDialog.version)
-        }
-
-        Text {
-            id: errorText
-            color: "red"
-            font.family: MoneroComponents.Style.fontRegular.name
-            font.pixelSize: 18
-            text: updateDialog.error
-            visible: text
-        }
-
-        Text {
-            id: statusText
-            color: updateDialog.valid ? MoneroComponents.Style.green : MoneroComponents.Style.defaultFontColor
-            font.family: MoneroComponents.Style.fontRegular.name
-            font.pixelSize: 18
-            visible: !errorText.visible
-
-            text: {
-                if (!updateDialog.url) {
-                    return qsTr("Please visit getmonero.org for details") + translationManager.emptyString;
-                }
-                if (downloader.active) {
-                    return "%1 (%2%)"
-                        .arg(qsTr("Downloading"))
-                        .arg(updateDialog.progress.toFixed(1))
-                        + translationManager.emptyString;
-                }
-                if (updateDialog.valid) {
-                    return qsTr("Update downloaded, signature verified") + translationManager.emptyString;
-                }
-                return qsTr("Do you want to download and verify new version?") + translationManager.emptyString;
-            }
-        }
-
-        Rectangle {
-            id: progressBar
-            color: MoneroComponents.Style.lightGreyFontColor
-            height: 3
-            Layout.fillWidth: true
-            visible: updateDialog.valid || downloader.active
-
-            Rectangle {
-                color: MoneroComponents.Style.buttonBackgroundColor
-                height: parent.height
-                width: parent.width * updateDialog.progress / 100
-            }
-        }
-
-        RowLayout {
-            Layout.alignment: Qt.AlignRight
-            spacing: parent.spacing
-
-            MoneroComponents.StandardButton {
-                id: cancelButton
-                fontBold: false
-                primary: !updateDialog.url
-                text: {
-                    if (!updateDialog.url) {
-                        return qsTr("Ok") + translationManager.emptyString;
-                    }
-                    if (updateDialog.valid || downloader.active || errorText.visible) {
-                        return qsTr("Cancel")  + translationManager.emptyString;
-                    }
-                    return qsTr("Download later") + translationManager.emptyString;
-                }
-
-                onClicked: {
-                    downloader.cancel();
-                    updateDialog.active = false;
-                }
-            }
-
-            MoneroComponents.StandardButton {
-                id: downloadButton
-                KeyNavigation.tab: cancelButton
-                fontBold: false
-                text: (updateDialog.error ? qsTr("Retry") : qsTr("Download")) + translationManager.emptyString
-                visible: updateDialog.url && !updateDialog.valid && !downloader.active
-
-                onClicked: {
-                    updateDialog.error = "";
-                    updateDialog.filename = updateDialog.url.replace(/^.*\//, '');
-                    const downloadingStarted = downloader.get(updateDialog.url, updateDialog.hash, function(error) {
-                        if (error) {
-                            console.error("Download failed", error);
-                            updateDialog.error = qsTr("Download failed") + translationManager.emptyString;
-                        } else {
-                            updateDialog.valid = true;
-                        }
-                    });
-                    if (!downloadingStarted) {
-                        updateDialog.error = qsTr("Failed to start download") + translationManager.emptyString;
-                    }
-                }
-            }
-
-            MoneroComponents.StandardButton {
-                id: saveButton
-                KeyNavigation.tab: cancelButton
-                fontBold: false
-                onClicked: {
-                    const fullPath = oshelper.openSaveFileDialog(
-                        qsTr("Save as") + translationManager.emptyString,
-                        oshelper.downloadLocation(),
-                        updateDialog.filename);
-                    if (!fullPath) {
-                        return;
-                    }
-                    if (downloader.saveToFile(fullPath)) {
-                        cancelButton.clicked();
-                        oshelper.openContainingFolder(fullPath);
-                    } else {
-                        updateDialog.error = qsTr("Save operation failed") + translationManager.emptyString;
-                    }
-                }
-                text: qsTr("Save to file") + translationManager.emptyString
-                visible: updateDialog.valid
-            }
-        }
-    }
-
-    Downloader {
-        id: downloader
-        proxyAddress: persistentSettings.getProxyAddress()
-    }
-}
--- a/components/WarningBox.qml
+++ b/components/WarningBox.qml
@@ -37,26 +37,26 @@ Rectangle {
            source: "qrc:///images/warning.png"
        }

-        Text {
+        TextArea {
            id: content
            Layout.fillWidth: true
            color: MoneroComponents.Style.defaultFontColor
            font.family: MoneroComponents.Style.fontRegular.name
            font.pixelSize: root.fontSize
            horizontalAlignment: TextInput.AlignLeft
+            selectByMouse: true
            textFormat: Text.RichText
            wrapMode: Text.WordWrap
+            textMargin: 0
            leftPadding: 4
            rightPadding: 18
            topPadding: 10
            bottomPadding: 10
+            readOnly: true
            onLinkActivated: root.linkActivated();

-            MouseArea {
-                anchors.fill: parent
-                acceptedButtons: Qt.NoButton
-                cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
-            }
+            selectionColor: MoneroComponents.Style.textSelectionColor
+            selectedTextColor: MoneroComponents.Style.textSelectedColor
        }
    }
 }
--- a/components/effects/ImageMask.qml
+++ b/components/effects/ImageMask.qml
@@ -39,9 +39,8 @@ Item {
    id: root
    property string image: ""
    property string color: ""
+    property bool fontAwesomeFallbackEnabled: true
    property var fontAwesomeFallbackIcon: ""
-    property string fontAwesomeFallbackFont: FontAwesome.fontFamilySolid
-    property string fontAwesomeFallbackStyle: "Solid"
    property int fontAwesomeFallbackSize: 16
    property double fontAwesomeFallbackOpacity: 0.8
    property string fontAwesomeFallbackColor: MoneroComponents.Style.defaultFontColor
@@ -68,16 +67,15 @@ Item {
        anchors.fill: root
        source: svgMask
        color: root.color
-        visible: image && isOpenGL
+        visible: isOpenGL
    }

    Text {
        id: fontAwesomeFallback
-        visible: !imgMockColor.visible
-        text: root.fontAwesomeFallbackIcon
-        font.family: root.fontAwesomeFallbackFont
+        visible: !isOpenGL && root.fontAwesomeFallback
+        text: !isOpenGL ? root.fontAwesomeFallbackIcon : ""
+        font.family: FontAwesome.fontFamily
        font.pixelSize: root.fontAwesomeFallbackSize
-        font.styleName: root.fontAwesomeFallbackStyle
        color: root.fontAwesomeFallbackColor
        anchors.verticalCenter: parent.verticalCenter
        anchors.horizontalCenter: parent.horizontalCenter
--- a/deployment.pri
+++ b/deployment.pri
@@ -0,0 +1,27 @@
+android-no-sdk {
+    target.path = /data/user/qt
+    export(target.path)
+    INSTALLS += target
+} else:android {
+    x86 {
+        target.path = /libs/x86
+    } else: armeabi-v7a {
+        target.path = /libs/armeabi-v7a
+    } else {
+        target.path = /libs/armeabi
+    }
+    export(target.path)
+    INSTALLS += target
+} else:unix {
+    isEmpty(target.path) {
+        qnx {
+            target.path = /tmp/$${TARGET}/bin
+        } else {
+            target.path = /opt/$${TARGET}/bin
+        }
+        export(target.path)
+    }
+    INSTALLS += target
+}
+
+export(INSTALLS)
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -1,7 +0,0 @@
-add_library(quirc STATIC
-    quirc/lib/decode.c
-    quirc/lib/identify.c
-    quirc/lib/quirc.c
-    quirc/lib/version_db.c
-)
-target_include_directories(quirc PUBLIC quirc/lib)
--- a/external/quirc
+++ b/external/quirc
--- a/src/main/filter.cpp
+++ b/src/main/filter.cpp
--- a/src/main/filter.h
+++ b/src/main/filter.h
--- a/fonts/CMakeLists.txt
+++ b/fonts/CMakeLists.txt
@@ -1 +0,0 @@
-qt5_add_resources(RESOURCE_FILES *.otf)
--- a/fonts/FontAwesome/FontAwesome.qml
+++ b/fonts/FontAwesome/FontAwesome.qml
@@ -4,23 +4,10 @@ import QtQuick 2.9
 Object {

    FontLoader {
-        id: regular
-        source: "./fa-regular-400.ttf"
+        source: "./fontawesome-webfont.ttf"
    }

-    FontLoader {
-        id: brands
-        source: "./fa-brands-400.ttf"
-    }
-
-    FontLoader {
-        id: solid
-        source: "./fa-solid-900.ttf"
-    }
-
-    property string fontFamily: regular.name
-    property string fontFamilyBrands: brands.name
-    property string fontFamilySolid: solid.name
+    property string fontFamily: "FontAwesome"

    // Icons 
    property string addressBook : "\uf2b9"
@@ -149,7 +136,6 @@ Object {
    property string caretUp : "\uf0d8"
    property string cartArrowDown : "\uf218"
    property string cartPlus : "\uf217"
-    property string cashRegister: "\uf788"
    property string cc : "\uf20a"
    property string ccAmex : "\uf1f3"
    property string ccDinersClub : "\uf24c"
@@ -403,7 +389,6 @@ Object {
    property string inbox : "\uf01c"
    property string indent : "\uf03c"
    property string industry : "\uf275"
-    property string infinity : "\uf534"
    property string info : "\uf129"
    property string infoCircle : "\uf05a"
    property string inr : "\uf156"
@@ -609,7 +594,6 @@ Object {
    property string shower : "\uf2cc"
    property string signIn : "\uf090"
    property string signLanguage : "\uf2a7"
-    property string signOutAlt : "\uf2f5"
    property string signOut : "\uf08b"
    property string signal : "\uf012"
    property string signing : "\uf2a7"
--- a/fonts/FontAwesome/fa-brands-400.ttf
+++ b/fonts/FontAwesome/fa-brands-400.ttf
--- a/fonts/FontAwesome/fa-regular-400.ttf
+++ b/fonts/FontAwesome/fa-regular-400.ttf
--- a/fonts/FontAwesome/fa-solid-900.ttf
+++ b/fonts/FontAwesome/fa-solid-900.ttf
--- a/fonts/FontAwesome/fontawesome-webfont.ttf
+++ b/fonts/FontAwesome/fontawesome-webfont.ttf
--- a/get_libwallet_api.sh
+++ b/get_libwallet_api.sh
@@ -0,0 +1,256 @@
+#!/bin/bash
+MONERO_URL=https://github.com/monero-project/monero.git
+MONERO_BRANCH=master
+
+pushd $(pwd)
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+source $ROOT_DIR/utils.sh
+
+INSTALL_DIR=$ROOT_DIR/wallet
+MONERO_DIR=$ROOT_DIR/monero
+BUILD_LIBWALLET=false
+
+# init and update monero submodule
+if [ ! -d $MONERO_DIR/src ]; then
+    git submodule init monero
+fi
+git submodule update --remote
+git -C $MONERO_DIR fetch
+git -C $MONERO_DIR checkout v0.14.1.0
+
+# get monero core tag
+pushd $MONERO_DIR
+get_tag
+popd
+# create local monero branch
+git -C $MONERO_DIR checkout -B $VERSIONTAG
+
+# Merge monero PR dependencies
+
+# Workaround for git username requirements
+# Save current user settings and revert back when we are done with merging PR's
+OLD_GIT_USER=$(git -C $MONERO_DIR config --local user.name)
+OLD_GIT_EMAIL=$(git -C $MONERO_DIR config --local user.email)
+git -C $MONERO_DIR config user.name "Monero GUI"
+git -C $MONERO_DIR config user.email "gui@monero.local"
+# check for PR requirements in most recent commit message (i.e requires #xxxx)
+for PR in $(git log --format=%B -n 1 | grep -io "requires #[0-9]*" | sed 's/[^0-9]*//g'); do
+    echo "Merging monero push request #$PR"
+    # fetch pull request and merge
+    git -C $MONERO_DIR fetch origin pull/$PR/head:PR-$PR
+    git -C $MONERO_DIR merge --quiet PR-$PR  -m "Merge monero PR #$PR"
+    BUILD_LIBWALLET=true
+done
+
+# revert back to old git config
+$(git -C $MONERO_DIR config user.name "$OLD_GIT_USER")
+$(git -C $MONERO_DIR config user.email "$OLD_GIT_EMAIL")
+
+git -C $MONERO_DIR submodule init
+git -C $MONERO_DIR submodule update
+
+# Build libwallet if it doesnt exist
+if [ ! -f $MONERO_DIR/lib/libwallet_merged.a ]; then 
+    echo "libwallet_merged.a not found - Building libwallet"
+    BUILD_LIBWALLET=true
+# Build libwallet if no previous version file exists
+elif [ ! -f $MONERO_DIR/version.sh ]; then 
+    echo "monero/version.h not found - Building libwallet"
+    BUILD_LIBWALLET=true
+## Compare previously built version with submodule + merged PR's version. 
+else
+    source $MONERO_DIR/version.sh
+    # compare submodule version with latest build
+    pushd "$MONERO_DIR"
+    get_tag
+    popd
+    echo "latest libwallet version: $GUI_MONERO_VERSION"
+    echo "Installed libwallet version: $VERSIONTAG"
+    # check if recent
+    if [ "$VERSIONTAG" != "$GUI_MONERO_VERSION" ]; then
+        echo "Building new libwallet version $GUI_MONERO_VERSION"
+        BUILD_LIBWALLET=true
+    else
+        echo "latest libwallet ($GUI_MONERO_VERSION) is already built. Remove monero/lib/libwallet_merged.a to force rebuild"
+    fi
+fi
+
+if [ "$BUILD_LIBWALLET" != true ]; then
+    exit 0
+fi
+
+echo "GUI_MONERO_VERSION=\"$VERSIONTAG\"" > $MONERO_DIR/version.sh
+
+## Continue building libwallet
+
+# default build type
+BUILD_TYPE=$1
+if [ -z $BUILD_TYPE ]; then
+    BUILD_TYPE=release
+fi
+
+BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR=ON"
+if [ "$BUILD_TREZOR" == false ]; then
+    BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR=OFF"
+fi
+BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR_UDP_RELEASE=ON ${BUILD_TREZOR_FLAGS}"
+
+STATIC=false
+ANDROID=false
+if [ "$BUILD_TYPE" == "release" ]; then
+    echo "Building libwallet release"
+    CMAKE_BUILD_TYPE=Release
+elif [ "$BUILD_TYPE" == "release-static" ]; then
+    echo "Building libwallet release-static"
+    CMAKE_BUILD_TYPE=Release
+    STATIC=true
+elif [ "$BUILD_TYPE" == "release-android" ]; then
+    echo "Building libwallet release-static for ANDROID"
+    CMAKE_BUILD_TYPE=Release
+    STATIC=true
+    ANDROID=true
+elif [ "$BUILD_TYPE" == "debug-android" ]; then
+    echo "Building libwallet debug-static for ANDROID"
+    CMAKE_BUILD_TYPE=Debug
+    STATIC=true
+    ANDROID=true
+elif [ "$BUILD_TYPE" == "debug" ]; then
+    echo "Building libwallet debug"
+    CMAKE_BUILD_TYPE=Debug
+    STATIC=true
+else
+    echo "Valid build types are release, release-static, release-android, debug-android and debug"
+    exit 1;
+fi
+
+
+echo "cleaning up existing monero build dir, libs and includes"
+rm -fr $MONERO_DIR/build
+rm -fr $MONERO_DIR/lib
+rm -fr $MONERO_DIR/include
+rm -fr $MONERO_DIR/bin
+
+
+mkdir -p $MONERO_DIR/build/$BUILD_TYPE
+pushd $MONERO_DIR/build/$BUILD_TYPE
+
+# reusing function from "utils.sh"
+platform=$(get_platform)
+# default make executable
+make_exec="make"
+
+## OS X
+if [ "$platform" == "darwin" ]; then
+    echo "Configuring build for MacOS.."
+    if [ "$STATIC" == true ]; then
+        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
+    else
+        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE  -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
+    fi
+
+## LINUX 64
+elif [ "$platform" == "linux64" ]; then
+    echo "Configuring build for Linux x64"
+    if [ "$ANDROID" == true ]; then
+        echo "Configuring build for Android on Linux host"
+        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="armv7-a" -D ANDROID=true -D BUILD_GUI_DEPS=ON -D USE_LTO=OFF -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
+    elif [ "$STATIC" == true ]; then
+        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
+    else
+        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
+    fi
+
+## LINUX 32
+elif [ "$platform" == "linux32" ]; then
+    echo "Configuring build for Linux i686"
+    if [ "$STATIC" == true ]; then
+        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
+    else
+        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
+    fi
+
+## LINUX ARMv7
+elif [ "$platform" == "linuxarmv7" ]; then
+    echo "Configuring build for Linux armv7"
+    if [ "$STATIC" == true ]; then
+        cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF  -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
+    else
+        cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D -D BUILD_64=OFF  -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
+    fi
+
+## LINUX other 
+elif [ "$platform" == "linux" ]; then
+    echo "Configuring build for Linux general"
+    if [ "$STATIC" == true ]; then
+        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
+    else
+        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
+    fi
+
+## Windows 64
+## Windows is always static to work outside msys2
+elif [ "$platform" == "mingw64" ]; then
+    # Do something under Windows NT platform
+    echo "Configuring build for MINGW64.."
+    BOOST_ROOT=/mingw64/boost
+    cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D BOOST_ROOT="$BOOST_ROOT" -D ARCH="x86-64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" -D CMAKE_TOOLCHAIN_FILE=../../cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=c:/msys64 ../..
+
+## Windows 32
+elif [ "$platform" == "mingw32" ]; then
+    # Do something under Windows NT platform
+    echo "Configuring build for MINGW32.."
+    BOOST_ROOT=/mingw32/boost
+    cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D Boost_DEBUG=ON -D BOOST_ROOT="$BOOST_ROOT" -D ARCH="i686" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" -D CMAKE_TOOLCHAIN_FILE=../../cmake/32-bit-toolchain.cmake -D MSYS2_FOLDER=c:/msys32 ../..
+    make_exec="mingw32-make"
+else
+    echo "Unknown platform, configuring general build"
+    if [ "$STATIC" == true ]; then
+        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
+    else
+        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
+    fi
+fi
+
+# set CPU core count
+# thanks to SO: http://stackoverflow.com/a/20283965/4118915
+if test -z "$CPU_CORE_COUNT"; then
+  CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu)
+fi
+
+# Build libwallet_merged
+pushd $MONERO_DIR/build/$BUILD_TYPE/src/wallet
+eval $make_exec version -C ../..
+eval $make_exec  -j$CPU_CORE_COUNT
+eval $make_exec  install -j$CPU_CORE_COUNT
+popd
+
+# Build monerod
+# win32 need to build daemon manually with msys2 toolchain
+if [ "$platform" != "mingw32" ] && [ "$ANDROID" != true ]; then
+    pushd $MONERO_DIR/build/$BUILD_TYPE/src/daemon
+    eval make  -j$CPU_CORE_COUNT
+    eval make install -j$CPU_CORE_COUNT
+    popd
+fi
+
+# build install epee
+eval make -C $MONERO_DIR/build/$BUILD_TYPE/contrib/epee all install
+
+# install easylogging
+eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/easylogging++ all install
+
+# install lmdb
+eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/db_drivers/liblmdb all install
+
+# Install libunbound
+if [ -d $MONERO_DIR/build/$BUILD_TYPE/external/unbound ]; then
+    echo "Installing libunbound..."
+    pushd $MONERO_DIR/build/$BUILD_TYPE/external/unbound
+    # no need to make, it was already built as dependency for libwallet
+    # make -j$CPU_CORE_COUNT
+    $make_exec install -j$CPU_CORE_COUNT
+    popd
+fi
+
+popd
--- a/images/CMakeLists.txt
+++ b/images/CMakeLists.txt
@@ -1 +0,0 @@
-qt5_add_resources(RESOURCE_FILES *.png)
--- a/images/busy-indicator.png
+++ b/images/busy-indicator.png
--- a/images/busy-indicator@2x.png
+++ b/images/busy-indicator@2x.png
--- a/images/card-background-black.png
+++ b/images/card-background-black.png
--- a/images/card-background-black@2x.png
+++ b/images/card-background-black@2x.png
--- a/images/card-background-white.png
+++ b/images/card-background-white.png
--- a/images/card-background-white@2x.png
+++ b/images/card-background-white@2x.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
luigi1111	a77a5909cf	Merge pull request #2215 (again) `bf785bb` build: checkout v0.14.1.0 tag (selsta)	2019-06-25 14:33:46 -05:00
selsta	bf785bb388	build: checkout v0.14.1.0 tag	2019-06-14 16:15:36 +02:00