diff --git a/blocks/advnotifications/javascript/custom.js b/blocks/advnotifications/javascript/custom.js
index 7548ec4b025..f9feaf5b558 100644
--- a/blocks/advnotifications/javascript/custom.js
+++ b/blocks/advnotifications/javascript/custom.js
@@ -235,7 +235,8 @@ require(['jquery'], function($) {
             previewalert.removeClass('alert-info alert-success alert-danger alert-warning');
             previewalert.addClass('alert-' + alerttype);
 
-            $('.preview-aicon').find('> img').attr('src', M.cfg.wwwroot + '/blocks/advnotifications/pix/' + alerttype + '.png');
+            // $('.preview-aicon').find('> img').attr('src', M.cfg.wwwroot + '/blocks/advnotifications/pix/' + alerttype + '.png');
+            $('.preview-aicon').find('> img').attr('src', M.util.image_url(alerttype, 'block_advnotifications'));
 
             // Check if dismissable.
             if (!$('#add_notification_dismissible')[0].checked) {
@@ -277,7 +278,8 @@ require(['jquery'], function($) {
         // Shiny new and fresh preview.
         var refreshPreview = function() {
             var previewelem = $('#notification_preview_wrapper');
-            var previewdom = '<div id="notification_preview_wrapper"><strong>' + strings.preview + '</strong><br><div class="alert alert-info preview-alert"><div class="preview-aicon" style="display: none;"><img src="' + M.cfg.wwwroot + '/blocks/advnotifications/pix/info.png' + '" /></div><strong class="preview-title">' + strings.title + '</strong> <div class="preview-message">' + strings.message + '</div> <div class="preview-alert-dismissible" style="display: none;"><strong>&times;</strong></div></div></div>';
+            // var previewdom = '<div id="notification_preview_wrapper"><strong>' + strings.preview + '</strong><br><div class="alert alert-info preview-alert"><div class="preview-aicon" style="display: none;"><img src="' + M.cfg.wwwroot + '/blocks/advnotifications/pix/info.png' + '" /></div><strong class="preview-title">' + strings.title + '</strong> <div class="preview-message">' + strings.message + '</div> <div class="preview-alert-dismissible" style="display: none;"><strong>&times;</strong></div></div></div>';
+            var previewdom = '<div id="notification_preview_wrapper"><strong>' + strings.preview + '</strong><br><div class="alert alert-info preview-alert"><div class="preview-aicon" style="display: none;"><img src="' + M.util.image_url('info.png', 'block_advnotifications') + '" /></div><strong class="preview-title">' + strings.title + '</strong> <div class="preview-message">' + strings.message + '</div> <div class="preview-alert-dismissible" style="display: none;"><strong>&times;</strong></div></div></div>';
 
             // If it exists already, remove before adding again.
             if (previewelem.length > 0) {
diff --git a/blocks/advnotifications/renderer.php b/blocks/advnotifications/renderer.php
index 628f63d5742..217059f7e0a 100644
--- a/blocks/advnotifications/renderer.php
+++ b/blocks/advnotifications/renderer.php
@@ -53,7 +53,8 @@ class block_advnotifications_renderer extends plugin_renderer_base
 
             if (!empty($notification['aiconflag']) && $notification['aiconflag'] == 1) {
                 $html .= '<img class="notification_aicon" src="' .
-                    $CFG->wwwroot . '/blocks/advnotifications/pix/' . $notification['aicon'] . '.png"/>';
+                    // $CFG->wwwroot . '/blocks/advnotifications/pix/' . $notification['aicon'] . '.png"/>';
+                $this->output->image_url($notification['aicon'], 'block_advnotifications') . '"';
             }
             if (!empty($notification['title'])) {
                 $html .= '<strong>' . $notification['title'] . '</strong> ';