diff --git a/src/app/app.component.html b/src/app/app.component.html
index 8e2890eb..b1bd2000 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -20,8 +20,6 @@
 
 <!-- THEME OPTIONS PANEL -->
 <button mat-icon-button class="mat-primary-bg mat-elevation-z2 theme-options-button"
-        [ngClass]="{'right-side-panel': fuseConfig.layout.sidepanel.position === 'right',
-                    'side-panel-hidden': fuseConfig.layout.sidepanel.hidden === true}"
         (click)="toggleSidebarOpen('themeOptionsPanel')">
     <mat-icon>settings</mat-icon>
 </button>
diff --git a/src/app/layout/horizontal/layout-1/layout-1.component.html b/src/app/layout/horizontal/layout-1/layout-1.component.html
index e06ee6be..03563840 100644
--- a/src/app/layout/horizontal/layout-1/layout-1.component.html
+++ b/src/app/layout/horizontal/layout-1/layout-1.component.html
@@ -1,13 +1,7 @@
 <!-- SIDE PANEL -->
 <ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'left'">
 
-    <!-- CHAT PANEL -->
-    <fuse-sidebar name="chatPanel" position="left" class="chat-panel left-chat-panel"
-                  [folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
-                  lockedOpen="gt-md">
-        <chat-panel></chat-panel>
-    </fuse-sidebar>
-    <!-- / CHAT PANEL -->
+    <!-- PANEL CONTENT -->
 
 </ng-container>
 <!-- / SIDE PANEL -->
@@ -72,13 +66,7 @@
 <!-- SIDE PANEL -->
 <ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'right'">
 
-    <!-- CHAT PANEL -->
-    <fuse-sidebar name="chatPanel" position="right" class="chat-panel right-chat-panel"
-                  [folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
-                  lockedOpen="gt-md">
-        <chat-panel></chat-panel>
-    </fuse-sidebar>
-    <!-- / CHAT PANEL -->
+    <!-- PANEL CONTENT -->
 
 </ng-container>
 <!-- / SIDE PANEL -->
diff --git a/src/app/layout/vertical/layout-1/layout-1.component.html b/src/app/layout/vertical/layout-1/layout-1.component.html
index 942a5b2b..4ef469fa 100644
--- a/src/app/layout/vertical/layout-1/layout-1.component.html
+++ b/src/app/layout/vertical/layout-1/layout-1.component.html
@@ -1,13 +1,7 @@
 <!-- SIDE PANEL -->
 <ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'left'">
 
-    <!-- CHAT PANEL -->
-    <fuse-sidebar name="chatPanel" position="left" class="chat-panel left-chat-panel"
-                  [folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
-                  lockedOpen="gt-md">
-        <chat-panel></chat-panel>
-    </fuse-sidebar>
-    <!-- / CHAT PANEL -->
+    <!-- PANEL CONTENT -->
 
 </ng-container>
 <!-- / SIDE PANEL -->
@@ -84,13 +78,7 @@
 <!-- SIDE PANEL -->
 <ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'right'">
 
-    <!-- CHAT PANEL -->
-    <fuse-sidebar name="chatPanel" position="right" class="chat-panel right-chat-panel"
-                  [folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
-                  lockedOpen="gt-md">
-        <chat-panel></chat-panel>
-    </fuse-sidebar>
-    <!-- / CHAT PANEL -->
+    <!-- PANEL CONTENT -->
 
 </ng-container>
 <!-- / SIDE PANEL -->
diff --git a/src/app/layout/vertical/layout-2/layout-2.component.html b/src/app/layout/vertical/layout-2/layout-2.component.html
index f4fd6dd1..0281f62e 100644
--- a/src/app/layout/vertical/layout-2/layout-2.component.html
+++ b/src/app/layout/vertical/layout-2/layout-2.component.html
@@ -1,13 +1,7 @@
 <!-- SIDE PANEL -->
 <ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'left'">
 
-    <!-- CHAT PANEL -->
-    <fuse-sidebar name="chatPanel" position="left" class="chat-panel left-chat-panel"
-                  [folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
-                  lockedOpen="gt-md">
-        <chat-panel></chat-panel>
-    </fuse-sidebar>
-    <!-- / CHAT PANEL -->
+    <!-- PANEL CONTENT -->
 
 </ng-container>
 <!-- / SIDE PANEL -->
@@ -84,13 +78,7 @@
 <!-- SIDE PANEL -->
 <ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'right'">
 
-    <!-- CHAT PANEL -->
-    <fuse-sidebar name="chatPanel" position="right" class="chat-panel right-chat-panel"
-                  [folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
-                  lockedOpen="gt-md">
-        <chat-panel></chat-panel>
-    </fuse-sidebar>
-    <!-- / CHAT PANEL -->
+    <!-- PANEL CONTENT -->
 
 </ng-container>
 <!-- / SIDE PANEL -->
diff --git a/src/app/layout/vertical/layout-3/layout-3.component.html b/src/app/layout/vertical/layout-3/layout-3.component.html
index 9154e39d..06257c9b 100644
--- a/src/app/layout/vertical/layout-3/layout-3.component.html
+++ b/src/app/layout/vertical/layout-3/layout-3.component.html
@@ -1,13 +1,7 @@
 <!-- SIDE PANEL -->
 <ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'left'">
 
-    <!-- CHAT PANEL -->
-    <fuse-sidebar name="chatPanel" position="left" class="chat-panel left-chat-panel"
-                  [folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
-                  lockedOpen="gt-md">
-        <chat-panel></chat-panel>
-    </fuse-sidebar>
-    <!-- / CHAT PANEL -->
+    <!-- PANEL CONTENT -->
 
 </ng-container>
 <!-- / SIDE PANEL -->
@@ -70,13 +64,7 @@
 <!-- SIDE PANEL -->
 <ng-container *ngIf="!fuseConfig.layout.sidepanel.hidden && fuseConfig.layout.sidepanel.position === 'right'">
 
-    <!-- CHAT PANEL -->
-    <fuse-sidebar name="chatPanel" position="right" class="chat-panel right-chat-panel"
-                  [folded]="true" [foldedWidth]="70" [foldedAutoTriggerOnHover]="false"
-                  lockedOpen="gt-md">
-        <chat-panel></chat-panel>
-    </fuse-sidebar>
-    <!-- / CHAT PANEL -->
+    <!-- PANEL CONTENT -->
 
 </ng-container>
 <!-- / SIDE PANEL -->