diff --git a/cms/static/img/home-icon.png b/cms/static/img/home-icon.png
new file mode 100644
index 0000000000..be44bc2089
Binary files /dev/null and b/cms/static/img/home-icon.png differ
diff --git a/cms/static/sass/_graphics.scss b/cms/static/sass/_graphics.scss
index 3abe0da860..1ee1313073 100644
--- a/cms/static/sass/_graphics.scss
+++ b/cms/static/sass/_graphics.scss
@@ -41,6 +41,13 @@
 	background: url(../img/list-icon.png) no-repeat;
 }
 
+.home-icon {
+	display: inline-block;
+	width: 19px;
+	height: 16px;
+	background: url(../img/home-icon.png) no-repeat;
+}
+
 .calendar-icon {
 	display: inline-block;
 	width: 12px;
diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss
index 6fe5b2ea32..0992d49210 100644
--- a/cms/static/sass/_header.scss
+++ b/cms/static/sass/_header.scss
@@ -26,6 +26,11 @@
 		color: #e4e6ee;
 	}
 
+	.class-nav,
+	.class-nav li {
+		float: left;
+	}
+
 	a {
 		box-shadow: 1px 0 0 #787981 inset, -1px 0 0 #3d3e44 inset, 1px 0 0 #787981, -1px 0 0 #3d3e44;
 
@@ -37,13 +42,5 @@
 			background: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0.3));
 			box-shadow: 0 2px 8px rgba(0, 0, 0, .7) inset;
 		}
-
-		&:last-child {
-			box-shadow: 1px 0 0 rgba(255, 255, 255, 0.2) inset, -1px 0 0 rgba(0, 0, 0, 0.3) inset, 1px 0 0 rgba(255, 255, 255, 0.2);
-		}
-
-		&:first-child {
-			box-shadow: 1px 0 0 rgba(255, 255, 255, 0.2) inset, -1px 0 0 rgba(0, 0, 0, 0.3) inset, -1px 0 0 rgba(0, 0, 0, 0.3);
-		}
 	}
 }
\ No newline at end of file
diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html
index 0c4905fbe2..21e0b002cb 100644
--- a/cms/templates/widgets/header.html
+++ b/cms/templates/widgets/header.html
@@ -14,9 +14,9 @@
     <div class="right">
       <span class="username">${ user.username }</span>
       % if user.is_authenticated():
-         <li><a href="${reverse('logout')}">Log out</a></li>
+         <a href="${reverse('logout')}">Log out</a>
       % else:
-         <li><a href="${reverse('login')}">Log in</a></li>
+         <a href="${reverse('login')}">Log in</a>
       % endif
 
     </ul>