diff --git a/app/common/directives/firmware-list.html b/app/common/directives/firmware-list.html
index c53a417..0be4625 100644
--- a/app/common/directives/firmware-list.html
+++ b/app/common/directives/firmware-list.html
@@ -21,23 +21,21 @@
 			</div>
 		</div>
 		<div class="table__body">
-			<div class="table__row" ng-class="firmware.functional ? 'firmware__primary' : ''" ng-repeat="firmware in firmwares|filter:filterBy|orderBy:'+Priority'">
+			<div class="table__row" ng-class="firmware.activationStatus == 'Functional' ? 'firmware__primary' : ''" ng-repeat="firmware in firmwares|filter:filterBy|orderBy:'+Priority'">
 				<div class="table__cell">
 					<span class="table__cell-label">Boot priority:</span>
 					<div class="icon icon__up-arrow" aria-hidden="true" ng-class="{'icon-as-spacer':$first}"
 					     ng-click="!$first && changePriority(firmware.imageId, firmware.Priority, firmware.Priority - 1)"
-					     ng-show="firmware.activationFlags.functional || firmware.activationFlags.ready">
+					     ng-show="firmware.activationStatus == 'Functional' || firmware.activationStatus == 'Ready'">
 						<span class="accessible-text">firmware up in priority</span></div>
 					<div class="icon icon__down-arrow" aria-hidden="true" ng-class="{'icon-as-spacer':$last}"
 					    ng-click="!$last && changePriority(firmware.imageId, firmware.Priority, firmware.Priority + 1)"
-					    ng-hide="firmware.activationFlags.ready">
+					    ng-hide="firmware.activationStatus == 'Ready'">
 						<span class="accessible-text">firmware down in priority</span></div>
 				</div>
 				<div class="table__cell firmware__active">
 					<span class="table__cell-label">Image state:</span>
-					<span ng-if="firmware.activationFlags.functional">Functional</span>
-					<span ng-if="firmware.activationFlags.active">Active</span>
-					<span ng-if="firmware.activationFlags.ready">Ready</span>
+					<span>{{firmware.activationStatus}}</span>
 				</div>
 				<div class="table__cell firmware__version" ng-class="{'active':firmware.isExtended}">
 					<span class="table__cell-label">Version:</span>{{firmware.Version}}
@@ -59,10 +57,10 @@
 				</div>
 				<div class="table__cell">
 				    <span class="table__cell-label">Action:</span>
-				    <button class="firmware__action-link" ng-show="firmware.activationFlags.ready" ng-click="activate(firmware.imageId)">Activate</button>
-				    <button class="firmware__action-link" ng-show="!firmware.functional" ng-click="delete(firmware.imageId)">Delete</button>
+				    <button class="firmware__action-link" ng-show="firmware.activationStatus == 'Ready'" ng-click="activate(firmware.imageId)">Activate</button>
+				    <button class="firmware__action-link" ng-show="firmware.activationStatus != 'Functional'" ng-click="delete(firmware.imageId)">Delete</button>
 				</div>
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>