diff --git a/bin/create-icons.sh b/bin/create-icons.sh
index 33b0bb4b7..16ace4c2c 100755
--- a/bin/create-icons.sh
+++ b/bin/create-icons.sh
@@ -45,5 +45,8 @@ icnsutil compose -f "mac/icon.icns" ./mac/*.png
 # Build Windows icon
 magick -background none "../icon-color.svg" -define icon:auto-resize=16,32,48,64,128,256 "./icon.ico"
 
+# Build Windows setup icon
+magick -background none "../icon-installer.svg" -define icon:auto-resize=16,32,48,64,128,256 "./win/setup.ico"
+
 # Build Squirrel splash image
 magick "./png/256x256.png" -background "#ffffff" -gravity center -extent 640x480 "./win/setup-banner.gif"
\ No newline at end of file
diff --git a/forge.config.cjs b/forge.config.cjs
index 64ef74b16..429bd5abe 100644
--- a/forge.config.cjs
+++ b/forge.config.cjs
@@ -62,7 +62,7 @@ module.exports = {
             name: "@electron-forge/maker-squirrel",
             config: {
                 iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico",
-                setupIcon: "./images/app-icons/icon.ico",
+                setupIcon: "./images/app-icons/win/setup.ico",
                 loadingGif: "./images/app-icons/win/setup-banner.gif"
             }
         },
diff --git a/images/app-icons/win/setup.ico b/images/app-icons/win/setup.ico
new file mode 100644
index 000000000..34dd447c5
Binary files /dev/null and b/images/app-icons/win/setup.ico differ
diff --git a/images/icon-installer.svg b/images/icon-installer.svg
new file mode 100644
index 000000000..9edc6b331
--- /dev/null
+++ b/images/icon-installer.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 256 256" style="enable-background:new 0 0 256 256;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#686768;}
+	.st1{fill:#808080;}
+	.st2{fill:url(#SVGID_1_);}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:#D9D9D9;}
+	.st6{fill:url(#SVGID_4_);}
+	.st7{opacity:0.47;}
+	.st8{fill:#5B5A5A;}
+	.st9{fill:#95C980;}
+	.st10{fill:#72B755;}
+	.st11{fill:#4FA52B;}
+	.st12{fill:#EE8C89;}
+	.st13{fill:#E96562;}
+	.st14{fill:#E33F3B;}
+	.st15{fill:#EFB075;}
+	.st16{fill:#E99547;}
+	.st17{fill:#E47B19;}
+	.st18{opacity:0.38;fill:url(#SVGID_5_);}
+</style>
+<g id="Layer_1">
+	<g id="Layer_1_1_">
+	</g>
+</g>
+<g id="Layer_2">
+	<polygon class="st0" points="86.3,63.2 86.2,99.4 33.1,101.1 32.5,99.9 53.9,67.1 	"/>
+	<path class="st1" d="M86.3,61.9l-0.2,37.5c0,0-53.9,0.8-53.7,0.5l21.2-34L86.3,61.9z"/>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="86.3479" y1="130.1949" x2="208.0555" y2="130.1949" gradientTransform="matrix(1 0 0 -1 0 258)">
+		<stop  offset="0" style="stop-color:#E3E3E3"/>
+		<stop  offset="1" style="stop-color:#F4F4F4"/>
+	</linearGradient>
+	<polygon class="st2" points="86.3,61.9 207.8,68.9 208.1,188.4 86.7,193.7 	"/>
+	
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="53.6067" y1="130.1949" x2="86.6402" y2="130.1949" gradientTransform="matrix(1 0 0 -1 0 258)">
+		<stop  offset="0" style="stop-color:#D9D9D9"/>
+		<stop  offset="1" style="stop-color:#D4D4D4"/>
+	</linearGradient>
+	<polygon class="st3" points="53.6,65.8 86.3,61.9 86.6,193.7 53.6,189.9 	"/>
+	
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="154.1068" y1="201.7921" x2="146.7211" y2="271.9565" gradientTransform="matrix(0.9941 1.431752e-03 -1.431754e-03 -1.1143 -2.6949 323.3557)">
+		<stop  offset="0" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.4752" style="stop-color:#B5B5B5"/>
+		<stop  offset="0.6464" style="stop-color:#BCBCBC"/>
+		<stop  offset="0.7685" style="stop-color:#C7C7C7"/>
+		<stop  offset="0.8671" style="stop-color:#D8D8D8"/>
+		<stop  offset="0.9506" style="stop-color:#EEEEEE"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<polygon class="st4" points="208.1,103.8 109,99.5 86.3,62.2 207.8,68.9 	"/>
+	<polygon class="st1" points="112.8,93.1 234.1,99.3 235.4,97.8 88.5,63.5 86.3,61.9 	"/>
+	<polygon class="st5" points="235.4,97.8 133.9,92.5 112.8,91.1 86.6,62.2 208,68.9 219.8,81.8 235,97.4 235,97.4 	"/>
+	
+		<radialGradient id="SVGID_4_" cx="480.8341" cy="689.2393" r="3.2653" gradientTransform="matrix(0.5088 -4.329579e-03 -0.1464 -14.7395 -56.4799 10295.6123)" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="6.758273e-02" style="stop-color:#FFFFFF;stop-opacity:0.9324"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</radialGradient>
+	<path class="st6" d="M88.5,147.7c0.2,21.3,0.7,34.5,0.1,34.5c-0.7,0-1.2-5.1-2-26.3c-0.9-21.2-1.1-69.1-0.4-69.2
+		C86.8,86.5,88.3,126.5,88.5,147.7z"/>
+	<g class="st7">
+		<path class="st8" d="M53.5,189.5l16.6,1.7c2.7,0.3,5.6,0.5,8.3,0.9l8.3,1h-0.1l60.7-2.6l30.4-1.4l7.6-0.3c2.5-0.1,5.1-0.2,7.6-0.3
+			l15.2-0.4l-15.2,1c-2.5,0.2-5.1,0.3-7.6,0.4l-7.6,0.3l-30.4,1.4l-60.6,2.6l0,0l0,0l-8.3-1c-2.7-0.3-5.5-0.7-8.3-1.1L53.5,189.5z"
+			/>
+		<path class="st1" d="M53.1,189.5c2.7,0.2,5.5,0.3,8.4,0.5c2.9,0.2,5.8,0.4,8.6,0.7l8.3,0.9l8.3,1l-0.1,0.9l-0.1,0l0-0.9l60.8-2.5
+			l30.4-1.3l15.2-0.6l15.2-0.4l0,0.5l-15.2,0.9l-7.6,0.4l-7.6,0.3l-30.4,1.3l-60.7,2.5l0,0l0,0l-8.3-1l-8.3-1.1l-16.6-2.2
+			L53.1,189.5z M54.5,189.7l15.6,2l8.3,1.1l8.3,1l0,0l60.7-2.7l30.4-1.4l7.6-0.3l7.6-0.4l15.2-1l0,0.5l-15.2,0.4l-15.2,0.6
+			l-30.4,1.4l-60.7,2.7l0-0.9l0.1,0l-0.1,0.9l-8.3-1l-8.3-0.9c-2.7-0.3-5.3-0.5-7.9-0.9C59.6,190.4,57.1,190,54.5,189.7z"/>
+	</g>
+	<g>
+		<g>
+			<g>
+				<path class="st9" d="M177.3,134.6c-7.1,5.5-19.1,6.6-27.5,4.5c2.1-1.9,3.1-2.8,5.1-4.7c2-1.8,2.9-2.6,4.9-4.4
+					c6.8-6,10.2-8.8,16.8-14.4c-6.9,5.2-10.5,7.8-17.6,13.3c-2,1.6-3,2.3-5,3.9c-2.1,1.6-3.1,2.5-5.2,4.1c-0.4-7.7,0.9-18,8.4-23.5
+					c0.6-0.5,1.4-0.9,2.1-1.4c1-0.5,2-1.1,3.2-1.5c9.3-3.6,20.2-6.1,30.3-4.8c0.6,5.3-4,15.4-9.6,22.9c-0.8,1-1.5,2-2.3,2.9
+					C179.6,132.6,178.4,133.7,177.3,134.6z"/>
+				<path class="st10" d="M180.7,131.4c-7.5,4.9-18.4,4.7-25.8,3c2-1.8,2.9-2.6,4.9-4.4c6.8-6,10.2-8.8,16.8-14.4
+					c-6.9,5.2-10.5,7.8-17.6,13.3c-2,1.6-3,2.3-5,3.9c-0.4-6.4,0.3-15,5.3-20.7c1-0.5,2-1.1,3.2-1.5c9.3-3.7,20.2-6.1,30.3-4.8
+					c0.6,5.3-4,15.4-9.6,22.9C182.3,129.5,181.5,130.5,180.7,131.4z"/>
+				<path class="st11" d="M183.1,128.5c-7.2,3.4-16.7,3.1-23.2,1.5c6.8-6,10.2-8.8,16.8-14.4c-6.9,5.2-10.5,7.8-17.6,13.3
+					c-0.4-5.5,0-12.8,3.5-18.4c9.3-3.6,20.2-6.1,30.3-4.8C193.4,111,188.8,121.2,183.1,128.5z"/>
+			</g>
+			<g>
+				<path class="st12" d="M144,161.3c-2.9-7.2,0.4-15.9,3.8-21.1c0.9,2,1.3,3,2.2,4.9c0.9,1.9,1.3,2.8,2.1,4.6
+					c3,6.4,4.5,9.6,7.6,15.6c-2.5-6.2-3.8-9.4-6.4-16c-0.7-1.8-1.1-2.7-1.8-4.5c-0.8-1.9-1.2-2.9-1.9-4.9c6,1.8,13.7,5.4,16.5,12.2
+					c0.2,0.6,0.4,1.2,0.6,1.8c0.2,0.8,0.4,1.7,0.5,2.6c1.2,7.8-0.7,18.7-3.6,22.8c-4.5-0.7-11.8-6.3-16.3-12.3
+					c-0.6-0.8-1.2-1.6-1.7-2.4C145,163.5,144.5,162.4,144,161.3z"/>
+				<path class="st13" d="M145.7,164.6c-1.9-6.8,1.2-14.7,4.4-19.5c0.9,1.9,1.3,2.8,2.1,4.6c3,6.4,4.5,9.6,7.6,15.6
+					c-2.5-6.2-3.8-9.4-6.4-16c-0.7-1.8-1.1-2.7-1.8-4.5c5.1,1.4,11.7,4.2,15.2,9.2c0.2,0.8,0.4,1.7,0.5,2.6
+					c1.2,7.8-0.7,18.7-3.6,22.7c-4.5-0.7-11.8-6.3-16.3-12.3C146.8,166.2,146.3,165.4,145.7,164.6z"/>
+				<path class="st14" d="M147.4,167c-0.9-6.1,2-13,4.8-17.3c3,6.4,4.5,9.6,7.6,15.6c-2.5-6.2-3.8-9.4-6.4-16
+					c4.5,1.1,10.2,3.3,14,7.2c1.2,7.8-0.7,18.7-3.6,22.7C159.1,178.5,151.9,173,147.4,167z"/>
+			</g>
+			<g>
+				<path class="st15" d="M132.2,118.5c8.5,3.5,13.4,12.5,15.3,19c-2.4-0.8-3.5-1.1-5.9-1.9c-2.3-0.7-3.4-1.1-5.6-1.8
+					c-7.9-2.6-11.8-4-19.4-6.7c7.4,3.1,11.1,4.7,18.8,7.8c2.1,0.9,3.2,1.3,5.3,2.2c2.2,0.9,3.3,1.3,5.6,2.2c-6,3.4-15,6.8-23,3.7
+					c-0.6-0.2-1.4-0.6-2.1-1c-0.8-0.5-1.8-1-2.7-1.7c-6.9-4.9-14.3-13.6-17-21.8c4-2.8,14.3-3.4,23-1.9c1.2,0.2,2.3,0.4,3.5,0.7
+					C129.6,117.5,130.9,117.9,132.2,118.5z"/>
+				<path class="st16" d="M128,117.1c7.4,3.9,11.8,12.2,13.6,18.4c-2.3-0.7-3.4-1.1-5.6-1.8c-7.9-2.6-11.8-4-19.4-6.7
+					c7.4,3.1,11.1,4.7,18.7,7.8c2.1,0.9,3.2,1.3,5.3,2.2c-5,2.9-12.5,6-19.4,4.9c-0.8-0.5-1.8-1-2.7-1.7c-6.9-4.9-14.3-13.6-17-21.8
+					c4-2.8,14.3-3.4,23-1.9C125.8,116.6,126.9,116.7,128,117.1z"/>
+				<path class="st17" d="M124.6,116.3c6.1,4.3,9.8,11.7,11.4,17.3c-7.9-2.6-11.8-4-19.4-6.7c7.4,3.1,11.1,4.7,18.8,7.8
+					c-4.4,2.6-10.6,5.4-16.8,5.3c-6.9-4.9-14.3-13.6-17-21.8C105.6,115.4,115.8,114.8,124.6,116.3z"/>
+			</g>
+		</g>
+	</g>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="226.3925" y1="147.1083" x2="159.9567" y2="186.9981">
+		<stop  offset="0.1721" style="stop-color:#C7C7C7"/>
+		<stop  offset="0.3798" style="stop-color:#D8D8D8"/>
+		<stop  offset="0.6814" style="stop-color:#DADADA"/>
+		<stop  offset="0.7898" style="stop-color:#E1E1E1"/>
+		<stop  offset="0.867" style="stop-color:#ECECEC"/>
+		<stop  offset="0.8745" style="stop-color:#EEEEEE"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path class="st18" d="M208,128c-0.8,0.3-2.7,12.8-3,15.6c-0.6,4.7-3.2,23.3-9,33.5c-5.9,10.4-12.8,11.1-13.3,11.9l25.3-0.7
+		C208,169.3,208,146.9,208,128L208,128z"/>
+</g>
+</svg>
diff --git a/src/public/app/widgets/mobile_widgets/screen_container.js b/src/public/app/widgets/mobile_widgets/screen_container.js
deleted file mode 100644
index 9fab0a4fc..000000000
--- a/src/public/app/widgets/mobile_widgets/screen_container.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import FlexContainer from "../containers/flex_container.js";
-
-export default class ScreenContainer extends FlexContainer {
-    constructor(screenName, direction) {
-        super(direction);
-
-        this.screenName = screenName;
-    }
-
-    activeScreenChangedEvent({ activeScreen }) {}
-}
diff --git a/src/public/app/widgets/mobile_widgets/screen_container.ts b/src/public/app/widgets/mobile_widgets/screen_container.ts
new file mode 100644
index 000000000..4ce276309
--- /dev/null
+++ b/src/public/app/widgets/mobile_widgets/screen_container.ts
@@ -0,0 +1,15 @@
+import type { EventData } from "../../components/app_context.js";
+import type BasicWidget from "../basic_widget.js";
+import FlexContainer, { type FlexDirection } from "../containers/flex_container.js";
+
+export default class ScreenContainer extends FlexContainer<BasicWidget> {
+    private screenName: string;
+
+    constructor(screenName: string, direction: FlexDirection) {
+        super(direction);
+
+        this.screenName = screenName;
+    }
+
+    activeScreenChangedEvent({ activeScreen }: EventData<"activeScreenChanged">) {}
+}
diff --git a/src/public/app/widgets/mobile_widgets/toggle_sidebar_button.js b/src/public/app/widgets/mobile_widgets/toggle_sidebar_button.ts
similarity index 100%
rename from src/public/app/widgets/mobile_widgets/toggle_sidebar_button.js
rename to src/public/app/widgets/mobile_widgets/toggle_sidebar_button.ts