diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.html
index 3d2e69e210..3b2c14c539 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.html
@@ -43,7 +43,7 @@
     </div>
     <ng-template #fullscreenEditor>
       <div class="tb-fullscreen-panel tb-layout-fill flex flex-row">
-        <div #leftPanel class="tb-split tb-content">
+        <div #leftPanel class="tb-split tb-content left-panel">
           <tb-custom-action-pretty-resources-tabs [hasCustomFunction]="false"
                                                   [helpId]="helpId"
                                                   [action]="action" (actionUpdated)="onActionUpdated($event ? true : false)">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss
index 002ccbeeb3..f0e09589ea 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss
@@ -19,25 +19,66 @@
   padding: 8px;
   background-color: #fff;
 
+  .css-panel, .html-panel{
+    border-color: #c0c0c0;
+    border-width: 0 1px 1px 1px;
+    border-style: solid;
+  }
+
+  .tb-js-func-toolbar{
+    padding: 0 3px;
+  }
+
+  .tb-js-func {
+    &:not(.tb-fullscreen) {
+      &.tb-hide-brackets {
+        padding-bottom: 0;
+      }
+    }
+  }
+
   .tb-fullscreen-panel {
     .tb-custom-action-editor-container {
+      height: 100%;
+    }
+
+    .css-panel, .html-panel{
+      border: none;
+    }
+
+    .left-panel, .right-panel{
       height: calc(100% - 40px);
     }
 
     .right-panel {
-      padding-top: 8px;
-      padding-left: 3px;
+      padding: 8px 0 0;
     }
 
-    tb-js-func .tb-js-func-panel {
-      box-sizing: border-box;
+    .tb-js-func {
+      .tb-js-func-panel {
+        box-sizing: border-box;
+      }
+      &.fill-height {
+        .tb-js-func-toolbar{
+          padding: 0 5px;
+        }
+
+        &.tb-hide-brackets {
+          .tb-js-func-panel {
+            border: none;
+            border-top: 1px solid #c0c0c0;
+          }
+        }
+      }
     }
 
     .mat-mdc-tab-group {
       .mat-mdc-tab-body-wrapper {
         height: 100%;
+
         .mat-mdc-tab-body {
           height: 100%;
+
           & > div {
             height: 100%;
           }
@@ -70,7 +111,7 @@
   .tb-split.tb-split-horizontal,
   .gutter.gutter-horizontal {
     float: left;
-    height: 100%;
+    height: calc(100% - 40px);
   }
 
   .tb-action-expand-button {
@@ -81,20 +122,7 @@
     &.tb-fullscreen-editor {
       position: relative;
       right: 0;
-     /* .mat-mdc-button {
-        .mat-icon {
-          margin-right: 5px;
-        }
-      } */
     }
-
-   /* .mat-mdc-button {
-      min-width: 36px;
-      padding: 0;
-      .mat-icon {
-        margin-right: 0;
-      }
-    } */
   }
 
   .tb-custom-action-editor {
@@ -105,3 +133,4 @@
 }
 
 
+