diff --git a/ui/StatusQ/sandbox/android/AndroidManifest.xml b/ui/StatusQ/sandbox/android/AndroidManifest.xml
deleted file mode 100644
index 6f5fe5c8da..0000000000
--- a/ui/StatusQ/sandbox/android/AndroidManifest.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<manifest package="im.statusq" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.1" android:versionCode="0100" android:installLocation="auto">
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
-
-    <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
-         Remove the comment if you do not require these default permissions. -->
-    <!-- %%INSERT_PERMISSIONS -->
-
-    <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
-         Remove the comment if you do not require these default features. -->
-    <!-- %%INSERT_FEATURES -->
-
-    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
-
-    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --">
-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-            <!-- Application arguments -->
-            <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
-            <!-- Application arguments -->
-            <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
-            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
-            <meta-data android:name="android.app.repository" android:value="default"/>
-            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
-            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
-            <!-- Deploy Qt libs as part of package -->
-            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
-            <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
-            <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
-            <!-- Run with local libs -->
-            <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
-            <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
-            <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
-            <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
-            <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
-            <!-- Used to specify custom system library path to run with local system libs -->
-            <!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> -->
-            <!--  Messages maps -->
-            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
-            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
-            <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
-            <meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/>
-            <!--  Messages maps -->
-            <!-- Splash screen -->
-            <!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation,
-                 then android.app.splash_screen_drawable. For best results, use together with splash_screen_sticky and
-                 use hideSplashScreen() with a fade-out animation from Qt Android Extras to hide the splash screen when you
-                 are done populating your window with content. -->
-            <!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / -->
-            <!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / -->
-            <!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
-            <!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
-            <!-- Splash screen -->
-            <!-- Background running -->
-            <!-- Warning: changing this value to true may cause unexpected crashes if the
-                          application still try to draw after
-                          "applicationStateChanged(Qt::ApplicationSuspended)"
-                          signal is sent! -->
-            <meta-data android:name="android.app.background_running" android:value="false"/>
-            <!-- Background running -->
-            <!-- auto screen scale factor -->
-            <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
-            <!-- auto screen scale factor -->
-            <!-- extract android style -->
-            <!-- available android:values :
-                * default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
-                * full - useful QWidget & Quick Controls 1 apps
-                * minimal - useful for Quick Controls 2 apps, it is much faster than "full"
-                * none - useful for apps that don't use any of the above Qt modules
-                -->
-            <meta-data android:name="android.app.extract_android_style" android:value="default"/>
-            <!-- extract android style -->
-        </activity>
-        <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
-    </application>
-
-</manifest>
diff --git a/ui/StatusQ/sandbox/android/build.gradle b/ui/StatusQ/sandbox/android/build.gradle
deleted file mode 100644
index 56dda85ffc..0000000000
--- a/ui/StatusQ/sandbox/android/build.gradle
+++ /dev/null
@@ -1,57 +0,0 @@
-buildscript {
-    repositories {
-        google()
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
-    }
-}
-
-repositories {
-    google()
-    jcenter()
-}
-
-apply plugin: 'com.android.application'
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-}
-
-android {
-    /*******************************************************
-     * The following variables:
-     * - androidBuildToolsVersion,
-     * - androidCompileSdkVersion
-     * - qt5AndroidDir - holds the path to qt android files
-     *                   needed to build any Qt application
-     *                   on Android.
-     *
-     * are defined in gradle.properties file. This file is
-     * updated by QtCreator and androiddeployqt tools.
-     * Changing them manually might break the compilation!
-     *******************************************************/
-
-    compileSdkVersion androidCompileSdkVersion.toInteger()
-
-    buildToolsVersion androidBuildToolsVersion
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
-            aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
-            res.srcDirs = [qt5AndroidDir + '/res', 'res']
-            resources.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            assets.srcDirs = ['assets']
-            jniLibs.srcDirs = ['libs']
-       }
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-}
diff --git a/ui/StatusQ/sandbox/android/gradle/wrapper/gradle-wrapper.jar b/ui/StatusQ/sandbox/android/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index f6b961fd5a..0000000000
Binary files a/ui/StatusQ/sandbox/android/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/ui/StatusQ/sandbox/android/gradle/wrapper/gradle-wrapper.properties b/ui/StatusQ/sandbox/android/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 1b16c34a71..0000000000
--- a/ui/StatusQ/sandbox/android/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/ui/StatusQ/sandbox/android/gradlew b/ui/StatusQ/sandbox/android/gradlew
deleted file mode 100755
index cccdd3d517..0000000000
--- a/ui/StatusQ/sandbox/android/gradlew
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/ui/StatusQ/sandbox/android/gradlew.bat b/ui/StatusQ/sandbox/android/gradlew.bat
deleted file mode 100644
index f9553162f1..0000000000
--- a/ui/StatusQ/sandbox/android/gradlew.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/ui/StatusQ/sandbox/android/res/values/libs.xml b/ui/StatusQ/sandbox/android/res/values/libs.xml
deleted file mode 100644
index 4009a7785a..0000000000
--- a/ui/StatusQ/sandbox/android/res/values/libs.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <array name="qt_sources">
-        <item>https://download.qt.io/ministro/android/qt5/qt-5.9</item>
-    </array>
-
-    <!-- The following is handled automatically by the deployment tool. It should
-         not be edited manually. -->
-
-    <array name="bundled_libs">
-        <!-- %%INSERT_EXTRA_LIBS%% -->
-    </array>
-
-     <array name="qt_libs">
-         <!-- %%INSERT_QT_LIBS%% -->
-     </array>
-
-    <array name="bundled_in_lib">
-        <!-- %%INSERT_BUNDLED_IN_LIB%% -->
-    </array>
-    <array name="bundled_in_assets">
-        <!-- %%INSERT_BUNDLED_IN_ASSETS%% -->
-    </array>
-
-</resources>
diff --git a/ui/StatusQ/sandbox/main.qml b/ui/StatusQ/sandbox/main.qml
index a09a55f5b6..7152cbcade 100644
--- a/ui/StatusQ/sandbox/main.qml
+++ b/ui/StatusQ/sandbox/main.qml
@@ -14,10 +14,8 @@ import StatusQ.Platform 0.1
 
 StatusWindow {
     id: rootWindow
-    width: Qt.platform.os == "ios" || Qt.platform.os == "android" ? Screen.width
-                                                                  :  1024
-    height: Qt.platform.os == "ios" || Qt.platform.os == "android" ? Screen.height
-                                                                   :840
+    width: 1024
+    height: 840
     visible: true
     title: qsTr("StatusQ Documentation App")
 
diff --git a/ui/StatusQ/sandbox/sandbox.pro b/ui/StatusQ/sandbox/sandbox.pro
index 24764c3b8c..39fdb84873 100644
--- a/ui/StatusQ/sandbox/sandbox.pro
+++ b/ui/StatusQ/sandbox/sandbox.pro
@@ -1,9 +1,6 @@
-QT += quick svg
-
-CONFIG += c++11 warn_on
-
-DEFINES += QT_DEPRECATED_WARNINGS
+QT += quick
 
+CONFIG += c++11
 
 # You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.
@@ -14,39 +11,20 @@ SOURCES += \
         main.cpp \
         sandboxapp.cpp
 
-!macx {
-    SOURCES += statuswindow.cpp
-}
+OBJECTIVE_SOURCES += \
+    statuswindow_mac.mm
 
-TARGET = sandboxapp
-
-macx {
-    CONFIG -= app_bundle
-    OBJECTIVE_SOURCES += \
-        statuswindow_mac.mm
-}
-
-ios {
-   LIBS += -framework UIKit
-
-   QMAKE_TARGET_BUNDLE_PREFIX = "im.status"
-   #QMAKE_XCODE_CODE_SIGN_IDENTITY = "iPhone Developer"
-   MY_DEVELOPMENT_TEAM.name = "STATUS HOLDINGS PTE.LTD"
-   MY_DEVELOPMENT_TEAM.value = "DTX7Z4U3YA"
-   QMAKE_MAC_XCODE_SETTINGS += MY_DEVELOPMENT_TEAM
-
-}
-
-RESOURCES += qml.qrc \
-            $$PWD/../statusq.qrc
+RESOURCES += qml.qrc
 
 DESTDIR = $$PWD/bin
+CONFIG -= app_bundle
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
-#OTHER_FILES += $$files($$PWD/../src/*, true)
+
+OTHER_FILES += $$files($$PWD/../src/*, true)
 
 HEADERS += \
     handler.h \
@@ -62,20 +40,3 @@ DISTFILES += \
     ../src/StatusQ/Controls/StatusRadioButton.qml \
     ../src/StatusQ/Controls/StatusSlider.qml \
     ../src/StatusQ/Controls/StatusSwitch.qml
-
-android {
-
-DISTFILES += \
-    android/AndroidManifest.xml \
-    android/build.gradle \
-    android/gradle/wrapper/gradle-wrapper.jar \
-    android/gradle/wrapper/gradle-wrapper.properties \
-    android/gradlew \
-    android/gradlew.bat \
-    android/res/values/libs.xml
-
-    contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
-        ANDROID_PACKAGE_SOURCE_DIR = \
-            $$PWD/android
-    }
-}
diff --git a/ui/StatusQ/sandbox/sandboxapp.cpp b/ui/StatusQ/sandbox/sandboxapp.cpp
index 3c4b4e1455..5efccb459b 100644
--- a/ui/StatusQ/sandbox/sandboxapp.cpp
+++ b/ui/StatusQ/sandbox/sandboxapp.cpp
@@ -17,20 +17,11 @@ void SandboxApp::startEngine()
 {
     qmlRegisterType<StatusWindow>("Sandbox", 0, 1, "StatusWindow");
 
-#ifdef QT_DEBUG
     const QUrl url(applicationDirPath() + "/../main.qml");
-#else
-    const QUrl url(QStringLiteral("qrc:/main.qml"));
-#endif
 
     m_engine.rootContext()->setContextProperty("app", m_handler);
 
-
-#ifdef QT_DEBUG
     m_engine.addImportPath(applicationDirPath() + "/../../src");
-#else
-    m_engine.addImportPath(QStringLiteral("qrc:/src"));
-#endif
     qDebug() << m_engine.importPathList();
     QObject::connect(&m_engine, &QQmlApplicationEngine::objectCreated,
         this, [url](QObject *obj, const QUrl &objUrl) {
diff --git a/ui/StatusQ/sandbox/statuswindow.cpp b/ui/StatusQ/sandbox/statuswindow.cpp
deleted file mode 100644
index 6a7a450ca8..0000000000
--- a/ui/StatusQ/sandbox/statuswindow.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "statuswindow.h"
-
-void StatusWindow::toggleFullScreen()
-{
-    if (m_isFullScreen) {
-        showNormal();
-    } else {
-        showFullScreen();
-    }
-}
-
-bool StatusWindow::isFullScreen() const
-{
-    return m_isFullScreen;
-}
-
-void StatusWindow::removeTitleBar()
-{
-
-}
-
-void StatusWindow::showTitleBar()
-{
-
-}
diff --git a/ui/StatusQ/statusq.qrc b/ui/StatusQ/statusq.qrc
deleted file mode 100644
index bd11e2f395..0000000000
--- a/ui/StatusQ/statusq.qrc
+++ /dev/null
@@ -1,237 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>src/StatusQ/Core/qmldir</file>
-        <file>src/StatusQ/Core/Theme/ThemePalette.qml</file>
-        <file>src/StatusQ/Core/Theme/StatusLightTheme.qml</file>
-        <file>src/StatusQ/Core/Theme/StatusDarkTheme.qml</file>
-        <file>src/StatusQ/Core/Theme/Theme.qml</file>
-        <file>src/StatusQ/Core/Theme/qmldir</file>
-        <file>src/StatusQ/Core/Theme/StatusColors.qml</file>
-        <file>src/StatusQ/Core/StatusIcon.qml</file>
-        <file>src/StatusQ/Core/StatusImageSettings.qml</file>
-        <file>src/StatusQ/Core/StatusIconSettings.qml</file>
-        <file>src/StatusQ/Core/StatusIconBackgroundSettings.qml</file>
-        <file>src/StatusQ/Core/StatusBaseText.qml</file>
-        <file>src/StatusQ/Popups/qmldir</file>
-        <file>src/StatusQ/Popups/StatusPopupMenu.qml</file>
-        <file>src/StatusQ/Popups/StatusMenuSeparator.qml</file>
-        <file>src/StatusQ/Popups/StatusMenuItem.qml</file>
-        <file>src/StatusQ/Components/qmldir</file>
-        <file>src/StatusQ/Components/StatusChatListItem.qml</file>
-        <file>src/StatusQ/Components/StatusNavigationListItem.qml</file>
-        <file>src/StatusQ/Components/StatusChatToolBar.qml</file>
-        <file>src/StatusQ/Components/StatusRoundedImage.qml</file>
-        <file>src/StatusQ/Components/StatusRoundIcon.qml</file>
-        <file>src/StatusQ/Components/StatusListItem.qml</file>
-        <file>src/StatusQ/Components/StatusDescriptionListItem.qml</file>
-        <file>src/StatusQ/Components/StatusBadge.qml</file>
-        <file>src/StatusQ/Components/StatusLetterIdenticon.qml</file>
-        <file>src/StatusQ/Components/StatusLoadingIndicator.qml</file>
-        <file>src/StatusQ/Platform/qmldir</file>
-        <file>src/StatusQ/Platform/StatusMacTrafficLights.qml</file>
-        <file>src/StatusQ/Controls/StatusIconTabButton.qml</file>
-        <file>src/StatusQ/Controls/StatusChatInfoButton.qml</file>
-        <file>src/StatusQ/Controls/qmldir</file>
-        <file>src/StatusQ/Controls/StatusSlider.qml</file>
-        <file>src/StatusQ/Controls/StatusRoundButton.qml</file>
-        <file>src/StatusQ/Controls/StatusNavBarTabButton.qml</file>
-        <file>src/StatusQ/Controls/StatusFlatRoundButton.qml</file>
-        <file>src/StatusQ/Controls/StatusRadioButton.qml</file>
-        <file>src/StatusQ/Controls/StatusFlatButton.qml</file>
-        <file>src/StatusQ/Controls/StatusBaseButton.qml</file>
-        <file>src/StatusQ/Controls/StatusSwitch.qml</file>
-        <file>src/StatusQ/Controls/StatusCheckBox.qml</file>
-        <file>src/StatusQ/Controls/StatusButton.qml</file>
-        <file>src/StatusQ/Controls/StatusToolTip.qml</file>
-        <file>src/StatusQ/Layout/StatusAppNavBar.qml</file>
-        <file>src/StatusQ/Layout/qmldir</file>
-        <file>src/StatusQ/Layout/StatusAppTwoPanelLayout.qml</file>
-        <file>src/StatusQ/Layout/StatusAppLayout.qml</file>
-        <file>src/StatusQ/qmldir</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-ThinItalic.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-Thin.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-SemiBoldItalic.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-SemiBold.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-Regular.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-MediumItalic.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-Medium.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-LightItalic.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-Light.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-Italic.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-ExtraLightItalic.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-ExtraLight.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-ExtraBoldItalic.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-ExtraBold.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-BoldItalic.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-Bold.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-BlackItalic.otf</file>
-        <file>src/assets/fonts/InterStatus/InterStatus-Black.otf</file>
-        <file>src/assets/fonts/Inter/Inter-V.otf</file>
-        <file>src/assets/fonts/Inter/Inter-ThinItalic.otf</file>
-        <file>src/assets/fonts/Inter/Inter-Thin.otf</file>
-        <file>src/assets/fonts/Inter/Inter-SemiBoldItalic.otf</file>
-        <file>src/assets/fonts/Inter/Inter-SemiBold.otf</file>
-        <file>src/assets/fonts/Inter/Inter-Regular.otf</file>
-        <file>src/assets/fonts/Inter/Inter-MediumItalic.otf</file>
-        <file>src/assets/fonts/Inter/Inter-Medium.otf</file>
-        <file>src/assets/fonts/Inter/Inter-LightItalic.otf</file>
-        <file>src/assets/fonts/Inter/Inter-Light.otf</file>
-        <file>src/assets/fonts/Inter/Inter-Italic.otf</file>
-        <file>src/assets/fonts/Inter/Inter-ExtraLightItalic.otf</file>
-        <file>src/assets/fonts/Inter/Inter-ExtraLight.otf</file>
-        <file>src/assets/fonts/Inter/Inter-ExtraBoldItalic.otf</file>
-        <file>src/assets/fonts/Inter/Inter-ExtraBold.otf</file>
-        <file>src/assets/fonts/Inter/Inter-BoldItalic.otf</file>
-        <file>src/assets/fonts/Inter/Inter-Bold.otf</file>
-        <file>src/assets/fonts/Inter/Inter-BlackItalic.otf</file>
-        <file>src/assets/fonts/Inter/Inter-Black.otf</file>
-        <file>src/assets/img/icons/traffic_lights/minimise_pressed.png</file>
-        <file>src/assets/img/icons/traffic_lights/minimise.png</file>
-        <file>src/assets/img/icons/traffic_lights/maximize_pressed.png</file>
-        <file>src/assets/img/icons/traffic_lights/maximize.png</file>
-        <file>src/assets/img/icons/traffic_lights/close_pressed.png</file>
-        <file>src/assets/img/icons/traffic_lights/close.png</file>
-        <file>src/assets/img/icons/public-chat.svg</file>
-        <file>src/assets/img/icons/muted.svg</file>
-        <file>src/assets/img/icons/channel-white.svg</file>
-        <file>src/assets/img/icons/checkbox.svg</file>
-        <file>src/assets/img/icons/warning.svg</file>
-        <file>src/assets/img/icons/wallet.svg</file>
-        <file>src/assets/img/icons/username.svg</file>
-        <file>src/assets/img/icons/up.svg</file>
-        <file>src/assets/img/icons/union.svg</file>
-        <file>src/assets/img/icons/tributeToTalk.svg</file>
-        <file>src/assets/img/icons/travel-and-places.svg</file>
-        <file>src/assets/img/icons/touch-id.svg</file>
-        <file>src/assets/img/icons/token.svg</file>
-        <file>src/assets/img/icons/token-sale.svg</file>
-        <file>src/assets/img/icons/time.svg</file>
-        <file>src/assets/img/icons/text.svg</file>
-        <file>src/assets/img/icons/teller.svg</file>
-        <file>src/assets/img/icons/tabs.svg</file>
-        <file>src/assets/img/icons/symbols.svg</file>
-        <file>src/assets/img/icons/swap.svg</file>
-        <file>src/assets/img/icons/subscription.svg</file>
-        <file>src/assets/img/icons/strikethrough.svg</file>
-        <file>src/assets/img/icons/stickers.svg</file>
-        <file>src/assets/img/icons/status.svg</file>
-        <file>src/assets/img/icons/status-update.svg</file>
-        <file>src/assets/img/icons/speech.svg</file>
-        <file>src/assets/img/icons/sound.svg</file>
-        <file>src/assets/img/icons/smileys-and-people.svg</file>
-        <file>src/assets/img/icons/show.svg</file>
-        <file>src/assets/img/icons/share-ios.svg</file>
-        <file>src/assets/img/icons/share-android.svg</file>
-        <file>src/assets/img/icons/settings.svg</file>
-        <file>src/assets/img/icons/settings-advanced.svg</file>
-        <file>src/assets/img/icons/send.svg</file>
-        <file>src/assets/img/icons/security.svg</file>
-        <file>src/assets/img/icons/secret.svg</file>
-        <file>src/assets/img/icons/search.svg</file>
-        <file>src/assets/img/icons/rotate.svg</file>
-        <file>src/assets/img/icons/right.svg</file>
-        <file>src/assets/img/icons/reply.svg</file>
-        <file>src/assets/img/icons/remove.svg</file>
-        <file>src/assets/img/icons/remove-contact.svg</file>
-        <file>src/assets/img/icons/remove-circle.svg</file>
-        <file>src/assets/img/icons/refresh.svg</file>
-        <file>src/assets/img/icons/receive.svg</file>
-        <file>src/assets/img/icons/reaction-b.svg</file>
-        <file>src/assets/img/icons/reaction-a.svg</file>
-        <file>src/assets/img/icons/qr.svg</file>
-        <file>src/assets/img/icons/profile.svg</file>
-        <file>src/assets/img/icons/private-chat.svg</file>
-        <file>src/assets/img/icons/previous.svg</file>
-        <file>src/assets/img/icons/play.svg</file>
-        <file>src/assets/img/icons/pin.svg</file>
-        <file>src/assets/img/icons/pause.svg</file>
-        <file>src/assets/img/icons/paste.svg</file>
-        <file>src/assets/img/icons/password.svg</file>
-        <file>src/assets/img/icons/offline.svg</file>
-        <file>src/assets/img/icons/objects.svg</file>
-        <file>src/assets/img/icons/notification.svg</file>
-        <file>src/assets/img/icons/node.svg</file>
-        <file>src/assets/img/icons/node-offline.svg</file>
-        <file>src/assets/img/icons/next.svg</file>
-        <file>src/assets/img/icons/network.svg</file>
-        <file>src/assets/img/icons/more.svg</file>
-        <file>src/assets/img/icons/mobile.svg</file>
-        <file>src/assets/img/icons/mobile-sync.svg</file>
-        <file>src/assets/img/icons/mobile-sync-off.svg</file>
-        <file>src/assets/img/icons/max.svg</file>
-        <file>src/assets/img/icons/logout.svg</file>
-        <file>src/assets/img/icons/location.svg</file>
-        <file>src/assets/img/icons/loading.svg</file>
-        <file>src/assets/img/icons/link.svg</file>
-        <file>src/assets/img/icons/left.svg</file>
-        <file>src/assets/img/icons/ledger.svg</file>
-        <file>src/assets/img/icons/language.svg</file>
-        <file>src/assets/img/icons/keycard.svg</file>
-        <file>src/assets/img/icons/keycard-logo.svg</file>
-        <file>src/assets/img/icons/keyboard.svg</file>
-        <file>src/assets/img/icons/italic.svg</file>
-        <file>src/assets/img/icons/info.svg</file>
-        <file>src/assets/img/icons/in-contacts.svg</file>
-        <file>src/assets/img/icons/image.svg</file>
-        <file>src/assets/img/icons/history.svg</file>
-        <file>src/assets/img/icons/hide.svg</file>
-        <file>src/assets/img/icons/help.svg</file>
-        <file>src/assets/img/icons/group.svg</file>
-        <file>src/assets/img/icons/group-chat.svg</file>
-        <file>src/assets/img/icons/gallery.svg</file>
-        <file>src/assets/img/icons/food-and-drinks.svg</file>
-        <file>src/assets/img/icons/flash.svg</file>
-        <file>src/assets/img/icons/flash-disable.svg</file>
-        <file>src/assets/img/icons/flags.svg</file>
-        <file>src/assets/img/icons/filter.svg</file>
-        <file>src/assets/img/icons/filled-account.svg</file>
-        <file>src/assets/img/icons/file.svg</file>
-        <file>src/assets/img/icons/favourite.svg</file>
-        <file>src/assets/img/icons/face-sad.svg</file>
-        <file>src/assets/img/icons/face-id.svg</file>
-        <file>src/assets/img/icons/external.svg</file>
-        <file>src/assets/img/icons/exchange.svg</file>
-        <file>src/assets/img/icons/emojis.svg</file>
-        <file>src/assets/img/icons/edit.svg</file>
-        <file>src/assets/img/icons/download.svg</file>
-        <file>src/assets/img/icons/down.svg</file>
-        <file>src/assets/img/icons/double-checkmark.svg</file>
-        <file>src/assets/img/icons/desktop.svg</file>
-        <file>src/assets/img/icons/delete.svg</file>
-        <file>src/assets/img/icons/dapp.svg</file>
-        <file>src/assets/img/icons/copy.svg</file>
-        <file>src/assets/img/icons/contact.svg</file>
-        <file>src/assets/img/icons/condition-or.svg</file>
-        <file>src/assets/img/icons/communities.svg</file>
-        <file>src/assets/img/icons/code.svg</file>
-        <file>src/assets/img/icons/close.svg</file>
-        <file>src/assets/img/icons/close-circle.svg</file>
-        <file>src/assets/img/icons/clear.svg</file>
-        <file>src/assets/img/icons/chevron-up.svg</file>
-        <file>src/assets/img/icons/chevron-down.svg</file>
-        <file>src/assets/img/icons/checkmark.svg</file>
-        <file>src/assets/img/icons/checkmark-circle.svg</file>
-        <file>src/assets/img/icons/chatbot.svg</file>
-        <file>src/assets/img/icons/chat.svg</file>
-        <file>src/assets/img/icons/chat-commands.svg</file>
-        <file>src/assets/img/icons/channel.svg</file>
-        <file>src/assets/img/icons/channel-category.svg</file>
-        <file>src/assets/img/icons/cancel.svg</file>
-        <file>src/assets/img/icons/camera.svg</file>
-        <file>src/assets/img/icons/browser.svg</file>
-        <file>src/assets/img/icons/bold.svg</file>
-        <file>src/assets/img/icons/backspace.svg</file>
-        <file>src/assets/img/icons/arrow-right.svg</file>
-        <file>src/assets/img/icons/arrow-down.svg</file>
-        <file>src/assets/img/icons/arbitrator.svg</file>
-        <file>src/assets/img/icons/appearance.svg</file>
-        <file>src/assets/img/icons/animals-and-nature.svg</file>
-        <file>src/assets/img/icons/airdrop.svg</file>
-        <file>src/assets/img/icons/admin.svg</file>
-        <file>src/assets/img/icons/address.svg</file>
-        <file>src/assets/img/icons/add.svg</file>
-        <file>src/assets/img/icons/add-contact.svg</file>
-        <file>src/assets/img/icons/add-circle.svg</file>
-        <file>src/assets/img/icons/activity.svg</file>
-    </qresource>
-</RCC>