diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/RegExpDialog.kt b/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/RegExpDialog.kt
index 3fd47c9577d3..6f364ed52281 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/RegExpDialog.kt
+++ b/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/RegExpDialog.kt
@@ -26,9 +26,7 @@ import com.intellij.ui.JBColor
 import com.intellij.ui.OnePixelSplitter
 import com.intellij.ui.SimpleListCellRenderer
 import com.intellij.ui.dsl.builder.*
-import com.intellij.ui.dsl.gridLayout.HorizontalAlign
 import com.intellij.ui.dsl.gridLayout.UnscaledGaps
-import com.intellij.ui.dsl.gridLayout.VerticalAlign
 import com.intellij.util.ui.JBUI
 import org.intellij.lang.regexp.RegExpBundle
 import org.intellij.lang.regexp.RegExpFileType
@@ -102,7 +100,7 @@ class RegExpDialog(val project: Project?, val editConfiguration: Boolean, defaul
       row {
         label(RegExpBundle.message("regexp.dialog.search.template"))
           .resizableColumn()
-          .horizontalAlign(HorizontalAlign.FILL)
+          .align(AlignX.FILL)
         val fileTypes = mutableListOf(UnknownFileType.INSTANCE)
         fileTypes.addAll(
           FileTypeManager.getInstance().registeredFileTypes.filterNotNull()
@@ -125,8 +123,7 @@ class RegExpDialog(val project: Project?, val editConfiguration: Boolean, defaul
     row {
       searchEditor = cell(createEditor(true))
         .resizableColumn()
-        .horizontalAlign(HorizontalAlign.FILL)
-        .verticalAlign(VerticalAlign.FILL)
+        .align(Align.FILL)
         .applyToComponent { addFocusListener(object : FocusAdapter() {
           override fun focusGained(e: FocusEvent?) {
             replaceEditorFocusedLast = false
@@ -139,7 +136,7 @@ class RegExpDialog(val project: Project?, val editConfiguration: Boolean, defaul
       row {
         replaceLabel = label(RegExpBundle.message("regexp.dialog.replace.template"))
           .resizableColumn()
-          .horizontalAlign(HorizontalAlign.FILL)
+          .align(AlignX.FILL)
           .component
         replaceButton = button(if (replace) RegExpBundle.message("button.search.only") else RegExpBundle.message("button.enable.replace")) {
           replace = !replace
@@ -150,8 +147,8 @@ class RegExpDialog(val project: Project?, val editConfiguration: Boolean, defaul
     replaceRow = row {
       replaceEditor = cell(createEditor(false))
         .resizableColumn()
-        .horizontalAlign(HorizontalAlign.FILL)
-        .verticalAlign(VerticalAlign.FILL).applyToComponent { addFocusListener(object : FocusAdapter() {
+        .align(Align.FILL)
+        .applyToComponent { addFocusListener(object : FocusAdapter() {
           override fun focusGained(e: FocusEvent?) {
             replaceEditorFocusedLast = true
           }
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/TextFieldsPanel.kt b/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/TextFieldsPanel.kt
index e57f3833acca..f6183d973b07 100644
--- a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/TextFieldsPanel.kt
+++ b/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/TextFieldsPanel.kt
@@ -23,7 +23,7 @@ internal class TextFieldsPanel: UISandboxPanel {
       row("Text field 2:") {
         textField()
           .align(AlignX.FILL)
-          .comment("horizontalAlign(HorizontalAlign.FILL)")
+          .comment("align(AlignX.FILL)")
       }
       row("Int text field 1:") {
         intTextField()