diff --git a/client/modules/crm/res/templates/calendar/modals/shared-options.tpl b/client/modules/crm/res/templates/calendar/modals/shared-options.tpl
index 6fb655f53d..878e78a57e 100644
--- a/client/modules/crm/res/templates/calendar/modals/shared-options.tpl
+++ b/client/modules/crm/res/templates/calendar/modals/shared-options.tpl
@@ -1 +1,7 @@
-<div class="record-container">{{{record}}}</div>
\ No newline at end of file
+<div class="panel panel-default no-side-margin">
+<div class="panel-body">
+
+<div class="record-container">{{{record}}}</div>
+
+</div>
+</div>
diff --git a/client/modules/crm/src/views/calendar/modals/edit-view.js b/client/modules/crm/src/views/calendar/modals/edit-view.js
index e9178cfbb0..81f58900a0 100644
--- a/client/modules/crm/src/views/calendar/modals/edit-view.js
+++ b/client/modules/crm/src/views/calendar/modals/edit-view.js
@@ -30,7 +30,12 @@ define('crm:views/calendar/modals/edit-view', ['views/modal', 'model'], function
 
     return Dep.extend({
 
-        _template: '<div class="record-container">{{{record}}}</div>',
+        _template: '' +
+            '<div class="panel panel-default no-side-margin"><div class="panel-body">' +
+            '<div class="record-container">{{{record}}}</div>' +
+            '</div></div>',
+
+        className: 'dialog dialog-record',
 
         buttonList: [
             {
diff --git a/client/modules/crm/src/views/calendar/modals/shared-options.js b/client/modules/crm/src/views/calendar/modals/shared-options.js
index 3b0160e94c..55ec8309ac 100644
--- a/client/modules/crm/src/views/calendar/modals/shared-options.js
+++ b/client/modules/crm/src/views/calendar/modals/shared-options.js
@@ -30,6 +30,8 @@ define('crm:views/calendar/modals/shared-options', ['views/modal', 'model'], fun
 
     return Dep.extend({
 
+        className: 'dialog dialog-record',
+
         template: 'crm:calendar/modals/shared-options',
 
         buttonList: [
diff --git a/client/res/templates/dashlets/options/base.tpl b/client/res/templates/dashlets/options/base.tpl
index 382025becf..e59c1e6d23 100644
--- a/client/res/templates/dashlets/options/base.tpl
+++ b/client/res/templates/dashlets/options/base.tpl
@@ -1,3 +1,7 @@
+<div class="no-side-margin">
+
 <form id="dashlet-options">
-    <div class="middle record">{{{record}}}</div>
+    <div class="middle record no-side-margins">{{{record}}}</div>
 </form>
+
+</div>
diff --git a/client/res/templates/modals/edit-dashboard.tpl b/client/res/templates/modals/edit-dashboard.tpl
index 1d5b46f127..f90d9a3dd6 100644
--- a/client/res/templates/modals/edit-dashboard.tpl
+++ b/client/res/templates/modals/edit-dashboard.tpl
@@ -1,3 +1,6 @@
+<div class="panel panel-default no-side-margin">
+<div class="panel-body">
+
 <div class="row">
     <div class="cell form-group col-md-6" data-name="dashboardTabList">
         <label class="control-label" data-name="dashboardTabList">{{translate 'dashboardTabList' category='fields' scope="Preferences"}}</label>
@@ -6,3 +9,6 @@
         </div>
     </div>
 </div>
+
+</div>
+</div>
\ No newline at end of file
diff --git a/client/res/templates/wysiwyg/modals/insert-image.tpl b/client/res/templates/wysiwyg/modals/insert-image.tpl
index d7b18453a3..134cbaba5c 100644
--- a/client/res/templates/wysiwyg/modals/insert-image.tpl
+++ b/client/res/templates/wysiwyg/modals/insert-image.tpl
@@ -1,3 +1,6 @@
+<div class="panel panel-default no-side-margin">
+<div class="panel-body">
+
 <div class="cell form-group">
     <label class="control-label">{{labels.selectFromFiles}}</label>
     <div class="field">
@@ -16,3 +19,6 @@
         </div>
     </div>
 </div>
+
+</div>
+</div>
diff --git a/client/res/templates/wysiwyg/modals/insert-link.tpl b/client/res/templates/wysiwyg/modals/insert-link.tpl
index 08ebdb4e4c..6eded14c5f 100644
--- a/client/res/templates/wysiwyg/modals/insert-link.tpl
+++ b/client/res/templates/wysiwyg/modals/insert-link.tpl
@@ -1,3 +1,5 @@
+<div class="panel panel-default no-side-margin">
+<div class="panel-body">
 
 <div class="cell form-group">
     <label class="control-label">{{labels.textToDisplay}}</label>
@@ -17,3 +19,6 @@
         <input class="" type="checkbox" data-name="openInNewWindow" checked>
     </div>
 </div>
+
+</div>
+</div>
\ No newline at end of file
diff --git a/client/src/views/modals/edit-dashboard.js b/client/src/views/modals/edit-dashboard.js
index 485198f83f..9cc1b29532 100644
--- a/client/src/views/modals/edit-dashboard.js
+++ b/client/src/views/modals/edit-dashboard.js
@@ -26,11 +26,12 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-
-Espo.define('views/modals/edit-dashboard', ['views/modal', 'model'], function (Dep, Model) {
+define('views/modals/edit-dashboard', ['views/modal', 'model'], function (Dep, Model) {
 
     return Dep.extend({
 
+        className: 'dialog dialog-record',
+
         cssName: 'edit-dashboard',
 
         template: 'modals/edit-dashboard',
diff --git a/client/src/views/wysiwyg/modals/insert-image.js b/client/src/views/wysiwyg/modals/insert-image.js
index 20008ce352..ec715bb2a2 100644
--- a/client/src/views/wysiwyg/modals/insert-image.js
+++ b/client/src/views/wysiwyg/modals/insert-image.js
@@ -30,6 +30,8 @@ define('views/wysiwyg/modals/insert-image', 'views/modal', function (Dep) {
 
     return Dep.extend({
 
+        className: 'dialog dialog-record',
+
         template: 'wysiwyg/modals/insert-image',
 
         events: {
diff --git a/client/src/views/wysiwyg/modals/insert-link.js b/client/src/views/wysiwyg/modals/insert-link.js
index b9524006b8..33da4179ae 100644
--- a/client/src/views/wysiwyg/modals/insert-link.js
+++ b/client/src/views/wysiwyg/modals/insert-link.js
@@ -30,6 +30,8 @@ define('views/wysiwyg/modals/insert-link', 'views/modal', function (Dep) {
 
     return Dep.extend({
 
+        className: 'dialog dialog-record',
+
         template: 'wysiwyg/modals/insert-link',
 
         events: {