diff --git a/pkg/api/index.go b/pkg/api/index.go
index 342de21c670..522b53b9026 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -36,7 +36,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 	}
 
 	if setting.DisableGravatar {
-		data.User.GravatarUrl = setting.AppSubUrl + "/img/user_profile.png"
+		data.User.GravatarUrl = setting.AppSubUrl + "/public/img/user_profile.png"
 	}
 
 	if len(data.User.Name) == 0 {
diff --git a/pkg/cmd/web.go b/pkg/cmd/web.go
index 897cfc4f3af..57726de654f 100644
--- a/pkg/cmd/web.go
+++ b/pkg/cmd/web.go
@@ -36,9 +36,6 @@ func newMacaron() *macaron.Macaron {
 	}
 
 	mapStatic(m, setting.StaticRootPath, "", "public")
-	mapStatic(m, setting.StaticRootPath, "css", "css")
-	mapStatic(m, setting.StaticRootPath, "img", "img")
-	mapStatic(m, setting.StaticRootPath, "fonts", "fonts")
 	mapStatic(m, setting.StaticRootPath, "robots.txt", "robots.txt")
 
 	m.Use(macaron.Renderer(macaron.RenderOptions{
diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html
index 3ebac53e8d1..2ba53897696 100644
--- a/public/app/core/components/navbar/navbar.html
+++ b/public/app/core/components/navbar/navbar.html
@@ -3,7 +3,7 @@
 			<div class="top-nav-btn top-nav-menu-btn">
 				<a class="pointer" ng-click="ctrl.contextSrv.toggleSideMenu()">
 					<span class="top-nav-logo-background">
-						<img class="logo-icon" src="img/grafana_icon.svg"></img>
+						<img class="logo-icon" src="public/img/grafana_icon.svg"></img>
 					</span>
 					<i class="icon-gf icon-gf-grafana_wordmark"></i>
 					<i class="fa fa-caret-down"></i>
diff --git a/public/app/core/directives/plugin_component.ts b/public/app/core/directives/plugin_component.ts
index 21900ce94ed..8dd05a83ab0 100644
--- a/public/app/core/directives/plugin_component.ts
+++ b/public/app/core/directives/plugin_component.ts
@@ -7,7 +7,7 @@ import config from 'app/core/config';
 import coreModule from 'app/core/core_module';
 import {UnknownPanelCtrl} from 'app/plugins/panel/unknown/module';
 
-/** @ngInject */
+/** @ngInject **/
 function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $templateCache) {
 
   function getTemplate(component) {