diff --git a/public/css/gogs.css b/public/css/gogs.css
index ed711ba78..a4767c1c8 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -119,6 +119,10 @@ html, body {
     bottom: -4px !important;
 }
 
+#gogs-nav-avatar:after {
+    bottom: -4px !important;
+}
+
 .gogs-nav .tooltip {
     border: none;
 }
@@ -712,11 +716,11 @@ html, body {
     vertical-align: top;
 }
 
-.commit-box .search{
+.commit-box .search {
     margin-top: 3px;
 }
 
-.commit-box td{
+.commit-box td {
     background-color: #FFF;
 }
 
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 947643a1a..fb54d4ef8 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -15,6 +15,7 @@ func Create(ctx *middleware.Context, form auth.CreateRepoForm) {
 	ctx.Data["Title"] = "Create repository"
 
 	if ctx.Req.Method == "GET" {
+		ctx.Data["PageIsNewRepo"] = true // For navbar arrow.
 		ctx.Data["LanguageIgns"] = models.LanguageIgns
 		ctx.Data["Licenses"] = models.Licenses
 		ctx.HTML(200, "repo/create", ctx.Data)
diff --git a/routers/user/user.go b/routers/user/user.go
index 42030076d..8c9660705 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -68,6 +68,8 @@ func Profile(ctx *middleware.Context, params martini.Params) {
 		ctx.Data["Repos"] = repos
 	}
 
+	ctx.Data["PageIsUserProfile"] = true // For navbar arrow.
+
 	ctx.HTML(200, "user/profile", ctx.Data)
 }
 
diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl
index 4902ce259..e0d796a87 100644
--- a/templates/base/navbar.tmpl
+++ b/templates/base/navbar.tmpl
@@ -5,10 +5,10 @@
             <a class="gogs-nav-item{{if .PageIsUserDashboard}} active{{end}}" href="/">Dashboard</a>
             <a class="gogs-nav-item{{if .PageIsHelp}} active{{end}}" href="/help">Help</a>{{if .IsSigned}}
             <a id="gogs-nav-out" class="gogs-nav-item navbar-right navbar-btn btn btn-danger" href="/user/logout/"><i class="fa fa-power-off fa-lg"></i></a>
-            <a id="gogs-nav-avatar" class="gogs-nav-item navbar-right" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}">
+            <a id="gogs-nav-avatar" class="gogs-nav-item navbar-right{{if .PageIsUserProfile}} active{{end}}" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}">
                 <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/>
             </a>
-            <a class="navbar-right gogs-nav-item" href="/repo/create" data-toggle="tooltip" data-placement="bottom" title="New Repository"><i class="fa fa-plus fa-lg"></i></a>
+            <a class="navbar-right gogs-nav-item{{if .PageIsNewRepo}} active{{end}}" href="/repo/create" data-toggle="tooltip" data-placement="bottom" title="New Repository"><i class="fa fa-plus fa-lg"></i></a>
             <a class="navbar-right gogs-nav-item{{if .PageIsUserSetting}} active{{end}}" href="/user/setting"  data-toggle="tooltip" data-placement="bottom" title="Setting"><i class="fa fa-cogs fa-lg"></i></a>
             {{else}}<a id="gogs-nav-signin" class="gogs-nav-item navbar-right navbar-btn btn btn-danger" href="/user/login/">Sign in</a>{{end}}
         </nav>