diff --git a/uc_store/images/alert.gif b/uc_store/images/alert.gif
deleted file mode 100644
index 429a5d9be4157148be3c72a33798c82e33a27bc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmV<S015v`Nk%w1VGsZh0K^{v{p^PS_1gQ~OY6dO``}*QvOMd>dh4Pm>zWkn%ZmEi
zLhH$e{NZEksW<DM9Q)l;>%eaO-&*_LR{r$P>%M90w^_V=66>%>{qLdv@v{BynEvv=
z{NiT+_T&Hm|NsC0A^8LW0018VEC2ui01yBV000GZ;3tls=aDGsCCQnpN!Kmz>n$C}
zbw-VPhTM+g8v%tJMxatG4RQqwV{$2ap1LR@vT67{kQ^f#kz@|FtC+EsJOmiD2;5<?
wqi=!6aXQ-Dc?t>ud_VyK6B8R585kM>kbET+6&DQ$4hWi?X(pbZCL$pKJ9H9v;Q#;t

diff --git a/uc_store/images/info.gif b/uc_store/images/info.gif
deleted file mode 100644
index 35e949963e4b7a5f04fd1c8932a980901e3d4385..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 263
zcmV+i0r>t$Nk%w1VGsZi0K^{vcEd+Ya4xgmmXXkDk(iA6{P)e~xr@?RgUwTMzeLpS
z#Wq<Qev@rdf-IBfSBd0I?DyrU<#)p7sa<+Te$_{S%TJ8uP)uMvaf@7w&S0e4cYxVQ
zX}CU8XF~t~|NsC0A^8LW0018VEC2ui01yBW000Gq;3s}wX?kNyPDINv6RLWcVMtLP
zHL^$>hu{H$s5p4O4v<)^3=A2^0_EulhRp%QGjIf`R%Ru$RUj;1k~O1%3=|$g0$`b{
z1p`T8E1%cF0ssJ7eF+H<c2yc2f`*119DhC+2MLgu91m$D9+VFhpc|SV1v3{7sHjst
NDJLc>u(2Z{06R}5X@39!

diff --git a/uc_store/src/Controller/StoreController.php b/uc_store/src/Controller/StoreController.php
index 6fa9f95..7c00357 100644
--- a/uc_store/src/Controller/StoreController.php
+++ b/uc_store/src/Controller/StoreController.php
@@ -21,29 +21,23 @@ class StoreController extends SystemController {
     $build['blocks'] = parent::overview($link_id);
 
     if ($results = $this->moduleHandler()->invokeAll('uc_store_status')) {
+      $map = [
+        'warning' => REQUIREMENT_WARNING,
+        'error' => REQUIREMENT_ERROR,
+      ];
       foreach ($results as $message) {
-        switch ($message['status']) {
-          case 'warning': $icon = 'alert.gif'; break;
-          case 'error':   $icon = 'error.gif'; break;
-          default:        $icon = 'info.gif';
-        }
-        $icon = array(
-          '#theme' => 'image',
-          '#uri' => drupal_get_path('module', 'uc_store') . '/images/' . $icon,
-        );
-        $rows[] = array(
-          array('data' => $icon, 'class' => array('status-icon')),
-          array('data' => $message['title'], 'class' => array('status-title')),
-          array('data' => $message['desc'], 'class' => array('status-value')),
-        );
+        $requirements[] = [
+          'title' => $message['title'],
+          'description' => $message['desc'],
+          'severity' => isset($map[$message['status']]) ? $map[$message['status']] : REQUIREMENT_INFO,
+        ];
       }
 
-      $build['status'] = array(
-        '#theme' => 'table',
-        '#caption' => ['#markup' => '<h2>' . $this->t('Store status') . '</h2>'],
-        '#rows' => $rows,
-        '#attributes' => array('class' => array('system-status-report')),
-      );
+      $build['status'] = [
+        '#theme' => 'status_report',
+        '#prefix' => '<h2>' . $this->t('Store status') . '</h2>',
+        '#requirements' => $requirements,
+      ];
     }
 
     return $build;