diff --git a/test/browser/agent_organization_profile_test.rb b/test/browser/agent_organization_profile_test.rb
index 6ba8d3e0e..66322654f 100644
--- a/test/browser/agent_organization_profile_test.rb
+++ b/test/browser/agent_organization_profile_test.rb
@@ -38,7 +38,7 @@ class AgentOrganizationProfileTest < TestCase
     sleep 2
 
     # check and change note again in edit screen
-    click( css: '.active .js-action .select-arrow', fast: true )
+    click( css: '.active .js-action .icon-arrow-down', fast: true )
     click( css: '.active .js-action a[data-type="edit"]' )
 
     watch_for(
diff --git a/test/browser/agent_ticket_actions_level0_test.rb b/test/browser/agent_ticket_actions_level0_test.rb
index b901ae59b..d9a9e69f4 100644
--- a/test/browser/agent_ticket_actions_level0_test.rb
+++ b/test/browser/agent_ticket_actions_level0_test.rb
@@ -230,7 +230,7 @@ class AgentTicketActionLevel0Test < TestCase
     )
     click(
       browser: browser2,
-      css: '.active div[data-tab="ticket"] .js-actions .select-arrow',
+      css: '.active div[data-tab="ticket"] .js-actions .icon-arrow-down',
     )
     click(
       browser: browser2,
diff --git a/test/browser/agent_ticket_actions_level1_test.rb b/test/browser/agent_ticket_actions_level1_test.rb
index d362bd576..43176184c 100644
--- a/test/browser/agent_ticket_actions_level1_test.rb
+++ b/test/browser/agent_ticket_actions_level1_test.rb
@@ -56,7 +56,7 @@ class AgentTicketActionLevel1Test < TestCase
     )
 
     # merge tickets
-    click( css: '.active div[data-tab="ticket"] .js-actions .select-arrow' )
+    click( css: '.active div[data-tab="ticket"] .js-actions .icon-arrow-down' )
     click( css: '.active div[data-tab="ticket"] .js-actions a[data-type="ticket-merge"]' )
     watch_for(
       css: '.modal',
@@ -113,7 +113,7 @@ class AgentTicketActionLevel1Test < TestCase
     )
 
     # merge tickets
-    click( css: '.active div[data-tab="ticket"] .js-actions .select-arrow' )
+    click( css: '.active div[data-tab="ticket"] .js-actions .icon-arrow-down' )
     click( css: '.active div[data-tab="ticket"] .js-actions a[data-type="ticket-merge"]' )
     watch_for(
       css: '.modal',
diff --git a/test/browser/agent_user_profile_test.rb b/test/browser/agent_user_profile_test.rb
index df9d3955d..4e9831bfe 100644
--- a/test/browser/agent_user_profile_test.rb
+++ b/test/browser/agent_user_profile_test.rb
@@ -36,7 +36,7 @@ class AgentUserProfileTest < TestCase
     sleep 2
 
     # check and change note again in edit screen
-    click( css: '.active .js-action .select-arrow' )
+    click( css: '.active .js-action .icon-arrow-down' )
     click( css: '.active .js-action a[data-type="edit"]' )
 
     watch_for(
diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb
index 0e17ff8a7..3a4f12c89 100644
--- a/test/browser_test_helper.rb
+++ b/test/browser_test_helper.rb
@@ -1053,7 +1053,7 @@ wait untill text in selector disabppears
       element.send_keys( :arrow_down )
       sleep 0.3
       instance.find_elements( { css: '.active .newTicket .recipientList-entry.js-user.is-active' } )[0].click
-      sleep 0.3
+      sleep 0.6
     end
 
     if data[:attachment]
@@ -1068,7 +1068,7 @@ wait untill text in selector disabppears
       assert( true, 'ticket created without submit' )
       return
     end
-    sleep 1.6
+    sleep 0.8
     #instance.execute_script( '$(".content.active .newTicket form").submit();' )
     instance.find_elements( { css: '.active .newTicket button.submit' } )[0].click
     sleep 1
@@ -1151,7 +1151,7 @@ wait untill text in selector disabppears
       # select tab
       click( browser: instance, css: '.active .tabsSidebar-tab[data-tab="customer"]')
 
-      click( browser: instance, css: '.active div[data-tab="customer"] .js-actions .select-arrow' )
+      click( browser: instance, css: '.active div[data-tab="customer"] .js-actions .icon-arrow-down' )
       click( browser: instance, css: '.active div[data-tab="customer"] .js-actions a[data-type="customer-change"]' )
       watch_for(
         browser: instance,