diff --git a/apps/common/main/lib/view/CopyWarningDialog.js b/apps/common/main/lib/view/CopyWarningDialog.js
index aac545fde5..9897514cc3 100644
--- a/apps/common/main/lib/view/CopyWarningDialog.js
+++ b/apps/common/main/lib/view/CopyWarningDialog.js
@@ -41,9 +41,7 @@
 if (Common === undefined)
     var Common = {};
 
-define([
-    'common/main/lib/component/Window'
-], function () { 'use strict';
+define([], function () { 'use strict';
 
     Common.Views.CopyWarningDialog = Common.UI.Window.extend(_.extend({
         options: {
diff --git a/apps/common/main/lib/view/ImageFromUrlDialog.js b/apps/common/main/lib/view/ImageFromUrlDialog.js
index 8efa331299..0f3979a2cf 100644
--- a/apps/common/main/lib/view/ImageFromUrlDialog.js
+++ b/apps/common/main/lib/view/ImageFromUrlDialog.js
@@ -37,9 +37,7 @@
  *
  */
 
-define([
-    'common/main/lib/component/Window'
-], function () { 'use strict';
+define([], function () { 'use strict';
 
     Common.Views.ImageFromUrlDialog = Common.UI.Window.extend(_.extend({
         options: {
diff --git a/apps/common/main/lib/view/InsertTableDialog.js b/apps/common/main/lib/view/InsertTableDialog.js
index e52a80b7a0..3d20b1871e 100644
--- a/apps/common/main/lib/view/InsertTableDialog.js
+++ b/apps/common/main/lib/view/InsertTableDialog.js
@@ -40,9 +40,7 @@
 if (Common === undefined)
     var Common = {};
 
-define([
-    'common/main/lib/component/Window'
-], function () { 'use strict';
+define([], function () { 'use strict';
 
     Common.Views.InsertTableDialog = Common.UI.Window.extend(_.extend({
         options: {
diff --git a/apps/common/main/lib/view/SelectFileDlg.js b/apps/common/main/lib/view/SelectFileDlg.js
index 101bbebe73..06059f0efa 100644
--- a/apps/common/main/lib/view/SelectFileDlg.js
+++ b/apps/common/main/lib/view/SelectFileDlg.js
@@ -34,10 +34,7 @@
  * Date: 09.02.15
  */
 
-define([
-    'common/main/lib/component/Window',
-    'common/main/lib/component/LoadMask'
-], function () { 'use strict';
+define([], function () { 'use strict';
 
     Common.Views.SelectFileDlg = Common.UI.Window.extend(_.extend({
         initialize : function(options) {
diff --git a/apps/common/main/lib/view/SymbolTableDialog.js b/apps/common/main/lib/view/SymbolTableDialog.js
index 65bce562e5..428df289fe 100644
--- a/apps/common/main/lib/view/SymbolTableDialog.js
+++ b/apps/common/main/lib/view/SymbolTableDialog.js
@@ -39,12 +39,7 @@
  */
 if (Common === undefined)
     var Common = {};
-define([
-    'common/main/lib/util/utils',
-    'common/main/lib/util/character',
-    'common/main/lib/component/InputField',
-    'common/main/lib/component/Window'
-], function () { 'use strict';
+define([], function () { 'use strict';
 
     var oRangeNames = {};
     oRangeNames[1] =  'Basic Latin';
diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index 8fbdf1b363..cce19b51fd 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -42,22 +42,9 @@
 define([
     'core',
     'common/main/lib/component/Window',
-    'common/main/lib/view/CopyWarningDialog',
-    'common/main/lib/view/ImageFromUrlDialog',
-    'common/main/lib/view/InsertTableDialog',
-    'common/main/lib/view/SelectFileDlg',
-    'common/main/lib/view/SymbolTableDialog',
     'common/main/lib/util/define',
     'documenteditor/main/app/view/Toolbar',
-    'documenteditor/main/app/view/PageMarginsDialog',
-    'documenteditor/main/app/view/PageSizeDialog',
     'documenteditor/main/app/controller/PageLayout',
-    'documenteditor/main/app/view/CustomColumnsDialog',
-    'documenteditor/main/app/view/ControlSettingsDialog',
-    'documenteditor/main/app/view/ListSettingsDialog',
-    'documenteditor/main/app/view/DateTimeDialog',
-    'documenteditor/main/app/view/LineNumbersDialog',
-    'documenteditor/main/app/view/HyphenationDialog'
 ], function () {
     'use strict';
 
diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js
index 72f4a88406..b99249c2d1 100644
--- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js
@@ -38,13 +38,8 @@
  *
  */
 
-define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
-    'common/main/lib/util/utils',
-    'common/main/lib/component/CheckBox',
-    'common/main/lib/component/InputField',
-    'common/main/lib/view/AdvancedSettingsWindow',
-    'common/main/lib/view/SymbolTableDialog',
-    'documenteditor/main/app/view/EditListItemDialog'
+define([
+    'text!documenteditor/main/app/template/ControlSettingsDialog.template'
 ], function (contentTemplate) { 'use strict';
 
     DE.Views.ControlSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
diff --git a/apps/documenteditor/main/app/view/CustomColumnsDialog.js b/apps/documenteditor/main/app/view/CustomColumnsDialog.js
index 9caf0a6b23..80fc6a5278 100644
--- a/apps/documenteditor/main/app/view/CustomColumnsDialog.js
+++ b/apps/documenteditor/main/app/view/CustomColumnsDialog.js
@@ -37,11 +37,7 @@
  *
  */
 
-define([
-    'common/main/lib/component/Window',
-    'common/main/lib/component/MetricSpinner',
-    'common/main/lib/component/CheckBox'
-], function () { 'use strict';
+define([], function () { 'use strict';
 
     DE.Views.CustomColumnsDialog = Common.UI.Window.extend(_.extend({
         options: {
diff --git a/apps/documenteditor/main/app/view/DateTimeDialog.js b/apps/documenteditor/main/app/view/DateTimeDialog.js
index fa25855803..e0f8c5cd61 100644
--- a/apps/documenteditor/main/app/view/DateTimeDialog.js
+++ b/apps/documenteditor/main/app/view/DateTimeDialog.js
@@ -37,11 +37,7 @@
  *
  */
 
-define([
-    'common/main/lib/component/Window',
-    'common/main/lib/component/ComboBox',
-    'common/main/lib/component/ListView'
-], function () {
+define([], function () {
     'use strict';
 
     DE.Views.DateTimeDialog = Common.UI.Window.extend(_.extend({
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index d4a3aeb2ce..4c47148c5e 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -47,9 +47,6 @@ define([
     'common/main/lib/util/utils',
     'common/main/lib/component/Menu',
     'common/main/lib/component/Calendar',
-    'common/main/lib/view/InsertTableDialog',
-    'common/main/lib/view/CopyWarningDialog',
-    'documenteditor/main/app/view/ControlSettingsDialog',
     'documenteditor/main/app/view/NumberingValueDialog',
     'documenteditor/main/app/view/CellsAddDialog',
     'documenteditor/main/app/view/ListIndentsDialog'
diff --git a/apps/documenteditor/main/app/view/EditListItemDialog.js b/apps/documenteditor/main/app/view/EditListItemDialog.js
index 0cf3710225..658e18d3eb 100644
--- a/apps/documenteditor/main/app/view/EditListItemDialog.js
+++ b/apps/documenteditor/main/app/view/EditListItemDialog.js
@@ -38,10 +38,7 @@
  *
  */
 
-define([
-    'common/main/lib/component/Window',
-    'common/main/lib/component/InputField'
-], function () { 'use strict';
+define([], function () { 'use strict';
 
     DE.Views.EditListItemDialog = Common.UI.Window.extend(_.extend({
         options: {
diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js
index 2a83bbb972..7773b50095 100644
--- a/apps/documenteditor/main/app/view/FormSettings.js
+++ b/apps/documenteditor/main/app/view/FormSettings.js
@@ -45,8 +45,7 @@ define([
     'common/main/lib/component/ComboBox',
     'common/main/lib/component/MetricSpinner',
     'common/main/lib/component/TextareaField',
-    'common/main/lib/component/CheckBox',
-    'common/main/lib/view/ImageFromUrlDialog'
+    'common/main/lib/component/CheckBox'
 ], function (menuTemplate, $, _, Backbone) {
     'use strict';
 
diff --git a/apps/documenteditor/main/app/view/HyphenationDialog.js b/apps/documenteditor/main/app/view/HyphenationDialog.js
index ad179236c4..5f0d9b6f7f 100644
--- a/apps/documenteditor/main/app/view/HyphenationDialog.js
+++ b/apps/documenteditor/main/app/view/HyphenationDialog.js
@@ -37,11 +37,7 @@
  *
  */
 
-define([
-    'common/main/lib/component/Window',
-    'common/main/lib/component/CheckBox',
-    'common/main/lib/component/MetricSpinner'
-], function () { 'use strict';
+define([], function () { 'use strict';
 
     DE.Views.HyphenationDialog = Common.UI.Window.extend(_.extend({
         options: {
diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js
index a901dc3a5a..33e3df1c4a 100644
--- a/apps/documenteditor/main/app/view/ImageSettings.js
+++ b/apps/documenteditor/main/app/view/ImageSettings.js
@@ -42,8 +42,7 @@ define([
     'jquery',
     'underscore',
     'backbone',
-    'common/main/lib/component/Button',
-    'common/main/lib/view/ImageFromUrlDialog',
+    'common/main/lib/component/Button'
 ], function (menuTemplate, $, _, Backbone) {
     'use strict';
 
diff --git a/apps/documenteditor/main/app/view/LineNumbersDialog.js b/apps/documenteditor/main/app/view/LineNumbersDialog.js
index ef045e44ea..3293d20e9c 100644
--- a/apps/documenteditor/main/app/view/LineNumbersDialog.js
+++ b/apps/documenteditor/main/app/view/LineNumbersDialog.js
@@ -37,11 +37,7 @@
  *
  */
 
-define([
-    'common/main/lib/component/Window',
-    'common/main/lib/component/CheckBox',
-    'common/main/lib/component/MetricSpinner'
-], function () { 'use strict';
+define([], function () { 'use strict';
 
     DE.Views.LineNumbersDialog = Common.UI.Window.extend(_.extend({
         options: {
diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js
index 7972fb5677..31f8362522 100644
--- a/apps/documenteditor/main/app/view/ListSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js
@@ -42,12 +42,6 @@ if (Common === undefined)
     var Common = {};
 
 define([
-    'common/main/lib/component/Window',
-    'common/main/lib/component/MetricSpinner',
-    'common/main/lib/component/ThemeColorPalette',
-    'common/main/lib/component/ColorButton',
-    'common/main/lib/component/ComboBox',
-    'common/main/lib/view/SymbolTableDialog',
     'documenteditor/main/app/view/ListTypesAdvanced'
 ], function () { 'use strict';
     var nMaxRecent = 5;
diff --git a/apps/documenteditor/main/app/view/ListTypesAdvanced.js b/apps/documenteditor/main/app/view/ListTypesAdvanced.js
index 4ad428027f..8665f12618 100644
--- a/apps/documenteditor/main/app/view/ListTypesAdvanced.js
+++ b/apps/documenteditor/main/app/view/ListTypesAdvanced.js
@@ -40,9 +40,7 @@
  */
 
 
-define([
-    'common/main/lib/component/Window'
-], function () { 'use strict';
+define([], function () { 'use strict';
 
     DE.Views.ListTypesAdvanced = Common.UI.Window.extend(_.extend({
 
diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js
index 7299efb748..ee05728145 100644
--- a/apps/documenteditor/main/app/view/MailMergeSettings.js
+++ b/apps/documenteditor/main/app/view/MailMergeSettings.js
@@ -42,7 +42,6 @@ define([
     'common/main/lib/component/Button',
     'common/main/lib/component/CheckBox',
     'common/main/lib/view/SaveAsDlg',
-    'common/main/lib/view/SelectFileDlg',
     'documenteditor/main/app/view/MailMergeEmailDlg'
 ], function (menuTemplate, $, _, Backbone) {
     'use strict';
diff --git a/apps/documenteditor/main/app/view/PageMarginsDialog.js b/apps/documenteditor/main/app/view/PageMarginsDialog.js
index 618d3ef840..2e93bdc411 100644
--- a/apps/documenteditor/main/app/view/PageMarginsDialog.js
+++ b/apps/documenteditor/main/app/view/PageMarginsDialog.js
@@ -37,10 +37,7 @@
  *
  */
 
-define([
-    'common/main/lib/component/Window',
-    'common/main/lib/component/MetricSpinner'
-], function () { 'use strict';
+define([], function () { 'use strict';
 
     DE.Views.PageMarginsDialog = Common.UI.Window.extend(_.extend({
         options: {
diff --git a/apps/documenteditor/main/app/view/PageSizeDialog.js b/apps/documenteditor/main/app/view/PageSizeDialog.js
index 15dee7caee..0016bea81f 100644
--- a/apps/documenteditor/main/app/view/PageSizeDialog.js
+++ b/apps/documenteditor/main/app/view/PageSizeDialog.js
@@ -37,10 +37,7 @@
  *
  */
 
-define([
-    'common/main/lib/component/Window',
-    'common/main/lib/component/MetricSpinner'
-], function () { 'use strict';
+define([], function () { 'use strict';
 
     DE.Views.PageSizeDialog = Common.UI.Window.extend(_.extend({
         options: {
diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js
index 6091b6a8bd..6d25959a4b 100644
--- a/apps/documenteditor/main/app/view/ShapeSettings.js
+++ b/apps/documenteditor/main/app/view/ShapeSettings.js
@@ -49,8 +49,7 @@ define([
     'common/main/lib/component/ColorButton',
     'common/main/lib/component/ComboDataView',
     'common/main/lib/component/Slider',
-    'common/main/lib/component/MultiSliderGradient',
-    'common/main/lib/view/ImageFromUrlDialog',
+    'common/main/lib/component/MultiSliderGradient'
 ], function (menuTemplate, $, _, Backbone) {
     'use strict';
 
diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js
index 6fde0a1898..b182e5472c 100644
--- a/apps/documenteditor/main/app/view/TableSettings.js
+++ b/apps/documenteditor/main/app/view/TableSettings.js
@@ -47,8 +47,7 @@ define([
     'common/main/lib/component/ThemeColorPalette',
     'common/main/lib/component/ColorButton',
     'common/main/lib/component/ComboBorderSize',
-    'common/main/lib/component/ComboDataView',
-    'common/main/lib/view/InsertTableDialog'
+    'common/main/lib/component/ComboDataView'
 ], function (menuTemplate, $, _, Backbone) {
     'use strict';
 
diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js
index 8942e1e91b..156f649e56 100644
--- a/apps/documenteditor/main/app_dev.js
+++ b/apps/documenteditor/main/app_dev.js
@@ -205,6 +205,11 @@ require([
                     'common/main/lib/controller/ScreenReaderFocus',
                     'common/main/lib/component/ComboBoxDataView',
                     'common/main/lib/view/OptionsDialog',
+                    'common/main/lib/view/CopyWarningDialog',
+                    'common/main/lib/view/ImageFromUrlDialog',
+                    'common/main/lib/view/InsertTableDialog',
+                    'common/main/lib/view/SelectFileDlg',
+                    'common/main/lib/view/SymbolTableDialog',
                     'documenteditor/main/app/view/ParagraphSettingsAdvanced',
                     'documenteditor/main/app/view/ImageSettingsAdvanced',
                     'documenteditor/main/app/view/TableSettingsAdvanced',
@@ -225,7 +230,16 @@ require([
                     'documenteditor/main/app/view/BookmarksDialog',
                     'documenteditor/main/app/view/NotesRemoveDialog',
                     'documenteditor/main/app/view/CrossReferenceDialog',
-                    'documenteditor/main/app/view/TableOfContentsSettings'
+                    'documenteditor/main/app/view/TableOfContentsSettings',
+                    'documenteditor/main/app/view/EditListItemDialog',
+                    'documenteditor/main/app/view/ControlSettingsDialog',
+                    'documenteditor/main/app/view/DateTimeDialog',
+                    'documenteditor/main/app/view/PageMarginsDialog',
+                    'documenteditor/main/app/view/PageSizeDialog',
+                    'documenteditor/main/app/view/CustomColumnsDialog',
+                    'documenteditor/main/app/view/ListSettingsDialog',
+                    'documenteditor/main/app/view/LineNumbersDialog',
+                    'documenteditor/main/app/view/HyphenationDialog',
                 ];
 
                 window.compareVersions = true;
diff --git a/apps/documenteditor/main/app_pack.js b/apps/documenteditor/main/app_pack.js
index 61a57145d3..c326315248 100644
--- a/apps/documenteditor/main/app_pack.js
+++ b/apps/documenteditor/main/app_pack.js
@@ -2,6 +2,11 @@ require([
     'common/main/lib/controller/ScreenReaderFocus',
     'common/main/lib/component/ComboBoxDataView',
     'common/main/lib/view/OptionsDialog',
+    'common/main/lib/view/CopyWarningDialog',
+    'common/main/lib/view/ImageFromUrlDialog',
+    'common/main/lib/view/InsertTableDialog',
+    'common/main/lib/view/SelectFileDlg',
+    'common/main/lib/view/SymbolTableDialog',
     'documenteditor/main/app/view/ParagraphSettingsAdvanced',
     'documenteditor/main/app/view/ImageSettingsAdvanced',
     'documenteditor/main/app/view/TableSettingsAdvanced',
@@ -22,6 +27,15 @@ require([
     'documenteditor/main/app/view/BookmarksDialog',
     'documenteditor/main/app/view/NotesRemoveDialog',
     'documenteditor/main/app/view/CrossReferenceDialog',
-    'documenteditor/main/app/view/TableOfContentsSettings'
+    'documenteditor/main/app/view/TableOfContentsSettings',
+    'documenteditor/main/app/view/EditListItemDialog',
+    'documenteditor/main/app/view/ControlSettingsDialog',
+    'documenteditor/main/app/view/DateTimeDialog',
+    'documenteditor/main/app/view/PageMarginsDialog',
+    'documenteditor/main/app/view/PageSizeDialog',
+    'documenteditor/main/app/view/CustomColumnsDialog',
+    'documenteditor/main/app/view/ListSettingsDialog',
+    'documenteditor/main/app/view/LineNumbersDialog',
+    'documenteditor/main/app/view/HyphenationDialog'
 ], function () {
 });