diff --git a/admin/plugins/civicrmicon/civicrmicon.php b/admin/plugins/civicrmicon/civicrmicon.php
index f07894f6..4dff950a 100644
--- a/admin/plugins/civicrmicon/civicrmicon.php
+++ b/admin/plugins/civicrmicon/civicrmicon.php
@@ -38,6 +38,11 @@ public function __construct(&$subject, $config) {
    * @since       2.5
    */
   public function onGetIcons($context) {
+    // exclude CiviCRM quick icons from notification and system block
+    if ($context == 'system_quickicon' || $context == 'update_quickicon') {
+      return [];
+    }
+
     jimport('joomla.environment.uri');
     $icon = array(
       array(
@@ -45,20 +50,26 @@ public function onGetIcons($context) {
         'image' => JURI::base() . 'components/com_civicrm/civicrm/i/smallLogo.png',
         'text' => 'CiviCRM',
         'id' => 'plg_quickicon_civicrmicon',
+        'class' => $context == 'mod_quickicon' ? 'success' : '',
       ),
     );
 
     //image must be handled via css class in J3.0
     if (version_compare(JVERSION, '3.0', 'ge')) {
-      $img = JURI::root() . 'plugins/quickicon/civicrmicon/smallLogo14.png';
-      $css = '
+      $img = version_compare(JVERSION, '4.0', 'ge') ? $icon[0]['image'] : JURI::root() . 'plugins/quickicon/civicrmicon/smallLogo14.png';
+      $additonalAttributes = version_compare(JVERSION, '4.0', 'ge') ? 'height:50px;width:50px;' : '';
+      $css = "
         .icon-civicrm, .icon-civicrm-open {
-          background-image:url("' . $img . '");
+          {$additonalAttributes}
+          background-image:url(\"{$img}\");
         }
-      ';
+      ";
       $document = JFactory::getDocument();
       $document->addStyleDeclaration($css);
       $icon[0]['image'] = 'civicrm';
+      if (version_compare(JVERSION, '4.0', 'ge')) {
+        $icon[0]['image'] = 'icon-civicrm';
+      }
     }
     else {
       $icon[0]['image'] = JURI::base() . 'components/com_civicrm/civicrm/i/smallLogo.png';