diff --git a/features/images/UnsafeBrowserNoProxySelected.png b/features/images/BrowserNoProxySelected.png
similarity index 100%
rename from features/images/UnsafeBrowserNoProxySelected.png
rename to features/images/BrowserNoProxySelected.png
diff --git a/features/images/BrowserPreferencesPage.png b/features/images/BrowserPreferencesPage.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6cd2c771cd89690ad9e1f0c02e4ea7f2a942804
Binary files /dev/null and b/features/images/BrowserPreferencesPage.png differ
diff --git a/features/images/BrowserPreferencesProxyHeading.png b/features/images/BrowserPreferencesProxyHeading.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab0e54e60fec50b93e4fc9e4b7cd86928c985af2
Binary files /dev/null and b/features/images/BrowserPreferencesProxyHeading.png differ
diff --git a/features/images/BrowserPreferencesProxySettingsButton.png b/features/images/BrowserPreferencesProxySettingsButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e79acc5a50f450bc32b9d9dfc5dac53f58ab76c
Binary files /dev/null and b/features/images/BrowserPreferencesProxySettingsButton.png differ
diff --git a/features/images/BrowserProxyRefused.png b/features/images/BrowserProxyRefused.png
new file mode 100644
index 0000000000000000000000000000000000000000..78338721eb7e00f140b8719fa862b890a45b2aec
Binary files /dev/null and b/features/images/BrowserProxyRefused.png differ
diff --git a/features/images/BrowserProxySettingsWindow.png b/features/images/BrowserProxySettingsWindow.png
new file mode 100644
index 0000000000000000000000000000000000000000..167e3930e3f4fcd65345ebfe82dc499f19562814
Binary files /dev/null and b/features/images/BrowserProxySettingsWindow.png differ
diff --git a/features/images/UnsafeBrowserAdvancedSettingsButton.png b/features/images/UnsafeBrowserAdvancedSettingsButton.png
deleted file mode 100644
index 97a02b05b6ac96e4ab62dcf457a722a1a98b885f..0000000000000000000000000000000000000000
Binary files a/features/images/UnsafeBrowserAdvancedSettingsButton.png and /dev/null differ
diff --git a/features/images/UnsafeBrowserMenuButton.png b/features/images/UnsafeBrowserMenuButton.png
deleted file mode 100644
index b3f9e7ed8a1c3a89f173300b2096fbec28af20c8..0000000000000000000000000000000000000000
Binary files a/features/images/UnsafeBrowserMenuButton.png and /dev/null differ
diff --git a/features/images/UnsafeBrowserNetworkTab.png b/features/images/UnsafeBrowserNetworkTab.png
deleted file mode 100644
index 2c6c0ef55d76a630588318b6009e08e91c2af49a..0000000000000000000000000000000000000000
Binary files a/features/images/UnsafeBrowserNetworkTab.png and /dev/null differ
diff --git a/features/images/UnsafeBrowserNetworkTabAlreadySelected.png b/features/images/UnsafeBrowserNetworkTabAlreadySelected.png
deleted file mode 100644
index 6ad45311e1bdf7048840c19fc7b4fbb7f8aee290..0000000000000000000000000000000000000000
Binary files a/features/images/UnsafeBrowserNetworkTabAlreadySelected.png and /dev/null differ
diff --git a/features/images/UnsafeBrowserNetworkTabSettingsButton.png b/features/images/UnsafeBrowserNetworkTabSettingsButton.png
deleted file mode 100644
index ba25ea88fea76026cafa67ea010964d08d3a9a28..0000000000000000000000000000000000000000
Binary files a/features/images/UnsafeBrowserNetworkTabSettingsButton.png and /dev/null differ
diff --git a/features/images/UnsafeBrowserPreferencesButton.png b/features/images/UnsafeBrowserPreferencesButton.png
deleted file mode 100644
index 7dc6e87903bc6ca192cf731d59f93bd749e4e396..0000000000000000000000000000000000000000
Binary files a/features/images/UnsafeBrowserPreferencesButton.png and /dev/null differ
diff --git a/features/images/UnsafeBrowserProxyRefused.png b/features/images/UnsafeBrowserProxyRefused.png
deleted file mode 100644
index 582987801c3c18098ea5a13c41d4b2ec7c605a5c..0000000000000000000000000000000000000000
Binary files a/features/images/UnsafeBrowserProxyRefused.png and /dev/null differ
diff --git a/features/images/UnsafeBrowserProxySettingsOkButton.png b/features/images/UnsafeBrowserProxySettingsOkButton.png
deleted file mode 100644
index b7488fc00a88fbb17fb1299ea82c0df73eaf5b97..0000000000000000000000000000000000000000
Binary files a/features/images/UnsafeBrowserProxySettingsOkButton.png and /dev/null differ
diff --git a/features/images/UnsafeBrowserProxySettingsWindow.png b/features/images/UnsafeBrowserProxySettingsWindow.png
deleted file mode 100644
index 8794975c412cfa7f2127197ef7737dbc4a725fde..0000000000000000000000000000000000000000
Binary files a/features/images/UnsafeBrowserProxySettingsWindow.png and /dev/null differ
diff --git a/features/step_definitions/unsafe_browser.rb b/features/step_definitions/unsafe_browser.rb
index 305742921463eee84c35169811f6394307374eb5..5976e1738351a09575bc0d20026e117cca283dcc 100644
--- a/features/step_definitions/unsafe_browser.rb
+++ b/features/step_definitions/unsafe_browser.rb
@@ -117,6 +117,15 @@ Then /^I can start the Unsafe Browser again$/ do
   step "I start the Unsafe Browser"
 end
 
+Then /^I open the Unsafe Browser proxy settings dialog$/ do
+  step "I open the address \"about:preferences\" in the Unsafe Browser"
+  @screen.wait('BrowserPreferencesPage.png', 10)
+  @screen.type('proxy')
+  @screen.wait('BrowserPreferencesProxyHeading.png', 10)
+  @screen.wait_and_click('BrowserPreferencesProxySettingsButton.png', 10)
+  @screen.wait('BrowserProxySettingsWindow.png', 10)
+end
+
 Then /^I cannot configure the Unsafe Browser to use any local proxies$/ do
   socks_proxy = 'C' # Alt+Shift+c for socks proxy
   socksport_lines =
@@ -128,15 +137,7 @@ Then /^I cannot configure the Unsafe Browser to use any local proxies$/ do
   proxies.each do |proxy_type, proxy_host, proxy_port|
     @screen.hide_cursor
 
-    # Open proxy settings
-    @screen.click('UnsafeBrowserMenuButton.png')
-    @screen.wait_and_click('UnsafeBrowserPreferencesButton.png', 10)
-    @screen.wait_and_click('UnsafeBrowserAdvancedSettingsButton.png', 10)
-    hit, _ = @screen.waitAny(['UnsafeBrowserNetworkTabAlreadySelected.png',
-                              'UnsafeBrowserNetworkTab.png'], 10)
-    @screen.click(hit) if hit == 'UnsafeBrowserNetworkTab.png'
-    @screen.wait_and_click('UnsafeBrowserNetworkTabSettingsButton.png', 10)
-    @screen.wait_and_click('UnsafeBrowserProxySettingsWindow.png', 10)
+    step "I open the Unsafe Browser proxy settings dialog"
 
     # Ensure the desired proxy configuration
     @screen.type("M", Sikuli::KeyModifier.ALT)
@@ -144,25 +145,20 @@ Then /^I cannot configure the Unsafe Browser to use any local proxies$/ do
     @screen.type(proxy_host + Sikuli::Key.TAB + proxy_port)
 
     # Close settings
-    @screen.click('UnsafeBrowserProxySettingsOkButton.png')
-    @screen.waitVanish('UnsafeBrowserProxySettingsWindow.png', 10)
+    @screen.type(Sikuli::Key.ENTER)
+    @screen.waitVanish('BrowserProxySettingsWindow.png', 10)
 
     # Test that the proxy settings work as they should
     step 'I open Tails homepage in the Unsafe Browser'
-    @screen.wait('UnsafeBrowserProxyRefused.png', 60)
+    @screen.wait('BrowserProxyRefused.png', 60)
   end
 end
 
 Then /^the Unsafe Browser has no proxy configured$/ do
-  @screen.click('UnsafeBrowserMenuButton.png')
-  @screen.wait_and_click('UnsafeBrowserPreferencesButton.png', 10)
-  @screen.wait_and_click('UnsafeBrowserAdvancedSettingsButton.png', 10)
-  @screen.wait_and_click('UnsafeBrowserNetworkTab.png', 10)
-  @screen.wait_and_click('UnsafeBrowserNetworkTabSettingsButton.png', 10)
-  @screen.wait('UnsafeBrowserProxySettingsWindow.png', 10)
-  @screen.wait('UnsafeBrowserNoProxySelected.png', 10)
+  step "I open the Unsafe Browser proxy settings dialog"
+  @screen.wait('BrowserNoProxySelected.png', 10)
   @screen.type(Sikuli::Key.F4, Sikuli::KeyModifier.ALT)
-  @screen.type("w", Sikuli::KeyModifier.CTRL)
+  @screen.type(Sikuli::Key.ESC)
 end
 
 Then /^the Unsafe Browser complains that no DNS server is configured$/ do