diff --git a/CliClient/app/base-command.js b/CliClient/app/base-command.js
index 748b034f90..940ee8097a 100644
--- a/CliClient/app/base-command.js
+++ b/CliClient/app/base-command.js
@@ -32,10 +32,6 @@ class BaseCommand {
 		return this.compatibleUis().indexOf(ui) >= 0;
 	}
 
-	aliases() {
-		return [];
-	}
-
 	options() {
 		return [];
 	}
diff --git a/CliClient/app/command-mkbook.js b/CliClient/app/command-mkbook.js
index 831ff4a0f4..cc668b49a1 100644
--- a/CliClient/app/command-mkbook.js
+++ b/CliClient/app/command-mkbook.js
@@ -14,10 +14,6 @@ class Command extends BaseCommand {
 		return _('Creates a new notebook.');
 	}
 
-	aliases() {
-		return ['mkdir'];
-	}
-
 	async action(args) {
 		let folder = await Folder.save({ title: args['new-notebook'] }, { userSideValidation: true });		
 		app().switchCurrentFolder(folder);
diff --git a/ElectronClient/app/ElectronAppWrapper.js b/ElectronClient/app/ElectronAppWrapper.js
index 850d0c9b83..655d2fa4c2 100644
--- a/ElectronClient/app/ElectronAppWrapper.js
+++ b/ElectronClient/app/ElectronAppWrapper.js
@@ -132,7 +132,8 @@ class ElectronAppWrapper {
 	// Note: this must be called only after the "ready" event of the app has been dispatched
 	createTray(contextMenu) {
 		try {
-			this.tray_ = new Tray(this.buildDir() + '/icons/16x16.png')
+			const iconFilename = this.env_ === 'dev' ? '16x16-dev.png' : '16x16.png';
+			this.tray_ = new Tray(this.buildDir() + '/icons/' + iconFilename)
 			this.tray_.setToolTip(this.electronApp_.getName())
 			this.tray_.setContextMenu(contextMenu)
 
diff --git a/ElectronClient/app/build/icons/16x16-dev.png b/ElectronClient/app/build/icons/16x16-dev.png
new file mode 100644
index 0000000000..f0a34833bc
Binary files /dev/null and b/ElectronClient/app/build/icons/16x16-dev.png differ