diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt
index 0e6ac142c9f..e8cdb62c851 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.psi.KtPsiFactory
 import javax.swing.JCheckBox
-import javax.swing.JComboBox
 import javax.swing.JComponent
 import javax.swing.JLabel
 import kotlin.properties.Delegates
@@ -31,7 +30,7 @@ class KotlinChangePropertySignatureDialog(
     private val methodDescriptor: KotlinMethodDescriptor,
     private val commandName: String?
 ) : RefactoringDialog(project, true) {
-    private val visibilityCombo = JComboBox(
+    private val visibilityCombo = ComboBox(
         arrayOf(Visibilities.INTERNAL, Visibilities.PRIVATE, Visibilities.PROTECTED, Visibilities.PUBLIC)
     )
     private val nameField = EditorTextField(methodDescriptor.name)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt
new file mode 100644
index 00000000000..4cefdac0746
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui
+
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.Messages
+import com.intellij.openapi.ui.Messages.OkCancelResult
+import org.jetbrains.kotlin.descriptors.Visibility
+import javax.swing.Icon
+
+// BUNCH: 193
+
+@OkCancelResult
+fun showOkCancelDialog(
+    project: Project?,
+    message: String?,
+    title: String,
+    icon: Icon?
+): Int {
+    return Messages.showOkCancelDialog(
+        project,
+        message,
+        title,
+        icon
+    )
+}
+
+typealias ComboBox = javax.swing.JComboBox<Visibility>
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193
new file mode 100644
index 00000000000..7eb46555ce0
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui
+
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.Messages
+import com.intellij.openapi.ui.Messages.OkCancelResult
+import javax.swing.Icon
+
+// BUNCH: 193
+
+@OkCancelResult
+fun showOkCancelDialog(
+    project: Project?,
+    message: String?,
+    title: String,
+    icon: Icon?
+): Int {
+    return Messages.showOkCancelDialog(
+        project,
+        message,
+        title,
+        Messages.OK_BUTTON,
+        Messages.CANCEL_BUTTON,
+        icon
+    )
+}
+
+typealias ComboBox = com.intellij.openapi.ui.ComboBox<Visibility>
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
index f9250b70772..686339f4c0b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
@@ -332,7 +332,7 @@ class KotlinChangeSignatureDialog(
         if (myMethod.canChangeReturnType() == MethodDescriptor.ReadWriteOption.ReadWrite &&
             myReturnTypeCodeFragment.getTypeInfo(isCovariant = true, forPreview = false, reanalyse = true).type == null
         ) {
-            if (Messages.showOkCancelDialog(
+            if (showOkCancelDialog(
                     myProject,
                     KotlinBundle.message("message.text.return.type.cannot.be.resolved",
                         myReturnTypeCodeFragment?.text.toString()
@@ -351,7 +351,7 @@ class KotlinChangeSignatureDialog(
                     KotlinBundle.message("text.parameter.0", item.parameter.name)
                 else
                     KotlinBundle.message("text.receiver")
-                if (Messages.showOkCancelDialog(
+                if (showOkCancelDialog(
                         myProject,
                         KotlinBundle.message("message.type.for.cannot.be.resolved",
                             item.typeCodeFragment.text,
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt.192 b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt.192
index 4a024b186e1..b5549c02a30 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt.192
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt.192
@@ -334,7 +334,7 @@ class KotlinChangeSignatureDialog(
         if (myMethod.canChangeReturnType() == MethodDescriptor.ReadWriteOption.ReadWrite &&
             myReturnTypeCodeFragment.getTypeInfo(isCovariant = true, forPreview = false).type == null
         ) {
-            if (Messages.showOkCancelDialog(
+            if (showOkCancelDialog(
                     myProject,
                     KotlinBundle.message("message.text.return.type.cannot.be.resolved",
                         myReturnTypeCodeFragment?.text.toString()
@@ -353,7 +353,7 @@ class KotlinChangeSignatureDialog(
                     KotlinBundle.message("text.parameter.0", item.parameter.name)
                 else
                     KotlinBundle.message("text.receiver")
-                if (Messages.showOkCancelDialog(
+                if (showOkCancelDialog(
                         myProject,
                         KotlinBundle.message("message.type.for.cannot.be.resolved",
                             item.typeCodeFragment.text,