diff --git a/app/scripts/directives/statusIcon.js b/app/scripts/directives/statusIcon.js
index b61614f0ea..9e9196682d 100644
--- a/app/scripts/directives/statusIcon.js
+++ b/app/scripts/directives/statusIcon.js
@@ -8,8 +8,7 @@ angular.module('openshiftConsole')
         templateUrl: 'views/directives/_status-icon.html',
         scope: {
           status: '=',
-          disableAnimation: "@",
-          fixedWidth: "=?"
+          disableAnimation: "@"
         },
         link: function($scope, $elem, $attrs) {
           $scope.spinning = !angular.isDefined($attrs.disableAnimation);
diff --git a/app/styles/_core.less b/app/styles/_core.less
index 5dea278742..a5240a570c 100644
--- a/app/styles/_core.less
+++ b/app/styles/_core.less
@@ -190,9 +190,6 @@ mark {
   }
   .last-status {
     margin-right: 5px;
-    .status-icon {
-      width: 20px;
-    }
   }
   // Indent icon width to align with text above.
   .last-timestamp {
@@ -1047,12 +1044,39 @@ a.disabled-link {
 
 .status {
   min-width: 130px;
-  .status-icon {
-    margin-right: 6px;
-    width: 13px;
+}
+
+status-icon {
+  // when status-icon is child of [row], add margin-right to the icon
+  // because the space resulting from display: inline-block collapses
+  [row] > & {
+    margin-right: 3px;
+  }
+  // so that status-icons have a fixed width (like .fa-fw, but better sized)
+  // this ensures when the icons change, the text that follows doesn't shift
+  .fa, .pficon {
     text-align: center;
+    width: 1.230769em; // ~16px at 13px font size
+    .latest-build-status & {
+      width: 20px;
+    }
+  }
+  // fixes wobble that occurs when status-icons utilize fa-spin (see https://github.com/FortAwesome/Font-Awesome/issues/671#issuecomment-249591495)
+  .fa-spin {
+    font-size: 14px;
+    line-height: normal;
+  }
+  // so that spinners match width of .fa/.pficon (16px or 20px)
+  .spinner.spinner-inline {
+    margin-left: 0.153846em; // ~2px at 13px font size
+    margin-right: 0.153846em; // ~2px at 13px font size
+    .latest-build-status & {
+      margin-left: 4px;
+      margin-right: 4px;
+    }
   }
 }
+
 pre.clipped {
   display: inline-block;
   margin-top: 10px;
@@ -1192,9 +1216,3 @@ copy-to-clipboard .input-group.limit-width {
     width: 100%;
   }
 }
-
-// fixes wobble that occurs when status-icons utilize fa-spin (see https://github.com/FortAwesome/Font-Awesome/issues/671#issuecomment-249591495)
-.status-icon > .fa-spin {
-  font-size: 14px;
-  line-height: normal;
-}
diff --git a/app/styles/_pipeline.less b/app/styles/_pipeline.less
index 60200ed0f2..030317dc3e 100644
--- a/app/styles/_pipeline.less
+++ b/app/styles/_pipeline.less
@@ -229,13 +229,6 @@
   .small();
 }
 
-.build-phase .status-icon {
-  margin-right: 2px;
-  .spinner.spinner-inline {
-    margin-right: 0;
-  }
-}
-
 .build-summary, .stage {
   .text-center();
 }
diff --git a/app/views/browse/build-config.html b/app/views/browse/build-config.html
index ef566a2f12..7be2dbe0c5 100644
--- a/app/views/browse/build-config.html
+++ b/app/views/browse/build-config.html
@@ -200,7 +200,7 @@ <h2>No builds.</h2>
                             </td>
                             <td data-title="Status">
                               <div row class="status">
-                                <status-icon status="build.status.phase" disable-animation fixed-width="true"></status-icon>
+                                <status-icon status="build.status.phase" disable-animation></status-icon>
                                 <span ng-if="!build.status.reason || build.status.phase === 'Cancelled'">{{build.status.phase}}</span>
                                 <span ng-if="build.status.reason && build.status.phase !== 'Cancelled'">{{build.status.reason | sentenceCase}}</span>
                               </div>
diff --git a/app/views/browse/deployment-config.html b/app/views/browse/deployment-config.html
index a74599acf9..6ee80dbaf2 100644
--- a/app/views/browse/deployment-config.html
+++ b/app/views/browse/deployment-config.html
@@ -155,7 +155,7 @@ <h1>
                           </td>
                           <td data-title="Status">
                             <div row class="status">
-                              <status-icon status="deployment | deploymentStatus" disable-animation fixed-width="true"></status-icon>
+                              <status-icon status="deployment | deploymentStatus" disable-animation></status-icon>
                               <span flex>
                                 {{deployment | deploymentStatus}}<span ng-if="(deployment | deploymentStatus) == 'Active' || (deployment | deploymentStatus) == 'Running'">,
                                 <span ng-if="deployment.spec.replicas !== deployment.status.replicas">{{deployment.status.replicas}}/</span>{{deployment.spec.replicas}} replica<span ng-if="deployment.spec.replicas != 1">s</span></span>
diff --git a/app/views/browse/route.html b/app/views/browse/route.html
index 27629dc571..57c61e75d5 100644
--- a/app/views/browse/route.html
+++ b/app/views/browse/route.html
@@ -58,7 +58,7 @@ <h1>
                     <span ng-if="!route.status.ingress">
                       {{route | routeLabel : null : true}}
                       <span data-toggle="popover" data-trigger="hover" data-content="The route is not accepting traffic yet because it has not been admitted by a router." style="cursor: help; padding-left: 5px;">
-                        <status-icon status="'Pending'" disable-animation></status-icon>
+                        <status-icon status="'Pending'"></status-icon>
                         <span class="sr-only">Pending</span>
                       </span>
                     </span>
diff --git a/app/views/browse/routes.html b/app/views/browse/routes.html
index a453f5d512..79fb3190ff 100644
--- a/app/views/browse/routes.html
+++ b/app/views/browse/routes.html
@@ -61,7 +61,7 @@ <h1>
                         {{route | routeLabel}}
                       </span>
                       <span ng-if="!route.status.ingress" data-toggle="popover" data-trigger="hover" data-content="The route is not accepting traffic yet because it has not been admitted by a router." style="cursor: help; padding-left: 5px;">
-                        <status-icon status="'Pending'" disable-animation></status-icon>
+                        <status-icon status="'Pending'"></status-icon>
                         <span class="sr-only">Pending</span>
                       </span>
                     </td>
diff --git a/app/views/builds.html b/app/views/builds.html
index 2e58f877a5..42d13112c5 100644
--- a/app/views/builds.html
+++ b/app/views/builds.html
@@ -83,7 +83,7 @@ <h1>
                     <td data-title="Status">
                       <div row class="status">
                         <!-- <build-status build="build"></build-status> -->
-                        <status-icon status="latestBuild.status.phase" disable-animation fixed-width="true"></status-icon>
+                        <status-icon status="latestBuild.status.phase" disable-animation></status-icon>
                         <span ng-if="!latestBuild.status.reason || latestBuild.status.phase === 'Cancelled'">{{latestBuild.status.phase}}</span>
                         <span ng-if="latestBuild.status.reason && latestBuild.status.phase !== 'Cancelled'">{{latestBuild.status.reason | sentenceCase}}</span>
                       </div>
diff --git a/app/views/deployments.html b/app/views/deployments.html
index 2e533f4d03..1a642ae8ff 100644
--- a/app/views/deployments.html
+++ b/app/views/deployments.html
@@ -74,7 +74,7 @@ <h3 ng-if="(deployments | hashSize) || (replicaSets | hashSize)">Deployment Conf
                     </td>
                     <td data-title="Status">
                       <div row class="status">
-                        <status-icon status="replicationController | deploymentStatus" disable-animation fixed-width="true"></status-icon>
+                        <status-icon status="replicationController | deploymentStatus" disable-animation></status-icon>
                         <span flex>
                           {{replicationController | deploymentStatus}}<span ng-if="(replicationController | deploymentStatus) == 'Active' || (replicationController | deploymentStatus) == 'Running'">,
                           <span ng-if="replicationController.spec.replicas !== replicationController.status.replicas">{{replicationController.status.replicas}}/</span>{{replicationController.spec.replicas}} replica<span ng-if="replicationController.spec.replicas != 1">s</span></span>
diff --git a/app/views/directives/_build-pipeline-expanded.html b/app/views/directives/_build-pipeline-expanded.html
index 8426823cc8..34745ec58c 100644
--- a/app/views/directives/_build-pipeline-expanded.html
+++ b/app/views/directives/_build-pipeline-expanded.html
@@ -7,10 +7,10 @@
       <span class="status-icon" ng-class="build.status.phase">
         <span ng-switch="build.status.phase" class="hide-ng-leave">
           <span ng-switch-when="Complete" aria-hidden="true">
-            <i class="fa fa-check-circle"></i>
+            <i class="fa fa-check-circle fa-fw"></i>
           </span>
           <span ng-switch-when="Failed" aria-hidden="true">
-            <i class="fa fa-times-circle"></i>
+            <i class="fa fa-times-circle fa-fw"></i>
           </span>
           <span ng-switch-default>
             <status-icon status="build.status.phase"></status-icon>
diff --git a/app/views/directives/_status-icon.html b/app/views/directives/_status-icon.html
index afa5dfbd41..4302e1d2e7 100644
--- a/app/views/directives/_status-icon.html
+++ b/app/views/directives/_status-icon.html
@@ -1,32 +1,32 @@
 <span ng-switch="status" class="hide-ng-leave status-icon">
-  <span ng-switch-when="Cancelled" class="fa fa-ban text-muted" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="Complete" class="fa fa-check text-success" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="Completed" class="fa fa-check text-success" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="Active" class="fa fa-refresh" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="Error" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="Failed" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="New" class="spinner spinner-xs spinner-inline" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="Pending" class="spinner spinner-xs spinner-inline" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="Running" class="fa fa-refresh" aria-hidden="true" ng-class="{'fa-spin' : spinning, 'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="Succeeded" class="fa fa-check text-success" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="Bound" class="fa fa-check text-success" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="Terminating" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="Terminated" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="Unknown" class="fa fa-question text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
+  <span ng-switch-when="Cancelled" class="fa fa-ban text-muted" aria-hidden="true"></span>
+  <span ng-switch-when="Complete" class="fa fa-check text-success" aria-hidden="true"></span>
+  <span ng-switch-when="Completed" class="fa fa-check text-success" aria-hidden="true"></span>
+  <span ng-switch-when="Active" class="fa fa-refresh" aria-hidden="true"></span>
+  <span ng-switch-when="Error" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="Failed" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="New" class="spinner spinner-xs spinner-inline" aria-hidden="true"></span>
+  <span ng-switch-when="Pending" class="spinner spinner-xs spinner-inline" aria-hidden="true"></span>
+  <span ng-switch-when="Running" class="fa fa-refresh" aria-hidden="true" ng-class="{'fa-spin' : spinning}"></span>
+  <span ng-switch-when="Succeeded" class="fa fa-check text-success" aria-hidden="true"></span>
+  <span ng-switch-when="Bound" class="fa fa-check text-success" aria-hidden="true"></span>
+  <span ng-switch-when="Terminating" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="Terminated" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="Unknown" class="fa fa-question text-danger" aria-hidden="true"></span>
 
   <!-- Container Runtime States -->
-  <span ng-switch-when="ContainerCreating" class="spinner spinner-xs spinner-inline" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="CrashLoopBackOff" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="ImagePullBackOff" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="ImageInspectError" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="ErrImagePull" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="ErrImageNeverPull" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="no matching container" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="RegistryUnavailable" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="RunContainerError" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="KillContainerError" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="VerifyNonRootError" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="SetupNetworkError" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="TeardownNetworkError" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
-  <span ng-switch-when="DeadlineExceeded" class="fa fa-times text-danger" aria-hidden="true" ng-class="{'fa-fw': fixedWidth}"></span>
+  <span ng-switch-when="ContainerCreating" class="spinner spinner-xs spinner-inline" aria-hidden="true"></span>
+  <span ng-switch-when="CrashLoopBackOff" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="ImagePullBackOff" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="ImageInspectError" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="ErrImagePull" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="ErrImageNeverPull" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="no matching container" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="RegistryUnavailable" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="RunContainerError" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="KillContainerError" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="VerifyNonRootError" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="SetupNetworkError" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="TeardownNetworkError" class="fa fa-times text-danger" aria-hidden="true"></span>
+  <span ng-switch-when="DeadlineExceeded" class="fa fa-times text-danger" aria-hidden="true"></span>
 </span>
diff --git a/app/views/directives/build-status.html b/app/views/directives/build-status.html
index 50aea83591..46f3aae87e 100644
--- a/app/views/directives/build-status.html
+++ b/app/views/directives/build-status.html
@@ -1,4 +1,4 @@
-<status-icon status="build.status.phase" disable-animation fixed-width="true"></status-icon>
+<status-icon status="build.status.phase" disable-animation></status-icon>
 <span ng-if="!build.status.reason || build.status.phase === 'Cancelled'">{{build.status.phase}}</span>
 <span ng-if="build.status.reason && build.status.phase !== 'Cancelled'">{{build.status.reason | sentenceCase}}</span><span
   ng-switch="build.status.phase" class="hide-ng-leave" ng-if="build.status.startTimestamp"><span
diff --git a/app/views/directives/traffic-table.html b/app/views/directives/traffic-table.html
index 42390525f7..b89702d2e3 100644
--- a/app/views/directives/traffic-table.html
+++ b/app/views/directives/traffic-table.html
@@ -44,7 +44,7 @@
           {{routes[routeName] | routeLabel}}
         </span>
         <span ng-if="!routes[routeName].status.ingress" data-toggle="popover" data-trigger="hover" data-content="The route is not accepting traffic yet because it has not been admitted by a router." style="cursor: help; padding-left: 5px;">
-          <status-icon status="'Pending'" disable-animation></status-icon>
+          <status-icon status="'Pending'"></status-icon>
           <span class="sr-only">Pending</span>
         </span>
       </td>
@@ -75,4 +75,4 @@
       </td>
     </tr>
   </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/app/views/monitoring.html b/app/views/monitoring.html
index 46da8dbec0..904ded3bb4 100644
--- a/app/views/monitoring.html
+++ b/app/views/monitoring.html
@@ -90,7 +90,7 @@ <h2>Pods</h2>
                               <small>created <span am-time-ago="pod.metadata.creationTimestamp"></span></small>
                             </div>
                             <div class="list-group-item-text">
-                              <status-icon status="pod | podStatus" disable-animation fixed-width="true"></status-icon>
+                              <status-icon status="pod | podStatus" disable-animation></status-icon>
                               {{pod | podStatus | sentenceCase}}
                             </div>
                           </div>
@@ -180,7 +180,7 @@ <h2>Deployments</h2>
                               <small>created <span am-time-ago="replicationController.metadata.creationTimestamp"></span></small>
                             </div>
                             <div class="list-group-item-text">
-                              <status-icon status="replicationController | deploymentStatus" disable-animation fixed-width="true"></status-icon>
+                              <status-icon status="replicationController | deploymentStatus" disable-animation></status-icon>
                               {{replicationController | deploymentStatus | sentenceCase}}<span ng-if="(replicationController | deploymentStatus) === 'Active'">, {{replicationController.status.replicas}} replica<span ng-if="replicationController.status.replicas !== 1">s</span></span>
                             </div>
                           </div>
diff --git a/app/views/overview/_dc.html b/app/views/overview/_dc.html
index e646743d32..5e5fdbbf11 100644
--- a/app/views/overview/_dc.html
+++ b/app/views/overview/_dc.html
@@ -111,7 +111,7 @@ <h2>No deployments.</h2>
 
       </div>
       <div ng-if="orderedReplicationControllers.length === 1" class="deployment-status-msg">
-        <status-icon status="orderedReplicationControllers[0] | deploymentStatus" class="mar-right-xs"></status-icon>
+        <status-icon status="orderedReplicationControllers[0] | deploymentStatus"></status-icon>
         Deployment&nbsp;#{{orderedReplicationControllers[0] | annotation : 'deploymentVersion'}}
         {{orderedReplicationControllers[0] | deploymentStatus | lowercase}}
       </div>
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index fb9b1c0ba7..1c19a9d591 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -11716,8 +11716,7 @@ restrict:"E",
 templateUrl:"views/directives/_status-icon.html",
 scope:{
 status:"=",
-disableAnimation:"@",
-fixedWidth:"=?"
+disableAnimation:"@"
 },
 link:function(a, b, c) {
 a.spinning = !angular.isDefined(c.disableAnimation);
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index a441c22201..55b21de392 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -1906,7 +1906,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</td>\n" +
     "<td data-title=\"Status\">\n" +
     "<div row class=\"status\">\n" +
-    "<status-icon status=\"build.status.phase\" disable-animation fixed-width=\"true\"></status-icon>\n" +
+    "<status-icon status=\"build.status.phase\" disable-animation></status-icon>\n" +
     "<span ng-if=\"!build.status.reason || build.status.phase === 'Cancelled'\">{{build.status.phase}}</span>\n" +
     "<span ng-if=\"build.status.reason && build.status.phase !== 'Cancelled'\">{{build.status.reason | sentenceCase}}</span>\n" +
     "</div>\n" +
@@ -2542,7 +2542,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</td>\n" +
     "<td data-title=\"Status\">\n" +
     "<div row class=\"status\">\n" +
-    "<status-icon status=\"deployment | deploymentStatus\" disable-animation fixed-width=\"true\"></status-icon>\n" +
+    "<status-icon status=\"deployment | deploymentStatus\" disable-animation></status-icon>\n" +
     "<span flex>\n" +
     "{{deployment | deploymentStatus}}<span ng-if=\"(deployment | deploymentStatus) == 'Active' || (deployment | deploymentStatus) == 'Running'\">,\n" +
     "<span ng-if=\"deployment.spec.replicas !== deployment.status.replicas\">{{deployment.status.replicas}}/</span>{{deployment.spec.replicas}} replica<span ng-if=\"deployment.spec.replicas != 1\">s</span></span>\n" +
@@ -3537,7 +3537,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span ng-if=\"!route.status.ingress\">\n" +
     "{{route | routeLabel : null : true}}\n" +
     "<span data-toggle=\"popover\" data-trigger=\"hover\" data-content=\"The route is not accepting traffic yet because it has not been admitted by a router.\" style=\"cursor: help; padding-left: 5px\">\n" +
-    "<status-icon status=\"'Pending'\" disable-animation></status-icon>\n" +
+    "<status-icon status=\"'Pending'\"></status-icon>\n" +
     "<span class=\"sr-only\">Pending</span>\n" +
     "</span>\n" +
     "</span>\n" +
@@ -3744,7 +3744,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "{{route | routeLabel}}\n" +
     "</span>\n" +
     "<span ng-if=\"!route.status.ingress\" data-toggle=\"popover\" data-trigger=\"hover\" data-content=\"The route is not accepting traffic yet because it has not been admitted by a router.\" style=\"cursor: help; padding-left: 5px\">\n" +
-    "<status-icon status=\"'Pending'\" disable-animation></status-icon>\n" +
+    "<status-icon status=\"'Pending'\"></status-icon>\n" +
     "<span class=\"sr-only\">Pending</span>\n" +
     "</span>\n" +
     "</td>\n" +
@@ -4057,7 +4057,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<td data-title=\"Status\">\n" +
     "<div row class=\"status\">\n" +
     "\n" +
-    "<status-icon status=\"latestBuild.status.phase\" disable-animation fixed-width=\"true\"></status-icon>\n" +
+    "<status-icon status=\"latestBuild.status.phase\" disable-animation></status-icon>\n" +
     "<span ng-if=\"!latestBuild.status.reason || latestBuild.status.phase === 'Cancelled'\">{{latestBuild.status.phase}}</span>\n" +
     "<span ng-if=\"latestBuild.status.reason && latestBuild.status.phase !== 'Cancelled'\">{{latestBuild.status.reason | sentenceCase}}</span>\n" +
     "</div>\n" +
@@ -5192,7 +5192,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</td>\n" +
     "<td data-title=\"Status\">\n" +
     "<div row class=\"status\">\n" +
-    "<status-icon status=\"replicationController | deploymentStatus\" disable-animation fixed-width=\"true\"></status-icon>\n" +
+    "<status-icon status=\"replicationController | deploymentStatus\" disable-animation></status-icon>\n" +
     "<span flex>\n" +
     "{{replicationController | deploymentStatus}}<span ng-if=\"(replicationController | deploymentStatus) == 'Active' || (replicationController | deploymentStatus) == 'Running'\">,\n" +
     "<span ng-if=\"replicationController.spec.replicas !== replicationController.status.replicas\">{{replicationController.status.replicas}}/</span>{{replicationController.spec.replicas}} replica<span ng-if=\"replicationController.spec.replicas != 1\">s</span></span>\n" +
@@ -5360,10 +5360,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span class=\"status-icon\" ng-class=\"build.status.phase\">\n" +
     "<span ng-switch=\"build.status.phase\" class=\"hide-ng-leave\">\n" +
     "<span ng-switch-when=\"Complete\" aria-hidden=\"true\">\n" +
-    "<i class=\"fa fa-check-circle\"></i>\n" +
+    "<i class=\"fa fa-check-circle fa-fw\"></i>\n" +
     "</span>\n" +
     "<span ng-switch-when=\"Failed\" aria-hidden=\"true\">\n" +
-    "<i class=\"fa fa-times-circle\"></i>\n" +
+    "<i class=\"fa fa-times-circle fa-fw\"></i>\n" +
     "</span>\n" +
     "<span ng-switch-default>\n" +
     "<status-icon status=\"build.status.phase\"></status-icon>\n" +
@@ -5685,35 +5685,35 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
 
   $templateCache.put('views/directives/_status-icon.html',
     "<span ng-switch=\"status\" class=\"hide-ng-leave status-icon\">\n" +
-    "<span ng-switch-when=\"Cancelled\" class=\"fa fa-ban text-muted\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"Complete\" class=\"fa fa-check text-success\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"Completed\" class=\"fa fa-check text-success\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"Active\" class=\"fa fa-refresh\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"Error\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"Failed\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"New\" class=\"spinner spinner-xs spinner-inline\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"Pending\" class=\"spinner spinner-xs spinner-inline\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"Running\" class=\"fa fa-refresh\" aria-hidden=\"true\" ng-class=\"{'fa-spin' : spinning, 'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"Succeeded\" class=\"fa fa-check text-success\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"Bound\" class=\"fa fa-check text-success\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"Terminating\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"Terminated\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"Unknown\" class=\"fa fa-question text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "\n" +
-    "<span ng-switch-when=\"ContainerCreating\" class=\"spinner spinner-xs spinner-inline\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"CrashLoopBackOff\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"ImagePullBackOff\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"ImageInspectError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"ErrImagePull\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"ErrImageNeverPull\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"no matching container\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"RegistryUnavailable\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"RunContainerError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"KillContainerError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"VerifyNonRootError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"SetupNetworkError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"TeardownNetworkError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
-    "<span ng-switch-when=\"DeadlineExceeded\" class=\"fa fa-times text-danger\" aria-hidden=\"true\" ng-class=\"{'fa-fw': fixedWidth}\"></span>\n" +
+    "<span ng-switch-when=\"Cancelled\" class=\"fa fa-ban text-muted\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"Complete\" class=\"fa fa-check text-success\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"Completed\" class=\"fa fa-check text-success\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"Active\" class=\"fa fa-refresh\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"Error\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"Failed\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"New\" class=\"spinner spinner-xs spinner-inline\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"Pending\" class=\"spinner spinner-xs spinner-inline\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"Running\" class=\"fa fa-refresh\" aria-hidden=\"true\" ng-class=\"{'fa-spin' : spinning}\"></span>\n" +
+    "<span ng-switch-when=\"Succeeded\" class=\"fa fa-check text-success\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"Bound\" class=\"fa fa-check text-success\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"Terminating\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"Terminated\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"Unknown\" class=\"fa fa-question text-danger\" aria-hidden=\"true\"></span>\n" +
+    "\n" +
+    "<span ng-switch-when=\"ContainerCreating\" class=\"spinner spinner-xs spinner-inline\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"CrashLoopBackOff\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"ImagePullBackOff\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"ImageInspectError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"ErrImagePull\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"ErrImageNeverPull\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"no matching container\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"RegistryUnavailable\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"RunContainerError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"KillContainerError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"VerifyNonRootError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"SetupNetworkError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"TeardownNetworkError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-switch-when=\"DeadlineExceeded\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
     "</span>"
   );
 
@@ -5799,7 +5799,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
 
 
   $templateCache.put('views/directives/build-status.html',
-    "<status-icon status=\"build.status.phase\" disable-animation fixed-width=\"true\"></status-icon>\n" +
+    "<status-icon status=\"build.status.phase\" disable-animation></status-icon>\n" +
     "<span ng-if=\"!build.status.reason || build.status.phase === 'Cancelled'\">{{build.status.phase}}</span>\n" +
     "<span ng-if=\"build.status.reason && build.status.phase !== 'Cancelled'\">{{build.status.reason | sentenceCase}}</span><span ng-switch=\"build.status.phase\" class=\"hide-ng-leave\" ng-if=\"build.status.startTimestamp\"><span ng-switch-when=\"Complete\">, ran for {{build.status.startTimestamp | timeOnlyDurationFromTimestamps : build.status.completionTimestamp}}</span><span ng-switch-when=\"Failed\">, ran for {{build.status.startTimestamp | timeOnlyDurationFromTimestamps : build.status.completionTimestamp}}</span><span ng-switch-when=\"Cancelled\"> after {{build.status.startTimestamp | timeOnlyDurationFromTimestamps : build.status.completionTimestamp}}</span><span ng-switch-when=\"Running\"> for <time-only-duration-until-now timestamp=\"build.status.startTimestamp\" time-only></time-only-duration-until-now></span><span ng-switch-when=\"New\"></span><span ng-switch-when=\"Pending\"></span><span ng-switch-default>, ran for {{build.status.startTimestamp | duration : build.status.completionTimestamp}}</span>\n" +
     "</span>"
@@ -8231,7 +8231,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "{{routes[routeName] | routeLabel}}\n" +
     "</span>\n" +
     "<span ng-if=\"!routes[routeName].status.ingress\" data-toggle=\"popover\" data-trigger=\"hover\" data-content=\"The route is not accepting traffic yet because it has not been admitted by a router.\" style=\"cursor: help; padding-left: 5px\">\n" +
-    "<status-icon status=\"'Pending'\" disable-animation></status-icon>\n" +
+    "<status-icon status=\"'Pending'\"></status-icon>\n" +
     "<span class=\"sr-only\">Pending</span>\n" +
     "</span>\n" +
     "</td>\n" +
@@ -10014,7 +10014,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<small>created <span am-time-ago=\"pod.metadata.creationTimestamp\"></span></small>\n" +
     "</div>\n" +
     "<div class=\"list-group-item-text\">\n" +
-    "<status-icon status=\"pod | podStatus\" disable-animation fixed-width=\"true\"></status-icon>\n" +
+    "<status-icon status=\"pod | podStatus\" disable-animation></status-icon>\n" +
     "{{pod | podStatus | sentenceCase}}\n" +
     "</div>\n" +
     "</div>\n" +
@@ -10081,7 +10081,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<small>created <span am-time-ago=\"replicationController.metadata.creationTimestamp\"></span></small>\n" +
     "</div>\n" +
     "<div class=\"list-group-item-text\">\n" +
-    "<status-icon status=\"replicationController | deploymentStatus\" disable-animation fixed-width=\"true\"></status-icon>\n" +
+    "<status-icon status=\"replicationController | deploymentStatus\" disable-animation></status-icon>\n" +
     "{{replicationController | deploymentStatus | sentenceCase}}<span ng-if=\"(replicationController | deploymentStatus) === 'Active'\">, {{replicationController.status.replicas}} replica<span ng-if=\"replicationController.status.replicas !== 1\">s</span></span>\n" +
     "</div>\n" +
     "</div>\n" +
@@ -10555,7 +10555,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div ng-if=\"orderedReplicationControllers.length > 1\" class=\"deployment-connector-arrow\">\n" +
     "</div>\n" +
     "<div ng-if=\"orderedReplicationControllers.length === 1\" class=\"deployment-status-msg\">\n" +
-    "<status-icon status=\"orderedReplicationControllers[0] | deploymentStatus\" class=\"mar-right-xs\"></status-icon>\n" +
+    "<status-icon status=\"orderedReplicationControllers[0] | deploymentStatus\"></status-icon>\n" +
     "Deployment&nbsp;#{{orderedReplicationControllers[0] | annotation : 'deploymentVersion'}} {{orderedReplicationControllers[0] | deploymentStatus | lowercase}}\n" +
     "</div>\n" +
     "</div>\n" +
diff --git a/dist/styles/main.css b/dist/styles/main.css
index 7acd82b3c6..d9e9049c67 100644
--- a/dist/styles/main.css
+++ b/dist/styles/main.css
@@ -3773,7 +3773,6 @@ mark{padding:0;background-color:rgba(252,248,160,.5)}
 @media (max-width:991px){.service-table{min-width:100%}
 }
 .build-config-summary .h3,.deployment-config-summary .h3{margin-bottom:0}
-.build-config-summary .last-status .status-icon,.deployment-config-summary .last-status .status-icon{width:20px}
 .build-config-summary .last-timestamp,.deployment-config-summary .last-timestamp{margin-left:25px}
 .deployment-config-summary{padding-bottom:20px}
 .deployment-config-summary.gutter-bottom-2x{padding-bottom:40px}
@@ -3968,7 +3967,12 @@ a.disabled-link:active,a.disabled-link:focus,a.disabled-link:hover{color:#bbb;te
 .edit-form .labels .form-group{width:100%}
 }
 .status{min-width:130px}
-.status .status-icon{margin-right:6px;width:13px;text-align:center}
+[row]>status-icon{margin-right:3px}
+status-icon .fa,status-icon .pficon{text-align:center;width:1.230769em}
+.latest-build-status status-icon .fa,.latest-build-status status-icon .pficon{width:20px}
+status-icon .fa-spin{font-size:14px;line-height:normal}
+status-icon .spinner.spinner-inline{margin-left:.153846em;margin-right:.153846em}
+.latest-build-status status-icon .spinner.spinner-inline{margin-left:4px;margin-right:4px}
 pre.clipped{display:inline-block;margin-top:10px;max-width:100%}
 pre.clipped.scroll{max-height:150px;overflow:auto;width:100%}
 .k8s-label{margin-right:5px;margin-top:3px}
@@ -3979,6 +3983,7 @@ pre.clipped.scroll{max-height:150px;overflow:auto;width:100%}
 .k8s-label .label-pair .label-key{background-color:#bee1f4;color:#00659c;padding-top:4px;padding-bottom:4px;margin-left:0;font-size:12px}
 .k8s-label .label-pair a.label-key:active,.k8s-label .label-pair a.label-key:focus,.k8s-label .label-pair a.label-key:hover{background-color:#00659c;color:#FFF}
 .k8s-label .label-pair .label-value{background-color:#7dc3e8;color:#FFF;margin-left:0;padding-top:4px;padding-bottom:4px;font-size:12px}
+.data-toolbar .data-toolbar-filter .filter .navbar-filter-widget .label-filter .selectize-control .selectize-input,.data-toolbar .data-toolbar-filter .filter .navbar-filter-widget .label-filter .selectize-control .selectize-input input,.selectize-dropdown{font-size:13px}
 .k8s-label .label-pair a.label-value:active,.k8s-label .label-pair a.label-value:focus,.k8s-label .label-pair a.label-value:hover{background-color:#00659c}
 @media (max-width:768px){.k8s-label,.k8s-label .label-pair{width:100%}
 .k8s-label .label{display:block;min-width:50px}
@@ -3997,8 +4002,6 @@ copy-to-clipboard .input-group.limit-width{max-width:300px}
 .tech-preview-header{justify-content:space-between}
 @media (max-width:479px){.col-xxs-12{width:100%}
 }
-.status-icon>.fa-spin{font-size:14px;line-height:normal}
-.data-toolbar .data-toolbar-filter .filter .navbar-filter-widget .label-filter .selectize-control .selectize-input,.data-toolbar .data-toolbar-filter .filter .navbar-filter-widget .label-filter .selectize-control .selectize-input input,.selectize-dropdown{font-size:13px}
 .data-toolbar{padding:5px 0}
 .data-toolbar.other-resources-toolbar .data-toolbar-dropdown{min-width:210px}
 .data-toolbar .checkbox{margin-bottom:0;margin-top:10px}
@@ -4555,8 +4558,6 @@ to{background-color:transparent}
 .build-links .pipeline-link+.pipeline-link:before{border-left:1px solid #d1d1d1;content:'';display:inline-block;height:12px;margin:0 5px -2px 2px}
 .build-links,.build-name,.build-phase,.build-timestamp{padding:0 10px}
 .build-links,.build-timestamp{padding-top:2px;font-size:84%}
-.build-phase .status-icon{margin-right:2px}
-.build-phase .status-icon .spinner.spinner-inline{margin-right:0}
 .build-summary,.stage{text-align:center}
 .build-summary{border-bottom:1px solid #d1d1d1;display:-webkit-flex;display:-moz-flex;display:-ms-flexbox;display:-ms-flex;display:flex;-webkit-flex-direction:row;-moz-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;-moz-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:space-around;-moz-justify-content:space-around;justify-content:space-around;padding:5px;position:relative}
 .build-timestamp{color:#9c9c9c}