diff --git a/src/resources/js/fontawesome.js b/src/resources/js/fontawesome.js
--- a/src/resources/js/fontawesome.js
+++ b/src/resources/js/fontawesome.js
@@ -12,6 +12,7 @@
     faCheck,
     faCheckCircle,
     faDownload,
+    faEnvelope,
     faGlobe,
     faExclamationCircle,
     faInfoCircle,
@@ -35,6 +36,7 @@
     faCheckSquare,
     faCreditCard,
     faDownload,
+    faEnvelope,
     faExclamationCircle,
     faGlobe,
     faInfoCircle,
diff --git a/src/resources/vue/Dashboard.vue b/src/resources/vue/Dashboard.vue
--- a/src/resources/vue/Dashboard.vue
+++ b/src/resources/vue/Dashboard.vue
@@ -16,6 +16,9 @@
                 <svg-icon icon="wallet"></svg-icon><span class="name">Wallet</span>
                 <span v-if="balance < 0" class="badge badge-danger">{{ $root.price(balance) }}</span>
             </router-link>
+            <a class="card link-webmail" href="https://kolabnow.com/apps">
+                <svg-icon icon="envelope"></svg-icon><span class="name">Webmail</span>
+            </a>
         </div>
     </div>
 </template>
diff --git a/src/resources/vue/Widgets/Menu.vue b/src/resources/vue/Widgets/Menu.vue
--- a/src/resources/vue/Widgets/Menu.vue
+++ b/src/resources/vue/Widgets/Menu.vue
@@ -31,15 +31,9 @@
                     <li class="nav-item" v-if="!logged_in && mode == 'footer'">
                         <a class="nav-link link-tos" href="https://kolabnow.com/tos">ToS</a>
                     </li>
-                    <li class="nav-item" v-if="logged_in">
-                        <a class="nav-link menulogin link-webmail" href="https://kolabnow.com/apps" target="_blank">Webmail</a>
-                    </li>
                     <li class="nav-item" v-if="logged_in">
                         <router-link class="nav-link menulogin link-logout" active-class="active" :to="{name: 'logout'}">Logout</router-link>
                     </li>
-                    <li class="nav-item" v-if="!logged_in && route == 'login'">
-                        <a class="nav-link menulogin link-webmail" href="https://kolabnow.com/apps" target="_blank">Webmail</a>
-                    </li>
                     <li class="nav-item" v-if="!logged_in && (!route || route == 'signup')">
                         <router-link class="nav-link menulogin link-login" active-class="active" :to="{name: 'login'}">Login</router-link>
                     </li>
diff --git a/src/tests/Browser/Admin/LogonTest.php b/src/tests/Browser/Admin/LogonTest.php
--- a/src/tests/Browser/Admin/LogonTest.php
+++ b/src/tests/Browser/Admin/LogonTest.php
@@ -29,7 +29,7 @@
         $this->browse(function (Browser $browser) {
             $browser->visit(new Home())
                 ->with(new Menu(), function ($browser) {
-                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'webmail']);
+                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support']);
                 })
                 ->assertMissing('@second-factor-input')
                 ->assertMissing('@forgot-password');
@@ -77,7 +77,7 @@
             // Checks if we're really on Dashboard page
             $browser->on(new Dashboard())
                 ->within(new Menu(), function ($browser) {
-                    $browser->assertMenuItems(['support', 'contact', 'webmail', 'logout']);
+                    $browser->assertMenuItems(['support', 'contact', 'logout']);
                 })
                 ->assertUser('jeroen@jeroen.jeroen');
 
@@ -108,7 +108,7 @@
 
             // with default menu
             $browser->within(new Menu(), function ($browser) {
-                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'webmail']);
+                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support']);
             });
 
             // Success toast message
@@ -135,7 +135,7 @@
 
             // with default menu
             $browser->within(new Menu(), function ($browser) {
-                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'webmail']);
+                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support']);
             });
 
             // Success toast message
diff --git a/src/tests/Browser/LogonTest.php b/src/tests/Browser/LogonTest.php
--- a/src/tests/Browser/LogonTest.php
+++ b/src/tests/Browser/LogonTest.php
@@ -21,12 +21,12 @@
         $this->browse(function (Browser $browser) {
             $browser->visit(new Home())
                 ->within(new Menu(), function ($browser) {
-                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'webmail']);
+                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support']);
                 });
 
             if ($browser->isDesktop()) {
                 $browser->within(new Menu('footer'), function ($browser) {
-                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'tos', 'webmail']);
+                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'tos']);
                 });
             } else {
                 $browser->assertMissing('#footer-menu .navbar-nav');
@@ -79,13 +79,14 @@
                 ->assertVisible('@links a.link-domains')
                 ->assertVisible('@links a.link-users')
                 ->assertVisible('@links a.link-wallet')
+                ->assertVisible('@links a.link-webmail')
                 ->within(new Menu(), function ($browser) {
-                    $browser->assertMenuItems(['support', 'contact', 'webmail', 'logout']);
+                    $browser->assertMenuItems(['support', 'contact', 'logout']);
                 });
 
             if ($browser->isDesktop()) {
                 $browser->within(new Menu('footer'), function ($browser) {
-                    $browser->assertMenuItems(['support', 'contact', 'webmail', 'logout']);
+                    $browser->assertMenuItems(['support', 'contact', 'logout']);
                 });
             } else {
                 $browser->assertMissing('#footer-menu .navbar-nav');
@@ -130,7 +131,7 @@
 
             // with default menu
             $browser->within(new Menu(), function ($browser) {
-                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'webmail']);
+                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support']);
             });
 
             // Success toast message
@@ -157,7 +158,7 @@
 
             // with default menu
             $browser->within(new Menu(), function ($browser) {
-                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'webmail']);
+                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support']);
             });
 
             // Success toast message