diff --git a/fonts/h5p-core-14.eot b/fonts/h5p-core-14.eot
new file mode 100644
index 0000000..9a90816
Binary files /dev/null and b/fonts/h5p-core-14.eot differ
diff --git a/fonts/h5p.svg b/fonts/h5p-core-14.svg
similarity index 78%
rename from fonts/h5p.svg
rename to fonts/h5p-core-14.svg
index 2087153..f66252d 100644
--- a/fonts/h5p.svg
+++ b/fonts/h5p-core-14.svg
@@ -3,7 +3,7 @@
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>Generated by IcoMoon</metadata>
 <defs>
-<font id="h5p" horiz-adv-x="1024">
+<font id="h5p-core-14" horiz-adv-x="1024">
 <font-face units-per-em="1024" ascent="960" descent="-64" />
 <missing-glyph horiz-adv-x="1024" />
 <glyph unicode="&#x20;" horiz-adv-x="512" d="" />
@@ -20,4 +20,6 @@
 <glyph unicode="&#xe892;" glyph-name="uniE892" horiz-adv-x="1321" d="M599.553 337.314c4.419-3.023 8.138-9.998 8.138-15.581v-58.599c0-5.348-3.721-7.441-8.138-4.419l-220.906 148.123c-4.419 3.023-8.138 9.998-8.138 15.348v50.228c0 5.348 3.721 12.323 8.138 15.581l220.906 149.517c4.419 3.023 8.138 1.162 8.138-4.419v-58.599c0-5.348-3.721-12.556-8.138-15.581l-152.773-106.731c-4.419-3.023-4.419-8.138 0-11.161l152.773-103.71zM874.175 440.559c4.419 3.023 4.65 8.138 0 11.161l-152.773 106.731c-4.419 3.023-8.138 10.232-8.138 15.581v58.599c0 5.348 3.721 7.441 8.138 4.419l220.906-149.517c4.419-3.023 8.138-9.998 8.138-15.581v-50.228c0-5.348-3.721-12.323-8.138-15.348l-220.906-148.123c-4.419-3.023-8.138-1.162-8.138 4.419v58.599c0 5.348 3.721 12.323 8.138 15.581l152.773 103.71z" />
 <glyph unicode="&#xe893;" glyph-name="uniE893" horiz-adv-x="1321" d="M502.17 522.957c-12.902 0-16.998-8.192-8.806-18.227l152.166-188.006c8.192-10.035 21.504-10.035 29.696 0l152.166 188.006c8.192 10.035 4.301 18.227-8.806 18.227h-316.416zM719.462 512.512v139.878c0 12.902-10.65 23.552-23.552 23.552h-70.656c-12.902 0-23.552-10.65-23.552-23.552v-139.878zM798.106 375.91c-8.602 0-20.070-5.53-25.6-12.288l-75.162-92.979c-5.325-6.758-15.36-16.589-22.118-21.914 0 0-4.506-3.686-14.746-3.686s-14.746 3.686-14.746 3.686c-6.758 5.325-16.589 15.36-22.118 21.914l-75.162 92.979c-5.325 6.758-16.998 12.288-25.6 12.288h-130.253c-8.602 0-15.77-6.963-15.77-15.77v-141.722c0-8.602 6.963-15.77 15.77-15.77h535.962c8.602 0 15.77 6.963 15.77 15.77v141.722c0 8.602-6.963 15.77-15.77 15.77h-130.458zM448.102 261.018c-15.565 0-28.262 12.698-28.262 28.262s12.698 28.262 28.262 28.262 28.262-12.698 28.262-28.262c-0.205-15.565-12.698-28.262-28.262-28.262z" />
 <glyph unicode="&#xe894;" glyph-name="uniE894" horiz-adv-x="1321" d="M742.605 448l107.11 107.11c9.626 9.626 9.626 25.19 0 34.816l-47.309 47.309c-9.626 9.626-25.19 9.626-34.816 0l-107.11-107.11-107.11 107.11c-9.626 9.626-25.19 9.626-34.816 0l-47.309-47.309c-9.626-9.626-9.626-25.19 0-34.816l107.11-107.11-107.11-107.11c-9.626-9.626-9.626-25.19 0-34.816l47.309-47.309c9.626-9.626 25.19-9.626 34.816 0l107.11 107.11 107.11-107.11c9.626-9.626 25.19-9.626 34.816 0l47.309 47.309c9.626 9.626 9.626 25.19 0 34.816l-107.11 107.11z" />
+<glyph unicode="&#xe900;" glyph-name="edit-image" d="M300.237 770.97c69.018 23.142 133.325 14.234 189.133-33.28 56.627-48.128 77.619-110.592 63.181-183.808-2.355-12.186 0.307-19.456 8.704-27.853 93.901-93.389 156.774-156.467 250.47-250.163 5.427-5.427 10.957-10.854 15.667-16.896 39.424-50.278 16.794-124.006-44.237-142.029-36.966-10.957-68.403 0-95.334 27.034-95.642 96.051-160.973 160.973-256.614 257.024-6.963 6.963-12.8 8.909-22.63 6.758-117.76-26.317-229.171 60.826-231.731 181.453-0.614 26.419 3.584 52.326 15.974 77.926 34.816-34.816 68.506-67.789 101.274-101.786 10.445-10.752 20.992-15.36 36.045-15.36 14.643 0 25.19 3.891 34.816 14.848 10.752 12.39 23.040 23.347 34.611 35.021 14.336 14.438 14.336 46.080-0.205 60.518-35.123 35.226-70.349 70.349-106.598 106.496 3.891 2.253 5.632 3.482 7.475 4.096zM703.386 212.89c-0.41-24.269 20.685-45.466 44.851-45.158 23.757 0.41 44.032 20.992 43.93 44.544-0.102 23.757-20.275 44.032-44.237 44.134-23.859 0.307-44.237-19.661-44.544-43.52z" />
+<glyph unicode="&#xe901;" glyph-name="hourglass" d="M733.286 138.752c-147.763 0-295.526 0-443.29 0 0 2.048 0.102 4.096 0 6.144-0.307 13.824-1.024 32.666-0.922 46.49 0.41 39.731 6.861 78.131 19.046 115.2 17.203 52.224 43.725 96.256 81.306 130.355 4.506 4.096 9.216 7.885 13.722 11.776-0.205 0.717-0.307 1.126-0.41 1.229-1.331 1.229-2.765 2.355-4.198 3.584-28.058 22.63-50.688 51.405-68.403 85.606-30.618 59.085-43.52 123.597-41.165 192.614 0.205 7.168 0.614 18.33 0.922 25.498 147.763 0 295.526 0 443.29 0 0.205-1.331 0.512-2.662 0.614-3.994 2.662-36.966 1.229-77.722-5.939-113.869-14.336-72.909-44.544-133.837-95.027-179.405-4.096-3.686-8.294-7.066-12.39-10.547 0.205-0.717 0.307-1.126 0.512-1.331 0.819-0.717 1.638-1.434 2.458-2.15 42.189-33.894 71.68-79.872 90.931-135.782 11.776-34.202 18.637-69.837 20.070-106.701 0.819-19.763-0.614-44.851-1.126-64.717zM687.309 181.965c0 6.554 0.205 12.493 0 18.432-1.331 37.581-7.27 74.138-19.866 108.749-17.92 49.562-45.568 88.269-88.678 108.646-2.458 1.126-2.97 3.072-2.97 5.837 0.102 16.691 0.102 33.485 0 50.176 0 3.994 1.331 5.427 4.096 6.963 9.114 5.325 18.432 10.24 26.829 16.896 29.696 23.552 49.152 56.934 62.362 95.744 10.342 30.413 15.77 62.259 17.818 94.822 0.614 9.114 0.102 18.227 0.102 27.546-116.634 0-233.574 0-351.027 0 0.307-8.704 0.614-16.998 1.024-25.395 1.946-37.274 8.499-73.216 21.504-107.213 18.125-47.104 45.261-83.558 86.528-103.117 2.253-1.024 2.867-2.662 2.867-5.427-0.102-17.203-0.102-34.509 0-51.712 0-3.072-1.024-4.506-3.277-5.632-5.632-2.867-11.366-5.734-16.691-9.216-34.304-22.733-56.832-57.754-71.987-100.147-12.493-35.123-18.125-71.987-19.661-109.875-0.205-5.325 0-10.752 0-16.282 117.35 0.205 234.189 0.205 351.027 0.205zM410.214 601.293c68.096 0 135.373 0 203.674 0-3.789-6.554-7.168-12.595-10.752-18.227-10.957-16.998-24.269-30.618-39.731-41.472s-27.75-25.293-32.768-46.592c-1.638-6.963-2.765-14.336-2.867-21.606-0.307-17.203-0.205-34.406 0.307-51.712 0.717-28.058 12.493-48.947 32.154-62.566 43.008-30.003 65.843-75.878 75.776-132.506 0.307-1.638 0.307-3.379 0.614-5.53-83.149 0-166.093 0-249.242 0 2.662 20.685 7.885 40.346 15.462 59.085 13.312 32.973 32.768 59.187 59.494 77.722 16.589 11.469 28.365 27.955 32.358 50.995 0.819 4.813 1.331 9.83 1.434 14.746 0.102 18.637 0.614 37.274-0.205 55.808-1.126 24.678-11.981 43.213-28.57 57.139-9.216 7.782-18.944 14.746-27.648 23.142-11.981 11.162-21.197 25.395-29.491 41.574z" />
 </font></defs></svg>
\ No newline at end of file
diff --git a/fonts/h5p-core-14.ttf b/fonts/h5p-core-14.ttf
new file mode 100644
index 0000000..77aa1c7
Binary files /dev/null and b/fonts/h5p-core-14.ttf differ
diff --git a/fonts/h5p-core-14.woff b/fonts/h5p-core-14.woff
new file mode 100644
index 0000000..e11a5c7
Binary files /dev/null and b/fonts/h5p-core-14.woff differ
diff --git a/fonts/h5p.eot b/fonts/h5p.eot
deleted file mode 100644
index 2c68dc5..0000000
Binary files a/fonts/h5p.eot and /dev/null differ
diff --git a/fonts/h5p.ttf b/fonts/h5p.ttf
deleted file mode 100644
index 81d242f..0000000
Binary files a/fonts/h5p.ttf and /dev/null differ
diff --git a/h5p.classes.php b/h5p.classes.php
index e308dc9..d69c2d9 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -3076,7 +3076,7 @@ class H5PContentValidator {
    * Validate given image data
    */
   public function validateImage(&$image, $semantics) {
-    $this->_validateFilelike($image, $semantics, array('width', 'height'));
+    $this->_validateFilelike($image, $semantics, array('width', 'height', 'originalImage'));
   }
 
   /**
diff --git a/styles/h5p.css b/styles/h5p.css
index 4586952..93a9860 100644
--- a/styles/h5p.css
+++ b/styles/h5p.css
@@ -3,11 +3,11 @@
 /* Custom H5P font to use for icons. */
 @font-face {
   font-family: 'h5p';
-  src:url('../fonts/h5p.eot?ny');
-  src:url('../fonts/h5p.eot?#iefix-ny') format('embedded-opentype'),
-	url('data:application/font-woff;base64,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') format('woff'),
-  url('../fonts/h5p.ttf?ny') format('truetype'),
-  url('../fonts/h5p.svg?ny#h5p') format('svg');
+  src:    url('../fonts/h5p-core-14.eot?inh2er');
+  src:    url('../fonts/h5p-core-14.eot?inh2er#iefix') format('embedded-opentype'),
+  url('../fonts/h5p-core-14.ttf?inh2er') format('truetype'),
+  url('../fonts/h5p-core-14.woff?inh2er') format('woff'),
+  url('../fonts/h5p-core-14.svg?inh2er#h5p-core-14') format('svg');
   font-weight: normal;
   font-style: normal;
 }