diff --git a/static/css/quay.css b/static/css/quay.css
index b4efa9230..c4386c415 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -104,10 +104,6 @@ html, body {
   word-wrap: normal !important;
 }
 
-.code-info {
-  border-bottom: 1px dashed #aaa;
-}
-
 .toggle-icon {
   font-size: 22px;
   padding: 6px;
@@ -740,7 +736,7 @@ i.toggle-icon:hover {
   white-space: nowrap;
 }
 
-.plans-list .features-bar .feature .feature-tooltip {
+.context-tooltip {
   border-bottom: 1px dotted black;
   cursor: default;
 }
@@ -2213,6 +2209,14 @@ p.editable:hover i {
   margin-bottom: 0px;
 }
 
+.plan-manager-element .plans-list-table .deprecated-plan {
+  color: #aaa;
+}
+
+.plan-manager-element .plans-list-table .deprecated-plan-label {
+  font-size: 0.7em;
+}
+
 .plans-table-element table {
   margin: 20px;
   border: 1px solid #eee;
diff --git a/static/directives/plan-manager.html b/static/directives/plan-manager.html
index 28f4dc719..dac8fd430 100644
--- a/static/directives/plan-manager.html
+++ b/static/directives/plan-manager.html
@@ -33,8 +33,13 @@
     </thead>
      
     <tr ng-repeat="plan in plans" ng-show="isPlanVisible(plan, subscribedPlan)"
-        ng-class="(subscribedPlan.stripeId === plan.stripeId) ? getActiveSubClass() : ''">
-      <td>{{ plan.title }}</td>
+        ng-class="{'active':(subscribedPlan.stripeId === plan.stripeId), 'deprecated-plan':plan.deprecated}">
+      <td>
+        {{ plan.title }}
+        <div class="deprecated-plan-label" ng-show="plan.deprecated">
+          <span class="context-tooltip" title="This plan has been discontinued. As a valued early adopter, you may continue to stay on this plan indefinitely." bs-tooltip="tooltip.title" data-placement="right">Discontinued Plan</span>
+        </div>
+      </td>
       <td>{{ plan.privateRepos }}</td>
       <td><div class="plan-price">${{ plan.price / 100 }}</div></td>
       <td class="controls">
diff --git a/static/js/app.js b/static/js/app.js
index 155e80f2a..a03f5a989 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -1915,10 +1915,6 @@ quayApp.directive('planManager', function () {
         return true;
       };
 
-      $scope.getActiveSubClass = function() {
-        return 'active';
-      };
-
       $scope.changeSubscription = function(planId) {
         if ($scope.planChanging) { return; }
 
diff --git a/static/partials/guide.html b/static/partials/guide.html
index e3b8ad4e4..e3c916b7b 100644
--- a/static/partials/guide.html
+++ b/static/partials/guide.html
@@ -101,16 +101,16 @@ Email: my@email.com</pre>
       as an HTTP <b>POST</b> to the specified URL, with a JSON body describing the push:<br><br>
       <pre>
 {
-  <span class="code-info" title="The number of images pushed" bs-tooltip="tooltip.title">"pushed_image_count"</span>: 2,
-  <span class="code-info" title="The name of the repository (without its namespace)" bs-tooltip="tooltip.title">"name"</span>: "ubuntu",
-  <span class="code-info" title="The full name of the repository" bs-tooltip="tooltip.title">"repository"</span>:"devtable/ubuntu",
-  <span class="code-info" title="The URL at which the repository can be pulled by Docker" bs-tooltip="tooltip.title">"docker_url"</span>: "quay.io/devtable/ubuntu",
-  <span class="code-info" title="Map of updated tag names to their latest image IDs" bs-tooltip="tooltip.title">"updated_tags"</span>: {
+  <span class="context-tooltip" title="The number of images pushed" bs-tooltip="tooltip.title">"pushed_image_count"</span>: 2,
+  <span class="context-tooltip" title="The name of the repository (without its namespace)" bs-tooltip="tooltip.title">"name"</span>: "ubuntu",
+  <span class="context-tooltip" title="The full name of the repository" bs-tooltip="tooltip.title">"repository"</span>:"devtable/ubuntu",
+  <span class="context-tooltip" title="The URL at which the repository can be pulled by Docker" bs-tooltip="tooltip.title">"docker_url"</span>: "quay.io/devtable/ubuntu",
+  <span class="context-tooltip" title="Map of updated tag names to their latest image IDs" bs-tooltip="tooltip.title">"updated_tags"</span>: {
     "latest": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc"
   },
-  <span class="code-info" title="The namespace of the repository" bs-tooltip="tooltip.title">"namespace"</span>: "devtable",
-  <span class="code-info" title="Whether the repository is public or private" bs-tooltip="tooltip.title">"visibility"</span>: "private",
-  <span class="code-info" title="The Quay URL for the repository" bs-tooltip="tooltip.title">"homepage"</span>: "https://quay.io/repository/devtable/ubuntu"
+  <span class="context-tooltip" title="The namespace of the repository" bs-tooltip="tooltip.title">"namespace"</span>: "devtable",
+  <span class="context-tooltip" title="Whether the repository is public or private" bs-tooltip="tooltip.title">"visibility"</span>: "private",
+  <span class="context-tooltip" title="The Quay URL for the repository" bs-tooltip="tooltip.title">"homepage"</span>: "https://quay.io/repository/devtable/ubuntu"
 }
 </pre>
     </div>
diff --git a/static/partials/plans.html b/static/partials/plans.html
index 02214c485..da49bf12b 100644
--- a/static/partials/plans.html
+++ b/static/partials/plans.html
@@ -61,7 +61,7 @@
               <span class="hidden-sm-inline">14-Day Free Trial</span>
               <span class="visible-sm-inline">14-Day Trial</span>
             </span>
-            <i class="fa fa-hdd visible-lg"></i> 
+            <i class="fa fa-clock-o visible-lg"></i> 
           </div>
         </div>