diff --git a/models/doctype/PrintSettings/PrintSettings.js b/models/doctype/PrintSettings/PrintSettings.js
new file mode 100644
index 00000000..4f2da28e
--- /dev/null
+++ b/models/doctype/PrintSettings/PrintSettings.js
@@ -0,0 +1,64 @@
+module.exports = {
+  name: 'PrintSettings',
+  label: 'Print Settings',
+  isSingle: 1,
+  isChild: 0,
+  fields: [
+    {
+      fieldname: 'logo',
+      label: 'Logo',
+      fieldtype: 'AttachImage'
+    },
+    {
+      fieldname: 'companyName',
+      label: 'Company Name',
+      fieldtype: 'Data'
+    },
+    {
+      fieldname: 'email',
+      label: 'Email',
+      fieldtype: 'Data'
+    },
+    {
+      fieldname: 'displayLogo',
+      label: 'Display Logo in Invoice',
+      fieldtype: 'Check'
+    },
+    {
+      fieldname: 'phone',
+      label: 'Phone',
+      fieldtype: 'Data'
+    },
+    {
+      fieldname: 'address',
+      label: 'Address',
+      fieldtype: 'Link',
+      target: 'Address',
+      inline: true
+    },
+    {
+      fieldname: 'gstin',
+      label: 'GSTIN',
+      fieldtype: 'Data'
+    },
+    {
+      fieldname: 'template',
+      label: 'Template',
+      fieldtype: 'Select',
+      options: ['Basic', 'Modern'],
+      default: 'Basic'
+    },
+    {
+      fieldname: 'color',
+      label: 'Theme Color',
+      fieldtype: 'Data'
+    },
+    {
+      fieldname: 'font',
+      label: 'Font',
+      fieldtype: 'Select',
+      options: ['Inter', 'Roboto'],
+      default: 'Inter'
+    }
+  ]
+};
diff --git a/models/index.js b/models/index.js
index 012556a2..7fd67096 100644
--- a/models/index.js
+++ b/models/index.js
@@ -65,6 +65,8 @@ module.exports = {
     EventSettings: require('./doctype/EventSettings/EventSettings'),
 
     Email: require('./doctype/Email/Email'),
-    EmailAccount: require('./doctype/EmailAccount/EmailAccount')
+    EmailAccount: require('./doctype/EmailAccount/EmailAccount'),
+
+    PrintSettings: require('./doctype/PrintSettings/PrintSettings')
   }
 };
diff --git a/src-electron/main.js b/src-electron/main.js
index ae7a5b9d..5ca37895 100644
--- a/src-electron/main.js
+++ b/src-electron/main.js
@@ -1,5 +1,6 @@
 const { app, BrowserWindow, ipcMain } = require('electron');
 const setupMenu = require('./menu');
+const theme = require('../src/theme');
 
 let mainWindow;
 let winURL;
@@ -48,6 +49,26 @@ function createWindow() {
   setupMenu();
 }
 
+function createSettingsWindow(tab = 'General') {
+  let settingsWindow = new BrowserWindow({
+    parent: mainWindow,
+    frame: false,
+    width: 460,
+    height: 577,
+    backgroundColor: theme.backgroundColor.gray['200'],
+    webPreferences: {
+      webSecurity: false,
+      nodeIntegration: true
+    }
+  });
+
+  settingsWindow.loadURL(`${winURL}/#/settings/${tab}`);
+}
+
+ipcMain.on('open-settings-window', tab => {
+  createSettingsWindow(tab);
+});
+
 ipcMain.on('reload-main-window', () => {
   mainWindow.reload();
 });
diff --git a/src/components/WindowControls.vue b/src/components/WindowControls.vue
index 0076d1a4..368af1fa 100644
--- a/src/components/WindowControls.vue
+++ b/src/components/WindowControls.vue
@@ -1,29 +1,55 @@
 <template>
   <div class="flex">
-    <div @click="close" class="w-3 h-3 rounded-full bg-red-500 hover:bg-red-700"></div>
-    <div @click="minimize" class="ml-2 w-3 h-3 rounded-full bg-yellow-500 hover:bg-yellow-700"></div>
-    <div @click="maximize" class="ml-2 w-3 h-3 rounded-full bg-green-500 hover:bg-green-700"></div>
+    <div
+      @click="action('close')"
+      class="w-3 h-3 rounded-full"
+      :class="getColorClasses('close')"
+    ></div>
+    <div
+      @click="action('minimize')"
+      class="ml-2 w-3 h-3 rounded-full"
+      :class="getColorClasses('minimize')"
+    ></div>
+    <div
+      @click="action('maximize')"
+      class="ml-2 w-3 h-3 rounded-full"
+      :class="getColorClasses('maximize')"
+    ></div>
   </div>
 </template>
 
 <script>
-import electron from 'electron'
+import electron from 'electron';
 
 export default {
   name: 'WindowControls',
+  props: {
+    buttons: {
+      type: Array,
+      default: () => ['close', 'minimize', 'maximize']
+    }
+  },
   methods: {
-    close() {
-      let window = electron.remote.getCurrentWindow();
-      window.close();
-    },
-    minimize() {
-      let window = electron.remote.getCurrentWindow();
-      window.minimize();
-    },
-    maximize() {
-      let window = electron.remote.getCurrentWindow();
-      window.maximize();
+    action(name) {
+      if (this.buttons.includes(name)) {
+        this.$emit(name);
+        let window = electron.remote.getCurrentWindow();
+        window[name]();
+      }
     },
+    getColorClasses(name) {
+      let classes = {
+        close: 'bg-red-500 hover:bg-red-700',
+        minimize: 'bg-yellow-500 hover:bg-yellow-700',
+        maximize: 'bg-green-500 hover:bg-green-700'
+      }[name];
+
+      if (this.buttons.includes(name)) {
+        return classes;
+      }
+
+      return 'bg-gray-500';
+    }
   }
-}
+};
 </script>
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
deleted file mode 100644
index 577e5503..00000000
--- a/src/pages/Settings.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
-  <div class="flex flex-col flex-1">
-    <div class="bg-gray-200 window-drag pb-2">
-      <div class="p-2">
-        <WindowControls />
-      </div>
-      <Row :columnCount="5" class="px-6" gap="0.5rem">
-        <div
-          v-for="(tab, i) in tabs"
-          :key="tab.label"
-          class="p-2 rounded-6px hover:bg-white flex flex-col items-center justify-center cursor-pointer"
-          :class="i === activeTab && 'bg-white shadow text-blue-500'"
-          @click="activeTab = i"
-        >
-          <component :is="getIconComponent(tab)" />
-          <div class="mt-2 text-xs">{{ tab.label }}</div>
-        </div>
-      </Row>
-    </div>
-    <div class="bg-white flex-1 p-6">
-      <component :is="activeTabComponent" />
-    </div>
-  </div>
-</template>
-<script>
-import { _ } from 'frappejs/utils';
-import WindowControls from '@/components/WindowControls';
-import TabGeneral from './TabGeneral.vue';
-import TabSystem from './TabSystem.vue';
-import Row from '@/components/Row';
-
-export default {
-  name: 'Settings',
-  components: {
-    WindowControls,
-    Row
-  },
-  data() {
-    return {
-      activeTab: 0,
-      tabs: [
-        {
-          label: _('General'),
-          icon: `<svg class="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-            <g fill="none" fill-rule="evenodd">
-              <path d="M18.94 13.94l4.025 4.024a3.535 3.535 0 11-5 5l-4.518-4.518 3.641-4.499c.304.035.607.053.912.053.318 0 .631-.024.94-.06zM4 0l4 4-1.293 1.293 2.378 2.378-1.522 1.306-2.27-2.27L4 8 0 4l4-4z" fill="#A1ABB4"/>
-              <path d="M20.271 6.771l-3.042-3.042L20.437.521A5.97 5.97 0 0018 0a6 6 0 00-5.75 7.708l-10.789 8.73a4.335 4.335 0 00-1.459 3.106 4.335 4.335 0 001.264 3.19 4.325 4.325 0 006.296-.195l8.73-10.789A6 6 0 0024 6c0-.869-.189-1.692-.521-2.438l-3.208 3.209z" fill="#415668"/>
-            </g>
-          </svg>`,
-          component: TabGeneral
-        },
-        {
-          label: _('Mail'),
-          icon: `<svg class="w-6 h-6" viewBox="0 0 24 20" xmlns="http://www.w3.org/2000/svg">
-            <g fill="none" fill-rule="evenodd">
-              <path d="M13.4 12.6a2.3 2.3 0 01-1.4.4 2.3 2.3 0 01-1.4-.4L0 6.9V17a3 3 0 003 3h18a3 3 0 003-3V6.9l-10.6 5.7z" fill="#415668"/>
-              <path d="M21 0H3a3 3 0 00-3 3v1a1.05 1.05 0 00.5.9l11 6a.9.9 0 00.5.1.9.9 0 00.5-.1l11-6A1.05 1.05 0 0024 4V3a3 3 0 00-3-3z" fill="#A1ABB4"/>
-            </g>
-          </svg>`
-        },
-        {
-          label: _('Invoice'),
-          icon: `<svg class="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-            <g fill="none" fill-rule="evenodd">
-              <path d="M20.7 15.6l2.85 2.85c.3.3.45.6.45 1.05V24h-4.5c-.45 0-.75-.15-1.05-.45L15.6 20.7l5.1-5.1zM3.45.45c.6-.6 1.5-.6 2.1 0L8.4 3.3 3.3 8.4.45 5.55c-.6-.6-.6-1.5 0-2.1z" fill="#A1ABB4"/>
-              <path d="M23.55 6.45l-6-6c-.6-.6-1.5-.6-2.1 0L13.5 2.4l2.55 2.55-2.1 2.1L11.4 4.5 9 6.9l2.55 2.55-2.1 2.1L6.9 9l-2.4 2.4 2.55 2.55-2.1 2.1L2.4 13.5.45 15.45c-.6.6-.6 1.5 0 2.1l6 6c.6.6 1.5.6 2.1 0l15-15c.6-.6.6-1.5 0-2.1z" fill="#415668"/>
-            </g>
-          </svg>`
-        },
-        {
-          label: _('System'),
-          icon: `<svg class="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-            <path d="M20.872 13.453c.082-.48.125-.966.128-1.453a9.033 9.033 0 00-.128-1.453l2.1-2.029a1 1 0 00.171-1.218l-1.5-2.6a1.009 1.009 0 00-1.143-.461l-2.8.8a9.017 9.017 0 00-2.527-1.451L14.47.758A1 1 0 0013.5 0h-3a1 1 0 00-.97.758l-.707 2.83A9.017 9.017 0 006.3 5.039l-2.8-.8a1.01 1.01 0 00-1.143.461l-1.5 2.6a1 1 0 00.171 1.219l2.1 2.029c-.082.48-.125.965-.128 1.452.003.487.046.973.128 1.453l-2.1 2.029A1 1 0 00.857 16.7l1.5 2.6a1 1 0 001.142.462l2.8-.8a9.017 9.017 0 002.527 1.451l.707 2.83A1 1 0 0010.5 24h3a1 1 0 00.97-.758l.707-2.83a9.017 9.017 0 002.523-1.451l2.8.8a1 1 0 001.142-.462l1.5-2.6a1 1 0 00-.171-1.219l-2.099-2.027zM12 16a4 4 0 110-8 4 4 0 010 8z" fill="#415668" fill-rule="evenodd"/>
-          </svg>`,
-          component: TabSystem
-        },
-        {
-          label: _('Privacy'),
-          icon: `<svg class="w-6 h-6" viewBox="0 0 22 24" xmlns="http://www.w3.org/2000/svg">
-            <g fill="#415668" fill-rule="evenodd">
-              <path d="M20.618 2.111L11.226.024a1.069 1.069 0 00-.453 0L1.382 2.111c-.478.106-.817.53-.817 1.02v10.434C.565 19.328 5.237 24 11 24c5.763 0 10.435-4.672 10.435-10.435V3.13c0-.489-.34-.913-.817-1.019zm-4.4 14.585c0 .576-.468 1.043-1.044 1.043H6.826a1.043 1.043 0 01-1.044-1.043v-5.218c0-.576.468-1.043 1.044-1.043h1.043V8.348a3.13 3.13 0 116.261 0v2.087h1.044c.576 0 1.043.467 1.043 1.043v5.218z"/>
-              <path d="M11 7.304c-.577 0-1.044.468-1.044 1.044v2.087h2.087V8.348c0-.576-.467-1.044-1.043-1.044z"/>
-            </g>
-          </svg>`
-        }
-      ]
-    };
-  },
-  methods: {
-    getIconComponent(tab) {
-      return {
-        template: tab.icon
-      };
-    },
-  },
-  computed: {
-    activeTabComponent() {
-      return this.tabs[this.activeTab].component;
-    }
-  }
-};
-</script>
diff --git a/src/pages/Settings/SettingSection.vue b/src/pages/Settings/SettingSection.vue
deleted file mode 100644
index 2ac40c00..00000000
--- a/src/pages/Settings/SettingSection.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<template>
-  <div v-if="doc">
-    <h4 class="mb-3">{{ title }}</h4>
-    <form-layout
-      :doc="doc"
-      :fields="fields"
-      @updateDoc="saveDoc"
-    />
-  </div>
-</template>
-<script>
-import FormLayout from 'frappejs/ui/components/Form/FormLayout';
-
-export default {
-  name: 'SettingSection',
-  props: ['doctype'],
-  components: {
-    FormLayout
-  },
-  data() {
-    return {
-      doc: null,
-      title: '',
-      fields: []
-    }
-  },
-  async mounted() {
-    this.doc = await frappe.getDoc(this.doctype);
-    const meta = frappe.getMeta(this.doctype);
-    this.fields = meta.fields;
-    this.title = meta.label;
-  },
-  methods: {
-    saveDoc() {
-      this.doc.update();
-      this.$toasted.show('Saved');
-    }
-  }
-}
-</script>
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index 4b338708..d1888f07 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -1,32 +1,102 @@
 <template>
-  <div>
-    <page-header title="Settings" />
-    <div>
-      <div class="col-9 col-lg-7 col-xl-6 mx-2 mt-4">
-        <div>
-          <setting-section doctype="AccountingSettings" />
-          <hr class="mt-4" />
-          <setting-section doctype="CompanySettings" />
-          <hr class="mt-4" />
-          <setting-section doctype="DashboardSettings" />
-          <hr class="mt-4" />
-          <setting-section doctype="EmailAccount" />
-          <hr class="mt-4" />
-          <setting-section doctype="SystemSettings" />
-        </div>
+  <div class="flex flex-col flex-1 overflow-hidden">
+    <div class="bg-gray-200 window-drag pb-2">
+      <div class="p-2">
+        <WindowControls
+          @close="frappe.events.trigger('reload-main-window')"
+          :buttons="['close']"
+        />
       </div>
+      <Row :columnCount="5" class="px-6" gap="0.5rem">
+        <div
+          v-for="(tab, i) in tabs"
+          :key="tab.label"
+          class="p-2 rounded-6px hover:bg-white flex flex-col items-center justify-center cursor-pointer"
+          :class="i === activeTab && 'bg-white shadow text-blue-500'"
+          @click="activeTab = i"
+        >
+          <component :is="getIconComponent(tab)" />
+          <div class="mt-2 text-xs">{{ tab.label }}</div>
+        </div>
+      </Row>
+    </div>
+    <div class="bg-white flex-1 p-6 overflow-y-auto">
+      <component :is="activeTabComponent" />
     </div>
   </div>
 </template>
 <script>
-import PageHeader from '@/components/PageHeader';
-import SettingSection from './SettingSection';
+import { _ } from 'frappejs/utils';
+import WindowControls from '@/components/WindowControls';
+import TabGeneral from './TabGeneral.vue';
+import TabSystem from './TabSystem.vue';
+import TabInvoice from './TabInvoice.vue';
+import Row from '@/components/Row';
+import Icon from '@/components/Icon';
 
 export default {
   name: 'Settings',
   components: {
-    PageHeader,
-    SettingSection
+    WindowControls,
+    Row
+  },
+  data() {
+    return {
+      activeTab: 0,
+      tabs: [
+        {
+          label: _('General'),
+          icon: 'general',
+          component: TabGeneral
+        },
+        // {
+        //   label: _('Mail'),
+        //   icon: 'mail'
+        // },
+        {
+          label: _('Invoice'),
+          icon: 'invoice',
+          component: TabInvoice
+        },
+        {
+          label: _('System'),
+          icon: 'system',
+          component: TabSystem
+        },
+        // {
+        //   label: _('Privacy'),
+        //   icon: 'privacy'
+        // }
+      ]
+    };
+  },
+  mounted() {
+    let path = this.$router.currentRoute.fullPath;
+    let tab = path.replace('/settings/', '');
+    let index = this.tabs.findIndex(t => t.label === _(tab));
+    if (index !== -1) {
+      this.activeTab = index;
+    }
+  },
+  methods: {
+    getIconComponent(tab) {
+      return {
+        render(h) {
+          return h(Icon, {
+            class: 'w-6 h-6',
+            props: {
+              name: tab.icon,
+              size: '24'
+            }
+          });
+        }
+      };
+    }
+  },
+  computed: {
+    activeTabComponent() {
+      return this.tabs[this.activeTab].component;
+    }
   }
 };
 </script>
diff --git a/src/pages/TabGeneral.vue b/src/pages/Settings/TabGeneral.vue
similarity index 87%
rename from src/pages/TabGeneral.vue
rename to src/pages/Settings/TabGeneral.vue
index fcb57653..35a76b67 100644
--- a/src/pages/TabGeneral.vue
+++ b/src/pages/Settings/TabGeneral.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="bg-blue-500 px-6 py-5 rounded-12px flex justify-between items-center">
+    <!-- <div class="bg-blue-500 px-6 py-5 rounded-12px flex justify-between items-center">
       <div class="flex items-center">
         <div class="bg-white rounded-full w-16 h-16 flex justify-center items-center">
           <svg class="w-6 h-6" viewBox="0 0 24 21" xmlns="http://www.w3.org/2000/svg">
@@ -17,8 +17,8 @@
         </div>
       </div>
       <Button class="text-xs">Edit</Button>
-    </div>
-    <TwoColumnForm class="mt-6" v-if="doc" :doc="doc" :fields="fields" :autosave="true" />
+    </div> -->
+    <TwoColumnForm v-if="doc" :doc="doc" :fields="fields" :autosave="true" />
   </div>
 </template>
 
@@ -45,6 +45,7 @@ export default {
     fields() {
       let meta = frappe.getMeta('AccountingSettings');
       return [
+        'companyName',
         'country',
         'bankName',
         'currency',
diff --git a/src/pages/Settings/TabInvoice.vue b/src/pages/Settings/TabInvoice.vue
new file mode 100644
index 00000000..d3e98e07
--- /dev/null
+++ b/src/pages/Settings/TabInvoice.vue
@@ -0,0 +1,104 @@
+<template>
+  <div v-if="doc">
+    <div class="flex items-center">
+      <FormControl
+        :df="meta.getField('logo')"
+        :value="doc.logo"
+        @change="
+          value => {
+            window.console.log(value)
+            doc.set('logo', value);
+            doc.update();
+          }
+        "
+      />
+      <div class="ml-6 flex flex-col">
+        <span class="font-semibold">
+          {{ companyName }}
+        </span>
+        <span class="text-lg text-gray-700">
+          {{ doc.email }}
+        </span>
+        <FormControl
+          class="mt-2"
+          :df="meta.getField('displayLogo')"
+          :value="doc.displayLogo"
+          @change="
+            value => {
+              doc.set('displayLogo', value);
+              doc.update();
+            }
+          "
+          size="small"
+        />
+      </div>
+    </div>
+    <TwoColumnForm class="mt-6" :doc="doc" :fields="fields" :autosave="true" />
+  </div>
+</template>
+<script>
+import frappe from 'frappejs';
+import { remote } from 'electron';
+import TwoColumnForm from '@/components/TwoColumnForm';
+import FormControl from '@/components/Controls/FormControl';
+
+export default {
+  name: 'TabInvoice',
+  components: {
+    TwoColumnForm,
+    FormControl
+  },
+  provide() {
+    return {
+      doctype: 'PrintSettings',
+      name: 'PrintSettings'
+    };
+  },
+  data() {
+    return {
+      companyName: null,
+      doc: null,
+      showEdit: false
+    };
+  },
+  async mounted() {
+    this.doc = await frappe.getSingle('PrintSettings');
+    this.companyName = (
+      await frappe.getSingle('AccountingSettings')
+    ).companyName;
+  },
+  computed: {
+    meta() {
+      return frappe.getMeta('PrintSettings');
+    },
+    fields() {
+      return [
+        'email',
+        'phone',
+        'address',
+        'gstin',
+        'template',
+        'font'
+      ].map(fieldname => this.meta.getField(fieldname));
+    }
+  },
+  methods: {
+    openFileSelector() {
+      remote.dialog.showOpenDialog(
+        remote.getCurrentWindow(),
+        {
+          title: frappe._('Select Logo'),
+          properties: ['openFile'],
+          filters: [{ name: 'Invoice Logo', extensions: ['png', 'jpg', 'svg'] }]
+        },
+        files => {
+          if (files && files[0]) {
+            this.doc.set('logo', `file://${files[0]}`);
+            this.doc.update();
+          }
+        }
+      );
+    }
+  }
+};
+</script>
diff --git a/src/pages/TabSystem.vue b/src/pages/Settings/TabSystem.vue
similarity index 100%
rename from src/pages/TabSystem.vue
rename to src/pages/Settings/TabSystem.vue
diff --git a/src/pages/Settings/utils.js b/src/pages/Settings/utils.js
new file mode 100644
index 00000000..38e85397
--- /dev/null
+++ b/src/pages/Settings/utils.js
@@ -0,0 +1,5 @@
+import { ipcRenderer } from 'electron';
+
+export function openSettings(tab = 'General') {
+  ipcRenderer.send('open-settings-window', tab);
+}