diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index ec6f80d9..3fef2e28 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -13,30 +13,15 @@
       >
         <h6
           class="
-            text-xl
             font-semibold
             whitespace-nowrap
             overflow-auto
             no-scrollbar
             select-none
-            w-32
           "
         >
           {{ companyName }}
         </h6>
-        <feather-icon
-          class="
-            w-5
-            h-5
-            ml-1
-            stroke-2
-            cursor-pointer
-            text-gray-600
-            hover:text-gray-800
-          "
-          name="chevron-down"
-          @click="$emit('change-db-file')"
-        />
       </div>
 
       <!-- Sidebar Items -->
@@ -93,17 +78,36 @@
     </div>
 
     <!-- Report Issue and App Version -->
-    <div class="px-5 window-no-drag">
-      <p v-if="fyo.store.isDevelopment" class="text-sm text-gray-600">
-        Development
-      </p>
+    <div class="window-no-drag flex flex-col gap-2 p-2">
       <button
-        class="pb-1 text-sm text-gray-600 hover:text-gray-800 w-full text-left"
+        class="
+          flex
+          text-sm text-gray-600
+          hover:text-gray-800
+          gap-1
+          items-center
+        "
         @click="() => reportIssue()"
       >
-        {{ t`Report Issue` }}
+        <feather-icon name="flag" class="h-4 w-4" />
+        <p>
+          {{ t`Report Issue` }}
+        </p>
+      </button>
+
+      <button
+        class="
+          flex
+          text-sm text-gray-600
+          hover:text-gray-800
+          gap-1
+          items-center
+        "
+        @click="$emit('change-db-file')"
+      >
+        <feather-icon name="database" class="h-4 w-4" />
+        <p>{{ t`Change DB` }}</p>
       </button>
-      <p class="pb-3 text-sm text-gray-600 select-none">v{{ appVersion }}</p>
     </div>
   </div>
 </template>
diff --git a/src/pages/Settings/TabSystem.vue b/src/pages/Settings/TabSystem.vue
index 05268094..d04791d7 100644
--- a/src/pages/Settings/TabSystem.vue
+++ b/src/pages/Settings/TabSystem.vue
@@ -8,10 +8,15 @@
       :emit-change="true"
       @change="forwardChangeEvent"
     />
-    <LanguageSelector
-      class="text-sm w-28 bg-gray-100 rounded-md mb-4 ml-4"
-      input-class="py-1.5 bg-transparent"
-    />
+    <div class="flex p-4 justify-between">
+      <LanguageSelector
+        class="text-sm w-28 bg-gray-100 rounded-md"
+        input-class="py-1.5 bg-transparent"
+      />
+      <p class="mt-auto text-gray-600 text-base select-none">
+        {{ `v${fyo.store.appVersion}` }}
+      </p>
+    </div>
   </div>
 </template>