diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index c3b2b012..a36abd29 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -4,9 +4,9 @@
     style="background-color: rgba(255, 255, 255, 0.6)"
   >
     <div>
-      <WindowControls class="px-3" />
+      <WindowControls class="px-3" :buttons="['close', 'minimize']" />
       <div class="mt-6 px-3">
-        <h6 class="text-sm font-semibold" @click="$router.push('/')">{{ companyName }}</h6>
+        <h6 class="text-base font-semibold" @click="$router.push('/')">{{ companyName }}</h6>
       </div>
       <div class="mt-5">
         <div class="mt-1 first:mt-0" v-for="group in groups" :key="group.title">
@@ -20,7 +20,7 @@
               :active="isActiveGroup(group) && !group.items"
             />
             <div
-              class="ml-2 text-sm text-gray-900"
+              class="ml-2 text-lg text-gray-900"
               :class="isActiveGroup(group) && !group.items && 'text-blue-500'"
             >{{ group.title }}</div>
           </div>
@@ -28,7 +28,7 @@
             <div
               v-for="item in group.items"
               :key="item.label"
-              class="mt-1 first:mt-0 text-sm text-gray-800 py-1 pl-10 rounded cursor-pointer hover:bg-white"
+              class="mt-1 first:mt-0 text-base text-gray-800 py-1 pl-10 rounded cursor-pointer hover:bg-white"
               :class="itemActiveClass(item)"
               @click="routeTo(item.route)"
             >{{ item.label }}</div>
@@ -36,19 +36,11 @@
         </div>
       </div>
     </div>
-    <div>
-      <button
-        class="block bg-white rounded w-full h-8 flex justify-center focus:outline-none focus:shadow-outline"
-      >
-        <AddIcon class="w-3 h-3 stroke-current text-gray-900" />
-      </button>
-    </div>
   </div>
 </template>
 <script>
 import sidebarConfig from '../sidebarConfig';
 import WindowControls from './WindowControls';
-import AddIcon from './Icons/Add';
 import { _ } from 'frappejs/utils';
 
 export default {
@@ -61,7 +53,6 @@ export default {
   },
   components: {
     WindowControls,
-    AddIcon
   },
   async mounted() {
     this.companyName = await sidebarConfig.getTitle();
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index a19f29a1..84ac6d78 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col">
     <PageHeader>
-      <h1 slot="title" class="text-xl font-bold">{{ _('Chart of Accounts') }}</h1>
+      <h1 slot="title" class="text-2xl font-bold">{{ _('Chart of Accounts') }}</h1>
       <template slot="actions">
         <SearchBar class="ml-2" />
       </template>
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index 153e2d6f..f5d85b98 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="px-12 py-10 flex-1 bg-white">
+  <div class="px-12 py-10 flex-1 bg-white window-drag">
     <h1 class="text-2xl font-semibold">{{ _('Welcome to Frappe Accounting') }}</h1>
     <p
       class="text-gray-600"
@@ -11,7 +11,7 @@
       >
         <div class="w-14 h-14 rounded-full bg-blue-200 relative flex items-center justify-center">
           <div class="w-12 h-12 absolute rounded-full bg-blue-500 flex items-center justify-center">
-            <AddIcon class="w-4 h-4 text-white stroke-current" />
+            <feather-icon name="plus" class="text-white w-5 h-5"/>
           </div>
         </div>
         <div class="mt-5 font-medium">{{ _('New Database') }}</div>
@@ -25,21 +25,7 @@
       >
         <div class="w-14 h-14 rounded-full bg-green-200 relative flex items-center justify-center">
           <div class="w-12 h-12 rounded-full bg-green-500 flex items-center justify-center">
-            <svg
-              class="w-4 h-4 stroke-current text-white"
-              viewBox="0 0 21 19"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M10.664 9.824V1.42m6.723.84h2.52v11.765H1.42V2.261h2.521m2.521 15.966h8.404m-4.202-4.202v4.202M7.303 4.782l3.36-3.362 3.362 3.362"
-                stroke="#FFF"
-                stroke-width="1.5"
-                fill="none"
-                fill-rule="evenodd"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-              />
-            </svg>
+            <feather-icon name="upload"  class="w-4 h-4 text-white" />
           </div>
         </div>
         <div class="mt-5 font-medium">{{ _('Existing Database') }}</div>
@@ -52,14 +38,10 @@
 </template>
 <script>
 import { _ } from 'frappejs';
-import AddIcon from '@/components/Icons/Add';
 import { createNewDatabase, loadExistingDatabase } from '@/utils';
 
 export default {
   name: 'DatabaseSelector',
-  components: {
-    AddIcon
-  },
   methods: {
     async newDatabase() {
       let filePath = await createNewDatabase();