diff --git a/htdocs/includes/ckeditor/contents.css b/htdocs/includes/ckeditor/contents.css
index 100ed27b5d4..3d9895c2442 100644
--- a/htdocs/includes/ckeditor/contents.css
+++ b/htdocs/includes/ckeditor/contents.css
@@ -15,7 +15,7 @@ body
 	/* Remove the background color to make it transparent */
 	background-color: #fff;
 
-	margin: 20px;
+	margin: 8px;
 }
 
 .cke_editable
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 7eeadd6ae1f..f3c86c0897f 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -242,6 +242,10 @@ a:hover { text-decoration: underline; color: #000000;}
 input:focus, textarea:focus, button:focus, select:focus {
     box-shadow: 0 0 4px #8091BF;
 }
+textarea.cke_source:focus
+{
+	box-shadow: none;
+}
 
 input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
     font-size: <?php print $fontsize ?>px;
@@ -2493,6 +2497,10 @@ A.none, A.none:active, A.none:visited, A.none:hover {
 /*  CKEditor                                                                      */
 /* ============================================================================== */
 
+.cke_editable 
+{
+	margin: 5px !important;
+}
 .cke_editor table, .cke_editor tr, .cke_editor td
 {
     border: 0px solid #FF0000 !important;