diff --git a/public/resources/css/module/_api.scss b/public/resources/css/module/_api.scss
index 7b52632c32..19af04a1e0 100644
--- a/public/resources/css/module/_api.scss
+++ b/public/resources/css/module/_api.scss
@@ -204,6 +204,11 @@ input.api-filter {
     cursor: pointer;
     text-decoration: none;
 
+    // Override highlight.js
+    .kwd {
+      color: #1E88E5 !important;
+    }
+
     &:hover {
       text-decoration: underline;
     }
diff --git a/tools/api-builder/angular.io-package/templates/class.template.html b/tools/api-builder/angular.io-package/templates/class.template.html
index 8e5fbb7a12..1d000e2801 100644
--- a/tools/api-builder/angular.io-package/templates/class.template.html
+++ b/tools/api-builder/angular.io-package/templates/class.template.html
@@ -36,7 +36,7 @@ include {$ relativePath(doc.path, '_util-fns') $}
     {% if doc.statics.length %}
     .div(layout="column")
       {% for member in doc.statics %}{% if not member.internal %}
-        pre(class="prettyprint no-bg" ng-class="{ 'anchor-focused': appCtrl.isApiDocMemberFocused('{$ member.name $}') }")
+        pre(class="prettyprint no-bg-with-indent")
           a(class="code-anchor" href="#{$ member.name $}-anchor")
             code(class="code-background api-doc-code") {$ member.name | indent(6, false) | trim $}
           code(class="api-doc-code") {$ paramList(member.parameters) | indent(8, false) | trim $}{$ returnType(member.returnType) $}
@@ -126,14 +126,15 @@ include {$ relativePath(doc.path, '_util-fns') $}
     h2(class="h2-api-docs") Static Members
   div(flex="80" flex-xs="100")
   {% for member in doc.statics %}{% if not member.internal %}
-    pre.prettyprint.no-bg
+    a(name="{$ member.name $}-anchor" class="anchor-offset")
+    pre(class="prettyprint no-bg" ng-class="{ 'anchor-focused': appCtrl.isApiDocMemberFocused('{$ member.name $}') }")
       code(class="api-doc-code").
         {$ member.name $}{$ paramList(member.parameters) | indent(8, false) | trim $}{$ returnType(member.returnType) $}
     :marked
       {%- if member.notYetDocumented %}
       *Not yet documented*
       {% else %}
-{$ member.description | indentForMarkdown(6) | replace('## Example', '') | replace('# Example', '') | trimBlankLines $}
+{$ member.description | indentForMarkdown(6) | replace('### Example', '') | replace('## Example', '') | replace('# Example', '') | trimBlankLines $}
       {% endif %}
 
     {% if not loop.last %}