diff --git a/guacamole/src/main/webapp/app/client/styles/filesystem-menu.css b/guacamole/src/main/webapp/app/client/styles/filesystem-menu.css
index f8ca075b6..1f51b88b9 100644
--- a/guacamole/src/main/webapp/app/client/styles/filesystem-menu.css
+++ b/guacamole/src/main/webapp/app/client/styles/filesystem-menu.css
@@ -21,22 +21,10 @@
  */
 
 #filesystem-menu .header h2 {
-
     font-size: 1em;
     font-weight: normal;
-
     padding-top: 0;
     padding-bottom: 0;
-    padding-left: 3.5em;
-
-    background-size:         1.5em 1.5em;
-    -moz-background-size:    1.5em 1.5em;
-    -webkit-background-size: 1.5em 1.5em;
-    -khtml-background-size:  1.5em 1.5em;
-    background-repeat: no-repeat;
-    background-position: 1em center;
-    background-image: url('images/drive.png');
-
 }
 
 #filesystem-menu .header {
@@ -71,3 +59,17 @@
     background-color: #CDA;
     cursor: pointer;
 }
+
+#filesystem-menu .header.breadcrumbs .breadcrumb.root {
+    background-size:         1.5em 1.5em;
+    -moz-background-size:    1.5em 1.5em;
+    -webkit-background-size: 1.5em 1.5em;
+    -khtml-background-size:  1.5em 1.5em;
+    background-repeat: no-repeat;
+    background-position: center center;
+    background-image: url('images/drive.png');
+    width: 2em;
+    height: 2em;
+    padding: 0;
+    vertical-align: middle;
+}
\ No newline at end of file
diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html
index 6493ffef2..5b2912c26 100644
--- a/guacamole/src/main/webapp/app/client/templates/client.html
+++ b/guacamole/src/main/webapp/app/client/templates/client.html
@@ -175,8 +175,11 @@
             </div>
 
             <!-- Breadcrumbs -->
-            <div class="header breadcrumbs" ng-show="getPath(filesystemMenuContents.currentDirectory).length">
-                <div class="breadcrumb" ng-repeat="file in getPath(filesystemMenuContents.currentDirectory)"
+            <div class="header breadcrumbs"><div
+                    class="breadcrumb root"
+                    ng-click="changeDirectory(filesystemMenuContents, filesystemMenuContents.root)"></div><div
+                        class="breadcrumb"
+                        ng-repeat="file in getPath(filesystemMenuContents.currentDirectory)"
                         ng-click="changeDirectory(filesystemMenuContents, file)">{{file.name}}</div>
             </div>