diff --git a/java/openapi/src/icons/OpenapiIcons.java b/java/openapi/src/icons/OpenapiIcons.java
index 148413d3eea0..a54a1aa78d7e 100644
--- a/java/openapi/src/icons/OpenapiIcons.java
+++ b/java/openapi/src/icons/OpenapiIcons.java
@@ -1,3 +1,4 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -8,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class OpenapiIcons {
-  private static Icon load(String path) {
+public final class OpenapiIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, OpenapiIcons.class);
   }
 
diff --git a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IconsClassGenerator.kt b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IconsClassGenerator.kt
index e319b3f0f161..578f48777be5 100644
--- a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IconsClassGenerator.kt
+++ b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IconsClassGenerator.kt
@@ -175,7 +175,13 @@ class IconsClassGenerator(private val projectHome: File, val util: JpsModule, pr
     append(answer, " * DO NOT EDIT IT BY HAND, run \"Generate icon classes\" configuration instead", 0)
     append(answer, " */", 0)
 
-    append(answer, "public class $className {", 0)
+
+    answer.append("public")
+    // backward compatibility
+    if (className != "AllIcons") {
+      answer.append(" final")
+    }
+    answer.append(" class ").append(className).append(" {")
     if (customLoad) {
       append(answer, "private static Icon load(String path) {", 1)
       append(answer, "return IconLoader.getIcon(path, ${className}.class);", 2)
@@ -230,7 +236,7 @@ class IconsClassGenerator(private val projectHome: File, val util: JpsModule, pr
 
         if (inners.isNotEmpty()) {
           append(answer, "", level)
-          append(answer, "public static class " + className(key) + " {", level)
+          append(answer, "public final static class " + className(key) + " {", level)
           append(answer, inners.toString(), 0)
           append(answer, "}", level)
         }
@@ -319,8 +325,12 @@ class IconsClassGenerator(private val projectHome: File, val util: JpsModule, pr
   }
 
   private fun append(answer: StringBuilder, text: String, level: Int) {
-    if (text.isNotBlank()) answer.append("  ".repeat(level))
-    answer.append(text).append("\n")
+    if (text.isNotBlank()) {
+      for (i in 0 until level) {
+        answer.append("  ")
+      }
+    }
+    answer.append(text).append('\n')
   }
 
   private fun getImageId(image: ImagePaths, depth: Int): String {
diff --git a/platform/dvcs-impl/src/icons/DvcsImplIcons.java b/platform/dvcs-impl/src/icons/DvcsImplIcons.java
index db651eaa6fc8..02cde60c1d9e 100644
--- a/platform/dvcs-impl/src/icons/DvcsImplIcons.java
+++ b/platform/dvcs-impl/src/icons/DvcsImplIcons.java
@@ -1,3 +1,4 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -8,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class DvcsImplIcons {
-  private static Icon load(String path) {
+public final class DvcsImplIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, DvcsImplIcons.class);
   }
 
diff --git a/platform/external-system-impl/src/icons/ExternalSystemIcons.java b/platform/external-system-impl/src/icons/ExternalSystemIcons.java
index 2a6604d062ea..8b9e25ae5295 100644
--- a/platform/external-system-impl/src/icons/ExternalSystemIcons.java
+++ b/platform/external-system-impl/src/icons/ExternalSystemIcons.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -23,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class ExternalSystemIcons {
-  private static Icon load(String path) {
+public final class ExternalSystemIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, ExternalSystemIcons.class);
   }
 
diff --git a/platform/platform-impl/src/icons/PlatformImplIcons.java b/platform/platform-impl/src/icons/PlatformImplIcons.java
index 90c0aeaf600c..4eb94063cb98 100644
--- a/platform/platform-impl/src/icons/PlatformImplIcons.java
+++ b/platform/platform-impl/src/icons/PlatformImplIcons.java
@@ -1,3 +1,4 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -8,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class PlatformImplIcons {
-  private static Icon load(String path) {
+public final class PlatformImplIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, PlatformImplIcons.class);
   }
 
diff --git a/platform/remote-servers/impl/src/icons/RemoteServersIcons.java b/platform/remote-servers/impl/src/icons/RemoteServersIcons.java
index 0a50728edb0d..574050e90f76 100644
--- a/platform/remote-servers/impl/src/icons/RemoteServersIcons.java
+++ b/platform/remote-servers/impl/src/icons/RemoteServersIcons.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -23,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class RemoteServersIcons {
-  private static Icon load(String path) {
+public final class RemoteServersIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, RemoteServersIcons.class);
   }
 
diff --git a/platform/tasks-platform-impl/src/icons/TasksIcons.java b/platform/tasks-platform-impl/src/icons/TasksIcons.java
index b1d34bf2bec7..ced34ada9d9b 100644
--- a/platform/tasks-platform-impl/src/icons/TasksIcons.java
+++ b/platform/tasks-platform-impl/src/icons/TasksIcons.java
@@ -1,3 +1,4 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -8,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class TasksIcons {
-  private static Icon load(String path) {
+public final class TasksIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, TasksIcons.class);
   }
 
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index 214d23d64a54..5a5d42d85653 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -10,8 +10,7 @@ import javax.swing.*;
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
 public class AllIcons {
-
-  public static class Actions {
+  public final static class Actions {
     public static final Icon AddMulticaret = IconLoader.getIcon("/actions/AddMulticaret.svg"); // 16x16
     public static final Icon Annotate = IconLoader.getIcon("/actions/annotate.svg"); // 16x16
     public static final Icon Back = IconLoader.getIcon("/actions/back.svg"); // 16x16
@@ -353,10 +352,10 @@ public class AllIcons {
 
   }
 
-  public static class CodeStyle {
+  public final static class CodeStyle {
     public static final Icon AddNewSectionRule = IconLoader.getIcon("/codeStyle/AddNewSectionRule.svg"); // 16x16
 
-    public static class Mac {
+    public final static class Mac {
 
       /** @deprecated to be removed in IDEA 2020 - use AllIcons.CodeStyle.AddNewSectionRule */
       @SuppressWarnings("unused")
@@ -372,7 +371,7 @@ public class AllIcons {
 
   }
 
-  public static class Css {
+  public final static class Css {
 
     /** @deprecated use 'icons.CssIcons' from 'intellij.css' module instead */
     @SuppressWarnings("unused")
@@ -391,7 +390,7 @@ public class AllIcons {
 
   }
 
-  public static class Darcula {
+  public final static class Darcula {
 
     @SuppressWarnings("unused")
     @Deprecated
@@ -407,9 +406,9 @@ public class AllIcons {
 
   }
 
-  public static class Debugger {
+  public final static class Debugger {
 
-    public static class Actions {
+    public final static class Actions {
       public static final Icon Force_run_to_cursor = IconLoader.getIcon("/debugger/actions/force_run_to_cursor.svg"); // 16x16
       public static final Icon Force_step_into = IconLoader.getIcon("/debugger/actions/force_step_into.svg"); // 16x16
       public static final Icon Force_step_over = IconLoader.getIcon("/debugger/actions/force_step_over.svg"); // 16x16
@@ -460,7 +459,7 @@ public class AllIcons {
     public static final Icon KillProcess = IconLoader.getIcon("/debugger/killProcess.svg"); // 16x16
     public static final Icon LambdaBreakpoint = IconLoader.getIcon("/debugger/LambdaBreakpoint.svg"); // 12x12
 
-    public static class MemoryView {
+    public final static class MemoryView {
       public static final Icon Active = IconLoader.getIcon("/debugger/memoryView/active.svg"); // 16x16
 
       /** @deprecated to be removed in IDEA 2020 - use AllIcons.Debugger.Watch */
@@ -495,7 +494,7 @@ public class AllIcons {
     public static final Icon ThreadRunning = IconLoader.getIcon("/debugger/threadRunning.svg"); // 16x16
     public static final Icon Threads = IconLoader.getIcon("/debugger/threads.svg"); // 16x16
 
-    public static class ThreadStates {
+    public final static class ThreadStates {
       public static final Icon Daemon_sign = IconLoader.getIcon("/debugger/threadStates/daemon_sign.svg"); // 16x16
       public static final Icon Idle = IconLoader.getIcon("/debugger/threadStates/idle.svg"); // 16x16
       public static final Icon Socket = IconLoader.getIcon("/debugger/threadStates/socket.svg"); // 16x16
@@ -710,7 +709,7 @@ public class AllIcons {
 
   }
 
-  public static class Diff {
+  public final static class Diff {
     public static final Icon ApplyNotConflicts = IconLoader.getIcon("/diff/applyNotConflicts.svg"); // 16x16
     public static final Icon ApplyNotConflictsLeft = IconLoader.getIcon("/diff/applyNotConflictsLeft.svg"); // 16x16
     public static final Icon ApplyNotConflictsRight = IconLoader.getIcon("/diff/applyNotConflictsRight.svg"); // 16x16
@@ -745,7 +744,7 @@ public class AllIcons {
 
   }
 
-  public static class Duplicates {
+  public final static class Duplicates {
     public static final Icon SendToTheLeft = IconLoader.getIcon("/duplicates/sendToTheLeft.png"); // 16x16
     public static final Icon SendToTheLeftGrayed = IconLoader.getIcon("/duplicates/sendToTheLeftGrayed.png"); // 16x16
     public static final Icon SendToTheRight = IconLoader.getIcon("/duplicates/sendToTheRight.png"); // 16x16
@@ -753,7 +752,7 @@ public class AllIcons {
 
   }
 
-  public static class FileTypes {
+  public final static class FileTypes {
     public static final Icon Any_type = IconLoader.getIcon("/fileTypes/any_type.svg"); // 16x16
     public static final Icon Archive = IconLoader.getIcon("/fileTypes/archive.svg"); // 16x16
     public static final Icon AS = IconLoader.getIcon("/fileTypes/as.svg"); // 16x16
@@ -801,7 +800,7 @@ public class AllIcons {
 
   }
 
-  public static class General {
+  public final static class General {
     public static final Icon ActualZoom = IconLoader.getIcon("/general/actualZoom.svg"); // 16x16
     public static final Icon Add = IconLoader.getIcon("/general/add.svg"); // 16x16
     public static final Icon AddJdk = IconLoader.getIcon("/general/addJdk.svg"); // 16x16
@@ -1395,7 +1394,7 @@ public class AllIcons {
 
   }
 
-  public static class Graph {
+  public final static class Graph {
     public static final Icon ActualZoom = IconLoader.getIcon("/graph/actualZoom.svg"); // 16x16
     public static final Icon FitContent = IconLoader.getIcon("/graph/fitContent.svg"); // 16x16
     public static final Icon Grid = IconLoader.getIcon("/graph/grid.png"); // 16x16
@@ -1414,7 +1413,7 @@ public class AllIcons {
 
   }
 
-  public static class Gutter {
+  public final static class Gutter {
     public static final Icon Colors = IconLoader.getIcon("/gutter/colors.svg"); // 12x12
     public static final Icon ExtAnnotation = IconLoader.getIcon("/gutter/extAnnotation.svg"); // 12x12
     public static final Icon ImplementedMethod = IconLoader.getIcon("/gutter/implementedMethod.png"); // 12x12
@@ -1429,7 +1428,7 @@ public class AllIcons {
 
   }
 
-  public static class Hierarchy {
+  public final static class Hierarchy {
     public static final Icon Class = IconLoader.getIcon("/hierarchy/class.svg"); // 16x16
     public static final Icon MethodDefined = IconLoader.getIcon("/hierarchy/methodDefined.svg"); // 8x8
     public static final Icon MethodNotDefined = IconLoader.getIcon("/hierarchy/methodNotDefined.svg"); // 8x8
@@ -1463,9 +1462,9 @@ public class AllIcons {
   public static final Icon Icon_CEsmall = IconLoader.getIcon("/icon_CEsmall.png"); // 16x16
   public static final Icon Icon_small = IconLoader.getIcon("/icon_small.png"); // 16x16
 
-  public static class Icons {
+  public final static class Icons {
 
-    public static class Ide {
+    public final static class Ide {
       public static final Icon NextStep = IconLoader.getIcon("/icons/ide/nextStep.png"); // 12x12
       public static final Icon NextStepGrayed = IconLoader.getIcon("/icons/ide/nextStepGrayed.png"); // 12x12
       public static final Icon NextStepInverted = IconLoader.getIcon("/icons/ide/nextStepInverted.png"); // 12x12
@@ -1475,9 +1474,9 @@ public class AllIcons {
 
   }
 
-  public static class Ide {
+  public final static class Ide {
 
-    public static class Dnd {
+    public final static class Dnd {
       public static final Icon Bottom = IconLoader.getIcon("/ide/dnd/bottom.png"); // 16x16
       public static final Icon Left = IconLoader.getIcon("/ide/dnd/left.png"); // 16x16
       public static final Icon Right = IconLoader.getIcon("/ide/dnd/right.png"); // 16x16
@@ -1501,7 +1500,7 @@ public class AllIcons {
     public static final Icon LookupAlphanumeric = IconLoader.getIcon("/ide/lookupAlphanumeric.png"); // 12x12
     public static final Icon LookupRelevance = IconLoader.getIcon("/ide/lookupRelevance.png"); // 12x12
 
-    public static class Macro {
+    public final static class Macro {
       public static final Icon Recording_1 = IconLoader.getIcon("/ide/macro/recording_1.svg"); // 16x16
       public static final Icon Recording_2 = IconLoader.getIcon("/ide/macro/recording_2.svg"); // 16x16
       public static final Icon Recording_3 = IconLoader.getIcon("/ide/macro/recording_3.svg"); // 16x16
@@ -1515,7 +1514,7 @@ public class AllIcons {
     }
     public static final Icon NoNotifications13 = IconLoader.getIcon("/ide/noNotifications13.png"); // 13x13
 
-    public static class Notification {
+    public final static class Notification {
       public static final Icon Close = IconLoader.getIcon("/ide/notification/close.svg"); // 16x16
       public static final Icon CloseHover = IconLoader.getIcon("/ide/notification/closeHover.svg"); // 16x16
       public static final Icon Collapse = IconLoader.getIcon("/ide/notification/collapse.svg"); // 16x16
@@ -1529,7 +1528,7 @@ public class AllIcons {
       public static final Icon InfoEvents = IconLoader.getIcon("/ide/notification/infoEvents.svg"); // 13x13
       public static final Icon NoEvents = IconLoader.getIcon("/ide/notification/noEvents.svg"); // 13x13
 
-      public static class Shadow {
+      public final static class Shadow {
         public static final Icon Bottom_left = IconLoader.getIcon("/ide/notification/shadow/bottom-left.png"); // 14x16
         public static final Icon Bottom_right = IconLoader.getIcon("/ide/notification/shadow/bottom-right.png"); // 14x16
         public static final Icon Bottom = IconLoader.getIcon("/ide/notification/shadow/bottom.png"); // 4x8
@@ -1555,13 +1554,13 @@ public class AllIcons {
     public static final Icon Readonly = IconLoader.getIcon("/ide/readonly.svg"); // 16x16
     public static final Icon Readwrite = IconLoader.getIcon("/ide/readwrite.svg"); // 16x16
 
-    public static class Shadow {
+    public final static class Shadow {
       public static final Icon Bottom_left = IconLoader.getIcon("/ide/shadow/bottom-left.svg"); // 18x22
       public static final Icon Bottom_right = IconLoader.getIcon("/ide/shadow/bottom-right.svg"); // 18x22
       public static final Icon Bottom = IconLoader.getIcon("/ide/shadow/bottom.svg"); // 4x14
       public static final Icon Left = IconLoader.getIcon("/ide/shadow/left.svg"); // 11x4
 
-      public static class Popup {
+      public final static class Popup {
         public static final Icon Bottom_left = IconLoader.getIcon("/ide/shadow/popup/bottom-left.png"); // 20x20
         public static final Icon Bottom_right = IconLoader.getIcon("/ide/shadow/popup/bottom-right.png"); // 20x20
         public static final Icon Bottom = IconLoader.getIcon("/ide/shadow/popup/bottom.png"); // 1x10
@@ -1596,7 +1595,7 @@ public class AllIcons {
   public static final Icon Idea_logo_background = IconLoader.getIcon("/idea_logo_background.png"); // 500x500
   public static final Icon Idea_logo_welcome = IconLoader.getIcon("/idea_logo_welcome.png"); // 100x100
 
-  public static class Javaee {
+  public final static class Javaee {
     public static final Icon Application_xml = IconLoader.getIcon("/javaee/application_xml.png"); // 16x16
     public static final Icon BuildOnFrameDeactivation = IconLoader.getIcon("/javaee/buildOnFrameDeactivation.png"); // 16x16
     public static final Icon Ejb_jar_xml = IconLoader.getIcon("/javaee/ejb-jar_xml.png"); // 16x16
@@ -1650,7 +1649,7 @@ public class AllIcons {
 
   }
 
-  public static class Json {
+  public final static class Json {
     public static final Icon Array = IconLoader.getIcon("/json/array.png"); // 16x16
     public static final Icon Object = IconLoader.getIcon("/json/object.png"); // 16x16
     public static final Icon Property_braces = IconLoader.getIcon("/json/property_braces.png"); // 16x16
@@ -1660,7 +1659,7 @@ public class AllIcons {
   public static final Icon Logo_welcomeScreen = IconLoader.getIcon("/Logo_welcomeScreen.png"); // 80x80
   public static final Icon Logo_welcomeScreen_CE = IconLoader.getIcon("/Logo_welcomeScreen_CE.png"); // 80x80
 
-  public static class Mac {
+  public final static class Mac {
     public static final Icon AppIconOk512 = IconLoader.getIcon("/mac/appIconOk512.png"); // 55x55
     public static final Icon Text = IconLoader.getIcon("/mac/text.png"); // 32x32
     public static final Icon Tree_black_right_arrow = IconLoader.getIcon("/mac/tree_black_right_arrow.png"); // 11x11
@@ -1670,7 +1669,7 @@ public class AllIcons {
 
   }
 
-  public static class Modules {
+  public final static class Modules {
     public static final Icon AddExcludedRoot = IconLoader.getIcon("/modules/addExcludedRoot.svg"); // 16x16
     public static final Icon Annotation = IconLoader.getIcon("/modules/annotation.svg"); // 16x16
     public static final Icon DeleteContentFolder = IconLoader.getIcon("/modules/deleteContentFolder.png"); // 9x9
@@ -1691,7 +1690,7 @@ public class AllIcons {
     public static final Icon TestResourcesRoot = IconLoader.getIcon("/modules/testResourcesRoot.svg"); // 16x16
     public static final Icon TestRoot = IconLoader.getIcon("/modules/testRoot.svg"); // 16x16
 
-    public static class Types {
+    public final static class Types {
 
       /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.User */
       @SuppressWarnings("unused")
@@ -1759,7 +1758,7 @@ public class AllIcons {
 
   }
 
-  public static class Nodes {
+  public final static class Nodes {
     public static final Icon AbstractClass = IconLoader.getIcon("/nodes/abstractClass.svg"); // 16x16
     public static final Icon AbstractException = IconLoader.getIcon("/nodes/abstractException.svg"); // 16x16
     public static final Icon AbstractMethod = IconLoader.getIcon("/nodes/abstractMethod.svg"); // 16x16
@@ -1820,7 +1819,7 @@ public class AllIcons {
     public static final Icon JavaModule = IconLoader.getIcon("/nodes/javaModule.svg"); // 16x16
     public static final Icon JavaModuleRoot = IconLoader.getIcon("/nodes/javaModuleRoot.svg"); // 16x16
 
-    public static class Jsf {
+    public final static class Jsf {
       public static final Icon Component = IconLoader.getIcon("/nodes/jsf/component.svg"); // 16x16
       public static final Icon Converter = IconLoader.getIcon("/nodes/jsf/converter.svg"); // 16x16
       public static final Icon General = IconLoader.getIcon("/nodes/jsf/general.svg"); // 16x16
@@ -2000,7 +1999,7 @@ public class AllIcons {
 
   }
 
-  public static class ObjectBrowser {
+  public final static class ObjectBrowser {
     public static final Icon AbbreviatePackageNames = IconLoader.getIcon("/objectBrowser/abbreviatePackageNames.png"); // 16x16
     public static final Icon CompactEmptyPackages = IconLoader.getIcon("/objectBrowser/compactEmptyPackages.svg"); // 16x16
     public static final Icon FlattenModules = IconLoader.getIcon("/objectBrowser/flattenModules.svg"); // 16x16
@@ -2020,7 +2019,7 @@ public class AllIcons {
 
   }
 
-  public static class Plugins {
+  public final static class Plugins {
     public static final Icon Downloads = IconLoader.getIcon("/plugins/downloads.svg"); // 12x12
     public static final Icon ModifierInvalid = IconLoader.getIcon("/plugins/modifierInvalid.svg"); // 15x15
     public static final Icon ModifierJBLogo = IconLoader.getIcon("/plugins/modifierJBLogo.svg"); // 14x14
@@ -2034,7 +2033,7 @@ public class AllIcons {
 
   }
 
-  public static class Preferences {
+  public final static class Preferences {
     public static final Icon Appearance = IconLoader.getIcon("/preferences/Appearance.png"); // 32x32
     public static final Icon CodeStyle = IconLoader.getIcon("/preferences/CodeStyle.png"); // 32x32
     public static final Icon Compiler = IconLoader.getIcon("/preferences/Compiler.png"); // 32x32
@@ -2049,9 +2048,9 @@ public class AllIcons {
 
   }
 
-  public static class Process {
+  public final static class Process {
 
-    public static class Big {
+    public final static class Big {
       public static final Icon Step_1 = IconLoader.getIcon("/process/big/step_1.svg"); // 32x32
       public static final Icon Step_2 = IconLoader.getIcon("/process/big/step_2.svg"); // 32x32
       public static final Icon Step_3 = IconLoader.getIcon("/process/big/step_3.svg"); // 32x32
@@ -2086,7 +2085,7 @@ public class AllIcons {
     public static final Icon DisabledDebug = IconLoader.getIcon("/process/disabledDebug.png"); // 13x13
     public static final Icon DisabledRun = IconLoader.getIcon("/process/disabledRun.png"); // 13x13
 
-    public static class FS {
+    public final static class FS {
       public static final Icon Step_1 = IconLoader.getIcon("/process/fs/step_1.png"); // 16x16
       public static final Icon Step_10 = IconLoader.getIcon("/process/fs/step_10.png"); // 16x16
       public static final Icon Step_11 = IconLoader.getIcon("/process/fs/step_11.png"); // 16x16
@@ -2118,7 +2117,7 @@ public class AllIcons {
     public static final Icon ProgressResumeSmall = IconLoader.getIcon("/process/progressResumeSmall.png"); // 12x12
     public static final Icon ProgressResumeSmallHover = IconLoader.getIcon("/process/progressResumeSmallHover.png"); // 12x12
 
-    public static class State {
+    public final static class State {
       public static final Icon GreenOK = IconLoader.getIcon("/process/state/GreenOK.png"); // 16x16
       public static final Icon GreyProgr = IconLoader.getIcon("/process/state/GreyProgr.png"); // 16x16
       public static final Icon GreyProgr_1 = IconLoader.getIcon("/process/state/GreyProgr_1.png"); // 16x16
@@ -2170,7 +2169,7 @@ public class AllIcons {
 
   }
 
-  public static class Providers {
+  public final static class Providers {
     public static final Icon Apache = IconLoader.getIcon("/providers/apache.png"); // 16x16
     public static final Icon ApacheDerby = IconLoader.getIcon("/providers/apacheDerby.png"); // 16x16
     public static final Icon Azure = IconLoader.getIcon("/providers/azure.png"); // 16x16
@@ -2197,7 +2196,7 @@ public class AllIcons {
 
   }
 
-  public static class RunConfigurations {
+  public final static class RunConfigurations {
     public static final Icon Applet = IconLoader.getIcon("/runConfigurations/applet.png"); // 16x16
     public static final Icon Application = IconLoader.getIcon("/runConfigurations/application.png"); // 16x16
     public static final Icon HidePassed = IconLoader.getIcon("/runConfigurations/hidePassed.png"); // 16x16
@@ -2224,7 +2223,7 @@ public class AllIcons {
     public static final Icon TestPaused = IconLoader.getIcon("/runConfigurations/testPaused.svg"); // 16x16
     public static final Icon TestSkipped = IconLoader.getIcon("/runConfigurations/testSkipped.svg"); // 16x16
 
-    public static class TestState {
+    public final static class TestState {
       public static final Icon Green2 = IconLoader.getIcon("/runConfigurations/testState/green2.png"); // 12x12
       public static final Icon Red2 = IconLoader.getIcon("/runConfigurations/testState/red2.png"); // 12x12
       public static final Icon Run = IconLoader.getIcon("/runConfigurations/testState/run.png"); // 12x12
@@ -2322,7 +2321,7 @@ public class AllIcons {
 
   }
 
-  public static class Scope {
+  public final static class Scope {
     public static final Icon ChangedFiles = IconLoader.getIcon("/scope/changedFiles.svg"); // 16x16
     public static final Icon ChangedFilesAll = IconLoader.getIcon("/scope/changedFilesAll.svg"); // 16x16
     public static final Icon Problems = IconLoader.getIcon("/scope/problems.svg"); // 16x16
@@ -2332,7 +2331,7 @@ public class AllIcons {
 
   }
 
-  public static class Toolbar {
+  public final static class Toolbar {
     public static final Icon Filterdups = IconLoader.getIcon("/toolbar/filterdups.svg"); // 16x16
     public static final Icon Unknown = IconLoader.getIcon("/toolbar/unknown.svg"); // 16x16
 
@@ -2343,7 +2342,7 @@ public class AllIcons {
 
   }
 
-  public static class ToolbarDecorator {
+  public final static class ToolbarDecorator {
     public static final Icon AddBlankLine = IconLoader.getIcon("/toolbarDecorator/addBlankLine.svg"); // 16x16
     public static final Icon AddClass = IconLoader.getIcon("/toolbarDecorator/addClass.svg"); // 16x16
     public static final Icon AddFolder = IconLoader.getIcon("/toolbarDecorator/addFolder.svg"); // 16x16
@@ -2356,7 +2355,7 @@ public class AllIcons {
     public static final Icon Export = IconLoader.getIcon("/toolbarDecorator/export.svg"); // 16x16
     public static final Icon Import = IconLoader.getIcon("/toolbarDecorator/import.svg"); // 16x16
 
-    public static class Mac {
+    public final static class Mac {
 
       /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.Add */
       @SuppressWarnings("unused")
@@ -2477,7 +2476,7 @@ public class AllIcons {
 
   }
 
-  public static class Toolwindows {
+  public final static class Toolwindows {
     public static final Icon Documentation = IconLoader.getIcon("/toolwindows/documentation.svg"); // 13x13
     public static final Icon Problems = IconLoader.getIcon("/toolwindows/problems.svg"); // 13x13
     public static final Icon ProblemsEmpty = IconLoader.getIcon("/toolwindows/problemsEmpty.svg"); // 13x13
@@ -2505,7 +2504,7 @@ public class AllIcons {
 
   }
 
-  public static class Vcs {
+  public final static class Vcs {
     public static final Icon Arrow_left = IconLoader.getIcon("/vcs/arrow_left.png"); // 16x16
     public static final Icon Arrow_right = IconLoader.getIcon("/vcs/arrow_right.png"); // 16x16
     public static final Icon Changelist = IconLoader.getIcon("/vcs/changelist.svg"); // 16x16
@@ -2531,7 +2530,7 @@ public class AllIcons {
     public static final Icon Unshelve = IconLoader.getIcon("/vcs/Unshelve.svg"); // 16x16
     public static final Icon UnshelveSilent = IconLoader.getIcon("/vcs/unshelveSilent.svg"); // 16x16
 
-    public static class Vendors {
+    public final static class Vendors {
       public static final Icon Github = IconLoader.getIcon("/vcs/vendors/github.svg"); // 16x16
 
     }
@@ -2543,17 +2542,17 @@ public class AllIcons {
 
   }
 
-  public static class Webreferences {
+  public final static class Webreferences {
     public static final Icon Server = IconLoader.getIcon("/webreferences/server.svg"); // 16x16
 
   }
 
-  public static class Welcome {
+  public final static class Welcome {
     public static final Icon CreateDesktopEntry = IconLoader.getIcon("/welcome/createDesktopEntry.png"); // 32x32
     public static final Icon CreateNewProject = IconLoader.getIcon("/welcome/createNewProject.svg"); // 16x16
     public static final Icon FromVCS = IconLoader.getIcon("/welcome/fromVCS.svg"); // 16x16
 
-    public static class Project {
+    public final static class Project {
       public static final Icon Remove_hover = IconLoader.getIcon("/welcome/project/remove-hover.png"); // 10x10
       public static final Icon Remove = IconLoader.getIcon("/welcome/project/remove.png"); // 10x10
 
@@ -2577,7 +2576,7 @@ public class AllIcons {
 
   }
 
-  public static class Windows {
+  public final static class Windows {
     public static final Icon CloseActive = IconLoader.getIcon("/windows/closeActive.svg"); // 16x16
     public static final Icon CloseHover = IconLoader.getIcon("/windows/closeHover.svg"); // 16x16
     public static final Icon CloseInactive = IconLoader.getIcon("/windows/closeInactive.svg"); // 16x16
@@ -2596,7 +2595,7 @@ public class AllIcons {
     public static final Icon RestoreInactive = IconLoader.getIcon("/windows/restoreInactive.svg"); // 16x16
     public static final Icon RestoreSmall = IconLoader.getIcon("/windows/restoreSmall.svg"); // 16x16
 
-    public static class Shadow {
+    public final static class Shadow {
       public static final Icon Bottom = IconLoader.getIcon("/windows/shadow/bottom.png"); // 1x13
       public static final Icon BottomLeft = IconLoader.getIcon("/windows/shadow/bottomLeft.png"); // 24x24
       public static final Icon BottomRight = IconLoader.getIcon("/windows/shadow/bottomRight.png"); // 24x24
@@ -2611,9 +2610,9 @@ public class AllIcons {
 
   }
 
-  public static class Xml {
+  public final static class Xml {
 
-    public static class Browsers {
+    public final static class Browsers {
       public static final Icon Canary16 = IconLoader.getIcon("/xml/browsers/canary16.png"); // 16x16
       public static final Icon Chrome16 = IconLoader.getIcon("/xml/browsers/chrome16.png"); // 16x16
       public static final Icon Chromium16 = IconLoader.getIcon("/xml/browsers/chromium16.png"); // 16x16
diff --git a/platform/vcs-log/impl/gen/icons/VcsLogIcons.java b/platform/vcs-log/impl/gen/icons/VcsLogIcons.java
index b9416eef2adb..83971692f078 100644
--- a/platform/vcs-log/impl/gen/icons/VcsLogIcons.java
+++ b/platform/vcs-log/impl/gen/icons/VcsLogIcons.java
@@ -9,15 +9,14 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class VcsLogIcons {
-  private static Icon load(String path) {
+public final class VcsLogIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, VcsLogIcons.class);
   }
 
   public static final Icon Branch = load("/icons/branch.svg"); // 16x16
   public static final Icon IntelliSort = load("/icons/IntelliSort.svg"); // 16x16
 
-  public static class Process {
+  public final static class Process {
     public static final Icon Dots_1 = load("/icons/process/dots_1.png"); // 16x16
     public static final Icon Dots_2 = load("/icons/process/dots_2.png"); // 16x16
     public static final Icon Dots_3 = load("/icons/process/dots_3.png"); // 16x16
diff --git a/plugins/ant/src/icons/AntIcons.java b/plugins/ant/src/icons/AntIcons.java
index e344a5445f3a..3221b0f36cd8 100644
--- a/plugins/ant/src/icons/AntIcons.java
+++ b/plugins/ant/src/icons/AntIcons.java
@@ -9,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class AntIcons {
-  private static Icon load(String path) {
+public final class AntIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, AntIcons.class);
   }
 
diff --git a/plugins/devkit/devkit-core/gen/icons/DevkitIcons.java b/plugins/devkit/devkit-core/gen/icons/DevkitIcons.java
index a6a5968a335e..a4d8e2ba3d15 100644
--- a/plugins/devkit/devkit-core/gen/icons/DevkitIcons.java
+++ b/plugins/devkit/devkit-core/gen/icons/DevkitIcons.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -23,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class DevkitIcons {
-  private static Icon load(String path) {
+public final class DevkitIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, DevkitIcons.class);
   }
 
diff --git a/plugins/eclipse/gen/icons/EclipseIcons.java b/plugins/eclipse/gen/icons/EclipseIcons.java
index 5832d35be7c4..700f2e66e53f 100644
--- a/plugins/eclipse/gen/icons/EclipseIcons.java
+++ b/plugins/eclipse/gen/icons/EclipseIcons.java
@@ -1,3 +1,4 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -8,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class EclipseIcons {
-  private static Icon load(String path) {
+public final class EclipseIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, EclipseIcons.class);
   }
 
diff --git a/plugins/editorconfig/src/icons/EditorconfigIcons.java b/plugins/editorconfig/src/icons/EditorconfigIcons.java
index 522611746ff1..4ff32413a337 100644
--- a/plugins/editorconfig/src/icons/EditorconfigIcons.java
+++ b/plugins/editorconfig/src/icons/EditorconfigIcons.java
@@ -9,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class EditorconfigIcons {
-  private static Icon load(String path) {
+public final class EditorconfigIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, EditorconfigIcons.class);
   }
 
diff --git a/plugins/github/src/icons/GithubIcons.java b/plugins/github/src/icons/GithubIcons.java
index 4ac6dc320d11..5f9b95f8b4e0 100644
--- a/plugins/github/src/icons/GithubIcons.java
+++ b/plugins/github/src/icons/GithubIcons.java
@@ -9,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class GithubIcons {
-  private static Icon load(String path) {
+public final class GithubIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, GithubIcons.class);
   }
 
diff --git a/plugins/google-app-engine/gen/icons/GoogleAppEngineIcons.java b/plugins/google-app-engine/gen/icons/GoogleAppEngineIcons.java
index 93335cbec6b4..020f694a8e7d 100644
--- a/plugins/google-app-engine/gen/icons/GoogleAppEngineIcons.java
+++ b/plugins/google-app-engine/gen/icons/GoogleAppEngineIcons.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -23,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class GoogleAppEngineIcons {
-  private static Icon load(String path) {
+public final class GoogleAppEngineIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, GoogleAppEngineIcons.class);
   }
 
diff --git a/plugins/gradle/src/icons/GradleIcons.java b/plugins/gradle/src/icons/GradleIcons.java
index 4dd09d9de659..f8ea87abb0bb 100644
--- a/plugins/gradle/src/icons/GradleIcons.java
+++ b/plugins/gradle/src/icons/GradleIcons.java
@@ -9,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class GradleIcons {
-  private static Icon load(String path) {
+public final class GradleIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, GradleIcons.class);
   }
 
diff --git a/plugins/groovy/groovy-psi/gen/icons/JetgroovyIcons.java b/plugins/groovy/groovy-psi/gen/icons/JetgroovyIcons.java
index 1fd4a7a09e19..9747ec912612 100644
--- a/plugins/groovy/groovy-psi/gen/icons/JetgroovyIcons.java
+++ b/plugins/groovy/groovy-psi/gen/icons/JetgroovyIcons.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -23,19 +9,18 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class JetgroovyIcons {
-  private static Icon load(String path) {
+public final class JetgroovyIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, JetgroovyIcons.class);
   }
 
 
-  public static class Griffon {
+  public final static class Griffon {
     public static final Icon Griffon = load("/icons/griffon/griffon.png"); // 16x16
     public static final Icon GriffonToolWindow = load("/icons/griffon/griffonToolWindow.svg"); // 13x13
 
   }
 
-  public static class Groovy {
+  public final static class Groovy {
     public static final Icon AbstractClass = load("/icons/groovy/abstractClass.png"); // 16x16
     public static final Icon AbstractField = load("/icons/groovy/abstractField.png"); // 16x16
     public static final Icon AbstractMethod = load("/icons/groovy/abstractMethod.png"); // 16x16
@@ -65,7 +50,7 @@ public class JetgroovyIcons {
 
   }
 
-  public static class Mvc {
+  public final static class Mvc {
     public static final Icon Action_method = load("/icons/mvc/action_method.png"); // 16x16
     public static final Icon Config_folder_closed = load("/icons/mvc/config_folder_closed.png"); // 16x16
     public static final Icon Controller = load("/icons/mvc/controller.png"); // 16x16
diff --git a/plugins/maven/src/main/java/icons/MavenIcons.java b/plugins/maven/src/main/java/icons/MavenIcons.java
index 8ac4ffc604fe..7a0071b0f1a8 100644
--- a/plugins/maven/src/main/java/icons/MavenIcons.java
+++ b/plugins/maven/src/main/java/icons/MavenIcons.java
@@ -9,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class MavenIcons {
-  private static Icon load(String path) {
+public final class MavenIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, MavenIcons.class);
   }
 
diff --git a/plugins/properties/properties-psi-api/gen/icons/PropertiesIcons.java b/plugins/properties/properties-psi-api/gen/icons/PropertiesIcons.java
index 67a39b7deb80..6f95cea2eb25 100644
--- a/plugins/properties/properties-psi-api/gen/icons/PropertiesIcons.java
+++ b/plugins/properties/properties-psi-api/gen/icons/PropertiesIcons.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -23,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class PropertiesIcons {
-  private static Icon load(String path) {
+public final class PropertiesIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, PropertiesIcons.class);
   }
 
diff --git a/plugins/stream-debugger/src/icons/JavaDebuggerStreamsIcons.java b/plugins/stream-debugger/src/icons/JavaDebuggerStreamsIcons.java
index 4249abc795bb..7ba9fbb829f2 100644
--- a/plugins/stream-debugger/src/icons/JavaDebuggerStreamsIcons.java
+++ b/plugins/stream-debugger/src/icons/JavaDebuggerStreamsIcons.java
@@ -9,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class JavaDebuggerStreamsIcons {
-  private static Icon load(String path) {
+public final class JavaDebuggerStreamsIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, JavaDebuggerStreamsIcons.class);
   }
 
diff --git a/plugins/svn4idea/gen/icons/SvnIcons.java b/plugins/svn4idea/gen/icons/SvnIcons.java
index 5d0393219456..48bcf3c2223b 100644
--- a/plugins/svn4idea/gen/icons/SvnIcons.java
+++ b/plugins/svn4idea/gen/icons/SvnIcons.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -23,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class SvnIcons {
-  private static Icon load(String path) {
+public final class SvnIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, SvnIcons.class);
   }
 
diff --git a/plugins/terminal/src/icons/TerminalIcons.java b/plugins/terminal/src/icons/TerminalIcons.java
index bf14bfa20da9..c4a658da7b52 100644
--- a/plugins/terminal/src/icons/TerminalIcons.java
+++ b/plugins/terminal/src/icons/TerminalIcons.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -23,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class TerminalIcons {
-  private static Icon load(String path) {
+public final class TerminalIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, TerminalIcons.class);
   }
 
diff --git a/plugins/ui-designer/src/icons/UIDesignerIcons.java b/plugins/ui-designer/src/icons/UIDesignerIcons.java
index b660a23c322d..c48fe341fe7b 100644
--- a/plugins/ui-designer/src/icons/UIDesignerIcons.java
+++ b/plugins/ui-designer/src/icons/UIDesignerIcons.java
@@ -9,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class UIDesignerIcons {
-  private static Icon load(String path) {
+public final class UIDesignerIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, UIDesignerIcons.class);
   }
 
diff --git a/plugins/xpath/xpath-lang/gen/icons/XpathIcons.java b/plugins/xpath/xpath-lang/gen/icons/XpathIcons.java
index 795bc89c2c24..d3cd9a4431c5 100644
--- a/plugins/xpath/xpath-lang/gen/icons/XpathIcons.java
+++ b/plugins/xpath/xpath-lang/gen/icons/XpathIcons.java
@@ -9,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class XpathIcons {
-  private static Icon load(String path) {
+public final class XpathIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, XpathIcons.class);
   }
 
diff --git a/plugins/xslt-debugger/src/icons/XsltDebuggerIcons.java b/plugins/xslt-debugger/src/icons/XsltDebuggerIcons.java
index cf5c8fdc3afd..1622a21ff3a3 100644
--- a/plugins/xslt-debugger/src/icons/XsltDebuggerIcons.java
+++ b/plugins/xslt-debugger/src/icons/XsltDebuggerIcons.java
@@ -9,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class XsltDebuggerIcons {
-  private static Icon load(String path) {
+public final class XsltDebuggerIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, XsltDebuggerIcons.class);
   }
 
diff --git a/python/educational-python/gen/icons/PythonEducationalIcons.java b/python/educational-python/gen/icons/PythonEducationalIcons.java
index ad51998339b1..efb2ccb3abfe 100644
--- a/python/educational-python/gen/icons/PythonEducationalIcons.java
+++ b/python/educational-python/gen/icons/PythonEducationalIcons.java
@@ -1,3 +1,4 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -8,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class PythonEducationalIcons {
-  private static Icon load(String path) {
+public final class PythonEducationalIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, PythonEducationalIcons.class);
   }
 
diff --git a/python/gen/icons/PythonIcons.java b/python/gen/icons/PythonIcons.java
index 1a75134b7635..bde47f2c57a6 100644
--- a/python/gen/icons/PythonIcons.java
+++ b/python/gen/icons/PythonIcons.java
@@ -9,34 +9,33 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class PythonIcons {
-  private static Icon load(String path) {
+public final class PythonIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, PythonIcons.class);
   }
 
 
-  public static class Cython {
+  public final static class Cython {
     public static final Icon CythonFile = load("/icons/com/jetbrains/cython/cythonFile.png"); // 16x16
 
   }
 
-  public static class Pyqt {
+  public final static class Pyqt {
     public static final Icon TsFile = load("/icons/com/jetbrains/pyqt/tsFile.png"); // 16x16
     public static final Icon UiForm = load("/icons/com/jetbrains/pyqt/uiForm.png"); // 16x16
 
   }
 
-  public static class Python {
+  public final static class Python {
     public static final Icon Anaconda = load("/icons/com/jetbrains/python/anaconda.png"); // 16x16
 
-    public static class Buildout {
+    public final static class Buildout {
       public static final Icon Buildout = load("/icons/com/jetbrains/python/buildout/buildout.png"); // 16x16
 
     }
     public static final Icon Condaenv = load("/icons/com/jetbrains/python/condaenv.png"); // 16x16
     public static final Icon DataView = load("/icons/com/jetbrains/python/DataView.svg"); // 13x13
 
-    public static class Debug {
+    public final static class Debug {
       public static final Icon CommandLine = load("/icons/com/jetbrains/python/debug/commandLine.png"); // 16x16
       public static final Icon SpecialVar = load("/icons/com/jetbrains/python/debug/specialVar.png"); // 16x16
       public static final Icon StepIntoMyCode = load("/icons/com/jetbrains/python/debug/StepIntoMyCode.svg"); // 16x16
@@ -48,7 +47,7 @@ public class PythonIcons {
     public static final Icon IpythonNotebook = load("/icons/com/jetbrains/python/IpythonNotebook.png"); // 16x16
     public static final Icon Jython = load("/icons/com/jetbrains/python/jython.png"); // 16x16
 
-    public static class Nodes {
+    public final static class Nodes {
       public static final Icon Cyan_dot = load("/icons/com/jetbrains/python/nodes/cyan-dot.png"); // 16x16
       public static final Icon Lock = load("/icons/com/jetbrains/python/nodes/lock.png"); // 16x16
       public static final Icon Red_inv_triangle = load("/icons/com/jetbrains/python/nodes/red-inv-triangle.png"); // 16x16
diff --git a/python/psi-api/src/icons/PythonPsiApiIcons.java b/python/psi-api/src/icons/PythonPsiApiIcons.java
index 0a29273f5dd1..1d4f4e33dd79 100644
--- a/python/psi-api/src/icons/PythonPsiApiIcons.java
+++ b/python/psi-api/src/icons/PythonPsiApiIcons.java
@@ -1,3 +1,4 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -8,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class PythonPsiApiIcons {
-  private static Icon load(String path) {
+public final class PythonPsiApiIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, PythonPsiApiIcons.class);
   }
 
diff --git a/python/rest/gen/icons/RestIcons.java b/python/rest/gen/icons/RestIcons.java
index a69a475accc0..25d4a4884756 100644
--- a/python/rest/gen/icons/RestIcons.java
+++ b/python/rest/gen/icons/RestIcons.java
@@ -1,3 +1,4 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -8,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class RestIcons {
-  private static Icon load(String path) {
+public final class RestIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, RestIcons.class);
   }
 
diff --git a/spellchecker/gen/icons/SpellcheckerIcons.java b/spellchecker/gen/icons/SpellcheckerIcons.java
index 1c28b2821936..b78c9b59e9f0 100644
--- a/spellchecker/gen/icons/SpellcheckerIcons.java
+++ b/spellchecker/gen/icons/SpellcheckerIcons.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -11,8 +9,7 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
  */
-public class SpellcheckerIcons {
-  private static Icon load(String path) {
+public final class SpellcheckerIcons {  private static Icon load(String path) {
     return IconLoader.getIcon(path, SpellcheckerIcons.class);
   }