diff --git a/.travis.yml b/.travis.yml
index e56c2b32a83..9d027cb47a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ script:
 
     # Install tools
     npm install
-    npm run typescript-compile
+    npm run tsc
     cd Tools
     npm install
     cd ..
diff --git a/Assets/JoplinIconBlack.svg b/Assets/JoplinIconBlack.svg
new file mode 100644
index 00000000000..90f5c30f612
--- /dev/null
+++ b/Assets/JoplinIconBlack.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg40"
+   version="1.1"
+   width="1536"
+   height="1536"
+   viewBox="0 0 1536 1536">
+  <metadata
+     id="metadata46">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs44" />
+  <path
+     id="path38"
+     fill="#ffffff"
+     d="M 373.834,0 C 168.227,0 0,168.223 0,373.834 V 1162.17 C 0,1367.778 168.227,1536 373.834,1536 H 1162.17 C 1367.778,1536 1536,1367.778 1536,1162.17 V 373.834 C 1536,168.224 1367.778,0 1162.17,0 Z m 397.222,205.431 h 417.424 a 7.132,7.132 0 0 1 7.132,7.133 v 132.552 c 0,4.461 -3.619,8.073 -8.077,8.073 h -57.23 c -24.168,0 -43.768,19.338 -44.284,43.374 v 2.377 h -0.017 v 136.191 h -0.053 l -0.466,509.375 c -5.02,77.667 -39.222,149.056 -96.324,201.046 -60.28,54.834 -141.948,85.017 -229.962,85.017 -12.45,0 -25.208,-0.61 -37.907,-1.785 -92.157,-8.682 -181.494,-48.601 -251.662,-112.438 -71.99,-65.517 -117.147,-150.03 -127.164,-238 -11.226,-98.763 23.42,-192.783 95.045,-257.937 81.99,-74.637 198.185,-101.768 316.613,-75.704 5.574,1.227 9.55,6.282 9.55,11.997 v 199.52 c -0.199,2.625 -1.481,6.599 -8.183,2.896 -0.663,-0.365 -1.194,-0.511 -1.653,-0.531 -21.987,-10.587 -45.159,-17.57 -68.559,-19.916 -0.38,-0.04 -0.757,-0.124 -1.138,-0.163 -0.537,-0.048 -1.034,-0.033 -1.556,-0.075 -4.13,-0.354 -8.183,-0.517 -12.203,-0.58 -0.87,-0.011 -1.771,-0.127 -2.641,-0.127 -0.486,0 -0.951,0.05 -1.437,0.057 -1.464,0.011 -2.886,0.115 -4.33,0.163 -2.76,0.102 -5.497,0.211 -8.182,0.448 -0.273,0.024 -0.547,0.07 -0.835,0.097 -25.509,2.4 -47.864,11.104 -65.012,25.47 -0.954,0.802 -1.974,1.53 -2.9,2.36 a 1.34,1.34 0 0 1 -0.168,0.146 c -23.96,21.8 -34.881,53.872 -30.726,90.316 4.62,40.737 26.94,81.156 62.841,113.823 35.908,32.67 80.335,52.977 125.113,57.186 35.118,3.36 66.547,-3.919 89.899,-20.461 a 97.255,97.255 0 0 0 9.365,-7.501 c 2.925,-2.661 5.569,-5.5 8.086,-8.416 0.3,-0.348 0.672,-0.673 0.975,-1.024 8.253,-9.864 14.222,-21.067 17.996,-33.148 0.639,-2.034 1.051,-4.148 1.564,-6.227 0.381,-1.563 0.81,-3.106 1.112,-4.693 0.555,-2.784 0.923,-5.632 1.253,-8.49 0.086,-0.709 0.183,-1.414 0.237,-2.128 0.492,-4.893 0.693,-9.858 0.55,-14.91 h 0.013 V 393.623 c -2.01,-22.626 -20.78,-40.434 -43.928,-40.434 h -57.23 a 8.071,8.071 0 0 1 -8.077,-8.073 V 212.564 a 7.132,7.132 0 0 1 7.136,-7.133 z" />
+</svg>
diff --git a/BUILD.md b/BUILD.md
index 7e00b45e95a..2a8dce4bb45 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -7,9 +7,9 @@
 
 # TypeScript
 
-Most of the application is written in JavaScript, however new classes and files should generally be written in [TypeScript](https://www.typescriptlang.org/). Even if you don't write TypeScript code, you will need to build the existing .ts and .tsx files. This is done from the root of the project, by running `npm run typescript-compile`.
+Most of the application is written in JavaScript, however new classes and files should generally be written in [TypeScript](https://www.typescriptlang.org/). Even if you don't write TypeScript code, you will need to build the existing .ts and .tsx files. This is done from the root of the project, by running `npm run tsc`.
 
-If you are modifying TypeScript code, the best is to have the compiler watch for changes from a terminal. To do so, run `npm run typescript-watch`.
+If you are modifying TypeScript code, the best is to have the compiler watch for changes from a terminal. To do so, run `npm run tsc-watch`.
 
 All TypeScript files are generated next to the .ts or .tsx file. So for example, if there's a file "lib/MyClass.ts", there will be a generated "lib/MyClass.js" next to it. If you create a new TypeScript file, make sure you add the generated .js file to .gitignore. It is implemented that way as it requires minimal changes to integrate TypeScript in the existing JavaScript code base.
 
@@ -37,7 +37,7 @@ npm install && cd Tools && npm install
 
 ```
 rsync --delete -a ReactNativeClient/lib/ ElectronClient/app/lib/
-npm run typescript-compile
+npm run tsc
 cd ElectronClient/app
 npm install
 yarn dist
@@ -57,7 +57,7 @@ From `/ElectronClient` you can also run `run.sh` to run the app for testing.
 
 ```
 xcopy /C /I /H /R /Y /S ReactNativeClient\lib ElectronClient\app\lib
-npm run typescript-compile
+npm run tsc
 cd ElectronClient\app
 npm install
 yarn dist
@@ -78,7 +78,7 @@ First you need to setup React Native to build projects with native code. For thi
 Then:
 
 ```
-npm run typescript-compile
+npm run tsc
 cd ReactNativeClient
 npm install
 react-native run-ios
diff --git a/CliClient/build.sh b/CliClient/build.sh
index e7190706c4b..929a3203cad 100755
--- a/CliClient/build.sh
+++ b/CliClient/build.sh
@@ -9,7 +9,7 @@ rsync -a --delete "$ROOT_DIR/../ReactNativeClient/locales/" "$BUILD_DIR/locales/
 cp "$ROOT_DIR/package.json" "$BUILD_DIR"
 
 cd $ROOT_DIR/..
-npm run typescript-compile
+npm run tsc
 cd $ROOT_DIR
 
 chmod 755 "$BUILD_DIR/main.js"
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 288f0e9dbfb..4922003ab2d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,7 +15,7 @@ install:
 build_script:
   - ps: xcopy /C /I /H /R /Y /S ReactNativeClient\lib ElectronClient\app\lib
   - npm install
-  - npm run typescript-compile
+  - npm run tsc
   - ps: cd Tools
   - npm install
   - ps: cd ..\ElectronClient\app
diff --git a/package.json b/package.json
index 5b6ebac2ba6..deaf43c48b7 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
   "scripts": {
     "linter": "./node_modules/.bin/eslint --fix --ext .js --ext .jsx --ext .ts --ext .tsx",
     "linter-ci": "./node_modules/.bin/eslint --ext .js --ext .jsx --ext .ts --ext .tsx",
-    "typescript-compile": "tsc",
-    "typescript-watch": "tsc --watch"
+    "tsc": "tsc",
+    "tsc-watch": "tsc --watch"
   },
   "husky": {
     "hooks": {