diff --git a/components/app/Header.vue b/components/app/Header.vue
index 9cfd4a10c..da2c8612c 100644
--- a/components/app/Header.vue
+++ b/components/app/Header.vue
@@ -29,6 +29,7 @@
           v-tippy="{ theme: 'tooltip' }"
           :title="$t('header.install_pwa')"
           icon="offline_bolt"
+          class="rounded"
           @click.native="showInstallPrompt()"
         />
         <ButtonSecondary
@@ -63,6 +64,7 @@
                 v-else
                 v-tippy="{ theme: 'tooltip' }"
                 :title="$t('account')"
+                class="rounded"
                 icon="account_circle"
               />
             </template>
diff --git a/components/collections/index.vue b/components/collections/index.vue
index b6279801e..34db23399 100644
--- a/components/collections/index.vue
+++ b/components/collections/index.vue
@@ -106,7 +106,7 @@
       />
     </div>
     <div
-      v-if="collections.length === 0"
+      v-if="filteredCollections.length === 0 && filterText.length === 0"
       class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
       <span class="text-center pb-4">
@@ -132,7 +132,7 @@
       />
     </div>
     <div
-      v-if="!(filteredCollections.length !== 0 || collections.length === 0)"
+      v-if="filterText.length !== 0 && filteredCollections.length === 0"
       class="flex flex-col text-secondaryLight p-4 items-center justify-center"
     >
       <i class="opacity-75 pb-2 material-icons">manage_search</i>
diff --git a/components/firebase/Login.vue b/components/firebase/Login.vue
index 815dffb0f..bfa06211b 100644
--- a/components/firebase/Login.vue
+++ b/components/firebase/Login.vue
@@ -332,7 +332,7 @@ export default {
         })
         .catch((e) => {
           console.error(e)
-          this.$toast.error(error.message, {
+          this.$toast.error(e.message, {
             icon: "error",
           })
           this.signingInWithEmail = false
diff --git a/components/teams/Edit.vue b/components/teams/Edit.vue
index 771eddf76..737832513 100644
--- a/components/teams/Edit.vue
+++ b/components/teams/Edit.vue
@@ -335,7 +335,7 @@ export default defineComponent({
             })
           })
           .catch((e) => {
-            this.$toast.error(error, {
+            this.$toast.error(e, {
               icon: "done",
             })
             console.error(e)
@@ -355,7 +355,7 @@ export default defineComponent({
             })
           })
           .catch((e) => {
-            this.$toast.error(error, {
+            this.$toast.error(e, {
               icon: "done",
             })
             console.error(e)
diff --git a/helpers/teams/utils.js b/helpers/teams/utils.js
index 957e20250..615bcc094 100644
--- a/helpers/teams/utils.js
+++ b/helpers/teams/utils.js
@@ -227,7 +227,7 @@ export async function deleteTeam(apollo, teamID) {
 }
 
 export function exitTeam(apollo, teamID) {
-  apollo.mutate({
+  return apollo.mutate({
     mutation: gql`
       mutation ($teamID: String!) {
         leaveTeam(teamID: $teamID)