diff --git a/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css b/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
index 14704bb34..2c55ce576 100644
--- a/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
+++ b/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
@@ -17,14 +17,16 @@
 .field-codeeditor .editor-toolbar >ul >li .tooltip.left {margin-right:25px}
 .field-codeeditor .editor-toolbar >ul >li >a {display:block;height:25px;width:25px;color:#666;font-size:20px;text-align:center;text-decoration:none}
 .field-codeeditor .editor-toolbar >ul >li >a >abbr {position:absolute;font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}
-.field-codeeditor .editor-toolbar >ul >li >a >i {opacity:0.7;filter:alpha(opacity=70);display:block}
+.field-codeeditor .editor-toolbar >ul >li >a >i {opacity:1;filter:alpha(opacity=100);display:block}
 .field-codeeditor .editor-toolbar >ul >li >a >i:before {font-size:15px}
 .field-codeeditor .editor-toolbar >ul >li >a:hover >i,
-.field-codeeditor .editor-toolbar >ul >li >a:focus >i {opacity:1;filter:alpha(opacity=100)}
+.field-codeeditor .editor-toolbar >ul >li >a:focus >i {opacity:1;filter:alpha(opacity=100);color:#fff}
 .field-codeeditor.editor-fullscreen {z-index:301;position:fixed !important;top:0;left:0;height:100%;border-width:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
 .field-codeeditor.editor-fullscreen .editor-code {-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
 .field-codeeditor.editor-fullscreen .editor-toolbar {z-index:302;border-radius:0 0 5px 5px;right:25px;background-color:#ddd;border:1px solid #cbcbcb;border-right-color:#cbcbcb;border-right-style:solid;border-right-width:1px;border-top:0 none;max-width:125px;overflow:hidden;margin:0;padding:4px;position:absolute;top:0;white-space:normal}
 .field-codeeditor.editor-fullscreen .editor-toolbar >ul >li >a {color:#666}
+.field-codeeditor.editor-fullscreen .editor-toolbar >ul >li >a:hover >i,
+.field-codeeditor.editor-fullscreen .editor-toolbar >ul >li >a:focus >i {color:#191919}
 .field-codeeditor.editor-fullscreen .ace_search {z-index:303}
 .field-codeeditor .secondary-tabs .editor-toolbar >ul >li >a {color:#fff}
 #cms-master-tabs .field-codeeditor .editor-toolbar >ul >li >a {color:#919898}
\ No newline at end of file
diff --git a/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less b/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less
index e217a3a23..bdb0ff8b9 100644
--- a/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less
+++ b/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less
@@ -5,6 +5,7 @@
 @color_3: #919898;
 @background_color_1: #ddd;
 @border_right_color_1: #cbcbcb;
+@fullscreen_icons_color_1: #191919;
 
 .field-codeeditor {
     width: 100%;
@@ -70,14 +71,17 @@
                 .text-hide();
             }
             > i {
-                .opacity(.7);
+                .opacity(1);
                 display: block;
                 &:before {
                     font-size: 15px;
                 }
             }
             &:hover, &:focus {
-                > i { .opacity(1); }
+                > i { 
+                    .opacity(1);
+                    color: @color_2;
+                }
             }
 
         }
@@ -113,6 +117,9 @@
                 >li {
                     >a {
                         color: @color_1;
+                        &:hover, &:focus {
+                            color: @fullscreen_icons_color_1;
+                        }
                     }
                 }
             }