diff --git a/www/script/editor/ckeditor/config.js b/www/script/editor/ckeditor/config.js
index 458d0538b7..17645ccec3 100644
--- a/www/script/editor/ckeditor/config.js
+++ b/www/script/editor/ckeditor/config.js
@@ -33,8 +33,10 @@ CKEDITOR.editorConfig = function( config ) {
     // Set the most common block elements.
     config.format_tags = 'p;h1;h2;h3;pre';
 
-	// Allow all div classes (from theme)
-    config.extraAllowedContent = 'div(*)';
+	// Allow all div classes (from theme and for Boostrap and FontAwesome), allow empty <i>
+    config.extraAllowedContent = 'div(*)[*]{*}; a[!href]; span(*)[*]{*};table(*)[*]{*}; p(*)[*]{*}; li(*)[*]{*}; ul(*)[*]{*}; img(*)[*]{*}';
+	CKEDITOR.dtd.$removeEmpty.i = 0;
+	CKEDITOR.dtd.$removeEmpty.span = 0;
 	
     // Simplify the dialog windows.
     config.removeDialogTabs = 'image:advanced;link:advanced';