diff --git a/public/app/features/styleguide/styleguide.html b/public/app/features/styleguide/styleguide.html
index e2a218bb763..573d720831e 100644
--- a/public/app/features/styleguide/styleguide.html
+++ b/public/app/features/styleguide/styleguide.html
@@ -40,8 +40,10 @@
 	</div>
 
 	<div class="tab-pane style-guide-icon-list" ng-if="ctrl.page.icons">
-		<div ng-repeat="icon in ctrl.icons" class="col-lg-1 col-md-2 col-sm-2 col-xs-4">
-			<i class="icon-gf icon-gf-{{icon}}" bs-tooltip="'icon-gf icon-gf-{{icon}}'"></i>
+		<div class="row">
+			<div ng-repeat="icon in ctrl.icons" class="col-md-2 col-sm-3 col-xs-4">
+				<i class="icon-gf icon-gf-{{icon}}" bs-tooltip="'icon-gf icon-gf-{{icon}}'"></i>
+			</div>
 		</div>
 	</div>
 
diff --git a/public/sass/icons.json b/public/sass/icons.json
index 593c7bbfb55..4c87042fe02 100644
--- a/public/sass/icons.json
+++ b/public/sass/icons.json
@@ -1,4 +1,6 @@
 [
+      "grafana_wordmark",
+      "worldping",
       "raintank_wordmark",
       "raintank_r-icn",
       "check-alt",
@@ -46,7 +48,5 @@
       "apps",
       "scale",
       "pending",
-      "verified",
-      "worldping",
-      "grafana_wordmark"
+      "verified"
 ]
\ No newline at end of file
diff --git a/public/sass/pages/_styleguide.scss b/public/sass/pages/_styleguide.scss
index 70a71cda1be..66543847574 100644
--- a/public/sass/pages/_styleguide.scss
+++ b/public/sass/pages/_styleguide.scss
@@ -22,7 +22,7 @@
 }
 
 .style-guide-icon-list {
-  font-size: 2em;
+  font-size: 1.8em;
   text-align: center;
 }