diff --git a/client/components/forms/FileInput.vue b/client/components/forms/FileInput.vue
index 1240a87..f5eeaf2 100644
--- a/client/components/forms/FileInput.vue
+++ b/client/components/forms/FileInput.vue
@@ -115,6 +115,7 @@ export default {
       return this.accept
         .split(',')
         .map((i) => {
+          if (!i) return null
           return '.' + i.trim()
         })
         .join(',')
diff --git a/client/components/open/forms/components/templates/FormTemplateModal.vue b/client/components/open/forms/components/templates/FormTemplateModal.vue
index b81ce46..671608d 100644
--- a/client/components/open/forms/components/templates/FormTemplateModal.vue
+++ b/client/components/open/forms/components/templates/FormTemplateModal.vue
@@ -105,7 +105,12 @@ onMounted(() => {
     related_templates: null,
     questions: []
   })
-  loadAllTemplates(templatesStore)
+})
+
+watch(() => props.show, () => {
+  if (props.show) {
+    loadAllTemplates(templatesStore)
+  }
 })
 
 let typesOptions = computed(() => {
diff --git a/client/pages/settings/workspace.vue b/client/pages/settings/workspace.vue
index 0048ff2..fc19c06 100644
--- a/client/pages/settings/workspace.vue
+++ b/client/pages/settings/workspace.vue
@@ -47,13 +47,13 @@
         <p class="text-gray-500 text-sm">
           Read our <a href="#"
                       @click.prevent="crisp.openHelpdeskArticle('how-to-use-my-own-domain-9m77g7')"
-          >custom
-            domain instructions</a> to learn how to use your own domain.
+        >custom domain instructions</a> to learn how to use your own domain.
         </p>
       </template>
 
       <div class="flex flex-wrap justify-between gap-2 mt-4">
-        <v-button v-if="customDomainsEnabled" class="w-full sm:w-auto" :loading="customDomainsLoading" @click="saveChanges">
+        <v-button v-if="customDomainsEnabled" class="w-full sm:w-auto" :loading="customDomainsLoading"
+                  @click="saveChanges">
           <svg class="w-4 h-4 text-white inline mr-1 -mt-1" viewBox="0 0 24 24" fill="none"
                xmlns="http://www.w3.org/2000/svg"
           >
@@ -155,9 +155,9 @@ const saveChanges = () => {
   customDomainsLoading.value = true
   // Update the workspace custom domain
   opnFetch('/open/workspaces/' + workspace.value.id + '/custom-domains', {
-    method:'PUT',
+    method: 'PUT',
     custom_domains: customDomains.split('\n')
-      .map(domain => domain.trim())
+      .map(domain => domain ? domain.trim() : null)
       .filter(domain => domain && domain.length > 0)
   }).then((data) => {
     workspacesStore.addOrUpdate(data)
@@ -180,7 +180,7 @@ const deleteWorkspace = (workspaceId) => {
     return
   }
   useAlert().confirm('Do you really want to delete this workspace? All forms created in this workspace will be removed.', () => {
-    opnFetch('/open/workspaces/' + workspaceId, {method:'DELETE'}).then((data) => {
+    opnFetch('/open/workspaces/' + workspaceId, {method: 'DELETE'}).then((data) => {
       useAlert().success('Workspace successfully removed.')
       workspacesStore.remove(workspaceId)
     })
diff --git a/client/public/img/icons/clock.png b/client/public/img/icons/clock.png
deleted file mode 100644
index 5716431..0000000
Binary files a/client/public/img/icons/clock.png and /dev/null differ
diff --git a/client/public/img/icons/form_happy.png b/client/public/img/icons/form_happy.png
deleted file mode 100644
index 076dfb3..0000000
Binary files a/client/public/img/icons/form_happy.png and /dev/null differ
diff --git a/client/public/img/icons/happy_flame.png b/client/public/img/icons/happy_flame.png
deleted file mode 100644
index 2f70081..0000000
Binary files a/client/public/img/icons/happy_flame.png and /dev/null differ
diff --git a/client/public/img/icons/neutral.png b/client/public/img/icons/neutral.png
deleted file mode 100644
index f63c43a..0000000
Binary files a/client/public/img/icons/neutral.png and /dev/null differ
diff --git a/client/public/img/icons/rocket.png b/client/public/img/icons/rocket.png
deleted file mode 100644
index 708be4a..0000000
Binary files a/client/public/img/icons/rocket.png and /dev/null differ
diff --git a/client/public/img/icons/sad.png b/client/public/img/icons/sad.png
deleted file mode 100644
index 47d7a8d..0000000
Binary files a/client/public/img/icons/sad.png and /dev/null differ
diff --git a/client/public/img/icons/sparks.png b/client/public/img/icons/sparks.png
deleted file mode 100644
index 5e51fe4..0000000
Binary files a/client/public/img/icons/sparks.png and /dev/null differ
diff --git a/client/public/img/icons/welcome.png b/client/public/img/icons/welcome.png
deleted file mode 100644
index 4daef91..0000000
Binary files a/client/public/img/icons/welcome.png and /dev/null differ
diff --git a/client/public/img/icons/wonder.png b/client/public/img/icons/wonder.png
deleted file mode 100644
index 417d6f3..0000000
Binary files a/client/public/img/icons/wonder.png and /dev/null differ