diff --git a/components/connection/ServerConnectForm.vue b/components/connection/ServerConnectForm.vue
index ebecabdf..8885cbe1 100644
--- a/components/connection/ServerConnectForm.vue
+++ b/components/connection/ServerConnectForm.vue
@@ -4,13 +4,16 @@
       <!-- list of server connection configs -->
       <template v-if="!showForm">
         <div v-for="config in serverConnectionConfigs" :key="config.id" class="border-b border-fg/10 py-4">
-          <div class="flex items-center my-1 relative" @click="connectToServer(config)">
-            <span class="material-symbols text-xl text-fg-muted">dns</span>
-            <p class="pl-3 pr-6 text-base text-fg">{{ config.name }}</p>
-
-            <div class="absolute top-0 right-0 h-full px-4 flex items-center" @click.stop="editServerConfig(config)">
+          <div class="flex items-center my-1 relative space-x-2" @click="connectToServer(config)">
+            <div class="grow inline-flex items-center overflow-hidden">
+              <p class="text-base text-fg truncate">{{ config.name }}</p>
+            </div>
+            <div class="h-full w-6 flex items-center" @click.stop="editServerConfig(config)">
               <span class="material-symbols text-2xl text-fg-muted">more_vert</span>
             </div>
+            <div class="h-full w-6 flex items-center" @click.stop="removeServerConfigClick(config)">
+              <span class="material-symbols fill text-1.5xl text-fg-muted">delete</span>
+            </div>
           </div>
           <!-- warning message if server connection config is using an old user id -->
           <div v-if="!checkIdUuid(config.userId)" class="flex flex-nowrap justify-between items-center space-x-4 pt-4">
@@ -57,7 +60,7 @@
             <ui-text-input v-model="password" type="password" :disabled="processing" :placeholder="$strings.LabelPassword" class="w-full mb-2 text-lg" />
 
             <div class="flex items-center pt-2">
-              <ui-icon-btn v-if="serverConfig.id" small bg-color="error" icon="delete" type="button" @click="removeServerConfigClick" />
+              <ui-icon-btn v-if="serverConfig.id" bg-color="error" icon="delete" type="button" @click="removeServerConfigClick(serverConfig)" />
               <div class="flex-grow" />
               <ui-btn :disabled="processing || !networkConnected" type="submit" class="mt-1 h-10">{{ networkConnected ? $strings.ButtonSubmit : $strings.MessageNoNetworkConnection }}</ui-btn>
             </div>
@@ -478,8 +481,8 @@ export default {
         }
       }
     },
-    async removeServerConfigClick() {
-      if (!this.serverConfig.id) return
+    async removeServerConfigClick(serverConfig) {
+      if (!serverConfig.id) return
       await this.$hapticsImpact()
 
       const { value } = await Dialog.confirm({
@@ -488,9 +491,9 @@ export default {
       })
       if (value) {
         this.processing = true
-        await this.$db.removeServerConnectionConfig(this.serverConfig.id)
+        await this.$db.removeServerConnectionConfig(serverConfig.id)
         const updatedDeviceData = { ...this.deviceData }
-        updatedDeviceData.serverConnectionConfigs = this.deviceData.serverConnectionConfigs.filter((scc) => scc.id != this.serverConfig.id)
+        updatedDeviceData.serverConnectionConfigs = this.deviceData.serverConnectionConfigs.filter((scc) => scc.id != serverConfig.id)
         this.$store.commit('setDeviceData', updatedDeviceData)
 
         this.serverConfig = {
@@ -502,6 +505,7 @@ export default {
         this.processing = false
         this.showAuth = false
         this.showForm = !this.serverConnectionConfigs.length
+        this.error = null
       }
     },
     async editServerConfig(serverConfig) {
diff --git a/tailwind.config.js b/tailwind.config.js
index c4c27f33..34a3ebaf 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,17 +1,11 @@
 const defaultTheme = require('tailwindcss/defaultTheme')
 
 module.exports = {
-  content: [
-    'components/**/*.vue',
-    'layouts/**/*.vue',
-    'pages/**/*.vue',
-    'mixins/**/*.js',
-    'plugins/**/*.js'
-  ],
+  content: ['components/**/*.vue', 'layouts/**/*.vue', 'pages/**/*.vue', 'mixins/**/*.js', 'plugins/**/*.js'],
   theme: {
     extend: {
       screens: {
-        'short': { 'raw': '(max-height: 500px)' }
+        short: { raw: '(max-height: 500px)' }
       },
       colors: {
         bg: 'rgb(var(--color-bg) / <alpha-value>)',
@@ -24,7 +18,7 @@ module.exports = {
         'bg-toggle': 'rgb(var(--color-bg-toggle) / <alpha-value>)',
         'bg-toggle-selected': 'rgb(var(--color-bg-toggle-selected) / <alpha-value>)',
         'track-cursor': 'rgb(var(--color-track-cursor) / <alpha-value>)',
-        'track': 'rgb(var(--color-track) / <alpha-value>)',
+        track: 'rgb(var(--color-track) / <alpha-value>)',
         'track-buffered': 'rgb(var(--color-track-buffered) / <alpha-value>)',
         accent: '#1ad691',
         error: '#FF5252',
@@ -41,28 +35,29 @@ module.exports = {
         mono: ['Ubuntu Mono', ...defaultTheme.fontFamily.mono]
       },
       fontSize: {
+        '1.5xl': '1.375rem',
         xxs: '0.625rem'
       },
       spacing: {
-        '18': '4.5rem'
+        18: '4.5rem'
       },
       height: {
-        '18': '4.5rem'
+        18: '4.5rem'
       },
       maxWidth: {
-        '24': '6rem'
+        24: '6rem'
       },
       minWidth: {
-        '4': '1rem',
-        '8': '2rem',
-        '10': '2.5rem',
-        '12': '3rem',
-        '16': '4rem'
+        4: '1rem',
+        8: '2rem',
+        10: '2.5rem',
+        12: '3rem',
+        16: '4rem'
       },
       minHeight: {
-        '12': '3rem'
+        12: '3rem'
       }
     }
   },
-  plugins: [],
+  plugins: []
 }