diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 7c8d1e4fe..a33ba83cd 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -23,10 +23,12 @@ jobs:
           exit 1
         fi
         gulp
-        langlength=`jq -r '. | length' src/assets/lang/en.json`
-        langindexlength=`jq -r '. | length' scripts/langindex.json`
-        if [ $langlength -ne $langindexlength ]; then
-          echo "Lang file has $langlength while langindex $langindexlength"
+        langcount=`jq -r '. | length' src/assets/lang/en.json`
+        freemiumcount=`jq 'keys' src/assets/lang/en.json | grep "freemium." | wc -l | xargs`
+        allcount=$(($langcount - $freemiumcount))
+        langindexcount=`jq -r '. | length' scripts/langindex.json`
+        if [ $allcount -ne $langindexcount ]; then
+          echo "Lang file has $langcount ($freemiumcount) while langindex $langindexcount"
           exit 1
         fi
 
diff --git a/config.xml b/config.xml
index dce611f4a..f1ad3cfa8 100644
--- a/config.xml
+++ b/config.xml
@@ -39,6 +39,7 @@
     <preference name="SplashScreenDelay" value="15000" />
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
+    <preference name="ShowSplashScreenSpinner" value="false" />
     <preference name="android-minSdkVersion" value="22" />
     <preference name="android-targetSdkVersion" value="30" />
     <preference name="AndroidPersistentFileLocation" value="Compatibility" />
diff --git a/resources/desktop/Square150x150Logo.png b/resources/desktop/Square150x150Logo.png
deleted file mode 100644
index 95de043c2..000000000
Binary files a/resources/desktop/Square150x150Logo.png and /dev/null differ
diff --git a/resources/desktop/Square44x44Logo.png b/resources/desktop/Square44x44Logo.png
deleted file mode 100644
index df2f21b2d..000000000
Binary files a/resources/desktop/Square44x44Logo.png and /dev/null differ
diff --git a/resources/desktop/StoreLogo.png b/resources/desktop/StoreLogo.png
deleted file mode 100644
index f41b1f803..000000000
Binary files a/resources/desktop/StoreLogo.png and /dev/null differ
diff --git a/resources/desktop/Wide310x150Logo.png b/resources/desktop/Wide310x150Logo.png
deleted file mode 100644
index 05b810bed..000000000
Binary files a/resources/desktop/Wide310x150Logo.png and /dev/null differ
diff --git a/resources/desktop/icon.icns b/resources/desktop/icon.icns
deleted file mode 100644
index 2799114b2..000000000
Binary files a/resources/desktop/icon.icns and /dev/null differ
diff --git a/resources/desktop/icon.ico b/resources/desktop/icon.ico
deleted file mode 100644
index 483c9647c..000000000
Binary files a/resources/desktop/icon.ico and /dev/null differ
diff --git a/resources/splash.png b/resources/splash.png
index e7889ccf9..524bd4707 100644
Binary files a/resources/splash.png and b/resources/splash.png differ
diff --git a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
index 15e0859a2..e3422805d 100644
--- a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
+++ b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
@@ -1,11 +1,28 @@
 <div class="core-rte-editor-container" (click)="focusRTE()" [class.toolbar-hidden]="toolbarHidden">
-    <div [hidden]="!rteEnabled" #editor contenteditable="true" class="core-rte-editor" button (focus)="showToolbar($event)"
-        (longPress)="showToolbar($event)" (blur)="hideToolbar($event)" [attr.data-placeholder-text]="placeholder" role="textbox">
+    <div
+        [hidden]="!rteEnabled"
+        #editor
+        class="core-rte-editor"
+        role="textbox"
+        contenteditable="true"
+        [attr.data-placeholder-text]="placeholder"
+        (focus)="showToolbar($event)"
+        (blur)="hideToolbar($event)"
+    >
     </div>
 
-    <ion-textarea [hidden]="rteEnabled" #textarea class="core-textarea" [placeholder]="placeholder" [attr.name]="name"
-        ngControl="control" (ionChange)="onChange()" (focus)="showToolbar($event)" (longPress)="showToolbar($event)"
-        (blur)="hideToolbar($event)" role="textbox">
+    <ion-textarea
+        [hidden]="rteEnabled"
+        #textarea
+        class="core-textarea"
+        role="textbox"
+        [attr.name]="name"
+        ngControl="control"
+        [placeholder]="placeholder"
+        (ionChange)="onChange()"
+        (ionFocus)="showToolbar($event)"
+        (ionBlur)="hideToolbar($event)"
+    >
     </ion-textarea>
 
     <div class="core-rte-info-message" *ngIf="infoMessage">
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
index 75d85bb6b..4ccb65ab5 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
@@ -29,8 +29,9 @@
     .core-rte-editor-container {
         max-height: calc(100% - 46px);
         display: flex;
-        flex-direction: column;
         flex-grow: 1;
+        flex-direction: column;
+        justify-content: space-between;
         &.toolbar-hidden {
             max-height: 100%;
         }
@@ -51,7 +52,7 @@
     .core-rte-editor, .core-textarea {
         padding: 2px;
         margin: 2px;
-        width: 100%;
+        width: calc(100% - 4px);
         resize: none;
         background-color: var(--background);
         color: var(--color);
@@ -59,8 +60,6 @@
     }
 
     .core-rte-editor {
-        flex-grow: 1;
-        flex-shrink: 1;
         -webkit-user-select: auto !important;
         user-select: auto !important;
         word-wrap: break-word;
@@ -86,8 +85,6 @@
     }
 
     .core-textarea {
-        flex-grow: 1;
-        flex-shrink: 1;
         position: relative;
 
         ::ng-deep textarea {
@@ -97,6 +94,7 @@
             overflow-x: hidden;
             overflow-y: auto;
             position: absolute;
+            height: auto;
             top: 0;
             bottom: 0;
         }
@@ -160,7 +158,7 @@
         }
 
         &.toolbar-hidden {
-            visibility: none;
+            visibility: hidden;
             height: 0;
             border: none;
         }