diff --git a/app/Icon-Template.png b/app/Icon-Template.png
index 260a91a..ebd7444 100644
Binary files a/app/Icon-Template.png and b/app/Icon-Template.png differ
diff --git a/app/Icon-Template@2x.png b/app/Icon-Template@2x.png
index 9c33b78..df0c58e 100644
Binary files a/app/Icon-Template@2x.png and b/app/Icon-Template@2x.png differ
diff --git a/app/settings.js b/app/settings.js
index 495030e..82f792f 100644
--- a/app/settings.js
+++ b/app/settings.js
@@ -3,14 +3,16 @@ var ipc = require('electron').ipcRenderer
 
 var defaultPreference = {
   'open-window-shortcut': 'ctrl+shift+space',
-  'emoji-size': '20',
-  'open-at-login': false
+  'emoji-size': '40',
+  'window-position': 'topRight',
+  'open-at-login': false,
 }
 
 var preferenceNames = {
   'open-window-shortcut': 'Mojibar shortcut',
-  'emoji-size': 'Emoji font size',
-  'open-at-login': 'Start Mojibar at login'
+  'emoji-size': 'Emoji size',
+  'window-position': 'Window Position',
+  'open-at-login': 'Start Mojibar at login',
 }
 
 var applyPreferences = function (preference, initialization) {
@@ -18,7 +20,7 @@ var applyPreferences = function (preference, initialization) {
 
   ipc.send('update-preference', preference, initialization)
   var style = document.createElement('style')
-  style.innerText = '.emoji { font-size: ' + preference['emoji-size'] + 'px; width: ' + (Number(preference['emoji-size']) + 20) + 'px; height: ' + (Number(preference['emoji-size']) + 20) + 'px; }'
+  style.innerText = '.emoji { width: ' + preference['emoji-size'] + 'px; height: ' + preference['emoji-size'] + 'px; }'
   document.body.appendChild(style)
 }
 
@@ -71,16 +73,37 @@ var togglePreferencePanel = function () {
     panel.id = 'js-preference-panel'
     var html = '<form>'
     Object.keys(preferenceNames).forEach(function (key) {
+      var prefTitle = preferenceNames[key]
+      var prefVal = preference[key]
       html += '<div class="pref-item"><label for="' + key + '">'
-      if (typeof preference[key] === 'boolean') {
+      if (typeof defaultPreference[key] === 'boolean') {
         html += '<label>'
-        html += '<input type="checkbox" id="' + key + '"' + (preference[key] ? 'checked' : '') + '>'
-        html += preferenceNames[key]
+        html += '<input type="checkbox" id="' + key + '"' + (prefVal ? 'checked' : '') + '>'
+        html += prefTitle
         html += '</label>'
+	  } else if (key == 'window-position') {
+	    let positionOptions = {
+          'topLeft': 'Top Left',
+          'topRight': 'Top Right',
+          'bottomLeft': 'Bottom Left',
+          'bottomRight': 'Bottom Right',
+          'topCenter': 'Top Center',
+          'bottomCenter': 'Bottom Center',
+          'center': 'Center'
+	    };
+        html += '<label for="' + key + '">'
+        html += prefTitle
+        html += '</label>'
+        html += '<select id="' + key + '">'
+        for(let opt in positionOptions) {
+          let title = positionOptions[opt];
+          html += '<option value="' + opt + '"' + (prefVal == opt ? ' selected' : '') + '>' + title + '</option>'
+        }
+        html += '</select>'
       } else {
-        html += preferenceNames[key]
+        html += prefTitle
         html += '</label>'
-        html += '<input type="text" id="' + key + '" value="' + preference[key] + '" placeholder="' + defaultPreference[key] + '">'
+        html += '<input type="text" id="' + key + '" value="' + prefVal + '" placeholder="' + defaultPreference[key] + '">'
       }
       html += '</div>'
     })
diff --git a/app/style.css b/app/style.css
index 4f7ed34..f38d410 100644
--- a/app/style.css
+++ b/app/style.css
@@ -112,7 +112,7 @@ button {
   margin-bottom: 8px;
 }
 
-.preference-panel input {
+.preference-panel input, .preference-panel select {
   padding: 10px 13px;
   font-size: 13px;
   border-radius: 3px;
diff --git a/index.js b/index.js
index ec4ed9f..9e4552e 100644
--- a/index.js
+++ b/index.js
@@ -31,8 +31,13 @@ ipcMain.on('update-preference', function (evt, pref, initialization) {
       openAsHidden: true
     })
   }
+
+  mb.setOption('windowPosition', pref['window-position'])
 })
 
+var isWin = /^win/.test(process.platform)
+var superHotKey = isWin ? 'Control+Shift' : 'Command'
+
 var template = [
   {
     label: 'Mojibar',
@@ -74,17 +79,17 @@ var template = [
       },
       {
         label: 'Preference',
-        accelerator: 'Command+,',
+        accelerator: superHotKey + '+,',
         click: function () { mb.window.webContents.send('open-preference') }
       },
       {
         label: 'Quit App',
-        accelerator: 'Command+Q',
-        selector: 'terminate:'
-      },
+        accelerator: superHotKey + '+Q',
+        click: function () { app.quit() }
+	  },
       {
         label: 'Toggle DevTools',
-        accelerator: 'Alt+Command+I',
+        accelerator: (isWin ? 'Control+Shift' : 'Alt+Command') + '+I',
         click: function () { mb.window.toggleDevTools() }
       }
     ]