diff --git a/tools/dgeni/processors/categorizer.js b/tools/dgeni/processors/categorizer.js
index 5aaec49b69b0..b515e5a026c5 100644
--- a/tools/dgeni/processors/categorizer.js
+++ b/tools/dgeni/processors/categorizer.js
@@ -68,14 +68,11 @@ module.exports = function categorizer() {
   }
 
   /**
-   * Decorates public exposed docs. Creates a property with CSS classes that will be 
-   * added to the template.
+   * Decorates public exposed docs. Creates a property on the doc that indicates whether
+   * the item is deprecated or not.
    **/
   function decoratePublicDoc(doc) {
-    // Specific classes that will can added to the Dgeni doc template.
-    doc.docClasses = [
-      isDeprecatedDoc(doc) ? 'docs-api-deprecated' : ''
-    ].join(' ');
+    doc.isDeprecated = isDeprecatedDoc(doc);
   }
 };
 
diff --git a/tools/dgeni/templates/class.template.html b/tools/dgeni/templates/class.template.html
index bf9ad46e0a88..f23c5d4e4d86 100644
--- a/tools/dgeni/templates/class.template.html
+++ b/tools/dgeni/templates/class.template.html
@@ -1,15 +1,17 @@
-<div class="{$ class.docClasses $}">
-  <h4 class="docs-api-h4 docs-api-class-name">
-    <code>{$ class.name $}</code>
-  </h4>
-  <p class="docs-api-class-description">{$ class.description $}</p>
+<h4 class="docs-api-h4 docs-api-class-name">
+  <code>{$ class.name $}</code>
+</h4>
+<p class="docs-api-class-description">{$ class.description $}</p>
 
-  {%- if class.directiveExportAs -%}
-  <span class="docs-api-h4 docs-api-class-export-label">Exported as:</span>
-  <span class="docs-api-class-export-name">{$ class.directiveExportAs $}</span>
-  {%- endif -%}
+{%- if class.directiveExportAs -%}
+<span class="docs-api-h4 docs-api-class-export-label">Exported as:</span>
+<span class="docs-api-class-export-name">{$ class.directiveExportAs $}</span>
+{%- endif -%}
 
-  {$ propertyList(class.properties) $}
+{%- if class.isDeprecated -%}
+<div class="docs-api-class-deprecated-marker">Deprecated</div>
+{%- endif -%}   
 
-  {$ methodList(class.methods) $}
-</div>
\ No newline at end of file
+{$ propertyList(class.properties) $}
+
+{$ methodList(class.methods) $}
diff --git a/tools/dgeni/templates/method.template.html b/tools/dgeni/templates/method.template.html
index c563d07c731e..eeb7373d0852 100644
--- a/tools/dgeni/templates/method.template.html
+++ b/tools/dgeni/templates/method.template.html
@@ -1,7 +1,12 @@
-<table class="docs-api-method-table {$ method.docClasses $}">
+<table class="docs-api-method-table">
   <thead>
     <tr class="docs-api-method-name-row">
-      <th colspan="2" class="docs-api-method-name-cell">{$ method.name $}</th>
+      <th colspan="2" class="docs-api-method-name-cell">
+        {%- if method.isDeprecated -%}
+          <div class="docs-api-deprecated-marker">Deprecated</div>
+        {%- endif -%}   
+        {$ method.name $}
+      </th>
     </tr>
   </thead>
   <tr class="docs-api-method-description-row">
diff --git a/tools/dgeni/templates/property.template.html b/tools/dgeni/templates/property.template.html
index 7dcc00f39f32..2d17ace86d83 100644
--- a/tools/dgeni/templates/property.template.html
+++ b/tools/dgeni/templates/property.template.html
@@ -1,4 +1,4 @@
-<tr class="docs-api-properties-row {$ property.docClasses $}">
+<tr class="docs-api-properties-row">
   <td class="docs-api-properties-name-cell">
     {%- if property.isDirectiveInput -%}
       <div class="docs-api-input-marker">
@@ -18,6 +18,9 @@
         {%- endif -%}
       </div>
     {%- endif -%}
+    {%- if property.isDeprecated -%}
+      <div class="docs-api-deprecated-marker">Deprecated</div>
+    {%- endif -%}   
 
     <p class="docs-api-property-name">
       {$ property.name $}