diff --git a/modules/ve-mw/tests/browser/features/step_definitions/headings_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/headings_steps.rb
index 15ba70ed5b..df62a187b4 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/headings_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/headings_steps.rb
@@ -31,5 +31,5 @@ When(/^I click Subheading4$/) do
 end
 
 When(/^I click the down arrow on the Headings menu$/) do
-  on(VisualEditorPage).toolbar_format_element.when_present.click
+  on(VisualEditorPage).format_indicator_down_element.when_present.click
 end
diff --git a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 5d6b97d1c5..eb98e1337f 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -51,7 +51,7 @@ Given(/^I go to "(.*?)" page containing math formula/) do |page_title|
 end
 
 When(/^I click on the Insert menu$/) do
-  on(VisualEditorPage).insert_menu_element.when_present.click
+  on(VisualEditorPage).insert_indicator_down_element.when_present.click
 end
 
 When(/^I click on the Special character option in Insert menu$/) do
@@ -81,7 +81,7 @@ When(/^I click on Insert media button$/) do
 end
 
 When(/^I click on Cite menu$/) do
-  on(VisualEditorPage).cite_menu_element.when_present.click
+  on(VisualEditorPage).cite_indicator_down_element.when_present.click
 end
 
 When(/^I send right arrow times (\d+)$/) do |number|
@@ -132,7 +132,7 @@ Then(/^I should see Headings pull-down menu$/) do
 end
 
 Then(/^I take screenshot of pull-dowm menu$/) do
-  capture_screenshot("#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png", [@current_page.toolbar_format_element, @current_page.heading_dropdown_menus_element])
+  capture_screenshot("#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png", [@current_page.format_indicator_down_element, @current_page.heading_dropdown_menus_element])
 end
 
 Then(/^I should see Formatting pull-down menu$/) do
@@ -162,13 +162,13 @@ Then(/^I take screenshot of insert pull-down menu$/) do
   step 'I click on More in insert pull-down menu'
   capture_screenshot(
     "#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png",
-    [@current_page.insert_menu_element, @current_page.insert_pull_down_element]
+    [@current_page.insert_indicator_down_element, @current_page.insert_pull_down_element]
   )
 
   highlight @current_page.media_insert_menu_element
   capture_screenshot(
     "VisualEditor_Media_Insert_Menu-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png",
-    [@current_page.insert_menu_element, @current_page.insert_pull_down_element],
+    [@current_page.insert_indicator_down_element, @current_page.insert_pull_down_element],
     nil,
     0
   )
@@ -177,7 +177,7 @@ Then(/^I take screenshot of insert pull-down menu$/) do
   highlight @current_page.template_insert_menu_element
   capture_screenshot(
     "VisualEditor_Template_Insert_Menu-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png",
-    [@current_page.insert_menu_element, @current_page.insert_pull_down_element],
+    [@current_page.insert_indicator_down_element, @current_page.insert_pull_down_element],
     nil,
     0
   )
@@ -186,7 +186,7 @@ Then(/^I take screenshot of insert pull-down menu$/) do
   highlight @current_page.ref_list_insert_menu_element
   capture_screenshot(
     "VisualEditor_References_List_Insert_Menu-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png",
-    [@current_page.insert_menu_element, @current_page.insert_pull_down_element],
+    [@current_page.insert_indicator_down_element, @current_page.insert_pull_down_element],
     nil,
     0
   )
@@ -195,7 +195,7 @@ Then(/^I take screenshot of insert pull-down menu$/) do
   highlight @current_page.formula_insert_menu_element
   capture_screenshot(
     "VisualEditor_Formula_Insert_Menu-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png",
-    [@current_page.insert_menu_element, @current_page.insert_pull_down_element],
+    [@current_page.insert_indicator_down_element, @current_page.insert_pull_down_element],
     nil,
     0
   )
@@ -269,7 +269,7 @@ end
 
 Then (/^I should see Cite dropdown menu$/) do
   on(VisualEditorPage).cite_pull_down_element.when_present.should be_visible
-  capture_screenshot("#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png", [@current_page.cite_pull_down_element, @current_page.cite_menu_element])
+  capture_screenshot("#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png", [@current_page.cite_pull_down_element, @current_page.cite_indicator_down_element])
 end
 
 Then(/^I should see Reference icon$/) do
diff --git a/modules/ve-mw/tests/browser/features/step_definitions/media_interface_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/media_interface_steps.rb
index 11dea2baeb..92cba2226d 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/media_interface_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/media_interface_steps.rb
@@ -1,6 +1,6 @@
 When(/^I click Media$/) do
   on(VisualEditorPage) do |page|
-    page.insert_menu_element.when_present.click
+    page.insert_indicator_down_element.when_present.click
     page.ve_media_menu_element.when_present.click
   end
 end
diff --git a/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb
index 1997dd13e0..70c4700265 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb
@@ -18,7 +18,7 @@ end
 
 When(/^I click Reference$/) do
   on(VisualEditorPage) do |page|
-    page.insert_menu_element.when_present.click
+    page.insert_indicator_down_element.when_present.click
     page.ve_more_references_options_element.when_present.click
     page.ve_references_element.when_present.click
   end
@@ -58,5 +58,5 @@ Then(/^I should see Insert reference button enabled$/) do
 end
 
 Then(/^link to Insert menu should be visible$/) do
-  expect(on(VisualEditorPage).insert_menu_element).to be_visible
+  expect(on(VisualEditorPage).insert_indicator_element).to be_visible
 end
diff --git a/modules/ve-mw/tests/browser/features/step_definitions/transclusion_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/transclusion_steps.rb
index fd79bd141f..d0ed4f3bed 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/transclusion_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/transclusion_steps.rb
@@ -16,7 +16,7 @@ end
 
 Given(/^I click Transclusion$/) do
   on(VisualEditorPage) do |page|
-    page.insert_menu_element.when_present.click
+    page.insert_indicator_down_element.when_present.click
     page.transclusion_element.when_present.click
   end
 end
diff --git a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index d6f832661b..51cdebd095 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -26,7 +26,7 @@ class VisualEditorPage
   text_field(:cite_custom_field_name, css: '.oo-ui-searchWidget-query > div:nth-child(1) > input:nth-child(1)')
   div(:cite_group_name_textarea, class: 'oo-ui-widget oo-ui-widget-enabled oo-ui-inputWidget oo-ui-indicatorElement oo-ui-textInputWidget')
   a(:cite_journal, css: '.oo-ui-tool-name-cite-journal > a:nth-child(1)')
-  span(:cite_menu, css: '.ve-test-toolbar-cite .oo-ui-indicator-down')
+  span(:cite_indicator_down, css: '.ve-test-toolbar-cite .oo-ui-indicator-down')
   div(:cite_new_field_label, css: '.oo-ui-optionWidget')
   text_area(:cite_new_website_field, css: 'div.oo-ui-layout:nth-child(10) > div:nth-child(3) > div:nth-child(1) > textarea:nth-child(1)')
   a(:cite_news, css: '.oo-ui-tool-name-cite-news > a:nth-child(1)')
@@ -48,7 +48,7 @@ class VisualEditorPage
   div(:disabled_save_button, css: 'div.ve-init-mw-viewPageTarget-toolbar-actions > div.oo-ui-flaggedElement-progressive.oo-ui-widget-disabled')
   text_field(:display_title_textbox, css: 'div.oo-ui-fieldLayout-align-inline:nth-child(4) > label:nth-child(1) > div:nth-child(1) > div:nth-child(1) > input:nth-child(1)')
   text_field(:redirect_page_name_textbox, css: '.oo-ui-flaggedElement-invalid > input:nth-child(1)')
-  span(:toolbar_format, css: '.ve-test-toolbar-format .oo-ui-indicator-down')
+  span(:format_indicator_down, css: '.ve-test-toolbar-format .oo-ui-indicator-down')
   a(:edit_ve, title: /Edit this page with VisualEditor/)
   a(:edit_wikitext, title: /You can edit this page\./)
   span(:ex, text: 'Return to save form')
@@ -65,7 +65,7 @@ class VisualEditorPage
   div(:indentation_pull_down, class: 'oo-ui-toolGroup-tools oo-ui-clippableElement-clippable', index: 3)
   span(:insert_citation, css: '.ve-ui-nodeDialog > div:nth-child(1) > div:nth-child(1) > div:nth-child(3) > div:nth-child(1) > a:nth-child(1) > span:nth-child(2)
 ')
-  span(:insert_menu, css: '.ve-test-toolbar-insert .oo-ui-indicator-down')
+  span(:insert_indicator_down, css: '.ve-test-toolbar-insert .oo-ui-indicator-down')
   a(:insert_more_fewer, css: '.ve-test-toolbar-insert .oo-ui-tool-name-more-fewer .oo-ui-tool-link')
   div(:insert_pull_down, class: 've-test-toolbar-insert')
   div(:insert_references, class: 'oo-ui-processDialog-location')