diff --git a/frontend/assets/style/_icons.scss b/frontend/assets/style/_icons.scss
index 43b1b0c91f..727b4d2e16 100644
--- a/frontend/assets/style/_icons.scss
+++ b/frontend/assets/style/_icons.scss
@@ -97,7 +97,7 @@ $icons: (
   }
 }
 
-.c-icon-round {
+.icon-round {
   width: 2rem;
   height: 2rem;
   margin-right: $spacer-sm*2;
diff --git a/frontend/views/components/ContributionItem.vue b/frontend/views/components/ContributionItem.vue
index 59f8ee0c09..c59488002b 100644
--- a/frontend/views/components/ContributionItem.vue
+++ b/frontend/views/components/ContributionItem.vue
@@ -133,7 +133,7 @@ export default {
           color: 'success'
         }
       }
-      return `icon-${style[this.type].icon} c-icon-round has-background-${style[this.type].color} has-text-${style[this.type].color}`
+      return `icon-${style[this.type].icon} icon-round has-background-${style[this.type].color} has-text-${style[this.type].color}`
     }
   }
 }
diff --git a/frontend/views/components/GroupWelcome.vue b/frontend/views/components/GroupWelcome.vue
index 4b6d8e4fa5..3d02024baf 100644
--- a/frontend/views/components/GroupWelcome.vue
+++ b/frontend/views/components/GroupWelcome.vue
@@ -1,9 +1,8 @@
 <template lang='pug'>
 .wrapper(data-test='welcome')
   avatar(
-    src='/assets/images/default-avatar.png'
-    :alt='groupSettings.groupName'
-    :blobURL='groupSettings.groupPicture'
+    :src='groupSettings.groupPicture'
+    :aria-label='L("{groupName}\'s avatar", { groupName: groupSettings.groupName })'
   )
 
   i18n(
diff --git a/frontend/views/containers/modals/CreateGroup.vue b/frontend/views/containers/modals/CreateGroup.vue
index f214af7f3d..3cde296686 100644
--- a/frontend/views/containers/modals/CreateGroup.vue
+++ b/frontend/views/containers/modals/CreateGroup.vue
@@ -130,7 +130,7 @@ export default {
           settings: {
             // authorizations: [contracts.CanModifyAuths.dummyAuth()], // TODO: this
             groupName: this.form.groupName,
-            groupPicture: this.form.groupPicture || '/assets/images/default-avatar.png',
+            groupPicture: this.form.groupPicture || `${window.location.origin}/assets/images/default-group-avatar.png`,
             sharedValues: this.form.sharedValues,
             mincomeAmount: +this.form.mincomeAmount, // ensure this is a number
             mincomeCurrency: this.form.mincomeCurrency,
diff --git a/frontend/views/containers/proposals/ProposalBox.vue b/frontend/views/containers/proposals/ProposalBox.vue
index 17849dc74a..3899756332 100644
--- a/frontend/views/containers/proposals/ProposalBox.vue
+++ b/frontend/views/containers/proposals/ProposalBox.vue
@@ -63,14 +63,14 @@ export default {
       if (isAnyOpen) {
         return isOwnProposal
           ? L('{strong_}You{_strong} are proposing:', this.LTags('strong'))
-          : L('{strong_}{username}{_strong} is proposing:', { username, ...this.LTags('strong') })
+          : L('{username} is proposing:', { username: `<strong>${username}</strong>` })
       }
 
       // Note: In English, no matter the subject, the wording is the same,
       // but in other languages the wording is different (ex: Portuguese)
       return isOwnProposal
         ? L('{strong_}You{_strong} proposed:', this.LTags('strong'))
-        : L('{strong_}{username}{_strong} proposed:', { username, ...this.LTags('strong') })
+        : L('{username} proposed:', { username: `<strong>${username}</strong>` })
     },
     humanDate () {
       const date = new Date(this.proposal.meta.createdDate)
@@ -97,12 +97,12 @@ export default {
         return `"${reason.substr(0, charToTruncate)}..."`
       }
 
-      return `"${reason}"`
+      return reason ? `"${reason}"` : ''
     }
   },
   methods: {
     toggleReason (e) {
-      e.target.blur() // so the button doesnt look black.
+      e.target.blur() // so the button doesnt remain focused (with black color).
       this.ephemeral.isReasonHidden = !this.ephemeral.isReasonHidden
     }
   }
diff --git a/frontend/views/containers/proposals/ProposalItem.vue b/frontend/views/containers/proposals/ProposalItem.vue
index 33dc5fd352..02ca300ccc 100644
--- a/frontend/views/containers/proposals/ProposalItem.vue
+++ b/frontend/views/containers/proposals/ProposalItem.vue
@@ -1,7 +1,7 @@
 <template lang='pug'>
   li.c-li(data-test='proposalItem')
     .c-item
-      i.c-icon-round(:class='iconClass')
+      i(:class='iconClass')
       .c-main
         p.has-text-bold(data-test='typeDescription') {{typeDescription}}
         p.has-text-1(
@@ -120,10 +120,10 @@ export default {
 
       if ([STATUS_PASSED, STATUS_FAILED].includes(this.proposal.status)) {
         // Show the status icon, no matter the proposal type
-        return `${status[this.proposal.status]} c-icon`
+        return `${status[this.proposal.status]} icon-round`
       }
 
-      return `${type[this.proposalType]} ${status[this.proposal.status]} c-icon`
+      return `${type[this.proposalType]} ${status[this.proposal.status]} icon-round`
     },
     invitationLink () {
       if (this.proposalType === PROPOSAL_INVITE_MEMBER &&
@@ -179,7 +179,7 @@ export default {
   }
 }
 
-.c-icon-round {
+.icon-round {
   @include phone {
     margin-left: $spacer-sm; // TODO: Suggest to @mmbotelho
   }
diff --git a/frontend/views/containers/proposals/ProposalVoteOptions.vue b/frontend/views/containers/proposals/ProposalVoteOptions.vue
index 868433a7f3..eda49b22aa 100644
--- a/frontend/views/containers/proposals/ProposalVoteOptions.vue
+++ b/frontend/views/containers/proposals/ProposalVoteOptions.vue
@@ -102,7 +102,10 @@ export default {
         const proposalHash = this.proposalHash
         const payload = {}
         if (oneVoteToPass(proposalHash)) {
-          payload.passPayload = createInvite({ creator: this.proposal.data.proposalData.member })
+          payload.passPayload = createInvite({
+            invitee: this.proposal.data.proposalData.member,
+            creator: this.proposal.meta.username
+          })
         }
         const vote = await sbp('gi.contracts/group/proposalVote/create',
           {
diff --git a/frontend/views/containers/sidebar/GroupsList.vue b/frontend/views/containers/sidebar/GroupsList.vue
index f6eea579cc..8c30cb57bb 100644
--- a/frontend/views/containers/sidebar/GroupsList.vue
+++ b/frontend/views/containers/sidebar/GroupsList.vue
@@ -12,8 +12,7 @@ ul.c-group-list(v-if='groupsByName.length')
     )
       button.c-group-picture.is-unstyled(@click='handleMenuSelect(group.contractID)')
         avatar.c-avatar(
-          src='/assets/images/default-avatar.png'
-          :blobURL='$store.state[group.contractID].settings.groupPicture'
+          :src='$store.state[group.contractID].settings.groupPicture'
         )
 
   li.c-group-list-item
diff --git a/frontend/views/pages/DesignSystem.vue b/frontend/views/pages/DesignSystem.vue
index 9de026e448..7d50eaf934 100644
--- a/frontend/views/pages/DesignSystem.vue
+++ b/frontend/views/pages/DesignSystem.vue
@@ -223,9 +223,9 @@ page(
         tr
           td
             pre
-              | i.icon-angle-left.c-icon-round.has-background-success.has-text-success
+              | i.icon-angle-left.icon-round.has-background-success.has-text-success
           td
-            i.icon-angle-left.c-icon-round.has-background-success.has-text-success
+            i.icon-angle-left.icon-round.has-background-success.has-text-success
   article#spacing
     section.card
       i18n(tag='h2' class='card-header') Spacing
diff --git a/frontend/views/pages/Join.vue b/frontend/views/pages/Join.vue
index 49cc34dbcb..4aeee1c5a2 100644
--- a/frontend/views/pages/Join.vue
+++ b/frontend/views/pages/Join.vue
@@ -35,16 +35,18 @@ div
     .c-broken(v-else-if='isStatus("INVALID") || isStatus("EXPIRED")')
       svg-broken-link.c-svg
       i18n.title.is-1(
-        v-if='isStatus("EXPIRED")'
+        v-if='isStatus("INVALID")'
         tag='h1'
+        data-test='pageTitle'
         :args='LTags()'
       ) Oh no! {br_}Something went wrong.
       i18n.title.is-1(
         v-else
         tag='h1'
+        data-test='pageTitle'
         :args='LTags()'
       ) Oh no! {br_}Your link has expired.
-      p.has-text-1 {{ ephemeral.errorMsg }}
+      p.has-text-1(data-test='helperText') {{ ephemeral.errorMsg }}
       i18n.c-goHome(tag='button' @click='goHome') Take me home
 </template>
 
@@ -136,7 +138,7 @@ export default {
       }
     } catch (e) {
       console.error(e)
-      this.ephemeral.errorMsg = `${L('Something went wrong.')} ${e.message}`
+      this.ephemeral.errorMsg = `${L('Something went wrong. Please, try again.')} ${e.message}`
       this.pageStatus = 'INVALID'
     }
   },
diff --git a/test/cypress/integration/group-proposals.spec.js b/test/cypress/integration/group-proposals.spec.js
index b1934eed56..ddd4901bad 100644
--- a/test/cypress/integration/group-proposals.spec.js
+++ b/test/cypress/integration/group-proposals.spec.js
@@ -1,4 +1,3 @@
-// const userId = 100 // for local test
 const userId = Math.floor(Math.random() * 10000)
 const groupName = 'Dreamers'
 
@@ -46,8 +45,7 @@ function updateIncome (newIcome, needIcome) {
 }
 
 describe('Proposals - Add members', () => {
-  let invitationLink = null
-  let invitationLinkToUser4 = null
+  const invitationLinks = {}
 
   it('user1 registers, creates a group and share its invitation link', () => {
     cy.visit('/')
@@ -63,7 +61,7 @@ describe('Proposals - Add members', () => {
     cy.getByDT('invitationLink').invoke('text').then(text => {
       const urlAt = text.indexOf('http://')
       const url = text.substr(urlAt)
-      invitationLink = url
+      invitationLinks.anyone = url
       assert.isOk(url, 'invitation link is found')
     })
 
@@ -72,30 +70,34 @@ describe('Proposals - Add members', () => {
   })
 
   it('not registered user2 and user3 join the group through the invitation link', () => {
-    cy.giAcceptGroupInvite(invitationLink, { username: `user2-${userId}`, groupName })
-    cy.giAcceptGroupInvite(invitationLink, { username: `user3-${userId}`, groupName })
+    cy.giAcceptGroupInvite(invitationLinks.anyone, { username: `user2-${userId}`, groupName })
+    cy.giAcceptGroupInvite(invitationLinks.anyone, { username: `user3-${userId}`, groupName })
   })
 
-  it('user1 proposes to add user4 and user5 together to the group', () => {
+  it('user1 proposes to add user4, user5 together to the group', () => {
     cy.giLogin(`user1-${userId}`)
 
-    cy.giInviteMember([`user4-${userId}`, `user5-${userId}`], { isProposal: true })
+    cy.giInviteMember([`user4-${userId}`, `user5-${userId}`])
   })
 
-  it('user2 proposes to add user6 to the group', () => {
+  it('user1 proposes to add user6 to the group', () => {
+    cy.giInviteMember([`user6-${userId}`])
+  })
+
+  it('user2 proposes to add user7 to the group', () => {
     cy.giSwitchUser(`user2-${userId}`)
 
-    cy.giInviteMember([`user6-${userId}`], { isProposal: true })
+    cy.giInviteMember([`user6-${userId}`])
   })
 
-  it('user3 logins and votes "yes" to all 3 proposals', () => {
+  it('user3 votes "yes" to all 4 proposals', () => {
     cy.giSwitchUser(`user3-${userId}`)
 
     getProposalBoxes()
-      // there are 2 grouped proposals
-      .should('have.length', 2)
-      // with a total of 3 individual proposals
-      .getByDT('proposalItem').should('have.length', 3)
+      // assert grouped proposals
+      .should('have.length', 3)
+      // assert total individual proposals
+      .getByDT('proposalItem').should('have.length', 4)
 
     // Go through each individual proposal and vote yes!
     getProposalBoxes().each(([group]) => {
@@ -133,30 +135,36 @@ describe('Proposals - Add members', () => {
     })
   })
 
-  it('user2 logins and votes "yes" to add user4. Proposal is accepted and invitation is created.', () => {
+  it('user2 votes "yes" to add user4 and user6. Proposals are accepted and invitations created.', () => {
     cy.giSwitchUser(`user2-${userId}`)
 
-    getProposalBoxes().eq(0).within(() => {
-      cy.getByDT('title', 'h4').as('title')
-      cy.get('@title').should('contain', `user1-${userId} is proposing:`)
-      cy.getByDT('proposalItem').eq(0).within(() => {
-        assertProposalOpenState({
-          description: '2 out of 3 members voted.'
+    function voteForAndIsAccepted (index, username) {
+      getProposalBoxes().eq(index).within(() => {
+        cy.getByDT('title', 'h4').as('title')
+        cy.get('@title').should('contain', `user1-${userId} is proposing:`)
+        cy.getByDT('proposalItem').eq(0).within(() => {
+          cy.getByDT('typeDescription')
+            .should('contain', `Add ${username}-${userId} to group.`)
+          assertProposalOpenState({
+            description: '2 out of 3 members voted.'
+          })
+          cy.getByDT('voteFor').click()
+          //  Proposal gets accepted and invitation is created!
+          cy.getByDT('statusDescription')
+            .should('contain', 'Proposal accepted!')
+          cy.getByDT('voted').should('not.exist')
+          cy.get('@title').should('contain', `user1-${userId} proposed:`)
+          cy.getByDT('sendLink').should('not.exist') // Only visible to who created the proposal
         })
-
-        cy.getByDT('voteFor').click()
-        //  Proposal gets accepted and invitation is created!
-        cy.getByDT('statusDescription')
-          .should('contain', 'Proposal accepted!')
-        cy.getByDT('voted').should('not.exist')
-        cy.get('@title').should('contain', `user1-${userId} proposed:`)
-        cy.getByDT('sendLink').should('not.exist') // Only visible to who created the proposal
       })
-    })
+    }
+
+    voteForAndIsAccepted(0, 'user4')
+    voteForAndIsAccepted(1, 'user6')
   })
 
   it('user2 decides to cancel his proposal of adding user6', () => {
-    getProposalBoxes().eq(1).within(() => {
+    getProposalBoxes().eq(2).within(() => {
       cy.getByDT('title', 'h4').as('title')
       cy.get('@title').should('contain', 'You are proposing:')
       cy.getByDT('proposalItem').eq(0).within(() => {
@@ -171,33 +179,68 @@ describe('Proposals - Add members', () => {
     })
   })
 
-  it('user1 logs back and see their accepted proposal to invite user4', () => {
+  it('user1 see their accepted proposals to invite user4 and user6', () => {
     cy.giSwitchUser(`user1-${userId}`)
 
-    getProposalBoxes().eq(0).within(() => {
-      cy.getByDT('title', 'h4').should('contain', 'You proposed:')
-      cy.getByDT('sendLink').should('contain', `Please send the following link to user4-${userId} so they can join the group:`)
-      cy.getByDT('sendLink').get('a.link')
-        .should('contain', 'http://localhost')
-        .invoke('attr', 'href')
-        .then(href => {
-          invitationLinkToUser4 = href
-          expect(href).to.contain('http://localhost')
-        })
-    })
+    function assertInvitationLinkFor (index, username) {
+      getProposalBoxes().eq(index).within(() => {
+        cy.getByDT('title', 'h4').should('contain', 'You proposed:')
+        cy.getByDT('sendLink').should('contain', `Please send the following link to ${username}-${userId} so they can join the group:`)
+        cy.getByDT('sendLink').get('a.link')
+          .should('contain', 'http://localhost')
+          .invoke('attr', 'href')
+          .then(href => {
+            invitationLinks[username] = href
+            expect(href).to.contain('http://localhost')
+          })
+      })
+    }
+
+    assertInvitationLinkFor(0, 'user4')
+    assertInvitationLinkFor(1, 'user6')
 
     cy.giLogout()
   })
 
   it('user4 registers and joins the group through its unique proposal invitation link', () => {
     cy.giSignup(`user4-${userId}`)
-    cy.giAcceptGroupInvite(invitationLinkToUser4, {
+    cy.giAcceptGroupInvite(invitationLinks.user4, {
       isLoggedIn: true,
       groupName
     })
   })
 
-  it('user1 logins and sees all 3 proposals correctly and the new member', () => {
+  it('user6 joins the group through its unique proposal invitation link', () => {
+    cy.giAcceptGroupInvite(invitationLinks.user6, {
+      groupName,
+      username: `user6-${userId}`,
+      inviteCreator: 'Margarida'
+    })
+  })
+
+  it('an expired invitation link cannot used', () => {
+    cy.visit(invitationLinks.user6) // already used on the previous test
+    cy.getByDT('pageTitle')
+      .invoke('text')
+      .should('contain', 'Oh no! Your link has expired.')
+    cy.getByDT('helperText').should('contain', 'You should ask for a new one. Sorry about that!')
+    cy.get('button').click()
+    cy.url().should('eq', 'http://localhost:8000/app/')
+    cy.getByDT('welcomeHome').should('contain', 'Welcome to GroupIncome')
+  })
+
+  it('an invalid invitation link cannot be used', () => {
+    cy.visit('http://localhost:8000/app/join?groupId=321&secret=123')
+    cy.getByDT('pageTitle')
+      .invoke('text')
+      .should('contain', 'Oh no! Something went wrong.')
+    cy.getByDT('helperText').should('contain', 'Something went wrong. Please, try again. 404: Not Found')
+    cy.get('button').click()
+    cy.url().should('eq', 'http://localhost:8000/app/')
+    cy.getByDT('welcomeHome').should('contain', 'Welcome to GroupIncome')
+  })
+
+  it('user1 logins and sees all 4 proposals correctly and the new member', () => {
     cy.giLogin(`user1-${userId}`)
 
     // A quick checkup that each proposal state is correct.
@@ -219,6 +262,16 @@ describe('Proposals - Add members', () => {
     })
 
     getProposalBoxes().eq(1).within(() => {
+      cy.getByDT('title', 'h4').should('contain', 'You proposed:')
+
+      cy.getByDT('proposalItem').eq(0).within(() => {
+        cy.getByDT('statusDescription')
+          .should('contain', 'Proposal accepted!')
+        cy.getByDT('sendLink').should('not.exist')
+      })
+    })
+
+    getProposalBoxes().eq(2).within(() => {
       cy.getByDT('title', 'h4').should('contain', `user2-${userId} proposed:`)
       cy.getByDT('proposalItem').eq(0).within(() => {
         cy.getByDT('statusDescription')
@@ -228,10 +281,11 @@ describe('Proposals - Add members', () => {
 
     cy.getByDT('groupMembers').find('ul')
       .children()
-      .should('have.length', 4)
+      .should('have.length', 5)
       .each(([member], index) => {
         cy.get(member).within(() => {
-          cy.getByDT('username').should('contain', `user${index + 1}-${userId}`)
+          const usersMap = [1, 2, 3, 4, 6]
+          cy.getByDT('username').should('contain', `user${usersMap[index]}-${userId}`)
         })
       })
   })
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 2002289c17..b636ceced1 100644
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -149,7 +149,8 @@ Cypress.Commands.add('giInviteMember', (
 Cypress.Commands.add('giAcceptGroupInvite', (invitationLink, {
   username,
   groupName,
-  isLoggedIn
+  isLoggedIn,
+  inviteCreator
 }) => {
   cy.visit(invitationLink)
 
@@ -157,7 +158,10 @@ Cypress.Commands.add('giAcceptGroupInvite', (invitationLink, {
     cy.getByDT('welcomeGroup').should('contain', `Welcome to ${groupName}!`)
   } else {
     cy.getByDT('groupName').should('contain', groupName)
-    cy.getByDT('invitationMessage').should('contain', 'You were invited to join')
+    const inviteMessage = inviteCreator
+      ? `${inviteCreator} invited you to join their group!`
+      : 'You were invited to join'
+    cy.getByDT('invitationMessage').should('contain', inviteMessage)
     cy.giSignup(username, { isInvitation: true, groupName })
   }
   cy.getByDT('toDashboardBtn').click()