diff --git a/website/public/js/friendButtons.js b/website/public/js/friendButtons.js
index 47c476a..303ccf9 100644
--- a/website/public/js/friendButtons.js
+++ b/website/public/js/friendButtons.js
@@ -19,24 +19,24 @@ function placeFriendButtons() {
                     case "0":
                         value1 = "request";
                         class1 = "green";
-                        text1 = "Bevriend";
-                        icon1 = "fa-handshake-o";
+                        text1 = "Word vrienden";
+                        icon1 = "fa-user-plus";
                         break;
                     case "1":
                         value1 = userID;
                         class1 = "green";
                         text1 = "Chat";
-                        icon1 = "fa-comment-o";
+                        icon1 = "fa-comment";
                         value2 = "delete";
                         class2 = "red";
-                        text2 = "Verwijder";
-                        icon2 = "fa-times";
+                        text2 = "Ontvriend";
+                        icon2 = "fa-user-times";
                         break;
                     case "2":
                         value1 = "delete";
                         class1 = "red";
                         text1 = "Trek verzoek in";
-                        icon1 = "fa-cross";
+                        icon1 = "fa-times";
                         break;
                     case "3":
                         value1 = "accept";
@@ -51,16 +51,18 @@ function placeFriendButtons() {
                 }
 
                 $buttonContainer.append(
-                    "<button class='"+ class1 +" friend-button' value='"+ value1 +"'>" +
-                        "<i class='fa "+ icon1 +"'></i> " + text1 +
-                    "</button>");
+                    "<div><button class='"+ class1 +" fancy-button friend-button' value='"+ value1 +"'>" +
+                    "<span>"+ text1 +"</span>" +
+                    "<i class='fa "+ icon1 +"'></i> " +
+                    "</button></div>");
                 $buttonContainer.append(
-                    "<button class='"+ class2 +" friend-button' value='"+ value2 +"'>" +
-                        "<i class='fa "+ icon2 +"'></i> " + text2 +
-                    "</button>");
+                    "<div><button class='"+ class2 +" fancy-button friend-button' value='"+ value2 +"'>" +
+                    "<span>"+ text2 +"</span>" +
+                    "<i class='fa "+ icon2 +"'></i> " +
+                    "</button></div>");
 
 
-            $buttonContainer.children().click(function() {
+            $buttonContainer.find("button").click(function() {
                 if (isNaN(this.value))
                     editFriendship(userID, this.value);
                 else if (this.value != "")
diff --git a/website/public/js/groupButtons.js b/website/public/js/groupButtons.js
index 549277d..caf3ab8 100644
--- a/website/public/js/groupButtons.js
+++ b/website/public/js/groupButtons.js
@@ -5,23 +5,23 @@ function placeGroupButtons() {
 
             if (data == 'none') {
                 $buttonContainer.append(
-                    "<button class='green group-button group-button-fixed' value='request'>" +
-                    "<i class='fa fa-plus'></i> Voeg toe" +
+                    "<button class='green group-button fancy-button' value='request'>" +
+                    "<span>Treed toe</span><i class='fa fa-plus'></i>" +
                     "</button>");
             } else if (data == 'request') {
                 $buttonContainer.append(
-                    "<button class='red group-button group-button-fixed' value='none'>" +
-                    "<i class='fa fa-times'></i> Trek verzoek in" +
+                    "<button class='red group-button fancy-button' value='none'>" +
+                    "<span>Trek verzoek in</span><i class='fa fa-times'></i>" +
                     "</button>");
             } else if (data == 'admin') {
                 $buttonContainer.append(
-                    "<button class='group-button group-button-fancy' value='admin'>" +
+                    "<button class='group-button fancy-button' value='admin'>" +
                         "<span>Instellingen</span><i class='fa fa-cogs'></i>" +
                         "</button>"
                 );
             } else {
                 $buttonContainer.append(
-                    "<button class='red group-button group-button-fancy' value='none'>" +
+                    "<button class='red group-button fancy-button' value='none'>" +
                     "<span>Verlaat groep</span><i class='fa fa-sign-out'></i>" +
                     "</button>");
             }
diff --git a/website/public/styles/post-popup.css b/website/public/styles/post-popup.css
index 9493b83..e82129b 100644
--- a/website/public/styles/post-popup.css
+++ b/website/public/styles/post-popup.css
@@ -92,16 +92,4 @@
 .deleteButton {
     background-color: firebrick;
     float: right;
-}
-
-.deleteButton i {
-    display: inline-block;
-}
-
-.deleteButton:hover span {
-    display: inline-block;
-}
-
-.deleteButton span {
-    display: none;
 }
\ No newline at end of file
diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css
index 18e105e..8a93d12 100644
--- a/website/public/styles/profile.css
+++ b/website/public/styles/profile.css
@@ -27,16 +27,21 @@
     display: inline-block;
 }
 
+.friend-button-container div, .status-buttons-container div {
+    width: 200px;
+    display: inline-block;
+}
+
 .friend-button-container button, .status-buttons-container button, .group-button-container button {
     display: block;
+    float: right;
 
     margin: 7px 0;
 
     font-size: 18px;
 }
-
-.friend-button-container button, .status-buttons-container button, .group-button-fixed {
-    width: 200px;
+.status-buttons-container button {
+    float: left;
 }
 
 .group-button-container button {
@@ -76,19 +81,19 @@
     border: none;
 }
 
-.group-button-fancy span {
+.fancy-button span {
     display: none;
 }
 
-.group-button-fancy:hover {
+.fancy-button:hover {
     text-align: right;
 }
 
-.group-button-fancy i {
+.fancy-button i {
     display: inline-block;
 }
 
-.group-button-fancy:hover span {
+.fancy-button:hover span {
     display: inline-block;
     margin-right: 5px;
 }
diff --git a/website/views/post-view.php b/website/views/post-view.php
index 717e6a8..fadc791 100644
--- a/website/views/post-view.php
+++ b/website/views/post-view.php
@@ -13,11 +13,11 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . "
     </span>
 </div>
 <?php if (checkPermissionOnPost($postID, $_SESSION["userID"])) {?>
-    <button class="deleteButton"
+    <button class="deleteButton fancy-button"
             onclick="deletePost('<?=$postID?>')"
             type="submit">
-        <i class="fa fa-trash"></i>
         <span>Verwijder post</span>
+        <i class="fa fa-trash"></i>
     </button><br />
 <?php } ?>
 <div class='post-content'>
diff --git a/website/views/profile.php b/website/views/profile.php
index 62157f4..0cb5cc2 100644
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -7,10 +7,16 @@
         <img alt="<?= $user["fname"] ?>" class="profile-picture main-picture <?= $user["onlinestatus"] ?>" src="<?= $user["profilepicture"] ?>"><br />
         <div class="platform">
             <div class="status-buttons-container">
-                <button disabled class="gray">
-                    <?= $user["onlinestatus"] ?>
-                </button>
-                <button disabled class="gray"><?= $user["role"] ?></button>
+                <div>
+                    <button disabled class="gray">
+                        <?= $user["onlinestatus"] ?>
+                    </button>
+                </div>
+                <div>
+                    <button disabled class="gray">
+                        <?= $user["role"] ?>
+                    </button>
+                </div>
             </div>
             <div class="friend-button-container">
                 <p>:)</p>