diff --git a/qml/Pages/Init.qml b/qml/Pages/Init.qml
index 78f99589..dcaa669a 100644
--- a/qml/Pages/Init.qml
+++ b/qml/Pages/Init.qml
@@ -112,6 +112,8 @@ Item {
         Button {
           text: qsTr("Join Server")
           Layout.fillWidth: true
+          display: AbstractButton.TextBesideIcon
+          icon.name: "go-next"
           enabled: passwordEdit.text !== ""
           onClicked: {
             config.serverAddr = server_addr.editText;
diff --git a/qml/Pages/Lobby.qml b/qml/Pages/Lobby.qml
index cdb765c8..143b7489 100644
--- a/qml/Pages/Lobby.qml
+++ b/qml/Pages/Lobby.qml
@@ -172,17 +172,24 @@ Item {
 */
   }
 
+  Button {
+    anchors.bottom: buttonRow.top
+    anchors.right: parent.right
+    width: 120
+    display: AbstractButton.TextUnderIcon
+    icon.name: "media-playback-start"
+    text: Backend.translate("Create Room")
+    onClicked: {
+      lobby_dialog.source = "LobbyElement/CreateRoom.qml";
+      lobby_drawer.open();
+      config.observing = false;
+    }
+  }
+
   RowLayout {
+    id: buttonRow
     anchors.right: parent.right
     anchors.bottom: parent.bottom
-    Button {
-      text: Backend.translate("Create Room")
-      onClicked: {
-        lobby_dialog.source = "LobbyElement/CreateRoom.qml";
-        lobby_drawer.open();
-        config.observing = false;
-      }
-    }
     Button {
       text: Backend.translate("Generals Overview")
       onClicked: {
@@ -212,13 +219,17 @@ Item {
         mainStack.push(mainWindow.aboutPage);
       }
     }
-    Button {
-      text: Backend.translate("Exit Lobby")
-      onClicked: {
-        toast.show("Goodbye.");
-        Backend.quitLobby();
-        mainStack.pop();
-      }
+  }
+
+  Button {
+    anchors.right: parent.right
+    text: Backend.translate("Exit Lobby")
+    display: AbstractButton.TextBesideIcon
+    icon.name: "application-exit"
+    onClicked: {
+      toast.show("Goodbye.");
+      Backend.quitLobby();
+      mainStack.pop();
     }
   }