diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 00c9c128e..9ca289ef7 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -74,8 +74,10 @@ foreach ($comments as $comment):
         $data['service'] = $comment->service;
     }
 
-    echo $cf->iconSubmitForm(
-        'img/icons/remove.png',
+    // echo $cf->iconSubmitForm(
+    //    'img/icons/remove.png',
+    echo $cf->labelSubmitForm(
+        'X',
         'Remove comment',
         'link-like',
         'removecomment',
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index f53da1739..7b48366fb 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -48,8 +48,10 @@ $helper = $this->getHelper('CommandForm');
         if (isset($downtime->service)) {
           $data['service'] = $downtime->service;
         }
-        echo $helper->iconSubmitForm(
-          'img/icons/remove.png',
+        // echo $helper->iconSubmitForm(
+        //   'img/icons/remove.png',
+        echo $helper->labelSubmitForm(
+          'X',
           'Remove Downtime',
           'link-like',
           'removedowntime',
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 3bf27d2cb..9623f4fa4 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -20,8 +20,10 @@ foreach ($object->comments as $comment) {
     $deleteData = $data;
     $deleteData['commentid'] = $comment->id;
 
-    $iconForm = $cf->iconSubmitForm(
-        'img/icons/remove_petrol.png',
+    // $iconForm = $cf->iconSubmitForm(
+    //     'img/icons/remove_petrol.png',
+    $iconForm = $cf->labelSubmitForm(
+        'X',
         'Remove comment',
         'link-like',
         'removecomment',
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 22218e4cb..34f4e98e4 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -24,8 +24,10 @@ foreach ($object->downtimes as $downtime) {
         }
     }
 
-    $iconForm = $cf->iconSubmitForm(
-        'img/icons/remove_petrol.png',
+    // $iconForm = $cf->iconSubmitForm(
+    //     'img/icons/remove_petrol.png',
+    $iconForm = $cf->labelSubmitForm(
+        'X',
         'Remove Downtime',
         'link-like',
         'removedowntime',