259ffc
diff --git a/src/lxml/html/clean.py b/src/lxml/html/clean.py
259ffc
index 6f3f7de..da5af16 100644
259ffc
--- a/src/lxml/html/clean.py
259ffc
+++ b/src/lxml/html/clean.py
259ffc
@@ -73,18 +73,25 @@ _looks_like_tag_content = re.compile(
259ffc
 
259ffc
 # All kinds of schemes besides just javascript: that can cause
259ffc
 # execution:
259ffc
-_is_image_dataurl = re.compile(
259ffc
-    r'^data:image/.+;base64', re.I).search
259ffc
+_find_image_dataurls = re.compile(
259ffc
+    r'^data:image/(.+);base64,', re.I).findall
259ffc
 _is_possibly_malicious_scheme = re.compile(
259ffc
-    r'(?:javascript|jscript|livescript|vbscript|data|about|mocha):',
259ffc
-    re.I).search
259ffc
+    r'(javascript|jscript|livescript|vbscript|data|about|mocha):',
259ffc
+    re.I).findall
259ffc
+# SVG images can contain script content
259ffc
+_is_unsafe_image_type = re.compile(r"(xml|svg)", re.I).findall
259ffc
+
259ffc
 def _is_javascript_scheme(s):
259ffc
-    if _is_image_dataurl(s):
259ffc
-        return None
259ffc
-    return _is_possibly_malicious_scheme(s)
259ffc
+    is_image_url = False
259ffc
+    for image_type in _find_image_dataurls(s):
259ffc
+        is_image_url = True
259ffc
+        if _is_unsafe_image_type(image_type):
259ffc
+            return True
259ffc
+    if is_image_url:
259ffc
+        return False
259ffc
+    return bool(_is_possibly_malicious_scheme(s))
259ffc
 
259ffc
 _substitute_whitespace = re.compile(r'[\s\x00-\x08\x0B\x0C\x0E-\x19]+').sub
259ffc
-# FIXME: should data: be blocked?
259ffc
 
259ffc
 # FIXME: check against: http://msdn2.microsoft.com/en-us/library/ms537512.aspx
259ffc
 _conditional_comment_re = re.compile(
259ffc
@@ -512,6 +519,8 @@ class Cleaner(object):
259ffc
             return True
259ffc
         if 'expression(' in style:
259ffc
             return True
259ffc
+        if '@import' in style:
259ffc
+            return True
259ffc
         if '
259ffc
             # e.g. '">'
259ffc
             return True
259ffc
diff --git a/src/lxml/html/tests/test_clean.py b/src/lxml/html/tests/test_clean.py
259ffc
index e40cdad..ad9a598 100644
259ffc
--- a/src/lxml/html/tests/test_clean.py
259ffc
+++ b/src/lxml/html/tests/test_clean.py
259ffc
@@ -1,3 +1,5 @@
259ffc
+import base64
259ffc
+import gzip
259ffc
 import unittest, sys
259ffc
 from lxml.tests.common_imports import make_doctest
259ffc
 from lxml.etree import LIBXML_VERSION
259ffc
@@ -89,6 +91,69 @@ class CleanerTest(unittest.TestCase):
259ffc
             b'<math><style>/* deleted */</style></math>',
259ffc
             lxml.html.tostring(clean_html(s)))
259ffc
 
259ffc
+    def test_sneaky_import_in_style(self):
259ffc
+        # Prevent "@@importimport" -> "@import" replacement.
259ffc
+        style_codes = [
259ffc
+            "@@importimport(extstyle.css)",
259ffc
+            "@ @  import import(extstyle.css)",
259ffc
+            "@ @ importimport(extstyle.css)",
259ffc
+            "@@  import import(extstyle.css)",
259ffc
+            "@ @import import(extstyle.css)",
259ffc
+            "@@importimport()",
259ffc
+        ]
259ffc
+        for style_code in style_codes:
259ffc
+            html = '<style>%s</style>' % style_code
259ffc
+            s = lxml.html.fragment_fromstring(html)
259ffc
+
259ffc
+            cleaned = lxml.html.tostring(clean_html(s))
259ffc
+            self.assertEqual(
259ffc
+                b'<style>/* deleted */</style>',
259ffc
+                cleaned,
259ffc
+                "%s  ->  %s" % (style_code, cleaned))
259ffc
+
259ffc
+    def test_svg_data_links(self):
259ffc
+        # Remove SVG images with potentially insecure content.
259ffc
+        svg = b'<svg onload="alert(123)" />'
259ffc
+        svgz = gzip.compress(svg)
259ffc
+        svg_b64 = base64.b64encode(svg).decode('ASCII')
259ffc
+        svgz_b64 = base64.b64encode(svgz).decode('ASCII')
259ffc
+        urls = [
259ffc
+            "data:image/svg+xml;base64," + svg_b64,
259ffc
+            "data:image/svg+xml-compressed;base64," + svgz_b64,
259ffc
+        ]
259ffc
+        for url in urls:
259ffc
+            html = '' % url
259ffc
+            s = lxml.html.fragment_fromstring(html)
259ffc
+
259ffc
+            cleaned = lxml.html.tostring(clean_html(s))
259ffc
+            self.assertEqual(
259ffc
+                b'',
259ffc
+                cleaned,
259ffc
+                "%s  ->  %s" % (url, cleaned))
259ffc
+
259ffc
+    def test_image_data_links(self):
259ffc
+        data = b'123'
259ffc
+        data_b64 = base64.b64encode(data).decode('ASCII')
259ffc
+        urls = [
259ffc
+            "data:image/jpeg;base64," + data_b64,
259ffc
+            "data:image/apng;base64," + data_b64,
259ffc
+            "data:image/png;base64," + data_b64,
259ffc
+            "data:image/gif;base64," + data_b64,
259ffc
+            "data:image/webp;base64," + data_b64,
259ffc
+            "data:image/bmp;base64," + data_b64,
259ffc
+            "data:image/tiff;base64," + data_b64,
259ffc
+            "data:image/x-icon;base64," + data_b64,
259ffc
+        ]
259ffc
+        for url in urls:
259ffc
+            html = '' % url
259ffc
+            s = lxml.html.fragment_fromstring(html)
259ffc
+
259ffc
+            cleaned = lxml.html.tostring(clean_html(s))
259ffc
+            self.assertEqual(
259ffc
+                html.encode("UTF-8"),
259ffc
+                cleaned,
259ffc
+                "%s  ->  %s" % (url, cleaned))
259ffc
+
259ffc
     def test_formaction_attribute_in_button_input(self):
259ffc
         # The formaction attribute overrides the form's action and should be
259ffc
         # treated as a malicious link attribute