diff --git a/app/app.html b/app/app.html
index 39fc1e0..23f9d77 100755
--- a/app/app.html
+++ b/app/app.html
@@ -131,8 +131,8 @@
                 <md-menu md-size="small">
                     <md-button md-menu-trigger>{{ loggedInUser.username }}</md-button>
                     <md-menu-content>
-                        <md-menu-item @click="navigateToAccountManager()">Manage account</md-menu-item>
-                        <md-menu-item @click="toggleDebugDialog()">Debug info and shit</md-menu-item>
+                        <md-menu-item @click="navigateToAccountManager()"><span>Manage account</span><md-icon>person</md-icon></md-menu-item>
+                        <md-menu-item @click="toggleDebugDialog()"><span>Debug info and shit</span><md-icon>code</md-icon></md-menu-item>
                     </md-menu-content>
                 </md-menu>
             </md-toolbar>
@@ -144,8 +144,8 @@
                     Browsing {{ selection.category.title }} with    
                     <a v-for="user in userLists[selection.category._id]" class="md-dense cursor" v-on:click="viewProfile(user.user._id)">{{ user.user.username }} </a>
                 </h3>
-                <md-button @click="browseCategories()" v-if="selection.category.isCategory || selection.category.isChatContext">Back</md-button>
-                <md-button @click="refresh()" v-if="!selection.category.isChatContext">Refresh</md-button>
+                <md-button @click="browseCategories()" v-if="selection.category.isCategory || selection.category.isChatContext"><md-icon>arrow_back</md-icon></md-button>
+                <md-button @click="refresh()" v-if="!selection.category.isChatContext"><md-icon>refresh</md-icon></md-button>
             </md-toolbar>
 
             <div id="posts-container" class="posts-container" v-if="selection.category.browsing">
@@ -158,7 +158,7 @@
                     <md-card-content v-html="post.body"></md-card-content>
 
                     <md-card-actions>
-                        <md-button v-for="button in cardButtons" v-bind:key="button.text" @click="button.click(post)">{{ button.text }}</md-button>
+                        <md-button v-for="button in cardButtons" v-bind:key="button.text" @click="button.click(post)"><md-icon>{{ button.text }}</md-icon></md-button>
                     </md-card-actions>
                 </md-card>
                 <div v-for="post,k in messages[selection.category._id]" v-if="selection.category.isChatContext" :key="post._id + post.author._id">
@@ -193,7 +193,7 @@
             </md-speed-dial>
 
             <md-field md-inline class="chat-bar" v-show="selection.category.isChatContext">
-                <label>Send message</label>
+                <label>Write something interesting, go on!</label>
                 <md-input v-model="message.typed" v-on:keyup.enter="sendCurrentMessage()"></md-input>
             </md-field>
         </div>
diff --git a/app/resources/js/app.js b/app/resources/js/app.js
index 686b079..f855624 100755
--- a/app/resources/js/app.js
+++ b/app/resources/js/app.js
@@ -320,12 +320,12 @@ const app = new Vue({
 
                 this.cardButtons = [];
 
-                this.button('Chat', (post) => {
+                this.button('chat', (post) => {
                     if (post._id) {
                         this.openChatForCategory(post._id);
                     }
                 });
-                this.button('View', (post) => {
+                this.button('topic', (post) => {
                     this.browse(post);
                 });