diff --git a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/MainToolbarUI.kt b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/MainToolbarUI.kt
index 24c4b368be78..1fee1988c009 100644
--- a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/MainToolbarUI.kt
+++ b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/MainToolbarUI.kt
@@ -11,7 +11,7 @@ class MainToolbarUI(data: ComponentData) : UiComponent(data) {
   val debugButton: UiComponent get() = x("//div[@myicon='debug.svg']")
   val moreButton: UiComponent get() = x("//div[@myicon='moreVertical.svg']")
   val searchButton: UiComponent get() = x("//div[@myicon='search.svg']")
-  val settingsButton: UiComponent get() = x("//div[@myicon='settings.svg']")
+  val settingsButton: UiComponent get() = x("//div[contains(@myaction, 'Settings')]")
   val runWidget get() = x(ActionButtonUi::class.java) { contains(byJavaClass("RedesignedRunConfigurationSelector")) }
   val cwmButton get() = x { byTooltip("Code With Me") }
 
diff --git a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/PopupUI.kt b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/PopupUI.kt
index 0d315e1d9ff7..0e47ae7482e1 100644
--- a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/PopupUI.kt
+++ b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/PopupUI.kt
@@ -52,7 +52,7 @@ open class PopupUiComponent(data: ComponentData) : UiComponent(data) {
   }
 }
 
-@Remote("com.intellij.openapi.actionSystem.impl.ActionMenuItem")
+@Remote("javax.swing.JMenu")
 interface PopupItemRef {
 
   fun isSelected(): Boolean