diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 7156181e4df..ee7032fc6de 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -1929,7 +1929,7 @@
                      groupName="Kotlin"
                      enabledByDefault="true"
                      cleanupTool="true"
-                     level="WARNING"
+                     level="WEAK WARNING"
                      language="kotlin"
     />
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/AddVarianceModifierInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/AddVarianceModifierInspection.kt
index ed94065a9a8..b6bd262b513 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/AddVarianceModifierInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/AddVarianceModifierInspection.kt
@@ -89,7 +89,7 @@ class AddVarianceModifierInspection : AbstractKotlinInspection() {
                         holder.registerProblem(
                                 typeParameter,
                                 "Type parameter can have $suggested variance",
-                                ProblemHighlightType.WEAK_WARNING,
+                                ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
                                 *fixes.toTypedArray()
                         )
                     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/ArrayInDataClassInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ArrayInDataClassInspection.kt
index a1e1804a6f0..a053d567a6c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/ArrayInDataClassInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ArrayInDataClassInspection.kt
@@ -44,7 +44,7 @@ class ArrayInDataClassInspection : AbstractKotlinInspection() {
                     if (KotlinBuiltIns.isArray(type) || KotlinBuiltIns.isPrimitiveArray(type)) {
                         holder.registerProblem(parameter,
                                                "Array property in data class: it's recommended to override equals() / hashCode()",
-                                               ProblemHighlightType.WEAK_WARNING)
+                                               ProblemHighlightType.GENERIC_ERROR_OR_WARNING)
                     }
                 }
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/CopyWithoutNamedArgumentsInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/CopyWithoutNamedArgumentsInspection.kt
index c8df6d2d802..659150ff4e2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/CopyWithoutNamedArgumentsInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/CopyWithoutNamedArgumentsInspection.kt
@@ -53,7 +53,7 @@ class CopyWithoutNamedArgumentsInspection : AbstractKotlinInspection() {
                 holder.registerProblem(
                         expression.calleeExpression ?: return,
                         "'copy' method of data class is called without named arguments",
-                        ProblemHighlightType.WEAK_WARNING,
+                        ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
                         IntentionWrapper(AddNamesToCallArgumentsIntention(), expression.containingKtFile)
                 )
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/MemberVisibilityCanPrivateInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/MemberVisibilityCanPrivateInspection.kt
index 8382b01643e..90406c715c0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/MemberVisibilityCanPrivateInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/MemberVisibilityCanPrivateInspection.kt
@@ -87,7 +87,7 @@ class MemberVisibilityCanPrivateInspection : AbstractKotlinInspection() {
         val nameElement = (declaration as? PsiNameIdentifierOwner)?.nameIdentifier ?: return
         holder.registerProblem(nameElement,
                                "$member '${declaration.name}' can be private",
-                               ProblemHighlightType.WEAK_WARNING,
+                               ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
                                IntentionWrapper(AddModifierFix(modifierListOwner, KtTokens.PRIVATE_KEYWORD), declaration.containingFile))
     }
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/MoveSuspiciousCallableReferenceIntoParenthesesInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/MoveSuspiciousCallableReferenceIntoParenthesesInspection.kt
index 7af18df9832..b47f993adb9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/MoveSuspiciousCallableReferenceIntoParenthesesInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/MoveSuspiciousCallableReferenceIntoParenthesesInspection.kt
@@ -56,7 +56,7 @@ class MoveSuspiciousCallableReferenceIntoParenthesesInspection : AbstractKotlinI
                     holder.registerProblem(
                             lambdaExpression,
                             "Suspicious callable reference as the only lambda element",
-                            ProblemHighlightType.WEAK_WARNING,
+                            ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
                             IntentionWrapper(MoveIntoParenthesesIntention(), lambdaExpression.containingFile)
                     )
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/ProtectedInFinalInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ProtectedInFinalInspection.kt
index eb2af90638b..1417a1880a1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/ProtectedInFinalInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ProtectedInFinalInspection.kt
@@ -43,7 +43,7 @@ class ProtectedInFinalInspection  : AbstractKotlinInspection() {
                         declaration.implicitVisibility() != KtTokens.PROTECTED_KEYWORD) {
                         holder.registerProblem(visibilityModifier,
                                                "'protected' visibility is effectively 'private' in a final class",
-                                               ProblemHighlightType.WEAK_WARNING,
+                                               ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
                                                MakePrivateFix(),
                                                MakeOpenFix()
                         )
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantIfInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantIfInspection.kt
index bd84a153485..60b41efb0c2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantIfInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantIfInspection.kt
@@ -36,7 +36,7 @@ class RedundantIfInspection : AbstractKotlinInspection(), CleanupLocalInspection
 
                 holder.registerProblem(expression,
                                        "Redundant 'if' statement",
-                                       ProblemHighlightType.WEAK_WARNING,
+                                       ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
                                        RemoveRedundantIf(redundancyType, branchType))
             }
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSamConstructorInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSamConstructorInspection.kt
index 218f6a00bef..559683c794e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSamConstructorInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSamConstructorInspection.kt
@@ -98,7 +98,7 @@ class RedundantSamConstructorInspection : AbstractKotlinInspection() {
                             createProblemDescriptor(expression.valueArgumentList!!,
                                                     "Redundant SAM-constructors",
                                                     createQuickFix(samConstructorCalls),
-                                                    ProblemHighlightType.WEAK_WARNING,
+                                                    ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
                                                     isOnTheFly)
 
                     holder.registerProblem(problemDescriptor)
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceRangeToWithUntilInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceRangeToWithUntilInspection.kt
index d7a0b6427d4..8fe5e767115 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceRangeToWithUntilInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceRangeToWithUntilInspection.kt
@@ -51,7 +51,7 @@ class ReplaceRangeToWithUntilInspection : AbstractKotlinInspection() {
                 holder.registerProblem(
                         expression,
                         "'rangeTo' or the '..' call can be replaced with 'until'",
-                        ProblemHighlightType.WEAK_WARNING,
+                        ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
                         ReplaceWithUntilQuickFix()
                 )
             }