diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinPackageEntry.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinPackageEntry.kt
index 65b8f0fd54d..4989ee3a05d 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinPackageEntry.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinPackageEntry.kt
@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.idea.core.formatter
 
 import com.intellij.openapi.application.ApplicationBundle
-import org.jetbrains.kotlin.resolve.ImportPath
 
 class KotlinPackageEntry(
     packageName: String,
diff --git a/idea/resources-en/messages/KotlinBundle.properties b/idea/resources-en/messages/KotlinBundle.properties
index 427e4b5b94a..71a1914acc6 100644
--- a/idea/resources-en/messages/KotlinBundle.properties
+++ b/idea/resources-en/messages/KotlinBundle.properties
@@ -2213,4 +2213,9 @@ logger.initialized.with.foreign.class=Logger initialized with foreign class ''{0
 logger.factory.method.name=Logger factory method name
 logger.factory.class.name=Logger factory class name
 choose.logger.factory.class=Choose logger factory class
-codestyle.layout.import.aliases.separately=Import aliases separately
\ No newline at end of file
+codestyle.layout.import.aliases.separately=Import aliases separately
+button.add.package=Add Package
+listbox.import.package=Package
+listbox.import.with.subpackages=With Subpackages
+title.import.layout=Import Layout
+title.packages.to.use.import.with=Packages to Use Import with '*'
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/BaseKotlinImportLayoutPanel.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/BaseKotlinImportLayoutPanel.kt
index 7c6e76401ce..b27707a1ace 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/BaseKotlinImportLayoutPanel.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/BaseKotlinImportLayoutPanel.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.formatter
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonShortcuts
 import com.intellij.openapi.actionSystem.ShortcutSet
-import com.intellij.openapi.application.ApplicationBundle
 import com.intellij.openapi.wm.IdeFocusManager
 import com.intellij.ui.*
 import com.intellij.ui.components.JBCheckBox
@@ -166,7 +165,7 @@ open class BaseKotlinImportLayoutPanel(title: String) : JPanel(BorderLayout()) {
     }
 }
 
-class KotlinStarImportLayoutPanel : BaseKotlinImportLayoutPanel(ApplicationBundle.message("title.packages.to.use.import.with")) {
+class KotlinStarImportLayoutPanel : BaseKotlinImportLayoutPanel(KotlinBundle.message("title.packages.to.use.import.with")) {
     init {
         val importLayoutPanel = ToolbarDecorator.createDecorator(layoutTable)
             .setAddAction { addPackage() }
@@ -182,7 +181,7 @@ class KotlinStarImportLayoutPanel : BaseKotlinImportLayoutPanel(ApplicationBundl
     }
 }
 
-class KotlinImportOrderLayoutPanel : BaseKotlinImportLayoutPanel(ApplicationBundle.message("title.import.layout")) {
+class KotlinImportOrderLayoutPanel : BaseKotlinImportLayoutPanel(KotlinBundle.message("title.import.layout")) {
     private val cbImportAliasesSeparately = JBCheckBox(KotlinBundle.message("codestyle.layout.import.aliases.separately"))
 
     init {
@@ -190,7 +189,7 @@ class KotlinImportOrderLayoutPanel : BaseKotlinImportLayoutPanel(ApplicationBund
 
         val importLayoutPanel = ToolbarDecorator.createDecorator(layoutTable)
             .addExtraAction(
-                object : DumbAwareActionButton(ApplicationBundle.message("button.add.package"), IconUtil.getAddPackageIcon()) {
+                object : DumbAwareActionButton(KotlinBundle.message("button.add.package"), IconUtil.getAddPackageIcon()) {
                     override fun actionPerformed(event: AnActionEvent) {
                         addPackage()
                     }
@@ -257,7 +256,7 @@ class KotlinImportOrderLayoutPanel : BaseKotlinImportLayoutPanel(ApplicationBund
 }
 
 fun createTableForPackageEntries(packageTable: KotlinPackageEntryTable): JBTable {
-    val names = arrayOf(ApplicationBundle.message("listbox.import.package"), ApplicationBundle.message("listbox.import.with.subpackages"))
+    val names = arrayOf(KotlinBundle.message("listbox.import.package"), KotlinBundle.message("listbox.import.with.subpackages"))
     val packageNameColumnIndex = 0
     val withSubpackagesColumnIndex = 1