diff --git a/src/plots/map/map.js b/src/plots/map/map.js
index 61348ac9e2c..92b47b28213 100644
--- a/src/plots/map/map.js
+++ b/src/plots/map/map.js
@@ -104,6 +104,20 @@ proto.createMap = function(calcData, fullLayout, resolve, reject) {
         compact: true
     }));
 
+    var requestedIcons = {};
+    map.on('styleimagemissing', function(e) {
+        var id = e.id;
+        if(!requestedIcons[id] && id.includes('-15')) {
+            requestedIcons[id] = true;
+            var img = new Image(15, 15);
+            img.onload = function() {
+                map.addImage(id, img);
+            };
+            img.crossOrigin = 'Anonymous';
+            img.src = 'https://unpkg.com/maki@2.1.0/icons/' + id + '.svg';
+        }
+    });
+
     map.setTransformRequest(function(url) {
         url = url.replace('https://fonts.openmaptiles.org/Open Sans Extrabold', 'https://fonts.openmaptiles.org/Open Sans Extra Bold');
         url = url.replace('https://tiles.basemaps.cartocdn.com/fonts/Open Sans Extrabold', 'https://fonts.openmaptiles.org/Open Sans Extra Bold');
diff --git a/test/image/baselines/map_angles.png b/test/image/baselines/map_angles.png
index 4873b9a499b..af4b4c19dc1 100644
Binary files a/test/image/baselines/map_angles.png and b/test/image/baselines/map_angles.png differ
diff --git a/test/image/baselines/map_symbol-text.png b/test/image/baselines/map_symbol-text.png
index 5a0513055eb..6a423f72ad3 100644
Binary files a/test/image/baselines/map_symbol-text.png and b/test/image/baselines/map_symbol-text.png differ
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js
index d2a56ae126f..da74b096a03 100644
--- a/test/image/compare_pixels_test.js
+++ b/test/image/compare_pixels_test.js
@@ -112,7 +112,8 @@ for(var i = 0; i < allMockList.length; i++) {
         // list flaky mocks other than mapbox:
         'map_density0-legend',
         'map_osm-style',
-        'gl3d_bunny-hull'
+        'gl3d_bunny-hull',
+        'map_angles'
     ].indexOf(mockName) !== -1;
 
     if(mathjax3) mockName = 'mathjax3___' + mockName;