diff --git a/src/CKEditorForMendix/widget/CKEditorForMendix.js b/src/CKEditorForMendix/widget/CKEditorForMendix.js
index 4c14883..b5b8ea1 100644
--- a/src/CKEditorForMendix/widget/CKEditorForMendix.js
+++ b/src/CKEditorForMendix/widget/CKEditorForMendix.js
@@ -425,6 +425,12 @@ define([
                         this._contextObj.addReference(this._imageReference, obj.getGuid());
                     }
 
+                    // Normalize file name and size (sometimes doesn't work in firefox)
+                    if (file.name === undefined && file.size === undefined) {
+                        file.name = file.fileName;
+                        file.size = file.fileSize;
+                    }
+
                     var guid = obj.getGuid();
                     var upload = new Upload({
                         objectGuid: guid,
@@ -592,6 +598,9 @@ define([
 
         _getFileUrl: function (guid) {
             var changedDate = Math.floor(Date.now() / 1); // Right now;
+            if (mx.data.getDocumentUrl) {
+                return mx.data.getDocumentUrl(guid, changedDate, false);
+            }
             return mx.appUrl + "file?" + [
                 "guid=" + guid,
                 "changedDate=" + changedDate
diff --git a/src/CKEditorForMendix/widget/CKEditorViewerForMendix.js b/src/CKEditorForMendix/widget/CKEditorViewerForMendix.js
index 3fffe9d..bde09b5 100644
--- a/src/CKEditorForMendix/widget/CKEditorViewerForMendix.js
+++ b/src/CKEditorForMendix/widget/CKEditorViewerForMendix.js
@@ -71,6 +71,9 @@ define([
 
         _getFileUrl: function (guid) {
             var changedDate = Math.floor(Date.now() / 1); // Right now;
+            if (mx.data.getDocumentUrl) {
+                return mx.data.getDocumentUrl(guid, changedDate, false);
+            }
             return mx.appUrl + "file?" + [
                 "guid=" + guid,
                 "changedDate=" + changedDate
diff --git a/src/CKEditorForMendix/widget/lib/ckeditor.js b/src/CKEditorForMendix/widget/lib/ckeditor.js
index 0ff52f4..77440af 100644
--- a/src/CKEditorForMendix/widget/lib/ckeditor.js
+++ b/src/CKEditorForMendix/widget/lib/ckeditor.js
@@ -378,7 +378,7 @@ var g=CKEDITOR.dom.walker.whitespaces(!0),z=CKEDITOR.dom.walker.bookmark(!1,!0),
 k;++r)e=D.getItem(r),a(e)?(g=e.getName(),J&&g in CKEDITOR.dtd.$list?f=f.concat(b(e,d)):(p=!!h[g],"br"!=g||!e.data("cke-eol")||r&&r!=k-1||(t=(m=r?f[r-1].node:D.getItem(r+1))&&(!a(m)||!m.is("br")),m=m&&a(m)&&B.$block[m.getName()]),-1!=G||p||(G=r),p||(n=r),f.push({isElement:1,isLineBreak:t,isBlock:e.isBlockBoundary(),hasBlockSibling:m,node:e,name:g,allowed:p}),m=t=0)):f.push({isElement:0,node:e,allowed:1});-1<G&&(f[G].firstNotAllowed=1);-1<n&&(f[n].lastNotAllowed=1);return f}function d(b,c){var e=[],
 l=b.getChildren(),m=l.count(),g,f=0,h=B[c],r=!b.is(B.$inline)||b.is("br");for(r&&e.push(" ");f<m;f++)g=l.getItem(f),a(g)&&!g.is(h)?e=e.concat(d(g,c)):e.push(g);r&&e.push(" ");return e}function e(b){return a(b.startContainer)&&b.startContainer.getChild(b.startOffset-1)}function g(b){return b&&a(b)&&(b.is(B.$removeEmpty)||b.is("a")&&!b.isBlockBoundary())}function f(b,c,d,e){var l=b.clone(),m,g;l.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);(m=(new CKEDITOR.dom.walker(l)).next())&&a(m)&&n[m.getName()]&&
 (g=m.getPrevious())&&a(g)&&!g.getParent().equals(b.startContainer)&&d.contains(g)&&e.contains(m)&&m.isIdentical(g)&&(m.moveChildren(g),m.remove(),f(b,c,d,e))}function G(b,c){function d(b,c){if(c.isBlock&&c.isElement&&!c.node.is("br")&&a(b)&&b.is("br"))return b.remove(),1}var e=c.endContainer.getChild(c.endOffset),l=c.endContainer.getChild(c.endOffset-1);e&&d(e,b[b.length-1]);l&&d(l,b[0])&&(c.setEnd(c.endContainer,c.endOffset-1),c.collapse())}var B=CKEDITOR.dtd,n={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,
-h6:1,ul:1,ol:1,li:1,pre:1,dl:1,blockquote:1},t={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},q=CKEDITOR.tools.extend({},B.$inline);delete q.br;return function(n,x,H,I){var E=n.editor,K=!1;"unfiltered_html"==x&&(x="html",K=!0);if(!I.checkReadOnly()){var J=(new CKEDITOR.dom.elementPath(I.startContainer,I.root)).blockLimit||I.root;n={type:x,dontFilter:K,editable:n,editor:E,range:I,blockLimit:J,mergeCandidates:[],zombies:[]};x=n.range;I=n.mergeCandidates;var L,v;"text"==n.type&&x.shrink(CKEDITOR.SHRINK_ELEMENT,
+h6:1,ul:1,ol:1,li:1,pre:1,dl:1,blockquote:1},t={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},q=CKEDITOR.tools.extend({},B.$inline);delete q.br;return function(n,x,H,I){var E=n.editor,K=!1;"unfiltered_html"==x&&(x="html",K=!0);if(I && !I.checkReadOnly()){var J=(new CKEDITOR.dom.elementPath(I.startContainer,I.root)).blockLimit||I.root;n={type:x,dontFilter:K,editable:n,editor:E,range:I,blockLimit:J,mergeCandidates:[],zombies:[]};x=n.range;I=n.mergeCandidates;var L,v;"text"==n.type&&x.shrink(CKEDITOR.SHRINK_ELEMENT,
 !0,!1)&&(L=CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",x.document),x.insertNode(L),x.setStartAfter(L));K=new CKEDITOR.dom.elementPath(x.startContainer);n.endPath=J=new CKEDITOR.dom.elementPath(x.endContainer);if(!x.collapsed){var E=J.block||J.blockLimit,y=x.getCommonAncestor();E&&!E.equals(y)&&!E.contains(y)&&x.checkEndOfBlock()&&n.zombies.push(E);x.deleteContents()}for(;(v=e(x))&&a(v)&&v.isBlockBoundary()&&K.contains(v);)x.moveToPosition(v,CKEDITOR.POSITION_BEFORE_END);
 f(x,n.blockLimit,K,J);L&&(x.setEndBefore(L),x.collapse(),L.remove());L=x.startPath();if(E=L.contains(g,!1,1))x.splitElement(E),n.inlineStylesRoot=E,n.inlineStylesPeak=L.lastElement;L=x.createBookmark();(E=L.startNode.getPrevious(c))&&a(E)&&g(E)&&I.push(E);(E=L.startNode.getNext(c))&&a(E)&&g(E)&&I.push(E);for(E=L.startNode;(E=E.getParent())&&g(E);)I.push(E);x.moveToBookmark(L);if(L=H){L=n.range;if("text"==n.type&&n.inlineStylesRoot){v=n.inlineStylesPeak;x=v.getDocument().createText("{cke-peak}");for(I=
 n.inlineStylesRoot.getParent();!v.equals(I);)x=x.appendTo(v.clone()),v=v.getParent();H=x.getOuterHtml().split("{cke-peak}").join(H)}v=n.blockLimit.getName();if(/^\s+|\s+$/.test(H)&&"span"in CKEDITOR.dtd[v]){var A='\x3cspan data-cke-marker\x3d"1"\x3e\x26nbsp;\x3c/span\x3e';H=A+H+A}H=n.editor.dataProcessor.toHtml(H,{context:null,fixForBody:!1,protectedWhitespaces:!!A,dontFilter:n.dontFilter,filter:n.editor.activeFilter,enterMode:n.editor.activeEnterMode});v=L.document.createElement("body");v.setHtml(H);
diff --git a/src/CKEditorForMendix/widget/lib/plugins/simple-image-browser/plugin.js b/src/CKEditorForMendix/widget/lib/plugins/simple-image-browser/plugin.js
index 538ce06..fd6c649 100644
--- a/src/CKEditorForMendix/widget/lib/plugins/simple-image-browser/plugin.js
+++ b/src/CKEditorForMendix/widget/lib/plugins/simple-image-browser/plugin.js
@@ -58,11 +58,11 @@ CKEDITOR.plugins.add('simple-image-browser', {
                 var txt = "";
                 $.each(images, function(key, value) {
                     var element = [
-                         "<div onclick=\"CKEDITOR.tools.simpleimagebrowserinsertpicture('",
-                         value.imageUrl, "','", value.guid,
-                         "');\" style=\"position:relative;width:75px;height:75px;margin:5px;background-image:url('",
+                         "<img src=\"",
                          value.thumbnailUrl,
-                         "');background-repeat:no-repeat;background-size:125%;background-position:center center;float:left;\"></div>"
+                         "\" onclick=\"CKEDITOR.tools.simpleimagebrowserinsertpicture('",
+                         value.imageUrl, "','", value.guid,
+                         "');\" style=\"position:relative;max-width:75px;max-height:75px;margin:5px;float:left;cursor:pointer;\" \\>"
                     ].join("");
                     txt = txt + element;
                  });
diff --git a/test/Test.mpr b/test/Test.mpr
index 9144e29..5760966 100644
Binary files a/test/Test.mpr and b/test/Test.mpr differ
diff --git a/test/widgets/CKEditorForMendix.mpk b/test/widgets/CKEditorForMendix.mpk
index 1562ebf..86a53a0 100644
Binary files a/test/widgets/CKEditorForMendix.mpk and b/test/widgets/CKEditorForMendix.mpk differ