diff --git a/guacamole/src/main/webapp/admin.xhtml b/guacamole/src/main/webapp/admin.xhtml
index 9388f4c8d..417c1d0be 100644
--- a/guacamole/src/main/webapp/admin.xhtml
+++ b/guacamole/src/main/webapp/admin.xhtml
@@ -25,6 +25,7 @@
         <link rel="icon" type="image/png" href="images/guacamole-logo-64.png"/>
         <link rel="apple-touch-icon" type="image/png" href="images/guacamole-logo-144.png"/>
         <link rel="stylesheet" type="text/css" href="styles/ui.css"/>
+        <link rel="stylesheet" type="text/css" href="styles/admin.css"/>
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=medium-dpi"/>
         <title>Guacamole ${project.version}</title>
     </head>
@@ -48,9 +49,7 @@
                     passwords can be changed.
                 </p>
                
-                <div id="user-add-form">
-                    <div class="icon user add"/><input type="text" class="name" id="username" placeholder="Add user"/><button id="add-user">Add</button>
-                </div>
+                <div id="user-add-form"><input type="text" class="name" id="username" placeholder="Username"/><button id="add-user">Add User</button></div>
                 
                 <div id="user-list">
                 </div>
@@ -70,9 +69,7 @@
                     can be changed.
                 </p>
 
-                <div id="connection-add-form">
-                    <button id="add-connection">New Connection</button><button id="add-connection-group">New Group</button>
-                </div>
+                <div id="connection-add-form"><button id="add-connection">New Connection</button><button id="add-connection-group">New Group</button></div>
                 
                 <div id="connection-list">
                 </div>
diff --git a/guacamole/src/main/webapp/images/action-icons/guac-back.png b/guacamole/src/main/webapp/images/action-icons/guac-back.png
new file mode 100644
index 000000000..6435f4a73
Binary files /dev/null and b/guacamole/src/main/webapp/images/action-icons/guac-back.png differ
diff --git a/guacamole/src/main/webapp/images/action-icons/guac-close.png b/guacamole/src/main/webapp/images/action-icons/guac-close.png
index ef29d0f87..5ac7edb2d 100644
Binary files a/guacamole/src/main/webapp/images/action-icons/guac-close.png and b/guacamole/src/main/webapp/images/action-icons/guac-close.png differ
diff --git a/guacamole/src/main/webapp/images/action-icons/guac-config.png b/guacamole/src/main/webapp/images/action-icons/guac-config.png
index eb91fc0a0..5c4700b04 100644
Binary files a/guacamole/src/main/webapp/images/action-icons/guac-config.png and b/guacamole/src/main/webapp/images/action-icons/guac-config.png differ
diff --git a/guacamole/src/main/webapp/images/action-icons/guac-group-add.png b/guacamole/src/main/webapp/images/action-icons/guac-group-add.png
new file mode 100644
index 000000000..be9b63014
Binary files /dev/null and b/guacamole/src/main/webapp/images/action-icons/guac-group-add.png differ
diff --git a/guacamole/src/main/webapp/images/action-icons/guac-logout.png b/guacamole/src/main/webapp/images/action-icons/guac-logout.png
new file mode 100644
index 000000000..579301441
Binary files /dev/null and b/guacamole/src/main/webapp/images/action-icons/guac-logout.png differ
diff --git a/guacamole/src/main/webapp/images/action-icons/guac-monitor-add.png b/guacamole/src/main/webapp/images/action-icons/guac-monitor-add.png
index 0c9ea962c..2ed062acd 100644
Binary files a/guacamole/src/main/webapp/images/action-icons/guac-monitor-add.png and b/guacamole/src/main/webapp/images/action-icons/guac-monitor-add.png differ
diff --git a/guacamole/src/main/webapp/images/action-icons/guac-user-add.png b/guacamole/src/main/webapp/images/action-icons/guac-user-add.png
index 8b2d80ece..8a9f22fa5 100644
Binary files a/guacamole/src/main/webapp/images/action-icons/guac-user-add.png and b/guacamole/src/main/webapp/images/action-icons/guac-user-add.png differ
diff --git a/guacamole/src/main/webapp/styles/admin.css b/guacamole/src/main/webapp/styles/admin.css
new file mode 100644
index 000000000..105c72f32
--- /dev/null
+++ b/guacamole/src/main/webapp/styles/admin.css
@@ -0,0 +1,62 @@
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+button#back {
+
+    background-image: url('../images/action-icons/guac-back.png');
+    background-repeat: no-repeat;
+    background-size: 1em;
+    background-position: 0.5em 0.45em;
+
+    padding-left: 1.8em;
+
+}
+
+button#add-user {
+
+    background-image: url('../images/action-icons/guac-user-add.png');
+    background-repeat: no-repeat;
+    background-size: 1em;
+    background-position: 0.5em 0.45em;
+
+    padding-left: 1.8em;
+
+}
+
+button#add-connection {
+
+    background-image: url('../images/action-icons/guac-monitor-add.png');
+    background-repeat: no-repeat;
+    background-size: 1em;
+    background-position: 0.5em 0.45em;
+
+    padding-left: 1.8em;
+
+}
+
+button#add-connection-group {
+
+    background-image: url('../images/action-icons/guac-group-add.png');
+    background-repeat: no-repeat;
+    background-size: 1em;
+    background-position: 0.5em 0.45em;
+
+    padding-left: 1.8em;
+
+}
diff --git a/guacamole/src/main/webapp/styles/login.css b/guacamole/src/main/webapp/styles/login.css
index 9fdd8d05c..00d703c30 100644
--- a/guacamole/src/main/webapp/styles/login.css
+++ b/guacamole/src/main/webapp/styles/login.css
@@ -44,6 +44,17 @@ body {
     display: inline-block;
 }
 
+button#manage {
+
+    background-image: url('../images/action-icons/guac-config.png');
+    background-repeat: no-repeat;
+    background-size: 1em;
+    background-position: 0.5em 0.45em;
+
+    padding-left: 1.8em;
+
+}
+
 div#login-ui {
     height: 100%;
     width: 100%;
diff --git a/guacamole/src/main/webapp/styles/ui.css b/guacamole/src/main/webapp/styles/ui.css
index eb6e5d342..1574ddab7 100644
--- a/guacamole/src/main/webapp/styles/ui.css
+++ b/guacamole/src/main/webapp/styles/ui.css
@@ -515,7 +515,7 @@ div.section {
 
 #connection-add-form,
 #user-add-form {
-    margin: 0.5em;
+    margin-bottom: 0.5em;
 }
 
 body:not(.manage-connections) .require-manage-connections,
@@ -604,4 +604,16 @@ div#logout-panel {
 .list-pager-buttons {
     text-align: center;
     margin: 1em;
-}
\ No newline at end of file
+}
+
+button#logout {
+
+    background-image: url('../images/action-icons/guac-logout.png');
+    background-repeat: no-repeat;
+    background-size: 1em;
+    background-position: 0.5em 0.45em;
+
+    padding-left: 1.8em;
+
+}
+