diff --git a/app/extensions/IconsHelper.php b/app/extensions/IconsHelper.php
index e4d77ed..a45974f 100644
--- a/app/extensions/IconsHelper.php
+++ b/app/extensions/IconsHelper.php
@@ -3,10 +3,17 @@
 class IconsHelper extends \Prefab {
 
     static public $status_icons = [
-        'New' => ['fas fa-circle-dot has-text-success', "🆕"],
-        'In Progress' => ['fas fa-circle-play has-text-link', "🔄"],
-        'On Hold' => ['fas fa-pause-circle has-text-warning',"⏸️"],
-        'Completed' => ['fas fa-check-circle has-text-danger', "✅"]
+        'open' => ['fas fa-circle-dot has-text-success', "🆕"],
+        'in_progress' => ['fas fa-circle-play has-text-link', "🔄"],
+        'on_hold' => ['fas fa-pause-circle has-text-warning',"⏸️"],
+        'completed' => ['fas fa-check has-text-danger', "✅"]
+    ];
+
+    static public $status_names = [
+        'open' => 'Open',
+        'in_progress' => 'In Progress',
+        'on_hold' => 'On Hold',
+        'completed' => 'Completed'
     ];
 
     static public $priority_icons = [
@@ -32,12 +39,15 @@ class IconsHelper extends \Prefab {
         $context = $f3->hive();
         $inner = $tpl->token($node[0], $context);
 
-        return '<?php echo IconsHelper::do_the_switch("' . $attr['type'] . '", ' . $inner . '); ?>';
+        return '<?php echo IconsHelper::do_the_switch("' . $attr['type'] . '", ' . $inner  . '); ?>';
         
     }
 
     static function do_the_switch($type, $value){
 
+        if($value !== null) {
+            $value = str_replace(' ', '_', strtolower($value));
+        }
         $icon_class = '';
         switch(strtolower($type)){
             case 'status':