Merge master -> release-v0.14.1

Merge pull request #2288
d83b400 build: set submodule to v0.14.1.1 (selsta)
2026-04-02 07:57:25 -04:00 · 2019-07-17 16:00:43 -05:00 · 2019-07-16 11:39:56 -05:00 · 2019-07-16 14:30:07 +02:00 · 2019-06-25 14:33:46 -05:00 · 2019-06-14 16:15:36 +02:00
437 changed files with 361446 additions and 190731 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +0,0 @@
-*
--- a/.github/verify_p2pool.py
+++ b/.github/verify_p2pool.py
@@ -1,107 +0,0 @@
-import requests
-import subprocess
-from urllib.request import urlretrieve
-import difflib
-
-sech_key = "https://p2pool.io/SChernykh.asc"
-sech_key_backup = "https://raw.githubusercontent.com/monero-project/gitian.sigs/master/gitian-pubkeys/SChernykh.asc"
-sech_key_fp = "1FCA AB4D 3DC3 310D 16CB  D508 C47F 82B5 4DA8 7ADF"
-
-p2pool_files = [{
-                    "os": "WIN",
-                    "filename": "windows-x64.zip",
-                },
-                {
-                    "os": "LINUX",
-                    "filename": "linux-x64.tar.gz"
-                },
-                {
-                    "os": "MACOS_AARCH64",
-                    "filename": "macos-aarch64.tar.gz",
-                },
-                {
-                    "os": "MACOS",
-                    "filename": "macos-x64.tar.gz",
-                }]
-
-def get_hash(fname):
-    fhash = subprocess.check_output(["sha256sum", fname]).decode("utf-8")
-    print(fhash.strip())
-    return fhash.split()[0]
-
-def main():
-    global p2pool_files, sech_key, sech_key_backup, sech_key_fp
-    p2pool_tag_api = "https://api.github.com/repos/SChernykh/p2pool/releases/latest"
-    data = requests.get(p2pool_tag_api).json()
-    tag = data["tag_name"]
-    head = f"p2pool-{tag}-"
-    url = f"https://github.com/SChernykh/p2pool/releases/download/{tag}/"
-
-    try:
-        urlretrieve(sech_key,"SChernykh.asc")
-    except:
-        urlretrieve(sech_key_backup,"SChernykh.asc")
-
-    urlretrieve(f"{url}sha256sums.txt.asc","sha256sums.txt.asc")
-
-    subprocess.check_call(["gpg", "--import", "SChernykh.asc"])
-    subprocess.check_call(["gpg", "--verify", "sha256sums.txt.asc"])    
-    fingerprint = subprocess.check_output(["gpg","--fingerprint", "SChernykh"]).decode("utf-8").splitlines()[1].strip()
-    
-    assert fingerprint == sech_key_fp
-    
-    with open("sha256sums.txt.asc","r") as f:
-        lines = f.readlines()
-
-    signed_hashes = {}
-    for line in lines:
-        if "Name:" in line:
-            signed_fname = line.split()[1]
-        if "SHA256:" in line:
-            signed_hashes[signed_fname] = line.split()[1].lower()
-
-    expected = ""
-    for i in range(len(p2pool_files)):
-        fname = p2pool_files[i]["filename"]
-        str_os =p2pool_files[i]["os"]
-        dl = f"{url}{head}{fname}"
-        urlretrieve(dl,f"{head}{fname}")
-        fhash = get_hash(f"{head}{fname}")
-        assert signed_hashes[f"{head}{fname}"] == fhash
-        if i == 0:
-            expected += f"        #ifdef Q_OS_{str_os}\n"
-        else:
-            expected += f"        #elif defined(Q_OS_{str_os})\n"
-        expected += f"            url = \"https://github.com/SChernykh/p2pool/releases/download/{tag}/{head}{fname}\";\n"
-        expected += f"            fileName = m_p2poolPath + \"/{head}{fname}\";\n"
-        expected += f"            validHash = \"{fhash}\";\n"
-    expected += "        #endif\n"
-
-    print(f"Expected:\n{expected}")
-
-    with open("src/p2pool/P2PoolManager.cpp","r") as f:
-        p2pool_lines = f.readlines()
-
-    unexpected = ""
-    ignore = 1
-    for line in p2pool_lines:
-        if ignore == 0:
-            unexpected += line
-        if "QString validHash;" in line:
-            ignore = 0
-        if "#endif" in line and ignore == 0:
-            break
-
-    d = difflib.Differ()
-    diff = d.compare(str(unexpected).splitlines(True),str(expected).splitlines(True))
-
-    print("Unexpected:")
-    for i in diff:
-        if i.startswith("?"):
-            continue
-        print(i.replace("\n",""))
-
-    assert unexpected == expected
-
-if __name__ == "__main__":
-    main()
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,192 +0,0 @@
-name: ci/gh-actions/gui
-
-on: [push, pull_request]
-
-env:
-  FREE_DISKSPACE: |
-    sudo rm -rf /usr/local/.ghcup /usr/share/dotnet /usr/share/swift /usr/share/miniconda
-  QT_TAG: v5.15.17-lts-lgpl
-  QT_PREFIX: ${{ github.workspace }}/qt-install
-
-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 openssl zmq libpgm libsodium miniupnpc 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 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-platform 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-pcre 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-unbound git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt mingw-w64-x86_64-angleproject
-    - name: build
-      run: DEV_MODE=ON make release-win64 -j2
-    - name: deploy
-      run: make deploy
-      working-directory: build/release
-    - name: test qml
-      run: build/release/bin/monero-wallet-gui --test-qml
-
-  macos-bundle:
-    runs-on: macos-15
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - name: install dependencies
-      run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi openssl zmq libpgm miniupnpc expat libunwind-headers protobuf pkg-config
-    - name: clone qt repo
-      run: git clone -b "${QT_TAG}" --recursive --depth 1 --shallow-submodules https://github.com/qt/qt5
-    - name: build qt from source
-      run: |
-        cd qt5
-        mkdir build && cd build
-        ../configure -prefix "${QT_PREFIX}" -opensource -confirm-license -release -nomake examples -nomake tests -no-rpath -skip qtwebengine -skip qt3d -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtlocation -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 qtwebsockets -skip qtwebview -skip qtwinextras -skip qtx11extras -skip gamepad -skip serialbus -skip location -skip webengine
-        make -j"$(sysctl -n hw.ncpu)"
-        make install
-        cd ../qttools/src/linguist/lrelease
-        ../../../../build/qtbase/bin/qmake
-        make -j"$(sysctl -n hw.ncpu)"
-        make install
-        cd ../../../../qttools/src/macdeployqt/macdeployqt/
-        ../../../../build/qtbase/bin/qmake
-        make -j"$(sysctl -n hw.ncpu)"
-        make install
-    - name: build monero-gui
-      run: |
-        mkdir build && cd build
-        cmake -D CMAKE_BUILD_TYPE=Release -D ARCH=default -D CMAKE_PREFIX_PATH="${QT_PREFIX}" ..
-        make -j"$(sysctl -n hw.ncpu)"
-    - name: deploy
-      run: make deploy
-      working-directory: build
-    - name: test qml
-      run: build/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/bin
-    - uses: actions/upload-artifact@v4
-      with:
-        name: ${{ github.job }}
-        path: build/bin/monero-wallet-gui.tar
-
-  docker-linux-static:
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - name: install dependencies
-      run: sudo apt -y install xvfb libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xkb1 libxcb-shape0 libxkbcommon-x11-0
-    - name: free up diskspace
-      run: ${{env.FREE_DISKSPACE}}
-    - name: prepare build environment
-      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@v4
-      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-22.04
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - name: free up diskspace
-      run: ${{env.FREE_DISKSPACE}}
-    - name: prepare build environment
-      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@v4
-      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-22.04
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - name: free up diskspace
-      run: ${{env.FREE_DISKSPACE}}
-    - name: prepare build environment
-      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@v4
-      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-22.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@v4
-      with:
-        name: ${{ env.OUTPUT }}
-        path: /home/runner/work/monero-gui/monero-gui/${{ env.OUTPUT }}
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -1,174 +0,0 @@
-name: Flatpak
-
-on:
-  release:
-    types: released
-
-jobs:
-  part1:
-    name: Part 1/3
-    if: github.repository == 'monero-project/monero-gui'
-    runs-on: ubuntu-latest
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08
-      options: --privileged
-    strategy:
-      matrix:
-        arch: [x86_64, aarch64]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Install deps
-      run: dnf -y install docker
-
-    - name: Setup QEMU
-      uses: docker/setup-qemu-action@v2
-      with:
-        platforms: arm64
-
-    - name: Build flatpak
-      uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-      env:
-        FLATPAK_BUILDER_N_JOBS: 3
-      with:
-        manifest-path: share/org.getmonero.Monero.yaml
-        arch: ${{ matrix.arch }}
-        cache: false
-        stop-at-module: boost
-
-    - name: Tar flatpak-builder
-      run: tar -cvf flatpak-builder.tar .flatpak-builder
-
-    - name: Save flatpak-builder
-      uses: actions/upload-artifact@v3
-      with:
-        name: flatpak-builder-${{ matrix.arch }}
-        path: flatpak-builder.tar
-
-  part2:
-    name: Part 2/3
-    if: github.repository == 'monero-project/monero-gui'
-    needs: part1
-    runs-on: ubuntu-latest
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08
-      options: --privileged
-    strategy:
-      matrix:
-        arch: [x86_64, aarch64]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Install deps
-      run: dnf -y install docker
-
-    - name: Setup QEMU
-      uses: docker/setup-qemu-action@v2
-      with:
-        platforms: arm64
-
-    - name: Restore flatpak-builder
-      uses: actions/download-artifact@v4.1.7
-      with:
-        name: flatpak-builder-${{ matrix.arch }}
-
-    - name: Untar flatpak-builder
-      run: tar -xvf flatpak-builder.tar
-
-    - name: Build flatpak
-      uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-      env:
-        FLATPAK_BUILDER_N_JOBS: 3
-      with:
-        manifest-path: share/org.getmonero.Monero.yaml
-        arch: ${{ matrix.arch }}
-        cache: false
-        stop-at-module: monero-gui
-
-    - name: Tar flatpak-builder
-      run: tar -cvf flatpak-builder.tar .flatpak-builder
-
-    - name: Save flatpak-builder
-      uses: actions/upload-artifact@v3
-      with:
-        name: flatpak-builder-${{ matrix.arch }}
-        path: flatpak-builder.tar
-
-  part3:
-    name: Part 3/3
-    if: github.repository == 'monero-project/monero-gui'
-    needs: [part1, part2]
-    runs-on: ubuntu-latest
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08
-      options: --privileged
-    strategy:
-      matrix:
-        arch: [x86_64, aarch64]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Add version and date
-      run: |
-        sed -i 's/<version>/${{ github.event.release.tag_name }}/g' $GITHUB_WORKSPACE/share/org.getmonero.Monero.metainfo.xml
-        sed -i 's/<date>/'"$(date '+%F')"'/g' $GITHUB_WORKSPACE/share/org.getmonero.Monero.metainfo.xml
-
-    - name: Install deps
-      run: dnf -y install docker
-
-    - name: Setup QEMU
-      uses: docker/setup-qemu-action@v2
-      with:
-        platforms: arm64
-
-    - name: Restore flatpak-builder
-      uses: actions/download-artifact@v4.1.7
-      with:
-        name: flatpak-builder-${{ matrix.arch }}
-
-    - name: Untar flatpak-builder
-      run: tar -xvf flatpak-builder.tar
-
-    - name: Build flatpak
-      uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-      env:
-        FLATPAK_BUILDER_N_JOBS: 3
-      with:
-        manifest-path: share/org.getmonero.Monero.yaml
-        arch: ${{ matrix.arch }}
-        cache: false
-
-    - name: Validate AppData
-      working-directory: flatpak_app/files/share/appdata
-      run: appstream-util validate org.getmonero.Monero.appdata.xml
-
-    - name: Delete flatpak-builder
-      uses: geekyeggo/delete-artifact@v2
-      with:
-        name: flatpak-builder-${{ matrix.arch }}
-
-    - name: Print hashes
-      working-directory: flatpak_app/files/bin
-      run: |
-        echo "Hashes of the ${{ matrix.arch }} binaries:" >> $GITHUB_STEP_SUMMARY
-        echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-        for bin in monero-blockchain-ancestry monero-blockchain-depth monero-blockchain-export monero-blockchain-import monero-blockchain-mark-spent-outputs monero-blockchain-prune monero-blockchain-prune-known-spent-data monero-blockchain-stats monero-blockchain-usage monerod monero-gen-ssl-cert monero-gen-trusted-multisig monero-wallet-cli monero-wallet-gui monero-wallet-rpc p2pool; do sha256sum $bin; done >> $GITHUB_STEP_SUMMARY
-        echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-        echo "An example command to check hashes:" >> $GITHUB_STEP_SUMMARY
-        echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-        echo "$ flatpak run --command=sha256sum org.getmonero.Monero /app/bin/monero-wallet-gui" >> $GITHUB_STEP_SUMMARY
-        echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-
-    - name: Publish to Flathub Beta
-      uses: flatpak/flatpak-github-actions/flat-manager@v6
-      with:
-        flat-manager-url: https://hub.flathub.org
-        repository: beta
-        token: ${{ secrets.FLATHUB_ }}
--- a/.github/workflows/verify_p2pool.yml
+++ b/.github/workflows/verify_p2pool.yml
@@ -1,16 +0,0 @@
-name: ci/gh-actions/verify
-on: 
-  push:
-    paths:
-      - 'src/p2pool/P2PoolManager.cpp'
-  pull_request:
-    paths:
-      - 'src/p2pool/P2PoolManager.cpp'
-jobs:
-  p2pool-hashes:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: Verify Hashes
-      run: |
-        python3 .github/verify_p2pool.py
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ monero-wallet-gui_plugin_import.cpp
 monero-wallet-gui_qml_plugin_import.cpp
 *.qmlc
 *.jsc
-qml_qmlcache.qrc

 ### Vim ###
 # Swap
@@ -29,7 +28,6 @@ Session.vim
 # Temporary                                                                                                                                                                                             
 .netrwhist
 *~
-*.autosave
 # Auto-generated tag files
 tags
 # Persistent undo
--- 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,458 +0,0 @@
-cmake_minimum_required(VERSION 3.12)
-project(monero-gui)
-
-message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
-
-set(VERSION_MAJOR "18")
-set(VERSION_MINOR "4")
-set(VERSION_REVISION "3")
-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(WITH_SCANNER "Enable webcam QR scanner" OFF)
-option(WITH_DESKTOP_ENTRY "Ask to install desktop entry on first startup" ON)
-option(WITH_UPDATER "Regularly check for new updates" ON)
-option(DEV_MODE "Checkout latest monero master on build" OFF)
-
-if(DEV_MODE)
-  # DEV_MODE checks out the monero submodule to master, which requires C++17.
-  set(CMAKE_CXX_STANDARD 17)
-else()
-  set(CMAKE_CXX_STANDARD 14)
-endif()
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake")
-include(CheckCCompilerFlag)
-include(CheckCXXCompilerFlag)
-include(CheckLinkerFlag)
-
-set(BUILD_GUI_DEPS ON)
-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)
-add_subdirectory(external)
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-
-get_directory_property(ARCH_WIDTH DIRECTORY "monero" DEFINITION ARCH_WIDTH)
-get_directory_property(Boost_VERSION_STRING DIRECTORY "monero" DEFINITION Boost_VERSION_STRING)
-
-if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-  add_definitions(-DQT_NO_DEBUG)
-endif()
-
-if(STATIC)
-  message(STATUS "Initiating static build")
-  set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ${CMAKE_FIND_LIBRARY_SUFFIXES})
-  add_definitions(-DMONERO_GUI_STATIC)
-endif()
-
-include(CMakePackageConfigHelpers)
-
-include_directories(${EASYLOGGING_INCLUDE})
-link_directories(${EASYLOGGING_LIBRARY_DIRS})
-
-include(VersionGui)
-
-message(STATUS "${CMAKE_MODULE_PATH}")
-
-if(WITH_SCANNER)
-    add_definitions(-DWITH_SCANNER)
-endif()
-
-if(WITH_DESKTOP_ENTRY)
-    add_definitions(-DWITH_DESKTOP_ENTRY)
-endif()
-
-if(WITH_UPDATER)
-    add_definitions(-DWITH_UPDATER)
-endif()
-
-# Sodium
-find_library(SODIUM_LIBRARY sodium)
-message(STATUS "libsodium: libraries at ${SODIUM_LIBRARY}")
-
-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()
-
-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/Qt/labs/platform)
-  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
-    qtlabsplatformplugin
-    qmlxmllistmodelplugin
-    qquicklayoutsplugin
-    modelsplugin
-  )
-
-  if(WITH_SCANNER)
-    list(APPEND QT5_EXTRA_LIBRARIES_LIST
-      declarative_multimedia
-      Qt5MultimediaQuick
-    )
-  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()
-
-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)
-  cmake_policy(SET CMP0042 NEW)
-endif()
-
-if (APPLE AND NOT IOS)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default")
-endif()
-
-if(APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default -DGTEST_HAS_TR1_TUPLE=0")
-endif()
-
-# warnings
-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 AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-  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} ${CXX_SECURITY_FLAGS}")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-
-add_subdirectory(translations)
-add_subdirectory(src)
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -1,75 +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@21 libgcrypt hidapi libusb cmake pkg-config && brew link protobuf@21`
-
-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. Compile `monero-wallet-gui.app`
-
-```bash
-mkdir build && cd build
-cmake -D CMAKE_BUILD_TYPE=Release -D ARCH=default -D CMAKE_PREFIX_PATH=/path/to/Qt5.12.8/5.12.8/clang_64 ..
-make
-make deploy
-```
-
-5. 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 notarytool submit monero-gui-mac-x64-v0.X.Y.Z.dmg --apple-id email@address.org --team-id XXXXXXXXXX`
-
-5. `xcrun notarytool info aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee --apple-id email@address.org --team-id XXXXXXXXXX`
-
-6. `xcrun stapler staple -v monero-gui-mac-x64-v0.X.Y.Z.dmg`
-
-## Compile Qt for Apple Silicon
-
-Qt does not offer pre-built binaries for Apple Silicon, they have to be manually compiled.
-
-```bash
-git clone https://github.com/qt/qt5.git
-cd qt5
-git checkout v5.15.9-lts-lgpl
-./init-repository
-mkdir build
-cd build
-../configure -prefix /path/to/qt-build-dir/ -opensource -confirm-license -release -nomake examples -nomake tests -no-rpath -skip qtwebengine -skip qt3d -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtlocation -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 qtwebsockets -skip qtwebview -skip qtwinextras -skip qtx11extras -skip gamepad -skip serialbus -skip location -skip webengine
-make
-make install
-cd ../qttools/src/linguist/lrelease
-../../../../build/qtbase/bin/qmake
-make
-make install
-cd ../../../../qttools/src/macdeployqt/macdeployqt/
-../../../../build/qtbase/bin/qmake
-make
-make install
-```
-
-For compilation with Xcode 15 the following patch has to be applied: https://raw.githubusercontent.com/Homebrew/formula-patches/086e8cf/qt5/qt5-qmake-xcode15.patch
-
-The `CMAKE_PREFIX_PATH` has to be set to `/path/to/qt-build-dir/` during monero-gui compilation.
--- a/Dockerfile.android
+++ b/Dockerfile.android
@@ -1,239 +0,0 @@
-FROM ubuntu:20.04
-
-ARG THREADS=1
-ARG ANDROID_NDK_REVISION=23c
-ARG ANDROID_NDK_HASH=e5053c126a47e84726d9f7173a04686a71f9a67a
-ARG ANDROID_SDK_REVISION=7302050_latest
-ARG ANDROID_SDK_HASH=7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622
-ARG QT_VERSION=v5.15.17-lts-lgpl
-
-WORKDIR /opt/android
-ENV WORKDIR=/opt/android
-
-ENV ANDROID_NATIVE_API_LEVEL=31
-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}/cmdline-tools
-ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
-ENV PATH=${JAVA_HOME}/bin:${PATH}
-ENV PREFIX=${WORKDIR}/prefix
-ENV TOOLCHAIN_DIR=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
-ENV DEBIAN_FRONTEND=noninteractive
-
-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-11-jdk-headless openjdk-11-jre-headless pkg-config python3 \
-    unzip wget
-
-RUN PACKAGE_NAME=commandlinetools-linux-${ANDROID_SDK_REVISION}.zip \
-    && wget -q https://dl.google.com/android/repository/${PACKAGE_NAME} \
-    && echo "${ANDROID_SDK_HASH}  ${PACKAGE_NAME}" | sha256sum -c \
-    && unzip -q ${PACKAGE_NAME} \
-    && rm -f ${PACKAGE_NAME}
-
-RUN PACKAGE_NAME=android-ndk-r${ANDROID_NDK_REVISION}-linux.zip \
-    && wget -q https://dl.google.com/android/repository/${PACKAGE_NAME} \
-    && echo "${ANDROID_NDK_HASH}  ${PACKAGE_NAME}" | sha1sum -c \
-    && unzip -q ${PACKAGE_NAME} \
-    && rm -f ${PACKAGE_NAME}
-
-RUN echo y | ${ANDROID_SDK_ROOT}/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "build-tools;28.0.3" "platforms;${ANDROID_API}" "tools" > /dev/null
-
-ENV HOST_PATH=${PATH}
-ENV PATH=${TOOLCHAIN_DIR}/aarch64-linux-android/bin:${TOOLCHAIN_DIR}/bin:${PATH}
-
-ARG ZLIB_VERSION=1.3.1
-ARG ZLIB_HASH=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
-RUN wget -q https://github.com/madler/zlib/releases/download/v${ZLIB_VERSION}/zlib-${ZLIB_VERSION}.tar.gz \
-    && echo "${ZLIB_HASH}  zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \
-    && 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 \
-    && 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_85_0
-ARG BOOST_VERSION_DOT=1.85.0
-ARG BOOST_HASH=7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617
-RUN wget -q https://archives.boost.io/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} \
-    && printf "using clang : arm : ${ANDROID_CLANGPP} :\n<cxxflags>\"-fPIC\"\n<cflags>\"-fPIC\" ;" > user.jam \
-    && 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-arm threading=multi \
-    threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} --user-config=user.jam architecture=arm address-model=64 \
-    install -j${THREADS} \
-    && rm -rf $(pwd)
-
-ARG OPENSSL_VERSION=1.1.1w
-ARG OPENSSL_HASH=cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8
-RUN wget -q https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
-    && echo "${OPENSSL_HASH}  openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c \
-    && 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-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 EXPAT_VERSION=2.6.4
-ARG EXPAT_HASH=8dc480b796163d4436e6f1352e71800a774f73dbae213f1860b60607d2a83ada
-RUN wget https://github.com/libexpat/libexpat/releases/download/R_2_6_4/expat-${EXPAT_VERSION}.tar.bz2 && \
-    echo "${EXPAT_HASH}  expat-${EXPAT_VERSION}.tar.bz2" | sha256sum -c && \
-    tar -xf expat-${EXPAT_VERSION}.tar.bz2 && \
-    rm expat-${EXPAT_VERSION}.tar.bz2 && \
-    cd expat-${EXPAT_VERSION} && \
-    CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --enable-static --disable-shared --prefix=${PREFIX} --host=aarch64-linux-android && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-ARG UNBOUND_VERSION=1.22.0
-ARG UNBOUND_HASH=c5dd1bdef5d5685b2cedb749158dd152c52d44f65529a34ac15cd88d4b1b3d43
-RUN wget https://www.nlnetlabs.nl/downloads/unbound/unbound-${UNBOUND_VERSION}.tar.gz && \
-    echo "${UNBOUND_HASH}  unbound-${UNBOUND_VERSION}.tar.gz" | sha256sum -c && \
-    tar -xzf unbound-${UNBOUND_VERSION}.tar.gz && \
-    rm unbound-${UNBOUND_VERSION}.tar.gz && \
-    cd unbound-${UNBOUND_VERSION} && \
-    CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --disable-shared --enable-static --without-pyunbound --with-libexpat=${PREFIX} --with-ssl=${PREFIX} --with-libevent=no --without-pythonmodule --disable-flto --with-pthreads --with-libunbound-only --host=aarch64-linux-android --with-pic --prefix=${PREFIX} && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-ARG ZMQ_VERSION=v4.3.5
-ARG ZMQ_HASH=622fc6dde99ee172ebaa9c8628d85a7a1995a21d
-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.20-RELEASE
-ARG SODIUM_HASH=9511c982fb1d046470a8b42aa36556cdb7da15de
-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.41 --depth 1 git://git.gnupg.org/libgpg-error.git \
-    && cd libgpg-error \
-    && git reset --hard 98032624ae89a67ee6fe3b1db5d95032e681d163 \
-    && ./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.10.1 --depth 1 git://git.gnupg.org/libgcrypt.git \
-    && cd libgcrypt \
-    && git reset --hard ae0e567820c37f9640440b3cff77d7c185aa6742 \
-    && ./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 git clone -b v3.31.4 --depth 1 https://github.com/Kitware/CMake \
-    && cd CMake \
-    && git reset --hard 569b821a138a4d3f7f4cc42c0cf5ae5e68d56f96 \
-    && PATH=${HOST_PATH} ./bootstrap \
-    && PATH=${HOST_PATH} make -j${THREADS} \
-    && PATH=${HOST_PATH} make -j${THREADS} install \
-    && rm -rf $(pwd)
-
-# Workaround
-ENV NEW_SDK_ROOT=${WORKDIR}/sdk
-RUN mkdir ${NEW_SDK_ROOT} \
-    && cp -r ${ANDROID_SDK_ROOT}/licenses ${NEW_SDK_ROOT} \
-    && cp -r ${ANDROID_SDK_ROOT}/platforms ${NEW_SDK_ROOT} \
-    && cp -r ${ANDROID_SDK_ROOT}/build-tools ${NEW_SDK_ROOT}
-
-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" \
-    -DANDROID_SDK="${NEW_SDK_ROOT}" \
-    -DWITH_SCANNER=ON \
-    -DWITH_DESKTOP_ENTRY=OFF \
-    ../../.. \
-    && PATH=${HOST_PATH} make generate_translations_header \
-    && sed -i -e "s#../monero/external/randomx/librandomx.a##" src/CMakeFiles/monero-wallet-gui.dir/link.txt \
-    && sed -i -e "s#-lm#-lm ../monero/external/randomx/librandomx.a#" src/CMakeFiles/monero-wallet-gui.dir/link.txt \
-    && make -j${THREADS} -C src \
-    && make -j${THREADS} apk
--- a/Dockerfile.linux
+++ b/Dockerfile.linux
@@ -1,287 +0,0 @@
-FROM ubuntu:18.04
-
-ARG THREADS=1
-ARG QT_VERSION=v5.15.17-lts-lgpl
-
-ENV CFLAGS="-fPIC"
-ENV CPPFLAGS="-fPIC"
-ENV CXXFLAGS="-fPIC"
-ENV SOURCE_DATE_EPOCH=1397818193
-
-RUN apt update && \
-    apt install -y automake autopoint bison gettext git gperf libgl1-mesa-dev libglib2.0-dev \
-    libpng-dev libpthread-stubs0-dev libsodium-dev libtool-bin libudev-dev libusb-1.0-0-dev mesa-common-dev \
-    pkg-config python wget xutils-dev
-
-RUN 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 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 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 c617eee22ae5c285e79e81ec39ce96862fd3262f && \
-    ./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 c617eee22ae5c285e79e81ec39ce96862fd3262f && \
-    ./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 c617eee22ae5c285e79e81ec39ce96862fd3262f && \
-    ./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 c617eee22ae5c285e79e81ec39ce96862fd3262f && \
-    ./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 c617eee22ae5c285e79e81ec39ce96862fd3262f && \
-    ./autogen.sh --enable-shared --disable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN 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.3 --depth 1 https://github.com/madler/zlib && \
-    cd zlib && \
-    git reset --hard 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851 && \
-    ./configure --static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b VER-2-10-2 --depth 1 https://gitlab.freedesktop.org/freetype/freetype.git && \
-    cd freetype && \
-    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 wget https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.bz2 && \
-    echo "a247a7f6bbb21cf2ca81ea4cbb916bfb9717ca523631675f99b3d4a5678dcd16 expat-2.4.8.tar.bz2" | sha256sum -c && \
-    tar -xf expat-2.4.8.tar.bz2 && \
-    rm expat-2.4.8.tar.bz2 && \
-    cd expat-2.4.8 && \
-    ./configure --enable-static --disable-shared --prefix=/usr && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN 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 wget https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz && \
-    echo "4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847 boost_1_80_0.tar.gz" | sha256sum -c && \
-    tar -xzf boost_1_80_0.tar.gz && \
-    rm boost_1_80_0.tar.gz && \
-    cd boost_1_80_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.1u.tar.gz && \
-    echo "e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6 openssl-1.1.1u.tar.gz" | sha256sum -c && \
-    tar -xzf openssl-1.1.1u.tar.gz && \
-    rm openssl-1.1.1u.tar.gz && \
-    cd openssl-1.1.1u && \
-    ./config no-shared no-zlib-dynamic --prefix=/usr --openssldir=/usr && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN wget https://www.nlnetlabs.nl/downloads/unbound/unbound-1.16.2.tar.gz && \
-    echo "2e32f283820c24c51ca1dd8afecfdb747c7385a137abe865c99db4b257403581 unbound-1.16.2.tar.gz" | sha256sum -c && \
-    tar -xzf unbound-1.16.2.tar.gz && \
-    rm unbound-1.16.2.tar.gz && \
-    cd unbound-1.16.2 && \
-    ./configure --disable-shared --enable-static --without-pyunbound --with-libexpat=/usr --with-ssl=/usr --with-libevent=no --without-pythonmodule --disable-flto --with-pthreads --with-libunbound-only --with-pic && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN 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 git clone -b v1.0.26 --depth 1 https://github.com/libusb/libusb && \
-    cd libusb && \
-    git reset --hard 4239bc3a50014b8e6a5a2a59df1fff3b7469543b && \
-    ./autogen.sh --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b hidapi-0.13.1 --depth 1 https://github.com/libusb/hidapi && \
-    cd hidapi && \
-    git reset --hard 4ebce6b5059b086d05ca7e091ce04a5fd08ac3ac && \
-    ./bootstrap && \
-    ./configure --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b v4.3.4 --depth 1 https://github.com/zeromq/libzmq && \
-    cd libzmq && \
-    git reset --hard 4097855ddaaa65ed7b5e8cb86d143842a594eebd && \
-    ./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.45 --depth 1 git://git.gnupg.org/libgpg-error.git && \
-    cd libgpg-error && \
-    git reset --hard dbac537e5e865fb6f3aa8596d213aa8c47a9dea1 && \
-    ./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.10.1 --depth 1 git://git.gnupg.org/libgcrypt.git && \
-    cd libgcrypt && \
-    git reset --hard ae0e567820c37f9640440b3cff77d7c185aa6742 && \
-    ./autogen.sh && \
-    ./configure --disable-shared --enable-static --disable-doc && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b v21.5 --depth 1 https://github.com/protocolbuffers/protobuf && \
-    cd protobuf && \
-    git reset --hard ab840345966d0fa8e7100d771c92a73bfbadd25c && \
-    ./autogen.sh && \
-    ./configure --enable-static --disable-shared && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b v3.24.0 --depth 1 https://github.com/Kitware/CMake && \
-    cd CMake && \
-    git reset --hard 4be24f031a4829db75b85062cc67125035d8831e && \
-    ./bootstrap && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -1,82 +0,0 @@
-FROM ubuntu:20.04
-
-ARG THREADS=1
-ARG QT_VERSION=v5.15.17-lts-lgpl
-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.18.4.3 --depth 1 https://github.com/monero-project/monero && \
-    cd monero && \
-    git reset --hard 7c6e84466a90f6701ebe09ff8f61ea8af3883181 && \
-    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/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2024, The Monero Project
+Copyright (c) 2014-2018, The Monero Project

 All rights reserved.

--- a/LeftPanel.qml
+++ b/LeftPanel.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -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" + (currentAccountIndex % MoneroComponents.Style.accountColors.length) + ".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 ---------------
@@ -360,8 +452,8 @@ Rectangle {
                anchors.left: parent.left
                anchors.right: parent.right
                text: qsTr("Account") + translationManager.emptyString
-                symbol: (isMac ? "⌃" : qsTr("Ctrl+")) + "T" + translationManager.emptyString
-
+                symbol: qsTr("T") + translationManager.emptyString
+                dotColor: "#44AAFF"
                onClicked: {
                    parent.previousButton.checked = false
                    parent.previousButton = accountButton
@@ -373,7 +465,7 @@ Rectangle {
                visible: accountButton.present
                anchors.left: parent.left
                anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
            }

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

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

            // ------------- Receive tab ---------------
@@ -426,7 +520,8 @@ Rectangle {
                anchors.left: parent.left
                anchors.right: parent.right
                text: qsTr("Receive") + translationManager.emptyString
-                symbol: (isMac ? "⌃" : qsTr("Ctrl+")) + "R" + translationManager.emptyString
+                symbol: qsTr("R") + translationManager.emptyString
+                dotColor: "#AAFFBB"
                onClicked: {
                    parent.previousButton.checked = false
                    parent.previousButton = receiveButton
@@ -438,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,7 +568,8 @@ Rectangle {
                anchors.left: parent.left
                anchors.right: parent.right
                text: qsTr("Transactions") + translationManager.emptyString
-                symbol: (isMac ? "⌃" : qsTr("Ctrl+")) + "H" + translationManager.emptyString
+                symbol: qsTr("H") + translationManager.emptyString
+                dotColor: "#6B0072"
                onClicked: {
                    parent.previousButton.checked = false
                    parent.previousButton = historyButton
@@ -460,7 +581,7 @@ Rectangle {
                visible: historyButton.present
                anchors.left: parent.left
                anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
            }

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

@@ -482,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,7 +708,8 @@ Rectangle {
                anchors.left: parent.left
                anchors.right: parent.right
                text: qsTr("Settings") + translationManager.emptyString
-                symbol: (isMac ? "⌃" : qsTr("Ctrl+")) + "E" + translationManager.emptyString
+                symbol: qsTr("E") + translationManager.emptyString
+                dotColor: "#36B25C"
                onClicked: {
                    parent.previousButton.checked = false
                    parent.previousButton = settingsButton
@@ -503,7 +721,7 @@ Rectangle {
                visible: settingsButton.present
                anchors.left: parent.left
                anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
            }

        } // Column
@@ -516,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
@@ -528,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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
@@ -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,9 @@
 #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 "src/qt/TailsOS.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 +63,15 @@ 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())
-    {
-        return fi.absoluteFilePath();
-    }
-
-    if (portable)
-    {
-        return QDir(MoneroSettings::portableFolderName()).filePath(defaultLogName);
-    }
+    const QFileInfo fi(logPath);

    if(TailsOS::detect() && TailsOS::usePersistence)
        return QDir::homePath() + "/Persistent/Monero/logs/" + defaultLogName;
+
+    if(!logPath.isEmpty() && !fi.isDir())
+        return fi.absoluteFilePath();
    else {
        QDir appDir(osPath + "/" + appFolder);
        if(!appDir.exists())
@@ -108,27 +98,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/components/NavbarItem.qml
+++ b/components/NavbarItem.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
@@ -26,12 +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.

-import QtQuick 2.9
+#ifndef LOGGER_H
+#define LOGGER_H

-QtObject {
-    property bool active: false
-    property string text
-    property bool visible: true
+const QString getLogPath(const QString logPath);
+void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message);
+
+#endif // LOGGER_H

-    signal selected()
-}
--- a/src/main/MainApp.cpp
+++ b/src/main/MainApp.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
--- a/src/main/MainApp.h
+++ b/src/main/MainApp.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
--- a/70
+++ b/70
@@ -1,70 +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 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} -D CMAKE_BUILD_TYPE=Debug .. && $(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 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 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 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-linux-ppc64le:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="ppc64le" -D CMAKE_BUILD_TYPE=Release $(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=Debug -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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -46,27 +46,32 @@ 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, string amount);
+    signal getProofClicked(string txid, string address, string message);
    signal checkProofClicked(string txid, string address, string message, string signature);

    Rectangle {
@@ -116,12 +121,6 @@ Rectangle {
        transferView.sendTo(address, paymentId, description);
    }

-    // open Transactions page with search term in search field
-    function searchInHistory(searchTerm){
-        root.state = "History";
-        historyView.searchInHistory(searchTerm);
-    }
-
        states: [
            State {
                name: "History"
@@ -139,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 }
@@ -159,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: {
@@ -172,7 +200,6 @@ Rectangle {
        }

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

        Flickable {
@@ -180,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: {
@@ -233,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
@@ -254,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
@@ -1,32 +1,15 @@
 # Monero GUI

-Copyright (c) 2014-2024, The Monero Project
-
-## Table of Contents
-  * [Development resources](#development-resources)
-  * [Vulnerability response](#vulnerability-response)
-  * [Introduction](#introduction)
-  * [About this project](#about-this-project)
-  * [Supporting the project](#supporting-the-project)
-  * [License](#license)
-  * [Translations](#translations)
-  * [Installing the Monero GUI from a package](#installing-the-monero-gui-from-a-package)
-  * [Compiling the Monero GUI from source](#compiling-the-monero-gui-from-source)
-    + [Building Reproducible Windows static binaries with Docker (any OS)](#building-reproducible-windows-static-binaries-with-docker-any-os)
-    + [Building Reproducible Linux static binaries with Docker (any OS)](#building-reproducible-linux-static-binaries-with-docker-any-os)
-    + [Building Android APK with Docker (any OS) *Experimental*](#building-android-apk-with-docker-any-os-experimental)
-    + [Building on Linux](#building-on-linux)
-    + [Building on OS X](#building-on-os-x)
-    + [Building on Windows](#building-on-windows)
+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-gui on Libera](irc://irc.libera.chat/#monero-gui)
- Translation platform (Weblate): [translate.getmonero.org](https://translate.getmonero.org)
- UI Design: [Monero-GUI on Figma](https://www.figma.com/file/DplJ2DDQfIKiuRvolHX2hN/Monero-GUI)
+- IRC: [#monero-dev on Freenode](irc://chat.freenode.net/#monero-dev)
+- Translation platform (Pootle): [translate.getmonero.org](https://translate.getmonero.org)

 ## Vulnerability response

@@ -53,15 +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/symas.png"/>](https://symas.com/)
-[<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).

@@ -71,135 +58,24 @@ 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](https://matrix.to/#/!BKMbQLMDzHKzmtrBfg:matrix.org?via=monero.social&via=matrix.org&via=libera.chat)) 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>
+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)

 ## Installing the Monero GUI from a package

 Packages are available for
-* Arch Linux: [monero-gui](https://archlinux.org/packages/extra/x86_64/monero-gui/)
-* NixOS: `nix-shell -p monero-gui`
-* Flatpak: [Monero GUI](https://flathub.org/apps/details/org.getmonero.Monero)
-* 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.
-
-*Note*: Official GUI releases use monero-wallet-gui from this process alongside the supporting binaries (monerod, etc) from the [CLI deterministic builds](https://github.com/monero-project/monero/blob/release-v0.18/contrib/gitian/README.md).
-
-### 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.18.4.3`) 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.18.4.3`) 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 binary will be placed in  `monero-gui/build/release/bin` directory
-6. (*Note*) This process is only for building `monero-wallet-gui`, `monerod` has to be built separately according to the instructions in the `monero` repository.
-7. (*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
-      ```
-
-### Building on Linux
+### On Linux:

 (Tested on Ubuntu 17.10 x64, Ubuntu 18.04 x64 and Gentoo x64)

@@ -207,65 +83,59 @@ Packaging for your favorite distribution would be a welcome contribution!

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

-	`sudo apt install build-essential cmake 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 libboost-chrono-dev libboost-date-time-dev libboost-filesystem-dev libboost-locale-dev libboost-program-options-dev libboost-regex-dev libboost-serialization-dev libboost-system-dev libboost-thread-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/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.

 The following instructions will fetch Qt from your distribution's repositories instead. Take note of what version it installs. Your mileage may vary.

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

-    `sudo apt install qtbase5-dev 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-platform 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
-  
-   
-    The *qml* USE flag must be enabled.

    `sudo emerge dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 dev-qt/qtgraphicaleffects:5`

  - Optional : To build the flag `WITH_SCANNER`

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

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

-    - For Gentoo      
+    - For Gentoo

-      `emerge dev-qt/qtmultimedia:5`
+      The *qml* USE flag must be enabled.
+
+      `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` environment 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.

-### Building on OS X
+### On OS X:

 1. Install Xcode from AppStore

@@ -273,32 +143,60 @@ The executable can be found in the build/release/bin folder.

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

-  `brew install cmake pkg-config openssl boost unbound hidapi zmq libpgm libsodium miniupnpc 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` environment 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"

-### Building on Windows
+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:

 The Monero GUI on Windows is 64 bits only; 32-bit Windows GUI builds are not officially supported anymore.

@@ -309,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 mingw-w64-x86_64-unbound mingw-w64-x86_64-pcre mingw-w64-x86_64-angleproject
+    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
@@ -331,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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
--- a/src/TranslationManager.h
+++ b/src/TranslationManager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
--- 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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
--- a/src/main/clipboardAdapter.h
+++ b/src/main/clipboardAdapter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
--- a/cmake/32-bit-toolchain.cmake
+++ b/cmake/32-bit-toolchain.cmake
@@ -1,50 +0,0 @@
-# Copyright (c) 2014-2024, 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-2024, 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,121 +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.framework/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/QtWidgets.framework/Versions/5/QtWidgets" $<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/QtSvg.framework/Versions/5/QtSvg" $<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/QtCore.framework/Versions/5/QtCore" $<TARGET_FILE_DIR:monero-wallet-gui>/../PlugIns/imageformats/libqsvg.dylib
-                               COMMENT "Copying libqsvg.dylib, running install_name_tool"
-
-            )
-        endif()
-
-        # Copy Boost dylibs that macdeployqt doesn't pick up
-        find_package(Boost QUIET COMPONENTS atomic container date_time)
-        set(_boost_extras Boost::atomic Boost::container Boost::date_time)
-        foreach(_tgt IN LISTS _boost_extras)
-            if(TARGET ${_tgt})
-                add_custom_command(TARGET deploy POST_BUILD
-                                   COMMAND ${CMAKE_COMMAND} -E copy
-                                   "$<TARGET_FILE:${_tgt}>"
-                                   "$<TARGET_FILE_DIR:monero-wallet-gui>/../Frameworks/"
-                                   COMMENT "Copying $<TARGET_FILE_NAME:${_tgt}>"
-                )
-            endif()
-        endforeach()
-
-        # Apple Silicon requires all binaries to be codesigned
-        find_program(CODESIGN_EXECUTABLE NAMES codesign)
-        if(CODESIGN_EXECUTABLE)
-            add_custom_command(TARGET deploy
-                            POST_BUILD
-                            COMMAND "${CODESIGN_EXECUTABLE}" --force --deep --sign - "$<TARGET_FILE_DIR:monero-wallet-gui>/../.."
-                            COMMENT "Running codesign..."
-            )
-        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_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-6.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
-            libpcre2-16-0.dll
-            libhidapi-0.dll
-            libdouble-conversion.dll
-            libgcrypt-20.dll
-            libgpg-error-0.dll
-            libsodium-26.dll
-            libzmq.dll
-            #platform files
-            libgcc_s_seh-1.dll
-            #openssl files
-            libssl-3-x64.dll
-            libcrypto-3-x64.dll
-            #icu
-            libicudt77.dll
-            libicuin77.dll
-            libicuio77.dll
-            libicutu77.dll
-            libicuuc77.dll
-        )
-
-        # Boost Regex is header-only since 1.77
-        if (Boost_VERSION_STRING VERSION_LESS 1.77.0)
-            list(APPEND WIN_DEPLOY_DLLS libboost_regex-mt.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/VersionGui.cmake
+++ b/cmake/VersionGui.cmake
@@ -1,47 +0,0 @@
-# Copyright (c) 2014-2024, 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 tag)
-    set(VERSION_TAG_GUI "${tag}" CACHE STRING "The tag portion of the Monero GUI software version" FORCE)
-  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}")
-  get_version_tag_from_git("${GIT_EXECUTABLE}")
-  write_static_version_header(${VERSIONTAG})
-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,68 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Layouts 1.1
-
-import "../components" as MoneroComponents
-
-RowLayout {
-    id: advancedOptionsItem
-
-    property alias title: title.text
-    property alias tooltip: title.tooltip
-    property alias button1: button1
-    property alias button2: button2
-    property alias button3: button3
-
-    RowLayout {
-        id: titlecolumn
-        Layout.alignment: Qt.AlignTop | Qt.AlignLeft
-        Layout.preferredWidth: 195
-        Layout.maximumWidth: 195
-        Layout.leftMargin: 10
-
-        MoneroComponents.Label {
-            id: title
-            fontSize: 14
-            tooltipIconVisible: true
-        }
-
-        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
-                primary: false
-                visible: button1.text
-            }
-
-            StandardButton {
-                id: button2
-                small: true
-                primary: false
-                visible: button2.text
-            }
-
-            StandardButton {
-                id: button3
-                small: true
-                primary: false
-                visible: button3.text
-            }
-        }
-    }
-}
--- 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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -38,39 +38,27 @@ 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
    property int fontSize: 14
    property alias fontColor: label.color
    property bool iconOnTheLeft: true
-    property alias tooltipIconVisible: label.tooltipIconVisible
-    property alias tooltip: label.tooltip
    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
@@ -82,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;
@@ -98,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;
@@ -116,17 +102,13 @@ Item {
            font.pixelSize: checkBox.fontSize
            color: MoneroComponents.Style.defaultFontColor
            textFormat: Text.RichText
-            wrapMode: Text.NoWrap
-            visible: text != ""
+            wrapMode: Text.Wrap
        }
    }

    MouseArea {
        anchors.fill: parent
-        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
-        onEntered: !label.tooltipIconVisible && label.tooltip ? label.tooltipPopup.open() : ""
-        onExited:  !label.tooltipIconVisible && label.tooltip ? label.tooltipPopup.close() : ""
        onClicked: {
            toggle()
        }
--- a/components/CheckBox2.qml
+++ b/components/CheckBox2.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 //
 // All rights reserved.
 //
--- a/components/ContextMenu.qml
+++ b/components/ContextMenu.qml
@@ -1,78 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-
-import FontAwesome 1.0
-import "../components" as MoneroComponents
-
-MouseArea {
-    signal cut()
-    signal copy()
-    signal paste()
-    signal remove()
-    signal selectAll()
-
-    id: root
-    acceptedButtons: Qt.RightButton
-    anchors.fill: parent
-    onClicked: {
-        if (mouse.button === Qt.RightButton) {
-            root.parent.persistentSelection = true;
-            contextMenu.open()
-            root.parent.cursorVisible = true;
-        }
-    }
-
-    Menu {
-        id: contextMenu
-
-        background: Rectangle {
-            border.color: MoneroComponents.Style.buttonBackgroundColorDisabledHover
-            border.width: 1
-            radius: 2
-            color: MoneroComponents.Style.blackTheme ? MoneroComponents.Style.buttonBackgroundColorDisabled : "#E5E5E5"
-        }
-
-        padding: 1
-        width: 110
-        x: root.mouseX
-        y: root.mouseY
-
-        onClosed: {
-            if (!root.parent.activeFocus) {
-                root.parent.cursorVisible = false;
-            }
-            root.parent.persistentSelection = false;
-            root.parent.forceActiveFocus()
-        }
-
-        MoneroComponents.ContextMenuItem {
-            enabled: root.parent.selectedText != "" && !root.parent.readOnly
-            onTriggered: root.cut()
-            text: qsTr("Cut") + translationManager.emptyString
-        }
-
-        MoneroComponents.ContextMenuItem {
-            enabled: root.parent.selectedText != ""
-            onTriggered: root.copy()
-            text: qsTr("Copy") + translationManager.emptyString
-        }
-
-        MoneroComponents.ContextMenuItem {
-            enabled: root.parent.canPaste === true
-            onTriggered: root.paste()
-            text: qsTr("Paste") + translationManager.emptyString
-        }
-
-        MoneroComponents.ContextMenuItem {
-            enabled: root.parent.selectedText != "" && !root.parent.readOnly
-            onTriggered: root.remove()
-            text: qsTr("Delete") + translationManager.emptyString
-        }
-
-        MoneroComponents.ContextMenuItem {
-            enabled: root.parent.text != ""
-            onTriggered: root.selectAll()
-            text: qsTr("Select All") + translationManager.emptyString
-        }
-    }
-}
--- a/components/ContextMenuItem.qml
+++ b/components/ContextMenuItem.qml
@@ -1,62 +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: 0
-
-        MouseArea {
-            id: mouse
-
-            anchors.fill: parent
-            hoverEnabled: true
-            onEntered: {
-                parent.opacity = 1;
-            }
-            onExited: {
-                parent.opacity = 0;
-            }
-            onClicked: {
-                if (menuItem.enabled) {
-                    menuItem.triggered();
-                    parent.opacity = 0;
-                }
-            }
-        }
-    }
-
-    contentItem: RowLayout {
-        anchors.fill: parent
-        anchors.leftMargin: 20
-        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.blackTheme ? MoneroComponents.Style.buttonTextColor : MoneroComponents.Style.defaultFontColor
-            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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 //
 // All rights reserved.
 //
@@ -32,7 +32,6 @@ import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Window 2.0
-import moneroComponents.Wallet 1.0

 import "../components" as MoneroComponents

@@ -53,7 +52,6 @@ Window {
    // TODO: implement without hardcoding sizes
    width: 480
    height: 200
-    color: MoneroComponents.Style.middlePanelBackgroundColor

    // Make window draggable
    MouseArea {
@@ -80,10 +78,6 @@ Window {
                running: false;
                repeat: true
                onTriggered: {
-                    if (currentWallet.connected() == Wallet.ConnectionStatus_Connected) {
-                        running = false;
-                        root.close();
-                    }
                    countDown--;
                    if(countDown < 0){
                        running = false;
@@ -102,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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -28,18 +28,17 @@

 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
-import FontAwesome 1.0

 import "." as MoneroComponents
 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
@@ -53,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"
@@ -92,8 +104,8 @@ Item {
            anchors.left: parent.left
            anchors.right: parent.right
            height: parent.height - 1
-            anchors.leftMargin: 0
-            anchors.rightMargin: 0
+            anchors.leftMargin: datePicker.expanded ? 1 : 0
+            anchors.rightMargin: datePicker.expanded ? 1 : 0
            radius: 4
            y: 1
            color: datePicker.backgroundColor
@@ -118,7 +130,7 @@ Item {

            Connections {
                target: datePicker
-                function onCurrentDateChanged() {
+                onCurrentDateChanged: {
                    dateInput.setDate(datePicker.currentDate)
                }
            }
@@ -222,23 +234,26 @@ Item {
                Layout.fillWidth: true
                color: "transparent"

-                MoneroEffects.ImageMask {
+                Image {
                    id: button
                    anchors.right: parent.right
                    anchors.rightMargin: 10
                    anchors.verticalCenter: parent.verticalCenter
-                    image: "qrc:///images/whiteDropIndicator.png"
-                    height: 8
-                    width: 12
-                    fontAwesomeFallbackIcon: FontAwesome.arrowDown
-                    fontAwesomeFallbackSize: 14
+                    source: "qrc:///images/whiteDropIndicator.png"
+                    visible: false
+                }
+
+                ColorOverlay {
+                    source: button
+                    anchors.fill: button
                    color: MoneroComponents.Style.defaultFontColor
                    rotation: datePicker.expanded ? 180 : 0
+                    opacity: 1
                }

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

-    QtQuickControls2.Popup {
-        id: popup
-        padding: 0
-        closePolicy: QtQuickControls2.Popup.CloseOnEscape | QtQuickControls2.Popup.CloseOnPressOutsideParent
-        onOpened: {
-            calendar.visibleMonth = currentDate.getMonth();
-            calendar.visibleYear = currentDate.getFullYear();
+    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 - 2
+            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: 150; 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
-                scrollGestureEnabled: false
-                onWheel: {
-                    if (wheel.angleDelta.y > 0) return calendar.showPreviousMonth();
-                    if (wheel.angleDelta.y < 0) return calendar.showNextMonth();
+                    Rectangle {
+                        id: dayRect
+                        anchors.fill: parent
+                        radius: parent.implicitHeight / 2
+                        color: {
+                            if(dayArea.pressed && styleData.visibleMonth)
+                                return MoneroComponents.Style.blackTheme ? "#20FFFFFF" : "#10000000"
+                            return "transparent";
+                        }
+                    }
+
+                    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
+                        }
+                    }
+
+                    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();
+                        }
+                    }
                }
-            }

-            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
-            }
+                dayOfWeekDelegate: Item {
+                    implicitHeight: 20
+                    implicitWidth: calendar.width / 7

-            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
+                    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)
+                        }
+                    }
+                }

-                style: CalendarStyle {
-                    gridVisible: false
-                    background: Rectangle { color: MoneroComponents.Style.middlePanelBackgroundColor }
-                    dayDelegate: Item {
-                        z: parent.z + 1
-                        implicitHeight: implicitWidth
-                        implicitWidth: calendar.width / 7
+                navigationBar: Rectangle {
+                    color: MoneroComponents.Style.middlePanelBackgroundColor
+                    implicitWidth: calendar.width
+                    implicitHeight: 30

-                        Rectangle {
-                            id: dayRect
-                            anchors.fill: parent
-                            radius: parent.implicitHeight / 2
+                    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 (currentDate.toDateString() === styleData.date.toDateString()) {
-                                  if (dayArea.containsMouse) {
-                                      dayRect.color = MoneroComponents.Style.buttonBackgroundColorHover;
-                                  } else {
-                                      dayRect.color = MoneroComponents.Style.buttonBackgroundColor;
-                                  }
-                              } else {
-                                  if (dayArea.containsMouse) {
-                                      dayRect.color = MoneroComponents.Style.blackTheme ? "#20FFFFFF" : "#10000000"
-                                  } else {
-                                      dayRect.color = "transparent";
-                                  }
-                              }
-                              if(!styleData.valid) return "transparent"
-                              if(styleData.date.toDateString() === (new Date()).toDateString()) return "#FFFF00"
-                              if(!styleData.visibleMonth) return MoneroComponents.Style.lightGreyFontColor
-                              if(dayArea.pressed) return MoneroComponents.Style.defaultFontColor
-                              return MoneroComponents.Style.defaultFontColor
-                            }
+                        ColorOverlay {
+                            source: prevMonthIcon
+                            anchors.fill: prevMonthIcon
+                            color: MoneroComponents.Style.defaultFontColor
+                            opacity: 0.5
                        }

                        MouseArea {
-                            id: dayArea
-                            anchors.fill: parent
-                            visible: styleData.valid
                            hoverEnabled: true
                            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
-
-                            MoneroEffects.ImageMask {
-                                id: prevMonthIcon
-                                anchors.centerIn: parent
-                                image: "qrc:///images/prevMonth.png"
-                                height: 8
-                                width: 12
-                                fontAwesomeFallbackIcon: FontAwesome.arrowLeft
-                                fontAwesomeFallbackSize: 14
-                                color: MoneroComponents.Style.defaultFontColor
-                            }
-
-                            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
-
-                            MoneroEffects.ImageMask {
-                                id: nextMonthIcon
-                                anchors.centerIn: parent
-                                image: "qrc:///images/prevMonth.png"
-                                height: 8
-                                width: 12
-                                rotation: 180
-                                fontAwesomeFallbackIcon: FontAwesome.arrowLeft
-                                fontAwesomeFallbackSize: 14
-                                color: MoneroComponents.Style.defaultFontColor
-                            }
-
-                            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-2024, 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/IconButton.qml
+++ b/components/IconButton.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 //
 // All rights reserved.
 //
@@ -36,28 +36,19 @@ MoneroEffects.ImageMask {
    color: MoneroComponents.Style.defaultFontColor
    image: ""

-    property alias tooltip: tooltip.text
    signal clicked(var mouse)

-    MoneroComponents.Tooltip {
-        id: tooltip
-        anchors.fill: parent
-        tooltipLeft: true
-    }
-
    MouseArea {
        anchors.fill: parent
        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor

        onEntered: {
-            tooltip.text ? tooltip.tooltipPopup.open() : ""
            button.width = button.width + 2
            button.height = button.height + 2
        }

        onExited: {
-            tooltip.text ? tooltip.tooltipPopup.close() : ""
            button.width = button.width - 2
            button.height = button.height - 2
        }
--- a/components/InlineButton.qml
+++ b/components/InlineButton.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
@@ -30,29 +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 alias fontStyleName: inlineText.font.styleName
-    property bool isFontAwesomeIcon: fontFamily == FontAwesome.fontFamily || fontFamily == FontAwesome.fontFamilySolid
    property alias buttonColor: rect.color
-    property alias tooltip: tooltip.text
-    property alias tooltipLeft: tooltip.tooltipLeft
-    property alias tooltipBottom: tooltip.tooltipBottom
-
-    height: isFontAwesomeIcon ? 30 : 24
-    width: isFontAwesomeIcon ? height : inlineText.width + 16
-
    signal clicked()

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

    Rectangle{
        id: rect
-        anchors.fill: parent
-        color: buttonArea.containsMouse ? MoneroComponents.Style.buttonInlineBackgroundColorHover : MoneroComponents.Style.buttonInlineBackgroundColor
+        color: MoneroComponents.Style.buttonInlineBackgroundColor
+        height: 24
+        width: inlineText.text ? (inlineText.width + 16) : inlineButton.icon ? (inlineImage.width + 16) : rect.height
        radius: 4
-        border.width: parent.focus && parent.enabled ? 1 : 0
+
+        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
@@ -85,9 +89,11 @@ Item {
            }
        }

-        MoneroComponents.Tooltip {
-            id: tooltip
-            anchors.fill: parent
+        Image {
+            id: inlineImage
+            visible: inlineButton.icon !== ""
+            anchors.centerIn: parent
+            source: inlineButton.icon
        }

        MouseArea {
@@ -95,15 +101,14 @@ Item {
            cursorShape: rect.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
            hoverEnabled: true
            anchors.fill: parent
-            onClicked: {
-                tooltip.text ? tooltip.tooltipPopup.close() : ""
-                doClick()
-            }
+            onClicked: doClick()
            onEntered: {
-                tooltip.text ? tooltip.tooltipPopup.open() : ""
+                rect.color = buttonColor ? buttonColor : "#707070";
+                rect.opacity = 0.8;
            }
            onExited: {
-                tooltip.text ? tooltip.tooltipPopup.close() : ""
+                rect.opacity = 1.0;
+                rect.color = buttonColor ? buttonColor : "#808080";
            }
        }
    }
@@ -120,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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -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,19 +44,4 @@ TextField {
    background: Rectangle {
        color: "transparent"
    }
-
-    MoneroComponents.ContextMenu {
-        cursorShape: Qt.IBeamCursor
-        onCut: textField.cut();
-        onCopy: textField.copy();
-        onPaste: {
-            var previoustextFieldLength = textField.length
-            var previousCursorPosition = textField.cursorPosition;
-            textField.paste();
-            textField.forceActiveFocus()
-            textField.cursorPosition = previousCursorPosition + (textField.length - previoustextFieldLength);
-        }
-        onRemove: textField.remove(selectionStart, selectionEnd);
-        onSelectAll: textField.selectAll();
-    }
 }
--- a/components/InputDialog.qml
+++ b/components/InputDialog.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 //
 // All rights reserved.
 //
@@ -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()
@@ -129,7 +129,6 @@ Item {

                MoneroComponents.StandardButton {
                    id: cancelButton
-                    primary: false
                    small: true
                    width: 120
                    fontSize: 14
--- a/components/InputMulti.qml
+++ b/components/InputMulti.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 //
 // All rights reserved.
 //
@@ -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,19 +64,4 @@ TextArea {
            TextArea.cursorPosition = textArea.text.length;
        }
    }
-
-    MoneroComponents.ContextMenu {
-        cursorShape: Qt.IBeamCursor
-        onCut: textArea.cut();
-        onCopy: textArea.copy();
-        onPaste: {
-            var previoustextFieldLength = textArea.length
-            var previousCursorPosition = textArea.cursorPosition;
-            textArea.paste();
-            textArea.forceActiveFocus()
-            textArea.cursorPosition = previousCursorPosition + (textArea.length - previoustextFieldLength);
-        }
-        onRemove: textArea.remove(selectionStart, selectionEnd);
-        onSelectAll: textArea.selectAll();
-    }
 }
--- a/components/Label.qml
+++ b/components/Label.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -34,10 +34,7 @@ import "../components" as MoneroComponents
 Item {
    id: item
    property alias text: label.text
-    property alias tooltip: label.tooltip
-    property alias tooltipIconVisible: label.tooltipIconVisible
    property alias color: label.color
-    property alias labelMouseArea: labelMouseArea
    property int textFormat: Text.PlainText
    property string tipText: ""
    property int fontSize: 16
@@ -48,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
@@ -72,14 +68,5 @@ Item {
        color: fontColor
        onLinkActivated: item.linkActivated()
        textFormat: parent.textFormat
-        MouseArea {
-            id: labelMouseArea
-            anchors.fill: parent
-            hoverEnabled: true
-            acceptedButtons: Qt.NoButton
-            cursorShape: parent.hoveredLink || (tooltip && !tooltipIconVisible) ? Qt.PointingHandCursor : Qt.ArrowCursor
-            onEntered: tooltip && !tooltipIconVisible ? parent.tooltipPopup.open() : undefined
-            onExited: tooltip && !tooltipIconVisible ? parent.tooltipPopup.close() : undefined
-        }
    }
 }
--- a/components/LabelButton.qml
+++ b/components/LabelButton.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 //
 // All rights reserved.
 //
--- a/components/LabelSubheader.qml
+++ b/components/LabelSubheader.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 //
 // All rights reserved.
 //
@@ -34,7 +34,8 @@ import "../components/effects/" as MoneroEffects
 Label {
    id: item
    fontSize: 18
-    tooltipIconVisible: true
+    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-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -37,12 +37,23 @@ import QtQuick.Controls 2.0
 Drawer {
    id: sideBar

+    // @TODO: Qt 5.10 introduces `opened` built-in for Drawer
+    property bool isOpened: false
+
+    onClosed: {
+        isOpened = false;
+    }
+
+    onOpened: {
+        isOpened = true;
+    }
+
    width: 240
    height: parent.height - (persistentSettings.customDecorations ? 50 : 0)
    y: titleBar.height

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

@@ -53,78 +64,25 @@ Drawer {
        color: "red"

        ListView {
-            id: languagesListView
            clip: true
            Layout.fillHeight: true
            Layout.fillWidth: true
            boundsBehavior: Flickable.StopAtBounds
            width: sideBar.width
            height: sideBar.height
-            focus: true

            model: langModel

-            Keys.onUpPressed: currentIndex !== 0 ? currentIndex = currentIndex - 1 : ""
-            Keys.onBacktabPressed: currentIndex !== 0 ? currentIndex = currentIndex - 1 : ""
-            Keys.onDownPressed: currentIndex + 1 !== count ? currentIndex = currentIndex + 1 : ""
-            Keys.onTabPressed: currentIndex + 1 !== count ? currentIndex = currentIndex + 1 : ""
-
            delegate: Rectangle {
                id: item
-                color: index == languagesListView.currentIndex ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent"
+                color: "transparent"
                width: sideBar.width
                height: 32

-                Accessible.role: Accessible.ListItem
-                Accessible.name: display_name
-                Keys.onEnterPressed: setSelectedItemAsLanguage();
-                Keys.onReturnPressed: setSelectedItemAsLanguage();
-                Keys.onSpacePressed: setSelectedItemAsLanguage();
-
-                function setSelectedItemAsLanguage() {
-                    var locale_spl = locale.split("_");
-
-                    // reload active translations
-                    console.log(locale_spl[0]);
-                    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();
-                }
-
-                Rectangle {
-                    id: selectedIndicator
-                    anchors.left: parent.left
-                    anchors.leftMargin: 0
-                    height: parent.height
-                    width: 2
-                    color: index == languagesListView.currentIndex ? MoneroComponents.Style.buttonBackgroundColor : "transparent"
-                }
-
-                Rectangle {
-                    id: flagRect
-                    height: 24
-                    width: 24
-                    anchors.left: selectedIndicator.right
-                    anchors.leftMargin: 4
-                    anchors.verticalCenter: parent.verticalCenter
-                    color: "transparent"
-
-                    Image {
-                        anchors.fill: parent
-                        source: flag
-                    }
-                }
-
                MoneroComponents.TextPlain {
                    anchors.left: parent.left
-                    anchors.leftMargin: 32
-                    font.bold: languagesListView.currentIndex == index ? true : false
+                    anchors.leftMargin: 16
+                    font.bold: true
                    font.pixelSize: 14
                    color: MoneroComponents.Style.defaultFontColor
                    text: display_name
@@ -150,7 +108,19 @@ Drawer {
                    MouseArea {
                        anchors.fill: parent
                        cursorShape: Qt.PointingHandCursor
-                        onClicked: setSelectedItemAsLanguage();
+                        onClicked: {
+                            var locale_spl = locale.split("_");
+
+                            // reload active translations
+                            console.log(locale_spl[0]);
+                            translationManager.setLanguage(locale_spl[0]);
+
+                            // set wizard language settings
+                            wizard.language_locale = locale;
+                            wizard.language_wallet = wallet_language;
+                            wizard.language_language = display_name + " (" + locale_spl[1] + ") ";
+                            sideBar.close()
+                        }
                        hoverEnabled: true
                        onEntered: {
                            // item.color = "#26FFFFFF"
@@ -164,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;
+                    }
+                }
            }
        }
    }
@@ -190,12 +167,4 @@ Drawer {
            }
        }
    }
-
-    function selectCurrentLanguage() {
-        for (var i = 0; i < langModel.count; ++i) {
-            if (langModel.get(i).display_name === persistentSettings.language)  {
-                languagesListView.currentIndex = i;
-            }
-        }
-    }
 }
--- a/components/LineEdit.qml
+++ b/components/LineEdit.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -26,34 +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

-ColumnLayout {
+Item {
    id: item
-    Layout.fillWidth: true
-
-    default property alias content: inlineButtons.children
-
    property alias input: input
-    property bool inputHasFocus: input.activeFocus
-    property bool tabNavigationEnabled: true
    property alias text: input.text

-    property int inputPaddingLeft: 10
-    property int inputPaddingRight: 10
-    property int inputPaddingTop: 10
-    property int inputPaddingBottom: 10
-    property int inputRadius: 4
-
-    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
@@ -61,40 +43,32 @@ ColumnLayout {
    property int placeholderFontSize: 18
    property string placeholderColor: MoneroComponents.Style.defaultFontColor
    property real placeholderOpacity: 0.35
-    property real placeholderLeftMargin: {
-        if (placeholderCenter) {
-            return undefined;
-        } else {
-            return inputPaddingLeft;
-        }
-    }

    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 bool pasteButton: false
-    property alias copyButtonText: copyButtonId.text
-    property alias copyButtonEnabled: copyButtonId.enabled

    property bool borderDisabled: false
    property string borderColor: {
-        if ((error && input.text !== "") || (errorWhenEmpty && input.text == "")) {
+        if(error && input.text !== ""){
            return MoneroComponents.Style.inputBorderColorInvalid;
-        } else if (input.activeFocus) {
+        } else if(input.activeFocus){
            return MoneroComponents.Style.inputBorderColorActive;
        } else {
            return MoneroComponents.Style.inputBorderColorInActive;
        }
    }

-    property string fontFamily: MoneroComponents.Style.fontRegular.name
    property int fontSize: 18
    property bool fontBold: false
    property alias fontColor: input.color
    property bool error: false
-    property bool errorWhenEmpty: false
    property alias labelText: inputLabel.text
    property alias labelColor: inputLabel.color
    property alias labelTextFormat: inputLabel.textFormat
@@ -105,16 +79,15 @@ ColumnLayout {
    property alias labelWrapMode: inputLabel.wrapMode
    property alias labelHorizontalAlignment: inputLabel.horizontalAlignment
    property bool showingHeader: inputLabel.text !== "" || copyButton
-    property int inputHeight: 39
+    property int inputHeight: 42

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

-    onActiveFocusChanged: activeFocus && input.forceActiveFocus()
+    height: showingHeader ? (inputLabel.height + inputItem.height + 2) : 42
+
    onTextUpdated: {
        // check to remove placeholder text when there is content
        if(item.isEmpty()){
@@ -134,135 +107,45 @@ ColumnLayout {
        }
    }

-    function isPasswordHidden() {
-        if (password) {
-            return passwordHidden;
-        }
-        if (passwordLinked) {
-            return passwordLinked.passwordHidden;
-        }
-        return false;
-    }
+    MoneroComponents.TextPlain {
+        id: inputLabel
+        anchors.top: parent.top
+        anchors.left: parent.left
+        font.family: MoneroComponents.Style.fontRegular.name
+        font.pixelSize: labelFontSize
+        font.bold: labelFontBold
+        textFormat: Text.RichText
+        color: MoneroComponents.Style.defaultFontColor
+        onLinkActivated: item.labelLinkActivated()

-    function reset() {
-        text = "";
-        if (!passwordLinked) {
-            passwordHidden = true;
+        MouseArea {
+            anchors.fill: parent
+            acceptedButtons: Qt.NoButton
+            cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
        }
    }

-    function passwordToggle() {
-        if (passwordLinked) {
-            passwordLinked.passwordHidden = !passwordLinked.passwordHidden;
-        } else {
-            passwordHidden = !passwordHidden;
+    MoneroComponents.LabelButton {
+        id: copyButtonId
+        text: qsTr("Copy") + translationManager.emptyString
+        anchors.right: parent.right
+        onClicked: {
+            if (input.text.length > 0) {
+                console.log("Copied to clipboard");
+                clipboard.setText(input.text);
+                appWindow.showStatusMessage(qsTr("Copied to clipboard"), 3);
+            }
        }
+        visible: copyButton && input.text !== ""
    }

-    spacing: 0
-    Rectangle {
-        id: inputLabelRect
-        color: "transparent"
-        Layout.fillWidth: true
-        height: (inputLabel.height + 10)
-        visible: showingHeader ? true : false
-
-        MoneroComponents.TextPlain {
-            id: inputLabel
-            anchors.top: parent.top
-            anchors.left: parent.left
-            font.family: MoneroComponents.Style.fontRegular.name
-            font.pixelSize: labelFontSize
-            font.bold: labelFontBold
-            textFormat: Text.RichText
-            color: MoneroComponents.Style.defaultFontColor
-            onLinkActivated: item.labelLinkActivated()
-
-            MouseArea {
-                anchors.fill: parent
-                acceptedButtons: Qt.NoButton
-                cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
-            }
-        }
-
-        RowLayout {
-            anchors.right: parent.right
-            spacing: 16
-
-            MoneroComponents.LabelButton {
-                id: copyButtonId
-                text: qsTr("Copy") + translationManager.emptyString
-                onClicked: {
-                    if (input.text.length > 0) {
-                        console.log("Copied to clipboard");
-                        clipboard.setText(input.text);
-                        appWindow.showStatusMessage(qsTr("Copied to clipboard"), 3);
-                    }
-                }
-                visible: copyButton && input.text !== ""
-            }
-
-            MoneroComponents.LabelButton {
-                id: pasteButtonId
-                onClicked: {
-                    input.clear();
-                    input.paste();
-                }
-                text: qsTr("Paste") + translationManager.emptyString
-                visible: pasteButton
-            }
-        }
-    }
-
-    MoneroComponents.Input {
-        id: input
-        Keys.onBacktabPressed: {
-            item.backtabPressed();
-            if (item.KeyNavigation.backtab) {
-                item.KeyNavigation.backtab.forceActiveFocus()
-            }
-        }
-        Keys.onTabPressed: {
-            item.tabPressed();
-            if (item.KeyNavigation.tab) {
-                item.KeyNavigation.tab.forceActiveFocus()
-            }
-        }
-        Layout.fillWidth: true
-        Layout.preferredHeight: inputHeight
-
-        leftPadding: item.inputPaddingLeft
-        rightPadding: (inlineButtons.width > 0 ? inlineButtons.width + inlineButtons.spacing : 0) + inputPaddingRight + (password || passwordLinked ? 45 : 0)
-        topPadding: item.inputPaddingTop
-        bottomPadding: item.inputPaddingBottom
-
-        font.family: item.fontFamily
-        font.pixelSize: item.fontSize
-        font.bold: item.fontBold
-        onEditingFinished: item.editingFinished()
-        onAccepted: item.accepted();
-        onTextChanged: item.textUpdated()
-        echoMode: isPasswordHidden() ? TextInput.Password : TextInput.Normal
-
-        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()
-            }
-        }
+    Item{
+        id: inputItem
+        height: inputHeight
+        anchors.top: showingHeader ? inputLabel.bottom : parent.top
+        anchors.topMargin: showingHeader ? 12 : 2
+        width: parent.width
+        clip: true

        MoneroComponents.TextPlain {
            id: placeholderLabel
@@ -270,7 +153,13 @@ ColumnLayout {
            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
@@ -284,7 +173,7 @@ ColumnLayout {
        Rectangle {
            anchors.fill: parent
            anchors.topMargin: 1
-            color: item.enabled ? "transparent" : MoneroComponents.Style.inputBoxBackgroundDisabled
+            color: "transparent"
        }

        Rectangle {
@@ -293,15 +182,39 @@ ColumnLayout {
            anchors.fill: parent
            border.width: borderDisabled ? 0 : 1
            border.color: borderColor
-            radius: item.inputRadius
+            radius: 4
        }

-        RowLayout {
-            id: inlineButtons
-            anchors.verticalCenter: parent.verticalCenter
+        Image {
+            id: inlineIcon
+            width: 26
+            height: 26
+            anchors.top: parent.top
+            anchors.topMargin: 8
+            anchors.left: parent.left
+            anchors.leftMargin: 12
+            source: "qrc:///images/moneroIcon-28x28.png"
+            visible: false
+        }
+
+        MoneroComponents.Input {
+            id: input
+            anchors.fill: parent
+            anchors.leftMargin: inlineIcon.visible ? 44 : 0
+            font.pixelSize: item.fontSize
+            font.bold: item.fontBold
+            onEditingFinished: item.editingFinished()
+            onAccepted: item.accepted();
+            onTextChanged: item.textUpdated()
+            topPadding: 10
+            bottomPadding: 10
+        }
+
+        MoneroComponents.InlineButton {
+            id: inlineButtonId
+            visible: item.inlineButtonText ? true : false
            anchors.right: parent.right
-            anchors.rightMargin: inputPaddingRight
-            spacing: 4
+            anchors.rightMargin: 8
        }
    }
 }
--- a/components/LineEditMulti.qml
+++ b/components/LineEditMulti.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
@@ -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
@@ -67,8 +65,7 @@ ColumnLayout {
        }
    }

-    property alias error: input.error
-    property alias cursorPosition: input.cursorPosition
+    property bool error: false

    property string labelFontColor: MoneroComponents.Style.defaultFontColor
    property bool labelFontBold: false
@@ -76,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

@@ -84,18 +80,20 @@ 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();
-    signal returnPressed();
-    signal enterPressed();
-
-    onActiveFocusChanged: activeFocus && input.forceActiveFocus()

    spacing: 0
    Rectangle {
@@ -148,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
            }
@@ -162,25 +157,20 @@ 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
        mouseSelection: item.mouseSelection
        onEditingFinished: item.editingFinished()
-        Keys.onReturnPressed: item.returnPressed()
-        Keys.onEnterPressed: item.enterPressed()
+        error: item.error

        MoneroComponents.TextPlain {
            id: placeholderLabel
@@ -206,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/MenuBar.qml
+++ b/components/MenuBar.qml
@@ -1,55 +0,0 @@
-// Copyright (c) 2014-2024, 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 Qt.labs.platform 1.0 as PlatformLabs
-import "." as MoneroComponents
-
-PlatformLabs.MenuBar {
-    PlatformLabs.Menu {
-        title: qsTr("File")
-        PlatformLabs.MenuItem {
-            enabled: appWindow.viewState === "normal"
-            text: qsTr("Close Wallet")
-            onTriggered: appWindow.showWizard()
-        }
-    }
-    PlatformLabs.Menu {
-        title: qsTr("View")
-        PlatformLabs.MenuItem {
-            text: MoneroComponents.Style.blackTheme ? qsTr("Light Theme") : qsTr("Dark Theme")
-            onTriggered: {
-                MoneroComponents.Style.blackTheme = !MoneroComponents.Style.blackTheme;
-            }
-        }
-        PlatformLabs.MenuItem {
-            text: qsTr("Change Language")
-            onTriggered: appWindow.toggleLanguageView();
-        }
-    }
-}
-
--- a/components/MenuButton.qml
+++ b/components/MenuButton.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -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.accountColors[currentAccountIndex % MoneroComponents.Style.accountColors.length] : "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,217 +0,0 @@
-// Copyright (c) 2014-2024, 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
-    property alias currentIndex: repeater.currentIndex
-    property alias previousIndex: repeater.previousIndex
-
-    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 {
-            id: repeater
-            model: items.length
-            property int currentIndex: 0
-            property int previousIndex: 0
-
-            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
-                        Layout.fillWidth: true
-                        color: items[index].active ? grid.borderColor : "transparent"
-                        implicitHeight: children[0].implicitHeight
-                        implicitWidth: children[0].implicitWidth
-
-                        MoneroComponents.TextPlain {
-                            anchors.centerIn: parent
-                            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: {
-                                repeater.previousIndex = repeater.currentIndex;
-                                repeater.currentIndex = index;
-                                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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -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,36 +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 && persistentSettings.allowRemoteNodeMining && appWindow.isMining)
-                    return qsTr("Remote node") + " + " + qsTr("Mining");
-                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 {
@@ -82,7 +68,7 @@ Rectangle {
                if(item.connected == Wallet.ConnectionStatus_Connected){
                    return 1
                } else {
-                    MoneroComponents.Style.blackTheme ? 0.5 : 0.3
+                    return 0.5
                }
            }

@@ -94,7 +80,7 @@ Rectangle {
                source: {
                    if(appWindow.isMining) {
                       return "qrc:///images/miningxmr.png"
-                    } else if(item.connected == Wallet.ConnectionStatus_Connected || !MoneroComponents.Style.blackTheme) {
+                    } else if(item.connected == Wallet.ConnectionStatus_Connected) {
                        return "qrc:///images/lightning.png"
                    } else {
                        return "qrc:///images/lightning-white.png"
@@ -128,8 +114,8 @@ Rectangle {
                font.family: MoneroComponents.Style.fontMedium.name
                font.bold: true
                font.pixelSize: 13
-                color: MoneroComponents.Style.blackTheme ? MoneroComponents.Style.dimmedFontColor : MoneroComponents.Style.defaultFontColor
-                opacity: MoneroComponents.Style.blackTheme ? 0.65 : 0.75
+                color: MoneroComponents.Style.dimmedFontColor
+                opacity: MoneroComponents.Style.blackTheme ? 0.65 : 0.5
                text: qsTr("Network status") + translationManager.emptyString
                themeTransition: false
            }
@@ -160,55 +146,6 @@ Rectangle {
                    }
                }
            }
-
-            MoneroComponents.TextPlain {
-                anchors.left: statusTextVal.right
-                anchors.leftMargin: 16
-                anchors.verticalCenter: parent.verticalCenter
-                color: refreshMouseArea.containsMouse ?  MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor
-                font.family: FontAwesome.fontFamilySolid
-                font.pixelSize: 24
-                font.styleName: "Solid"
-                opacity: 0.85
-                text: FontAwesome.random
-                themeTransition: false
-                tooltip: qsTr("Switch to another public remote node") + translationManager.emptyString;
-                visible: (
-                    !appWindow.disconnected &&
-                    !persistentSettings.useRemoteNode &&
-                    (persistentSettings.bootstrapNodeAddress == "auto" || persistentSettings.walletMode < 2)
-                )
-
-                MouseArea {
-                    id: refreshMouseArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    visible: true
-                    onEntered: parent.tooltipPopup.open()
-                    onExited: parent.tooltipPopup.close()
-                    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,
-                            persistentSettings.blockchainDataDir,
-                            callback);
-
-                        refreshMouseArea.visible = false;
-                        appWindow.showStatusMessage(qsTr("Switching to another public node"), 3);
-                    }
-                }
-            }
        }
    }
 }
--- a/components/Notifier.qml
+++ b/components/Notifier.qml
@@ -1,21 +1,21 @@
-// Copyright (c) 2021-2024, 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/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
@@ -41,16 +41,15 @@ import "../js/Utils.js" as Utils
 Item {
    id: root
    visible: false
+    z: parent.z + 2

+    property bool isHidden: true
    property alias password: passwordInput1.text
    property string walletName
-    property var okButtonText
-    property string okButtonIcon
    property string errorText
    property bool passwordDialogMode
    property bool passphraseDialogMode
    property bool newPasswordDialogMode
-    property bool backgroundSyncing

    // same signals as Dialog has
    signal accepted()
@@ -62,11 +61,14 @@ Item {
    signal closeCallback()

    function _openInit(walletName, errorText) {
+        isHidden = true
        capsLockTextLabel.visible = oshelper.isCapsLock();
-        passwordInput1.reset();
-        passwordInput2.reset();
-        if(!appWindow.currentWallet || appWindow.active)
-            passwordInput1.input.forceActiveFocus();
+        passwordInput1.echoMode = TextInput.Password
+        passwordInput2.echoMode = TextInput.Password
+        passwordInput1.text = ""
+        passwordInput2.text = ""
+        passwordInput1.forceActiveFocus();
+        inactiveOverlay.visible = true // draw appwindow inactive
        root.walletName = walletName ? walletName : ""
        errorTextLabel.text = errorText ? errorText : "";
        leftPanel.enabled = false
@@ -78,13 +80,10 @@ Item {
        appWindow.updateBalance();
    }

-    function open(walletName, errorText, okButtonText, okButtonIcon, backgroundSyncOn) {
+    function open(walletName, errorText) {
        passwordDialogMode = true;
        passphraseDialogMode = false;
        newPasswordDialogMode = false;
-        backgroundSyncing = backgroundSyncOn || false;
-        root.okButtonText = okButtonText;
-        root.okButtonIcon = okButtonIcon ? okButtonIcon : "";
        _openInit(walletName, errorText);
    }

@@ -92,7 +91,6 @@ Item {
        passwordDialogMode = false;
        passphraseDialogMode = true;
        newPasswordDialogMode = false;
-        backgroundSyncing = false;
        _openInit("", "");
    }

@@ -100,7 +98,6 @@ Item {
        passwordDialogMode = false;
        passphraseDialogMode = false;
        newPasswordDialogMode = true;
-        backgroundSyncing = false;
        _openInit("", "");
    }

@@ -109,14 +106,11 @@ Item {
    }

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

        root.visible = false;
        appWindow.hideBalanceForced = false;
@@ -124,32 +118,14 @@ 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()
-        }
+    function toggleIsHidden() {
+        passwordInput1.echoMode = isHidden ? TextInput.Normal : TextInput.Password;
+        passwordInput2.echoMode = isHidden ? TextInput.Normal : TextInput.Password;
+        isHidden = !isHidden;
    }

    ColumnLayout {
+        z: inactiveOverlay.z + 1
        id: mainLayout
        spacing: 10
        anchors { fill: parent; margins: 35 }
@@ -208,14 +184,18 @@ Item {
                font.family: MoneroComponents.Style.fontLight.name
                Layout.fillWidth: true
                wrapMode: Text.Wrap
-                text: qsTr("CAPS LOCK IS ON.") + translationManager.emptyString;
+                text: qsTr("CAPSLOCKS IS ON.") + translationManager.emptyString;
            }

-            MoneroComponents.LineEdit {
+            TextField {
                id: passwordInput1
-                password: true
                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: {
                    if (passwordDialogMode) {
                        return okButton
@@ -223,12 +203,76 @@ Item {
                        return passwordInput2
                    }
                }
+                bottomPadding: 10
+                leftPadding: 10
+                topPadding: 10
+                color: MoneroComponents.Style.defaultFontColor
+                selectionColor: MoneroComponents.Style.textSelectionColor
+                selectedTextColor: MoneroComponents.Style.textSelectedColor
                onTextChanged: capsLockTextLabel.visible = oshelper.isCapsLock();

+                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: {
+                                toggleIsHidden();
+                            }
+                            onEntered: {
+                                parent.opacity = 0.9
+                                parent.fontSize = 24
+                            }
+                            onExited: {
+                                parent.opacity = 0.7
+                                parent.fontSize = 20
+                            }
+                        }
+                    }
+                }
+
                Keys.enabled: root.visible
-                Keys.onEnterPressed: root.onOk()
-                Keys.onReturnPressed: root.onOk()
-                Keys.onEscapePressed: root.onCancel()
+                Keys.onReturnPressed: {
+                    root.close()
+                    if (passwordDialogMode) {
+                        root.accepted()
+                    } else if (newPasswordDialogMode) {
+                        root.acceptedNewPassword()
+                    } else if (passphraseDialogMode) {
+                        root.acceptedPassphrase()
+                    }
+                }
+                Keys.onEscapePressed: {
+                    root.close()
+                    if (passwordDialogMode) {
+                        root.rejected()
+                    } else if (newPasswordDialogMode) {
+                        root.rejectedNewPassword()
+                    } else if (passphraseDialogMode) {
+                        root.rejectedPassphrase()
+                    }
+                }
            }

            // padding
@@ -252,19 +296,78 @@ Item {
                color: MoneroComponents.Style.defaultFontColor
            }

-            MoneroComponents.LineEdit {
+            TextField {
                id: passwordInput2
-                passwordLinked: passwordInput1
                visible: !passwordDialogMode
                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
                onTextChanged: capsLockTextLabel.visible = oshelper.isCapsLock();

-                Keys.enabled: root.visible
-                Keys.onEnterPressed: root.onOk()
-                Keys.onReturnPressed: root.onOk()
-                Keys.onEscapePressed: root.onCancel()
+                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()
+                        if (newPasswordDialogMode) {
+                            root.acceptedNewPassword()
+                        } else if (passphraseDialogMode) {
+                            root.acceptedPassphrase()
+                        }
+                    }
+                }
+                Keys.onEscapePressed: {
+                    root.close()
+                    if (newPasswordDialogMode) {
+                        root.rejectedNewPassword()
+                    } else if (passphraseDialogMode) {
+                        root.rejectedPassphrase()
+                    }
+                }
            }

            // padding
@@ -286,36 +389,39 @@ Item {

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

                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()
+                        if (passwordDialogMode) {
+                            root.accepted()
+                        } else if (newPasswordDialogMode) {
+                            root.acceptedNewPassword()
+                        } else if (passphraseDialogMode) {
+                            root.acceptedPassphrase()
+                        }
+                    }
                }
            }
-
-            Label {
-                visible: backgroundSyncing
-                text: qsTr("Syncing in the background...") + translationManager.emptyString;
-                Layout.fillWidth: true
-
-                font.pixelSize: 14
-                font.family: MoneroComponents.Style.fontLight.name
-                font.italic: true
-
-                color: MoneroComponents.Style.defaultFontColor
-            }
        }
    }
 }
--- a/components/ProcessingSplash.qml
+++ b/components/ProcessingSplash.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 //
 // All rights reserved.
 //
@@ -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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -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-2024, 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,17 +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 if (walletManager.addressValid(data, appWindow.persistentSettings.nettype)) {
-                root.qrcode_decoded(data, "", "", "", "", null);
-                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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -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,170 +0,0 @@
-// Copyright (c) 2021-2024, 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 onOk() {
-        root.success = true;
-        root.close();
-    }
-
-    function onCancel() { root.close(); }
-
-    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
-
-        Keys.enabled: root.visible
-        Keys.onEnterPressed: root.onOk()
-        Keys.onReturnPressed: root.onOk()
-        Keys.onEscapePressed: root.onCancel()
-    }
-
-    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
-
-            Keys.enabled: root.visible
-            Keys.onEnterPressed: root.onOk()
-            Keys.onReturnPressed: root.onOk()
-            Keys.onEscapePressed: root.onCancel()
-        }
-    }
-
-    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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -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,35 +53,32 @@ 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
    }

    function getAddress() {
-        if (!isValid()) {
-            return "";
-        }
-
        var addr = daemonAddr.text.trim();
        var port = daemonPort.text.trim();
+
+        // validation
+        if(addr === "" || addr.length < 2) return "";
+        if(!Utils.isNumeric(port)) return "";
+
        return addr + ":" + port;
    }

-    MoneroComponents.LineEdit {
+    LineEdit {
        id: daemonAddr
-        Layout.preferredWidth: root.width/3
+        Layout.fillWidth: true
        placeholderText: qsTr("Remote Node Hostname / IP") + translationManager.emptyString
        placeholderFontFamily: root.placeholderFontFamily
        placeholderFontBold: root.placeholderFontBold
@@ -92,21 +86,18 @@ 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]
    }

-    MoneroComponents.LineEdit {
+    LineEdit {
        id: daemonPort
-        Layout.preferredWidth: root.width/3
+        Layout.fillWidth: true
        placeholderText: qsTr("Port") + translationManager.emptyString
        placeholderFontFamily: root.placeholderFontFamily
        placeholderFontBold: root.placeholderFontBold
@@ -114,6 +105,7 @@ GridLayout {
        placeholderColor: root.placeholderColor
        placeholderOpacity: root.placeholderOpacity
        labelFontSize: root.labelFontSize
+        borderColor: lineEditBorderColor
        backgroundColor: lineEditBackgroundColor
        fontColor: lineEditFontColor
        fontBold: lineEditFontBold
@@ -122,6 +114,5 @@ GridLayout {

        onEditingFinished: root.editingFinished()
        onTextChanged: root.textChanged()
-        text: initialHostPort[2]
    }
 }
--- a/components/RemoteNodeList.qml
+++ b/components/RemoteNodeList.qml
@@ -1,167 +0,0 @@
-// Copyright (c) 2021-2024, 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 FontAwesome 1.0
-
-import "." as MoneroComponents
-import "effects/" as MoneroEffects
-
-ColumnLayout {
-    id: remoteNodeList
-    spacing: 20
-
-    MoneroComponents.CheckBox {
-        border: false
-        checkedIcon: FontAwesome.minusCircle
-        uncheckedIcon: FontAwesome.plusCircle
-        fontAwesomeIcons: true
-        fontSize: 16
-        iconOnTheLeft: true
-        text: qsTr("Add remote node") + translationManager.emptyString
-        toggleOnClick: false
-        onClicked: remoteNodeDialog.add(remoteNodesModel.append)
-    }
-
-    ColumnLayout {
-        spacing: 0
-
-        Repeater {
-            model: remoteNodesModel
-
-            Rectangle {
-                height: 30
-                Layout.fillWidth: true
-                color: itemMouseArea.containsMouse || trustedDaemonCheckMark.labelMouseArea.containsMouse || index === remoteNodesModel.selected ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent"
-
-                Rectangle {
-                    visible: index === remoteNodesModel.selected
-                    Layout.fillHeight: true
-                    anchors.top: parent.top
-                    anchors.bottom: parent.bottom
-                    color: "darkgrey"
-                    width: 2
-                }
-
-                Rectangle {
-                    color: MoneroComponents.Style.appWindowBorderColor
-                    anchors.right: parent.right
-                    anchors.left: parent.left
-                    anchors.top: parent.top
-                    height: 1
-                    visible: index > 0
-
-                    MoneroEffects.ColorTransition {
-                        targetObj: parent
-                        blackColor: MoneroComponents.Style._b_appWindowBorderColor
-                        whiteColor: MoneroComponents.Style._w_appWindowBorderColor
-                    }
-                }
-
-                Rectangle {
-                    anchors.fill: parent
-                    anchors.rightMargin: 80
-                    color: "transparent"
-                    property var trusted: remoteNodesModel.get(index) ? remoteNodesModel.get(index).trusted : false
-
-                    MoneroComponents.TextPlain {
-                        id: addressText
-                        width: parent.width - trustedDaemonCheckMark.width
-                        color: index === remoteNodesModel.selected ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.left: parent.left
-                        anchors.leftMargin: 6
-                        font.pixelSize: 16
-                        text: address
-                        themeTransition: false
-                        elide: Text.ElideMiddle
-                    }
-
-                    MoneroComponents.Label {
-                        id: trustedDaemonCheckMark
-                        anchors.left: addressText.right
-                        anchors.leftMargin: 3
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.verticalCenterOffset: 2
-                        z: itemMouseArea.z + 1
-                        fontSize: 16
-                        fontFamily: FontAwesome.fontFamilySolid
-                        fontColor: index === remoteNodesModel.selected ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor
-                        styleName: "Solid"
-                        visible: trusted
-                        text: FontAwesome.shieldAlt
-                        tooltip: qsTr("Trusted daemon") + translationManager.emptyString
-                        themeTransition: false
-                    }
-
-                    MouseArea {
-                        id: itemMouseArea
-                        cursorShape: Qt.PointingHandCursor
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        onClicked: remoteNodesModel.applyRemoteNode(index)
-                    }
-                }
-
-                RowLayout {
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.right: parent.right
-                    height: 30
-                    spacing: 2
-
-                    MoneroComponents.InlineButton {
-                        buttonColor: "transparent"
-                        fontFamily: FontAwesome.fontFamily
-                        fontPixelSize: 18
-                        text: FontAwesome.edit
-                        tooltip: qsTr("Edit remote node") + translationManager.emptyString
-                        tooltipLeft: true
-                        onClicked: remoteNodeDialog.edit(remoteNodesModel.get(index), function (remoteNode) {
-                            remoteNodesModel.set(index, remoteNode)
-                            if (index === remoteNodesModel.selected) {
-                                remoteNodesModel.applyRemoteNode(index)
-                            }
-                        })
-                    }
-
-                    MoneroComponents.InlineButton {
-                        buttonColor: "transparent"
-                        fontFamily: FontAwesome.fontFamily
-                        text: FontAwesome.times
-                        visible: remoteNodesModel.count > 1
-                        tooltip: qsTr("Remove remote node") + translationManager.emptyString
-                        tooltipLeft: true
-                        onClicked: remoteNodesModel.removeSelectNextIfNeeded(index)
-                    }
-                }
-            }
-        }
-    }
-}
--- a/components/LanguageButton.qml
+++ b/components/LanguageButton.qml
@@ -1,21 +1,21 @@
-// Copyright (c) 2020-2024, 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,131 +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 symbol: symbolText.text
-    property alias description: area.text
-    property alias title: header.text
-    property bool isLast: false
-    property bool enabled: true
-    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";
-            opacity: settingsListItem.enabled ? 1 : 0.25
-            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 {
-            visible: settingsListItem.enabled
-            cursorShape: Qt.PointingHandCursor
-            anchors.fill: parent
-            hoverEnabled: true
-            onEntered: root.color = MoneroComponents.Style.titleBarButtonHoverColor
-            onExited: root.color = "transparent"
-            onClicked: {
-                settingsListItem.clicked()
-            }
-        }
-
-        MoneroComponents.TextPlain {
-            id: symbolText
-            anchors.right: parent.right
-            anchors.rightMargin: 44
-            anchors.verticalCenter: parent.verticalCenter
-            font.pixelSize: 12
-            font.bold: true
-            color: MoneroComponents.Style.menuButtonTextColor
-            visible: appWindow.ctrlPressed
-            themeTransition: false
-        }
-    }
-}
--- 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
-
-    MoneroComponents.TextPlain {
-        id: label
-        color: MoneroComponents.Style.defaultFontColor
-        font.pixelSize: 14
-        font.family: MoneroComponents.Style.fontRegular.name
-    }
-
-    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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -29,28 +29,20 @@
 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: 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 13.5;
+        if(small) return 14;
        else return 16;
    }
    property alias label: label
-    property alias tooltip: tooltip.text
-    property alias tooltipLeft: tooltip.tooltipLeft
-    property alias tooltipPopup: tooltip.tooltipPopup
    signal clicked()

    height: small ?  30 : 36
@@ -67,8 +59,7 @@ Item {
        id: buttonRect
        anchors.fill: parent
        radius: 3
-        border.width: parent.focus && parent.enabled ? 1 : 0
-        opacity: 1
+        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 {
@@ -99,14 +86,7 @@ Item {
                when: !button.enabled
                PropertyChanges {
                    target: buttonRect
-                    opacity: 0.5
-                    color: primary
-                        ? MoneroComponents.Style.buttonBackgroundColor
-                        : MoneroComponents.Style.buttonSecondaryBackgroundColor
-                }
-                PropertyChanges {
-                    target: label
-                    opacity: 0.5
+                    color: MoneroComponents.Style.buttonBackgroundColorDisabled
                }
            }
        ]
@@ -126,7 +106,7 @@ Item {
        MoneroComponents.TextPlain {
            id: label
            font.family: MoneroComponents.Style.fontBold.name
-            font.bold: button.primary ? true : false
+            font.bold: true
            font.pixelSize: button.fontSize
            color: !buttonArea.pressed ? button.textColor : "transparent"
            visible: text !== ""
@@ -145,34 +125,17 @@ 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
-            opacity: buttonRect.opacity
            source: {
-                if (fontAwesomeIcon) return "";
                if(button.rightIconInactive !== "" && !button.enabled) {
                    return button.rightIconInactive;
                }
                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 !== ""
-        }
-    }
-
-    MoneroComponents.Tooltip {
-        id: tooltip
-        anchors.fill: parent
    }

    MouseArea {
@@ -180,13 +143,9 @@ Item {
        anchors.fill: parent
        hoverEnabled: true
        onClicked: doClick()
-        onEntered: tooltip.text ? tooltip.tooltipPopup.open() : ""
-        onExited: tooltip.text ? tooltip.tooltipPopup.close() : ""
        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
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 //
 // All rights reserved.
 //
@@ -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
@@ -171,7 +166,6 @@ Rectangle {

            MoneroComponents.StandardButton {
                id: cancelButton
-                primary: false
                text: qsTr("Cancel") + translationManager.emptyString
                onClicked: {
                    root.close()
--- a/components/StandardDropdown.qml
+++ b/components/StandardDropdown.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -27,18 +27,13 @@
 // 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 FontAwesome 1.0
-import QtQuick.Layouts 1.1

 import "../components" as MoneroComponents
 import "../components/effects/" as MoneroEffects

-ColumnLayout {
+Item {
    id: dropdown
-    Layout.fillWidth: true
-
    property int itemTopMargin: 0
    property alias dataModel: repeater.model
    property string shadowPressedColor
@@ -47,69 +42,64 @@ ColumnLayout {
    property string releasedColor: MoneroComponents.Style.titleBarButtonHoverColor
    property string textColor: MoneroComponents.Style.defaultFontColor
    property alias currentIndex: columnid.currentIndex
-    readonly property alias expanded: popup.visible
-    property alias labelText: dropdownLabel.text
-    property alias labelColor: dropdownLabel.color
-    property alias labelTextFormat: dropdownLabel.textFormat
-    property alias labelWrapMode: dropdownLabel.wrapMode
-    property alias labelHorizontalAlignment: dropdownLabel.horizontalAlignment
-    property bool showingHeader: dropdownLabel.text !== ""
-    property int labelFontSize: 14
-    property bool labelFontBold: false
-    property int dropdownHeight: 39
-    property int fontSize: 14
+    property bool expanded: false
+    property int dropdownHeight: 42
+    property int fontHeaderSize: 16
    property int fontItemSize: 14
    property string colorBorder: MoneroComponents.Style.inputBorderColorInActive
    property string colorHeaderBackground: "transparent"
    property bool headerBorder: true
    property bool headerFontBold: false

+    height: dropdownHeight
+
    signal changed();

    onExpandedChanged: if(expanded) appWindow.currentItem = dropdown
-
-    spacing: 0
-    Rectangle {
-        id: dropdownLabelRect
-        color: "transparent"
-        Layout.fillWidth: true
-        height: (dropdownLabel.height + 10)
-        visible: showingHeader ? true : false
-
-        MoneroComponents.TextPlain {
-            id: dropdownLabel
-            anchors.top: parent.top
-            anchors.left: parent.left
-            font.family: MoneroComponents.Style.fontRegular.name
-            font.pixelSize: labelFontSize
-            font.bold: labelFontBold
-            textFormat: Text.RichText
-            color: MoneroComponents.Style.defaultFontColor
-        }
+    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
    }

-    Rectangle {
+    // 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
-        color: dropArea.containsMouse ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent"
-        border.width: dropdown.headerBorder ? 1 : 0
-        border.color: dropdown.colorBorder
-        radius: 4
-        Layout.fillWidth: true
-        Layout.preferredHeight: dropdownHeight
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.topMargin: parent.itemTopMargin
+        height: dropdown.dropdownHeight
+
+        Rectangle {
+            color: "transparent"
+            border.width: dropdown.headerBorder ? 1 : 0
+            border.color: dropdown.colorBorder
+            radius: 4
+            anchors.fill: parent
+        }

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

        Item {
@@ -117,108 +107,139 @@ ColumnLayout {
            anchors.top: parent.top
            anchors.bottom: parent.bottom
            anchors.right: parent.right
-            anchors.rightMargin: 12
-            width: dropdownIcon.width
+            width: 32

-            MoneroEffects.ImageMask {
+            Image {
                id: dropdownIcon
                anchors.centerIn: parent
-                image: "qrc:///images/whiteDropIndicator.png"
-                height: 8
-                width: 12
-                fontAwesomeFallbackIcon: FontAwesome.arrowDown
-                fontAwesomeFallbackSize: 14
+                source: "qrc:///images/whiteDropIndicator.png"
+                visible: false
+            }
+
+            ColorOverlay {
+                source: dropdownIcon
+                anchors.fill: dropdownIcon
                color: MoneroComponents.Style.defaultFontColor
+                rotation: dropdown.expanded ? 180  : 0
+                opacity: 1
            }
        }

        MouseArea {
            id: dropArea
            anchors.fill: parent
-            onClicked: dropdown.expanded ? popup.close() : popup.open()
+            onClicked: dropdown.expanded = !dropdown.expanded
            hoverEnabled: true
-            cursorShape: Qt.ArrowCursor
+            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
            anchors.left: parent.left
-            width: dropdown.width
-            y: head.y + head.height
-            clip: true
-            height: dropdown.expanded ? columnid.height : 0
+            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: false
-                            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
+                    }

-                        MouseArea {
-                            id: itemArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.ArrowCursor
+                    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
@@ -42,12 +41,8 @@ QtObject {
    property string buttonBackgroundColorDisabled: blackTheme ? _b_buttonBackgroundColorDisabled : _w_buttonBackgroundColorDisabled
    property string buttonBackgroundColorDisabledHover: blackTheme ? _b_buttonBackgroundColorDisabledHover : _w_buttonBackgroundColorDisabledHover
    property string buttonInlineBackgroundColor: blackTheme ? _b_buttonInlineBackgroundColor : _w_buttonInlineBackgroundColor
-    property string buttonInlineBackgroundColorHover: blackTheme ? _b_buttonInlineBackgroundColorHover : _w_buttonInlineBackgroundColorHover
    property string buttonTextColor: blackTheme ? _b_buttonTextColor : _w_buttonTextColor
    property string buttonTextColorDisabled: blackTheme ? _b_buttonTextColorDisabled : _w_buttonTextColorDisabled
-    property string buttonSecondaryBackgroundColor: blackTheme ? _b_buttonSecondaryBackgroundColor : _w_buttonSecondaryBackgroundColor
-    property string buttonSecondaryBackgroundColorHover: blackTheme ? _b_buttonSecondaryBackgroundColorHover : _w_buttonSecondaryBackgroundColorHover
-    property string buttonSecondaryTextColor: blackTheme ? _b_buttonSecondaryTextColor : _w_buttonSecondaryTextColor
    property string dividerColor: blackTheme ? _b_dividerColor : _w_dividerColor
    property real dividerOpacity: blackTheme ? _b_dividerOpacity : _w_dividerOpacity

@@ -56,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
@@ -81,7 +77,6 @@ QtObject {
    property string leftPanelBackgroundGradientStart: blackTheme ? _b_leftPanelBackgroundGradientStart : _w_leftPanelBackgroundGradientStart
    property string leftPanelBackgroundGradientStop: blackTheme ? _b_leftPanelBackgroundGradientStop : _w_leftPanelBackgroundGradientStop
    property string historyHeaderTextColor: blackTheme ? _b_historyHeaderTextColor : _w_historyHeaderTextColor
-    property var accountColors: blackTheme ? _b_accountColors : _w_accountColors

    property string _b_defaultFontColor: "white"
    property string _b_dimmedFontColor: "#BBBBBB"
@@ -91,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"
@@ -104,12 +98,8 @@ QtObject {
    property string _b_buttonBackgroundColorDisabled: "#707070"
    property string _b_buttonBackgroundColorDisabledHover: "#808080"
    property string _b_buttonInlineBackgroundColor: "#707070"
-    property string _b_buttonInlineBackgroundColorHover: "#808080"
    property string _b_buttonTextColor: "white"
    property string _b_buttonTextColorDisabled: "black"
-    property string _b_buttonSecondaryBackgroundColor: "#707070"
-    property string _b_buttonSecondaryBackgroundColorHover: "#808080"
-    property string _b_buttonSecondaryTextColor: "white"
    property string _b_dividerColor: "white"
    property real _b_dividerOpacity: 0.20

@@ -118,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"
@@ -134,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"
@@ -143,7 +134,6 @@ QtObject {
    property string _b_leftPanelBackgroundGradientStart: "#222222"
    property string _b_leftPanelBackgroundGradientStop: "#1a1a1a"
    property string _b_historyHeaderTextColor: "#C0C0C0"
-    property var _b_accountColors: ["#6E513C", "#842129", "#458421", "#742184", "#291DBE", "#846F21", "#217F84", "#696969"]

    property string _w_defaultFontColor: "black"
    property string _w_dimmedFontColor: "#3f3f3f"
@@ -153,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"
@@ -165,13 +154,9 @@ QtObject {
    property string _w_buttonBackgroundColorHover: "#E65E00"
    property string _w_buttonBackgroundColorDisabled: "#bbbbbb"
    property string _w_buttonBackgroundColorDisabledHover: "#D1D1D1"
-    property string _w_buttonInlineBackgroundColor: "#d9d9d9"
-    property string _w_buttonInlineBackgroundColorHover: "#C8C8C8"
+    property string _w_buttonInlineBackgroundColor: "#bbbbbb"
    property string _w_buttonTextColor: "white"
    property string _w_buttonTextColorDisabled: "black"
-    property string _w_buttonSecondaryBackgroundColor: "#d9d9d9"
-    property string _w_buttonSecondaryBackgroundColorHover: "#C8C8C8"
-    property string _w_buttonSecondaryTextColor: "#4d4d4d"
    property string _w_dividerColor: "black"
    property real _w_dividerOpacity: 0.20

@@ -180,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"
@@ -196,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: "#4d4d4d"
+    property string _w_inlineButtonTextColor: "white"
    property string _w_inlineButtonBorderColor: "transparent"
    property string _w_appWindowBackgroundColor: "black"
    property string _w_appWindowBorderColor: "#dedede"
@@ -205,5 +191,4 @@ QtObject {
    property string _w_leftPanelBackgroundGradientStart: "white"
    property string _w_leftPanelBackgroundGradientStop: "#f5f5f5"
    property string _w_historyHeaderTextColor: "#515151"
-    property var _w_accountColors: ["#6E513C", "#6E513C", "#842129", "#458421", "#742184", "#291DBE", "#846F21", "#217F84", "#696969"]
 }
--- a/components/SuccessfulTxDialog.qml
+++ b/components/SuccessfulTxDialog.qml
@@ -1,181 +0,0 @@
-// Copyright (c) 2014-2024, 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
-        }
-
-        // view progress / open folder / done buttons
-        RowLayout {
-            id: buttons
-            spacing: 70
-            Layout.alignment: Qt.AlignBottom | Qt.AlignHCenter
-            Layout.fillWidth: true
-            Layout.preferredHeight: 50
-
-            MoneroComponents.StandardButton {
-                id: viewProgressButton
-                visible: !appWindow.viewOnly
-                text: qsTr("View progress") + translationManager.emptyString;
-                width: 200
-                primary: false
-                KeyNavigation.tab: doneButton
-                onClicked: {
-                    doSearchInHistory(root.transactionID);
-                    root.close()
-                    root.rejected()
-                }
-            }
-
-            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: appWindow.viewOnly ? openFolderButton : viewProgressButton
-                onClicked: {
-                    root.close()
-                    root.accepted()
-                }
-            }
-        }
-    }
-}
--- a/components/TextPlain.qml
+++ b/components/TextPlain.qml
@@ -12,23 +12,11 @@ Text {
    property bool themeTransition: true
    property string themeTransitionBlackColor: ""
    property string themeTransitionWhiteColor: ""
-    property alias tooltip: tooltip.text
-    property alias tooltipLeft: tooltip.tooltipLeft
-    property alias tooltipIconVisible: tooltip.tooltipIconVisible
-    property alias tooltipPopup: tooltip.tooltipPopup
    font.family: MoneroComponents.Style.fontMedium.name
    font.bold: false
    font.pixelSize: 14
    textFormat: Text.PlainText

-    Rectangle {
-        width: root.contentWidth
-        height: root.height
-        anchors.left: parent.left
-        anchors.top: parent.top
-        color: root.focus ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent"
-    }
-
    MoneroEffects.ColorTransition {
        enabled: root.themeTransition
        themeTransition: root.themeTransition
@@ -37,10 +25,4 @@ Text {
        blackColor: root.themeTransitionBlackColor !== "" ? root.themeTransitionBlackColor : MoneroComponents.Style._b_defaultFontColor
        whiteColor: root.themeTransitionWhiteColor !== "" ? root.themeTransitionWhiteColor : MoneroComponents.Style._w_defaultFontColor
    }
-
-    MoneroComponents.Tooltip {
-        id: tooltip
-        anchors.top: parent.top
-        anchors.left: tooltipIconVisible ? parent.right : parent.left
-    }
 }
--- a/components/TipItem.qml
+++ b/components/TipItem.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
--- a/components/TitleBar.qml
+++ b/components/TitleBar.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -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,21 +56,18 @@ Rectangle {
    signal maximizeClicked
    signal minimizeClicked
    signal languageClicked
-    signal closeWalletClicked
-    signal lockWalletClicked
+    signal goToBasicVersion(bool yes)

    state: "default"
    states: [
        State {
            name: "default";
-            PropertyChanges { target: btnCloseWallet; visible: true}
-            PropertyChanges { target: btnLockWallet; 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: btnLockWallet; visible: false}
+            PropertyChanges { target: btnSidebarCollapse; visible: false}
            PropertyChanges { target: btnLanguageToggle; visible: false}
        }
    ]
@@ -94,84 +91,34 @@ Rectangle {
        spacing: 0
        anchors.fill: parent

-        // lock wallet
-        Rectangle {
-            id: btnLockWallet
-            color: "transparent"
-            Layout.preferredWidth: parent.height
-            Layout.preferredHeight: parent.height
-
-            Text {
-                text: FontAwesome.lock
-                font.family: FontAwesome.fontFamilySolid
-                font.pixelSize: 16
-                color: MoneroComponents.Style.defaultFontColor
-                font.styleName: "Solid"
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.horizontalCenter: parent.horizontalCenter
-                opacity: 0.75
-            }
-
-            MoneroComponents.Tooltip {
-                id: btnLockWalletTooltip
-                anchors.fill: parent
-                text: qsTr("Lock this wallet") + translationManager.emptyString
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                onEntered: {
-                    parent.color = MoneroComponents.Style.titleBarButtonHoverColor
-                    btnLockWalletTooltip.tooltipPopup.open()
-                }
-                onExited: {
-                    parent.color = "transparent"
-                    btnLockWalletTooltip.tooltipPopup.close()
-                }
-                onClicked: root.lockWalletClicked(leftPanel.visible)
-            }
-        }
-
        // 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
            }

-            MoneroComponents.Tooltip {
-                id: btnCloseWalletTooltip
-                anchors.fill: parent
-                text: qsTr("Close this wallet and return to main menu") + translationManager.emptyString
-            }
-
            MouseArea {
                anchors.fill: parent
                hoverEnabled: true
                cursorShape: Qt.PointingHandCursor
-                onEntered: {
-                    parent.color = MoneroComponents.Style.titleBarButtonHoverColor
-                    btnCloseWalletTooltip.tooltipPopup.open()
-                }
-                onExited: {
-                    parent.color = "transparent"
-                    btnCloseWalletTooltip.tooltipPopup.close()
-                }
-                onClicked: root.closeWalletClicked(leftPanel.visible)
+                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
+                onExited: parent.color = "transparent"
+                onClicked: root.goToBasicVersion(leftPanel.visible)
            }
        }

@@ -184,33 +131,20 @@ 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
            }

-            MoneroComponents.Tooltip {
-                id: btnLanguageToggleTooltip
-                anchors.fill: parent
-                text: qsTr("Change language") + translationManager.emptyString
-            }
-
            MouseArea {
                anchors.fill: parent
                hoverEnabled: true
                cursorShape: Qt.PointingHandCursor
-                onEntered: {
-                    parent.color = MoneroComponents.Style.titleBarButtonHoverColor
-                    btnLanguageToggleTooltip.tooltipPopup.open()
-                }
-                onExited: {
-                    parent.color = "transparent"
-                    btnLanguageToggleTooltip.tooltipPopup.close()
-                }
+                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
+                onExited: parent.color = "transparent"
                onClicked: root.languageClicked()
            }
        }
@@ -222,36 +156,24 @@ 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
                opacity: 0.75
            }

-            MoneroComponents.Tooltip {
-                id: btnSwitchThemeTooltip
-                anchors.fill: parent
-                text: MoneroComponents.Style.blackTheme ? qsTr("Switch to light theme") : qsTr("Switch to dark theme") + translationManager.emptyString
-            }
-
            MouseArea {
                anchors.fill: parent
                hoverEnabled: true
                cursorShape: Qt.PointingHandCursor
-                onEntered: {
-                    parent.color = MoneroComponents.Style.titleBarButtonHoverColor
-                    btnSwitchThemeTooltip.tooltipPopup.open()
-                }
-                onExited: {
-                    parent.color = "transparent"
-                    btnSwitchThemeTooltip.tooltipPopup.close()
-                }
+                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
+                onExited: parent.color = "transparent"
                onClicked: {
                    MoneroComponents.Style.blackTheme = !MoneroComponents.Style.blackTheme;
+                    persistentSettings.blackTheme = MoneroComponents.Style.blackTheme;
                }
            }
        }
@@ -267,7 +189,6 @@ Rectangle {

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

@@ -295,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"
@@ -387,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
            }
@@ -425,7 +330,6 @@ Rectangle {
        anchors.fill: parent
        propagateComposedEvents: true
        onPressed: previousPosition = globalCursor.getPosition()
-        onDoubleClicked: root.maximizeClicked()
        onPositionChanged: {
            if (pressedButtons == Qt.LeftButton) {
                var pos = globalCursor.getPosition()
--- a/components/Tooltip.qml
+++ b/components/Tooltip.qml
@@ -1,112 +0,0 @@
-// Copyright (c) 2021-2024, 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 FontAwesome 1.0
-import "." as MoneroComponents
-
-Rectangle {
-    property alias text: tooltip.text
-    property alias tooltipPopup: popup
-    property bool tooltipIconVisible: false
-    property bool tooltipLeft: false
-    property bool tooltipBottom: tooltipIconVisible ? false : true
-
-    color: "transparent"
-    height: tooltipIconVisible ? icon.height : parent.height
-    width: tooltipIconVisible ? icon.width : parent.width
-    visible: text != ""
-
-    Text {
-        id: icon
-        visible: tooltipIconVisible
-        color: MoneroComponents.Style.defaultFontColor
-        font.family: FontAwesome.fontFamily
-        font.pixelSize: 10
-        font.styleName: "Regular"
-        leftPadding: 5
-        rightPadding: 5
-        text: FontAwesome.questionCircle
-        opacity: mouseArea.containsMouse ? 0.7 : 1
-
-        MouseArea {
-            id: mouseArea
-            anchors.fill: parent
-            hoverEnabled: true
-            cursorShape: Qt.WhatsThisCursor
-            onEntered: popup.open()
-            onExited: popup.close()
-        }
-    }
-
-    ToolTip {
-        id: popup
-        height: tooltip.height + 20
-
-        background: Rectangle {
-            border.color: MoneroComponents.Style.buttonInlineBackgroundColor
-            border.width: 1
-            color: MoneroComponents.Style.titleBarBackgroundGradientStart
-            radius: 4
-        }
-        closePolicy: Popup.NoAutoClose
-        padding: 10
-        x: tooltipLeft
-            ? (tooltipIconVisible ? icon.x - icon.width : parent.x - tooltip.width - 20 + parent.width/2)
-            : (tooltipIconVisible ? icon.x + icon.width : parent.x + parent.width/2)
-        y: tooltipBottom
-            ? (tooltipIconVisible ? icon.y + height : parent.y + parent.height + 2)
-            : (tooltipIconVisible ? icon.y - height : parent.y - tooltip.height - 20)
-        enter: Transition {
-            NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 150 }
-        }
-
-        exit: Transition {
-            NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 150 }
-        }
-        delay: 200
-
-        RowLayout {
-            Layout.maximumWidth: 370
-
-            Text {
-                id: tooltip
-                width: contentWidth
-                Layout.maximumWidth: 370
-                color: MoneroComponents.Style.defaultFontColor
-                font.family: MoneroComponents.Style.fontRegular.name
-                font.pixelSize: 12
-                textFormat: Text.RichText
-                wrapMode: Text.WordWrap
-            }
-        }
-    }
-}
--- a/components/TxConfirmationDialog.qml
+++ b/components/TxConfirmationDialog.qml
@@ -1,441 +0,0 @@
-// Copyright (c) 2014-2024, 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 ? "&lt;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 {
-                    property bool maliciousTxFee: parseFloat(root.transactionFee) > 0.01
-                    color: maliciousTxFee ? "red" : MoneroComponents.Style.defaultFontColor
-                    font.pixelSize: maliciousTxFee ? 20 : 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" + (maliciousTxFee ? " (HIGH FEE)" : "")
-                            }
-                        } 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-2024, 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/ColorTransition.qml
+++ b/components/effects/ColorTransition.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
--- a/components/effects/GradientBackground.qml
+++ b/components/effects/GradientBackground.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
--- a/components/effects/ImageMask.qml
+++ b/components/effects/ImageMask.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
@@ -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,8 +0,0 @@
-add_library(quirc STATIC
-    quirc/lib/decode.c
-    quirc/lib/identify.c
-    quirc/lib/quirc.c
-    quirc/lib/version_db.c
-)
-set_target_properties(quirc PROPERTIES POSITION_INDEPENDENT_CODE ON)
-target_include_directories(quirc PUBLIC quirc/lib)
--- a/external/quirc
+++ b/external/quirc
--- a/src/main/filter.cpp
+++ b/src/main/filter.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -27,9 +27,14 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include "filter.h"
+#include <QtGlobal>
 #include <QKeyEvent>
 #include <QDebug>

+#ifdef QT_DEBUG
+    #include "private/qabstractanimation_p.h"
+#endif
+
 filter::filter(QObject *parent) :
    QObject(parent)
 {
@@ -86,6 +91,21 @@ bool filter::eventFilter(QObject *obj, QEvent *ev) {
    case QEvent::KeyRelease: {
        QKeyEvent *ke = static_cast<QKeyEvent*>(ev);

+#ifdef QT_DEBUG
+        if(ke->key() == Qt::Key_F9){
+            QUnifiedTimer::instance()->setSlowModeEnabled(true);
+            QUnifiedTimer::instance()->setSlowdownFactor(10);
+            qDebug() << "Slow animations enabled";
+        }
+
+        if(ke->key() == Qt::Key_F10){
+            QUnifiedTimer::instance()->setSlowModeEnabled(false);
+            QUnifiedTimer::instance()->setSlowdownFactor(1);
+
+            qDebug() << "Slow animations disabled";
+        }
+#endif
+
        if(ke->key() == Qt::Key_Backtab)
            m_backtabPressed = false;

--- a/src/main/filter.h
+++ b/src/main/filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2024, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
--- 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
@@ -3,74 +3,796 @@ import QtQuick 2.9

 Object {

-    //Font Awesome version 5.15.3
    FontLoader {
-        id: regular
-        source: "./fa-regular-400.otf"
+        source: "./fontawesome-webfont.ttf"
    }

-    FontLoader {
-        id: brands
-        source: "./fa-brands-400.otf"
-    }
-
-    FontLoader {
-        id: solid
-        source: "./fa-solid-900.otf"
-    }
-
-    property string fontFamily: regular.name
-    property string fontFamilyBrands: brands.name
-    property string fontFamilySolid: solid.name
-
-    // Icons used in Monero GUI (Font Awesome version 5.15.3)
-    // To add new icons, check unicodes in Font Awesome Free's Cheatsheet:
-    // https://fontawesome.com/v5/cheatsheet/free/solid
-    // https://fontawesome.com/v5/cheatsheet/free/regular
-    // https://fontawesome.com/v5/cheatsheet/free/brands
+    property string fontFamily: "FontAwesome"

+    // Icons 
    property string addressBook : "\uf2b9"
+    property string addressBookO : "\uf2ba"
+    property string addressCard : "\uf2bb"
+    property string addressCardO : "\uf2bc"
+    property string adjust : "\uf042"
+    property string adn : "\uf170"
+    property string alignCenter : "\uf037"
+    property string alignJustify : "\uf039"
+    property string alignLeft : "\uf036"
+    property string alignRight : "\uf038"
+    property string amazon : "\uf270"
+    property string ambulance : "\uf0f9"
+    property string americanSignLanguageInterpreting : "\uf2a3"
+    property string anchor : "\uf13d"
+    property string android : "\uf17b"
+    property string angellist : "\uf209"
+    property string angleDoubleDown : "\uf103"
+    property string angleDoubleLeft : "\uf100"
+    property string angleDoubleRight : "\uf101"
+    property string angleDoubleUp : "\uf102"
+    property string angleDown : "\uf107"
+    property string angleLeft : "\uf104"
+    property string angleRight : "\uf105"
+    property string angleUp : "\uf106"
+    property string apple : "\uf179"
+    property string archive : "\uf187"
+    property string areaChart : "\uf1fe"
+    property string arrowCircleDown : "\uf0ab"
+    property string arrowCircleLeft : "\uf0a8"
+    property string arrowCircleODown : "\uf01a"
+    property string arrowCircleOLeft : "\uf190"
+    property string arrowCircleORight : "\uf18e"
+    property string arrowCircleOUp : "\uf01b"
    property string arrowCircleRight : "\uf0a9"
+    property string arrowCircleUp : "\uf0aa"
    property string arrowDown : "\uf063"
    property string arrowLeft : "\uf060"
    property string arrowRight : "\uf061"
-    property string cashRegister: "\uf788"
-    property string checkCircle: "\uf058"
+    property string arrowUp : "\uf062"
+    property string arrows : "\uf047"
+    property string arrowsAlt : "\uf0b2"
+    property string arrowsH : "\uf07e"
+    property string arrowsV : "\uf07d"
+    property string aslInterpreting : "\uf2a3"
+    property string assistiveListeningSystems : "\uf2a2"
+    property string asterisk : "\uf069"
+    property string at : "\uf1fa"
+    property string audioDescription : "\uf29e"
+    property string automobile : "\uf1b9"
+    property string backward : "\uf04a"
+    property string balanceScale : "\uf24e"
+    property string ban : "\uf05e"
+    property string bandcamp : "\uf2d5"
+    property string bank : "\uf19c"
+    property string barChart : "\uf080"
+    property string barChartO : "\uf080"
+    property string barcode : "\uf02a"
+    property string bars : "\uf0c9"
+    property string bath : "\uf2cd"
+    property string bathtub : "\uf2cd"
+    property string battery : "\uf240"
+    property string battery0 : "\uf244"
+    property string battery1 : "\uf243"
+    property string battery2 : "\uf242"
+    property string battery3 : "\uf241"
+    property string battery4 : "\uf240"
+    property string batteryEmpty : "\uf244"
+    property string batteryFull : "\uf240"
+    property string batteryHalf : "\uf242"
+    property string batteryQuarter : "\uf243"
+    property string batteryThreeQuarters : "\uf241"
+    property string bed : "\uf236"
+    property string beer : "\uf0fc"
+    property string behance : "\uf1b4"
+    property string behanceSquare : "\uf1b5"
+    property string bell : "\uf0f3"
+    property string bellO : "\uf0a2"
+    property string bellSlash : "\uf1f6"
+    property string bellSlashO : "\uf1f7"
+    property string bicycle : "\uf206"
+    property string binoculars : "\uf1e5"
+    property string birthdayCake : "\uf1fd"
+    property string bitbucket : "\uf171"
+    property string bitbucketSquare : "\uf172"
+    property string bitcoin : "\uf15a"
+    property string blackTie : "\uf27e"
+    property string blind : "\uf29d"
+    property string bluetooth : "\uf293"
+    property string bluetoothB : "\uf294"
+    property string bold : "\uf032"
+    property string bolt : "\uf0e7"
+    property string bomb : "\uf1e2"
+    property string book : "\uf02d"
+    property string bookmark : "\uf02e"
+    property string bookmarkO : "\uf097"
+    property string braille : "\uf2a1"
+    property string briefcase : "\uf0b1"
+    property string btc : "\uf15a"
+    property string bug : "\uf188"
+    property string building : "\uf1ad"
+    property string buildingO : "\uf0f7"
+    property string bullhorn : "\uf0a1"
+    property string bullseye : "\uf140"
+    property string bus : "\uf207"
+    property string buysellads : "\uf20d"
+    property string cab : "\uf1ba"
+    property string calculator : "\uf1ec"
+    property string calendar : "\uf073"
+    property string calendarCheckO : "\uf274"
+    property string calendarMinusO : "\uf272"
+    property string calendarO : "\uf133"
+    property string calendarPlusO : "\uf271"
+    property string calendarTimesO : "\uf273"
+    property string camera : "\uf030"
+    property string cameraRetro : "\uf083"
+    property string car : "\uf1b9"
+    property string caretDown : "\uf0d7"
+    property string caretLeft : "\uf0d9"
+    property string caretRight : "\uf0da"
+    property string caretSquareODown : "\uf150"
+    property string caretSquareOLeft : "\uf191"
+    property string caretSquareORight : "\uf152"
+    property string caretSquareOUp : "\uf151"
+    property string caretUp : "\uf0d8"
+    property string cartArrowDown : "\uf218"
+    property string cartPlus : "\uf217"
+    property string cc : "\uf20a"
+    property string ccAmex : "\uf1f3"
+    property string ccDinersClub : "\uf24c"
+    property string ccDiscover : "\uf1f2"
+    property string ccJcb : "\uf24b"
+    property string ccMastercard : "\uf1f1"
+    property string ccPaypal : "\uf1f4"
+    property string ccStripe : "\uf1f5"
+    property string ccVisa : "\uf1f0"
+    property string certificate : "\uf0a3"
+    property string chain : "\uf0c1"
+    property string chainBroken : "\uf127"
+    property string check : "\uf00c"
+    property string checkCircle : "\uf058"
+    property string checkCircleO : "\uf05d"
+    property string checkSquare : "\uf14a"
+    property string checkSquareO : "\uf046"
+    property string chevronCircleDown : "\uf13a"
+    property string chevronCircleLeft : "\uf137"
+    property string chevronCircleRight : "\uf138"
+    property string chevronCircleUp : "\uf139"
+    property string chevronDown : "\uf078"
+    property string chevronLeft : "\uf053"
+    property string chevronRight : "\uf054"
+    property string chevronUp : "\uf077"
+    property string child : "\uf1ae"
+    property string chrome : "\uf268"
+    property string circle : "\uf111"
+    property string circleO : "\uf10c"
+    property string circleONotch : "\uf1ce"
+    property string circleThin : "\uf1db"
    property string clipboard : "\uf0ea"
    property string clockO : "\uf017"
+    property string clone : "\uf24d"
+    property string close : "\uf00d"
    property string cloud : "\uf0c2"
+    property string cloudDownload : "\uf0ed"
+    property string cloudUpload : "\uf0ee"
+    property string cny : "\uf157"
+    property string code : "\uf121"
+    property string codeFork : "\uf126"
+    property string codepen : "\uf1cb"
+    property string codiepie : "\uf284"
+    property string coffee : "\uf0f4"
+    property string cog : "\uf013"
+    property string cogs : "\uf085"
+    property string columns : "\uf0db"
+    property string comment : "\uf075"
+    property string commentO : "\uf0e5"
+    property string commenting : "\uf27a"
+    property string commentingO : "\uf27b"
+    property string comments : "\uf086"
+    property string commentsO : "\uf0e6"
+    property string compass : "\uf14e"
+    property string compress : "\uf066"
+    property string connectdevelop : "\uf20e"
+    property string contao : "\uf26d"
+    property string copy : "\uf0c5"
+    property string copyright : "\uf1f9"
+    property string creativeCommons : "\uf25e"
+    property string creditCard : "\uf09d"
+    property string creditCardAlt : "\uf283"
+    property string crop : "\uf125"
+    property string crosshairs : "\uf05b"
+    property string css3 : "\uf13c"
+    property string cube : "\uf1b2"
+    property string cubes : "\uf1b3"
+    property string cut : "\uf0c4"
+    property string cutlery : "\uf0f5"
+    property string dashboard : "\uf0e4"
+    property string dashcube : "\uf210"
+    property string database : "\uf1c0"
+    property string deaf : "\uf2a4"
+    property string deafness : "\uf2a4"
+    property string dedent : "\uf03b"
+    property string delicious : "\uf1a5"
    property string desktop : "\uf108"
+    property string deviantart : "\uf1bd"
+    property string diamond : "\uf219"
+    property string digg : "\uf1a6"
+    property string dollar : "\uf155"
+    property string dotCircleO : "\uf192"
+    property string download : "\uf019"
+    property string dribbble : "\uf17d"
+    property string driversLicense : "\uf2c2"
+    property string driversLicenseO : "\uf2c3"
+    property string dropbox : "\uf16b"
+    property string drupal : "\uf1a9"
+    property string edge : "\uf282"
    property string edit : "\uf044"
+    property string eercast : "\uf2da"
+    property string eject : "\uf052"
    property string ellipsisH : "\uf141"
+    property string ellipsisV : "\uf142"
+    property string empire : "\uf1d1"
+    property string envelope : "\uf0e0"
+    property string envelopeO : "\uf003"
+    property string envelopeOpen : "\uf2b6"
+    property string envelopeOpenO : "\uf2b7"
+    property string envelopeSquare : "\uf199"
+    property string envira : "\uf299"
+    property string eraser : "\uf12d"
+    property string etsy : "\uf2d7"
+    property string eur : "\uf153"
+    property string euro : "\uf153"
+    property string exchange : "\uf0ec"
+    property string exclamation : "\uf12a"
    property string exclamationCircle : "\uf06a"
+    property string exclamationTriangle : "\uf071"
+    property string expand : "\uf065"
+    property string expeditedssl : "\uf23e"
+    property string externalLink : "\uf08e"
+    property string externalLinkSquare : "\uf14c"
    property string eye : "\uf06e"
    property string eyeSlash : "\uf070"
+    property string eyedropper : "\uf1fb"
+    property string fa : "\uf2b4"
+    property string facebook : "\uf09a"
+    property string facebookF : "\uf09a"
+    property string facebookOfficial : "\uf230"
+    property string facebookSquare : "\uf082"
+    property string fastBackward : "\uf049"
+    property string fastForward : "\uf050"
+    property string fax : "\uf1ac"
+    property string feed : "\uf09e"
+    property string female : "\uf182"
+    property string fighterJet : "\uf0fb"
+    property string file : "\uf15b"
+    property string fileArchiveO : "\uf1c6"
+    property string fileAudioO : "\uf1c7"
+    property string fileCodeO : "\uf1c9"
+    property string fileExcelO : "\uf1c3"
+    property string fileImageO : "\uf1c5"
+    property string fileMovieO : "\uf1c8"
+    property string fileO : "\uf016"
+    property string filePdfO : "\uf1c1"
+    property string filePhotoO : "\uf1c5"
+    property string filePictureO : "\uf1c5"
+    property string filePowerpointO : "\uf1c4"
+    property string fileSoundO : "\uf1c7"
+    property string fileText : "\uf15c"
+    property string fileTextO : "\uf0f6"
+    property string fileVideoO : "\uf1c8"
+    property string fileWordO : "\uf1c2"
+    property string fileZipO : "\uf1c6"
+    property string filesO : "\uf0c5"
+    property string film : "\uf008"
+    property string filter : "\uf0b0"
+    property string fire : "\uf06d"
+    property string fireExtinguisher : "\uf134"
+    property string firefox : "\uf269"
+    property string firstOrder : "\uf2b0"
+    property string flag : "\uf024"
+    property string flagCheckered : "\uf11e"
+    property string flagO : "\uf11d"
+    property string flash : "\uf0e7"
+    property string flask : "\uf0c3"
+    property string flickr : "\uf16e"
+    property string floppyO : "\uf0c7"
+    property string folder : "\uf07b"
+    property string folderO : "\uf114"
    property string folderOpen : "\uf07c"
+    property string folderOpenO : "\uf115"
+    property string font : "\uf031"
+    property string fontAwesome : "\uf2b4"
+    property string fonticons : "\uf280"
+    property string fortAwesome : "\uf286"
+    property string forumbee : "\uf211"
+    property string forward : "\uf04e"
+    property string foursquare : "\uf180"
+    property string freeCodeCamp : "\uf2c5"
+    property string frownO : "\uf119"
+    property string futbolO : "\uf1e3"
+    property string gamepad : "\uf11b"
+    property string gavel : "\uf0e3"
+    property string gbp : "\uf154"
+    property string ge : "\uf1d1"
+    property string gear : "\uf013"
+    property string gears : "\uf085"
+    property string genderless : "\uf22d"
+    property string getPocket : "\uf265"
+    property string gg : "\uf260"
+    property string ggCircle : "\uf261"
+    property string gift : "\uf06b"
+    property string git : "\uf1d3"
+    property string gitSquare : "\uf1d2"
+    property string github : "\uf09b"
+    property string githubAlt : "\uf113"
+    property string githubSquare : "\uf092"
+    property string gitlab : "\uf296"
+    property string gittip : "\uf184"
+    property string glass : "\uf000"
+    property string glide : "\uf2a5"
+    property string glideG : "\uf2a6"
    property string globe : "\uf0ac"
+    property string google : "\uf1a0"
+    property string googlePlus : "\uf0d5"
+    property string googlePlusCircle : "\uf2b3"
+    property string googlePlusOfficial : "\uf2b3"
+    property string googlePlusSquare : "\uf0d4"
+    property string googleWallet : "\uf1ee"
+    property string graduationCap : "\uf19d"
+    property string gratipay : "\uf184"
+    property string grav : "\uf2d6"
+    property string group : "\uf0c0"
+    property string hSquare : "\uf0fd"
+    property string hackerNews : "\uf1d4"
+    property string handGrabO : "\uf255"
+    property string handLizardO : "\uf258"
+    property string handODown : "\uf0a7"
+    property string handOLeft : "\uf0a5"
+    property string handORight : "\uf0a4"
+    property string handOUp : "\uf0a6"
+    property string handPaperO : "\uf256"
+    property string handPeaceO : "\uf25b"
+    property string handPointerO : "\uf25a"
+    property string handRockO : "\uf255"
+    property string handScissorsO : "\uf257"
+    property string handSpockO : "\uf259"
+    property string handStopO : "\uf256"
+    property string handshakeO : "\uf2b5"
+    property string hardOfHearing : "\uf2a4"
+    property string hashtag : "\uf292"
+    property string hddO : "\uf0a0"
+    property string header : "\uf1dc"
+    property string headphones : "\uf025"
+    property string heart : "\uf004"
+    property string heartO : "\uf08a"
+    property string heartbeat : "\uf21e"
+    property string history : "\uf1da"
    property string home : "\uf015"
-    property string houseUser : "\ue065"
-    property string infinity : "\uf534"
+    property string hospitalO : "\uf0f8"
+    property string hotel : "\uf236"
+    property string hourglass : "\uf254"
+    property string hourglass1 : "\uf251"
+    property string hourglass2 : "\uf252"
+    property string hourglass3 : "\uf253"
+    property string hourglassEnd : "\uf253"
+    property string hourglassHalf : "\uf252"
+    property string hourglassO : "\uf250"
+    property string hourglassStart : "\uf251"
+    property string houzz : "\uf27c"
+    property string html5 : "\uf13b"
+    property string iCursor : "\uf246"
+    property string idBadge : "\uf2c1"
+    property string idCard : "\uf2c2"
+    property string idCardO : "\uf2c3"
+    property string ils : "\uf20b"
+    property string image : "\uf03e"
+    property string imdb : "\uf2d8"
+    property string inbox : "\uf01c"
+    property string indent : "\uf03c"
+    property string industry : "\uf275"
    property string info : "\uf129"
+    property string infoCircle : "\uf05a"
+    property string inr : "\uf156"
+    property string instagram : "\uf16d"
+    property string institution : "\uf19c"
+    property string internetExplorer : "\uf26b"
+    property string intersex : "\uf224"
+    property string ioxhost : "\uf208"
+    property string italic : "\uf033"
+    property string joomla : "\uf1aa"
+    property string jpy : "\uf157"
+    property string jsfiddle : "\uf1cc"
    property string key : "\uf084"
+    property string keyboardO : "\uf11c"
+    property string krw : "\uf159"
    property string language : "\uf1ab"
+    property string laptop : "\uf109"
+    property string lastfm : "\uf202"
+    property string lastfmSquare : "\uf203"
+    property string leaf : "\uf06c"
+    property string leanpub : "\uf212"
+    property string legal : "\uf0e3"
+    property string lemonO : "\uf094"
+    property string levelDown : "\uf149"
+    property string levelUp : "\uf148"
+    property string lifeBouy : "\uf1cd"
+    property string lifeBuoy : "\uf1cd"
+    property string lifeRing : "\uf1cd"
+    property string lifeSaver : "\uf1cd"
+    property string lightbulbO : "\uf0eb"
+    property string lineChart : "\uf201"
+    property string link : "\uf0c1"
+    property string linkedin : "\uf0e1"
+    property string linkedinSquare : "\uf08c"
+    property string linode : "\uf2b8"
+    property string linux : "\uf17c"
+    property string list : "\uf03a"
+    property string listAlt : "\uf022"
+    property string listOl : "\uf0cb"
+    property string listUl : "\uf0ca"
+    property string locationArrow : "\uf124"
    property string lock : "\uf023"
-    property string magnifyingGlass : "\uf002"
+    property string longArrowDown : "\uf175"
+    property string longArrowLeft : "\uf177"
+    property string longArrowRight : "\uf178"
+    property string longArrowUp : "\uf176"
+    property string lowVision : "\uf2a8"
+    property string magic : "\uf0d0"
+    property string magnet : "\uf076"
+    property string mailForward : "\uf064"
+    property string mailReply : "\uf112"
+    property string mailReplyAll : "\uf122"
+    property string male : "\uf183"
+    property string map : "\uf279"
+    property string mapMarker : "\uf041"
+    property string mapO : "\uf278"
+    property string mapPin : "\uf276"
+    property string mapSigns : "\uf277"
+    property string mars : "\uf222"
+    property string marsDouble : "\uf227"
+    property string marsStroke : "\uf229"
+    property string marsStrokeH : "\uf22b"
+    property string marsStrokeV : "\uf22a"
+    property string maxcdn : "\uf136"
+    property string meanpath : "\uf20c"
+    property string medium : "\uf23a"
+    property string medkit : "\uf0fa"
+    property string meetup : "\uf2e0"
+    property string mehO : "\uf11a"
+    property string mercury : "\uf223"
+    property string microchip : "\uf2db"
+    property string microphone : "\uf130"
+    property string microphoneSlash : "\uf131"
    property string minus : "\uf068"
    property string minusCircle : "\uf056"
+    property string minusSquare : "\uf146"
+    property string minusSquareO : "\uf147"
+    property string mixcloud : "\uf289"
+    property string mobile : "\uf10b"
+    property string mobilePhone : "\uf10b"
+    property string modx : "\uf285"
+    property string money : "\uf0d6"
    property string moonO : "\uf186"
-    property string monero : "\uf3d0"
+    property string mortarBoard : "\uf19d"
+    property string motorcycle : "\uf21c"
+    property string mousePointer : "\uf245"
+    property string music : "\uf001"
+    property string navicon : "\uf0c9"
+    property string neuter : "\uf22c"
+    property string newspaperO : "\uf1ea"
+    property string objectGroup : "\uf247"
+    property string objectUngroup : "\uf248"
+    property string odnoklassniki : "\uf263"
+    property string odnoklassnikiSquare : "\uf264"
+    property string opencart : "\uf23d"
+    property string openid : "\uf19b"
+    property string opera : "\uf26a"
+    property string optinMonster : "\uf23c"
+    property string outdent : "\uf03b"
+    property string pagelines : "\uf18c"
+    property string paintBrush : "\uf1fc"
+    property string paperPlane : "\uf1d8"
+    property string paperPlaneO : "\uf1d9"
+    property string paperclip : "\uf0c6"
+    property string paragraph : "\uf1dd"
    property string paste : "\uf0ea"
+    property string pause : "\uf04c"
+    property string pauseCircle : "\uf28b"
+    property string pauseCircleO : "\uf28c"
+    property string paw : "\uf1b0"
+    property string paypal : "\uf1ed"
+    property string pencil : "\uf040"
    property string pencilSquare : "\uf14b"
+    property string pencilSquareO : "\uf044"
+    property string percent : "\uf295"
+    property string phone : "\uf095"
+    property string phoneSquare : "\uf098"
+    property string photo : "\uf03e"
+    property string pictureO : "\uf03e"
+    property string pieChart : "\uf200"
+    property string piedPiper : "\uf2ae"
+    property string piedPiperAlt : "\uf1a8"
+    property string piedPiperPp : "\uf1a7"
+    property string pinterest : "\uf0d2"
+    property string pinterestP : "\uf231"
+    property string pinterestSquare : "\uf0d3"
+    property string plane : "\uf072"
+    property string play : "\uf04b"
+    property string playCircle : "\uf144"
+    property string playCircleO : "\uf01d"
+    property string plug : "\uf1e6"
    property string plus : "\uf067"
    property string plusCircle : "\uf055"
+    property string plusSquare : "\uf0fe"
+    property string plusSquareO : "\uf196"
+    property string podcast : "\uf2ce"
+    property string powerOff : "\uf011"
+    property string printIcon : "\uf02f"
    property string productHunt : "\uf288"
+    property string puzzlePiece : "\uf12e"
+    property string qq : "\uf1d6"
    property string qrcode : "\uf029"
+    property string question : "\uf128"
    property string questionCircle : "\uf059"
+    property string questionCircleO : "\uf29c"
+    property string quora : "\uf2c4"
+    property string quoteLeft : "\uf10d"
+    property string quoteRight : "\uf10e"
+    property string ra : "\uf1d0"
    property string random : "\uf074"
+    property string ravelry : "\uf2d9"
+    property string rebel : "\uf1d0"
+    property string recycle : "\uf1b8"
+    property string reddit : "\uf1a1"
+    property string redditAlien : "\uf281"
+    property string redditSquare : "\uf1a2"
+    property string refresh : "\uf021"
+    property string registered : "\uf25d"
+    property string remove : "\uf00d"
+    property string renren : "\uf18b"
+    property string reorder : "\uf0c9"
    property string repeat : "\uf01e"
+    property string reply : "\uf112"
+    property string replyAll : "\uf122"
+    property string resistance : "\uf1d0"
+    property string retweet : "\uf079"
+    property string rmb : "\uf157"
+    property string road : "\uf018"
+    property string rocket : "\uf135"
+    property string rotateLeft : "\uf0e2"
+    property string rotateRight : "\uf01e"
+    property string rouble : "\uf158"
+    property string rss : "\uf09e"
+    property string rssSquare : "\uf143"
+    property string rub : "\uf158"
+    property string ruble : "\uf158"
+    property string rupee : "\uf156"
+    property string s15 : "\uf2cd"
+    property string safari : "\uf267"
+    property string save : "\uf0c7"
+    property string scissors : "\uf0c4"
+    property string scribd : "\uf28a"
+    property string search : "\uf002"
+    property string searchMinus : "\uf010"
    property string searchPlus : "\uf00e"
+    property string sellsy : "\uf213"
+    property string send : "\uf1d8"
+    property string sendO : "\uf1d9"
    property string server : "\uf233"
-    property string shieldAlt : "\uf3ed"
-    property string signOutAlt : "\uf2f5"
+    property string share : "\uf064"
+    property string shareAlt : "\uf1e0"
+    property string shareAltSquare : "\uf1e1"
+    property string shareSquare : "\uf14d"
+    property string shareSquareO : "\uf045"
+    property string shekel : "\uf20b"
+    property string sheqel : "\uf20b"
+    property string shield : "\uf132"
+    property string ship : "\uf21a"
+    property string shirtsinbulk : "\uf214"
+    property string shoppingBag : "\uf290"
+    property string shoppingBasket : "\uf291"
+    property string shoppingCart : "\uf07a"
+    property string shower : "\uf2cc"
+    property string signIn : "\uf090"
+    property string signLanguage : "\uf2a7"
+    property string signOut : "\uf08b"
+    property string signal : "\uf012"
+    property string signing : "\uf2a7"
+    property string simplybuilt : "\uf215"
+    property string sitemap : "\uf0e8"
+    property string skyatlas : "\uf216"
+    property string skype : "\uf17e"
+    property string slack : "\uf198"
+    property string sliders : "\uf1de"
+    property string slideshare : "\uf1e7"
+    property string smileO : "\uf118"
+    property string snapchat : "\uf2ab"
+    property string snapchatGhost : "\uf2ac"
+    property string snapchatSquare : "\uf2ad"
+    property string snowflakeO : "\uf2dc"
+    property string soccerBallO : "\uf1e3"
+    property string sort : "\uf0dc"
+    property string sortAlphaAsc : "\uf15d"
+    property string sortAlphaDesc : "\uf15e"
+    property string sortAmountAsc : "\uf160"
+    property string sortAmountDesc : "\uf161"
+    property string sortAsc : "\uf0de"
+    property string sortDesc : "\uf0dd"
+    property string sortDown : "\uf0dd"
+    property string sortNumericAsc : "\uf162"
+    property string sortNumericDesc : "\uf163"
+    property string sortUp : "\uf0de"
+    property string soundcloud : "\uf1be"
+    property string spaceShuttle : "\uf197"
+    property string spinner : "\uf110"
+    property string spoon : "\uf1b1"
+    property string spotify : "\uf1bc"
+    property string square : "\uf0c8"
+    property string squareO : "\uf096"
+    property string stackExchange : "\uf18d"
+    property string stackOverflow : "\uf16c"
+    property string star : "\uf005"
+    property string starHalf : "\uf089"
+    property string starHalfEmpty : "\uf123"
+    property string starHalfFull : "\uf123"
+    property string starHalfO : "\uf123"
+    property string starO : "\uf006"
+    property string steam : "\uf1b6"
+    property string steamSquare : "\uf1b7"
+    property string stepBackward : "\uf048"
+    property string stepForward : "\uf051"
+    property string stethoscope : "\uf0f1"
+    property string stickyNote : "\uf249"
+    property string stickyNoteO : "\uf24a"
+    property string stop : "\uf04d"
+    property string stopCircle : "\uf28d"
+    property string stopCircleO : "\uf28e"
+    property string streetView : "\uf21d"
+    property string strikethrough : "\uf0cc"
+    property string stumbleupon : "\uf1a4"
+    property string stumbleuponCircle : "\uf1a3"
+    property string subscript : "\uf12c"
+    property string subway : "\uf239"
+    property string suitcase : "\uf0f2"
+    property string sunO : "\uf185"
+    property string superpowers : "\uf2dd"
+    property string superscript : "\uf12b"
+    property string support : "\uf1cd"
+    property string table : "\uf0ce"
+    property string tablet : "\uf10a"
+    property string tachometer : "\uf0e4"
+    property string tag : "\uf02b"
+    property string tags : "\uf02c"
+    property string tasks : "\uf0ae"
+    property string taxi : "\uf1ba"
+    property string telegram : "\uf2c6"
+    property string television : "\uf26c"
+    property string tencentWeibo : "\uf1d5"
+    property string terminal : "\uf120"
+    property string textHeight : "\uf034"
+    property string textWidth : "\uf035"
+    property string th : "\uf00a"
+    property string thLarge : "\uf009"
+    property string thList : "\uf00b"
+    property string themeisle : "\uf2b2"
+    property string thermometer : "\uf2c7"
+    property string thermometer0 : "\uf2cb"
+    property string thermometer1 : "\uf2ca"
+    property string thermometer2 : "\uf2c9"
+    property string thermometer3 : "\uf2c8"
+    property string thermometer4 : "\uf2c7"
+    property string thermometerEmpty : "\uf2cb"
+    property string thermometerFull : "\uf2c7"
+    property string thermometerHalf : "\uf2c9"
+    property string thermometerQuarter : "\uf2ca"
+    property string thermometerThreeQuarters : "\uf2c8"
+    property string thumbTack : "\uf08d"
+    property string thumbsDown : "\uf165"
+    property string thumbsODown : "\uf088"
+    property string thumbsOUp : "\uf087"
+    property string thumbsUp : "\uf164"
+    property string ticket : "\uf145"
    property string times : "\uf00d"
+    property string timesCircle : "\uf057"
+    property string timesCircleO : "\uf05c"
+    property string timesRectangle : "\uf2d3"
+    property string timesRectangleO : "\uf2d4"
+    property string tint : "\uf043"
+    property string toggleDown : "\uf150"
+    property string toggleLeft : "\uf191"
+    property string toggleOff : "\uf204"
+    property string toggleOn : "\uf205"
+    property string toggleRight : "\uf152"
+    property string toggleUp : "\uf151"
+    property string trademark : "\uf25c"
+    property string train : "\uf238"
+    property string transgender : "\uf224"
+    property string transgenderAlt : "\uf225"
+    property string trash : "\uf1f8"
+    property string trashO : "\uf014"
+    property string tree : "\uf1bb"
+    property string trello : "\uf181"
+    property string tripadvisor : "\uf262"
+    property string trophy : "\uf091"
+    property string truck : "\uf0d1"
+    property string tryIcon : "\uf195"
+    property string tty : "\uf1e4"
+    property string tumblr : "\uf173"
+    property string tumblrSquare : "\uf174"
+    property string turkishLira : "\uf195"
+    property string tv : "\uf26c"
+    property string twitch : "\uf1e8"
+    property string twitter : "\uf099"
+    property string twitterSquare : "\uf081"
+    property string umbrella : "\uf0e9"
+    property string underline : "\uf0cd"
+    property string undo : "\uf0e2"
+    property string universalAccess : "\uf29a"
+    property string university : "\uf19c"
+    property string unlink : "\uf127"
+    property string unlock : "\uf09c"
+    property string unlockAlt : "\uf13e"
+    property string unsorted : "\uf0dc"
+    property string upload : "\uf093"
+    property string usb : "\uf287"
+    property string usd : "\uf155"
+    property string user : "\uf007"
+    property string userCircle : "\uf2bd"
+    property string userCircleO : "\uf2be"
+    property string userMd : "\uf0f0"
+    property string userO : "\uf2c0"
+    property string userPlus : "\uf234"
+    property string userSecret : "\uf21b"
+    property string userTimes : "\uf235"
+    property string users : "\uf0c0"
+    property string vcard : "\uf2bb"
+    property string vcardO : "\uf2bc"
+    property string venus : "\uf221"
+    property string venusDouble : "\uf226"
+    property string venusMars : "\uf228"
+    property string viacoin : "\uf237"
+    property string viadeo : "\uf2a9"
+    property string viadeoSquare : "\uf2aa"
+    property string videoCamera : "\uf03d"
+    property string vimeo : "\uf27d"
+    property string vimeoSquare : "\uf194"
+    property string vine : "\uf1ca"
+    property string vk : "\uf189"
+    property string volumeControlPhone : "\uf2a0"
+    property string volumeDown : "\uf027"
+    property string volumeOff : "\uf026"
+    property string volumeUp : "\uf028"
+    property string warning : "\uf071"
+    property string wechat : "\uf1d7"
+    property string weibo : "\uf18a"
+    property string weixin : "\uf1d7"
+    property string whatsapp : "\uf232"
+    property string wheelchair : "\uf193"
+    property string wheelchairAlt : "\uf29b"
+    property string wifi : "\uf1eb"
+    property string wikipediaW : "\uf266"
+    property string windowClose : "\uf2d3"
+    property string windowCloseO : "\uf2d4"
+    property string windowMaximize : "\uf2d0"
+    property string windowMinimize : "\uf2d1"
+    property string windowRestore : "\uf2d2"
+    property string windows : "\uf17a"
+    property string won : "\uf159"
+    property string wordpress : "\uf19a"
+    property string wpbeginner : "\uf297"
+    property string wpexplorer : "\uf2de"
+    property string wpforms : "\uf298"
+    property string wrench : "\uf0ad"
+    property string xing : "\uf168"
+    property string xingSquare : "\uf169"
+    property string yCombinator : "\uf23b"
+    property string yCombinatorSquare : "\uf1d4"
+    property string yahoo : "\uf19e"
+    property string yc : "\uf23b"
+    property string ycSquare : "\uf1d4"
+    property string yelp : "\uf1e9"
+    property string yen : "\uf157"
+    property string yoast : "\uf2b1"
+    property string youtube : "\uf167"
+    property string youtubePlay : "\uf16a"
+    property string youtubeSquare : "\uf166"
 }
--- a/fonts/FontAwesome/fa-brands-400.otf
+++ b/fonts/FontAwesome/fa-brands-400.otf
--- a/fonts/FontAwesome/fa-regular-400.otf
+++ b/fonts/FontAwesome/fa-regular-400.otf
--- a/fonts/FontAwesome/fa-solid-900.otf
+++ b/fonts/FontAwesome/fa-solid-900.otf
--- a/fonts/FontAwesome/fontawesome-webfont.ttf
+++ b/fonts/FontAwesome/fontawesome-webfont.ttf
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
luigi1111	300a5afc21	Merge master -> release-v0.14.1	2019-07-17 16:00:43 -05:00
luigi1111	758dd1df96	Merge pull request #2288 `d83b400` build: set submodule to v0.14.1.1 (selsta)	2019-07-16 11:39:56 -05:00
selsta	d83b400931	build: set submodule to v0.14.1.1	2019-07-16 14:30:07 +02:00
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