         app.textFields["URLBar.urlText"].tap()
         app.textFields["URLBar.urlText"].typeText("bugzilla.mozilla.org\n")
         waitForValueContains(app.textFields["URLBar.urlText"], value: "bugzilla.mozilla.org")
-        app.buttons["URLBar.pageActionsButton"].tap()
+        app.buttons["HomeView.settingsButton"].tap()
         app.tables["Context Menu"].cells["icon_openwith_active"].tap()
         snapshot("14ShareMenu")
     }
 
     func test05SafariIntegration() {
+        dismissURLBarFocused()
         app.buttons["HomeView.settingsButton"].tap()
+        app.tables.cells["icon_settings"].tap()
         app.tables.switches["BlockerToggle.Safari"].tap()
         snapshot("15SafariIntegrationInstructions")
     }

class SnapshotTests: XCTestCase {

    let app = XCUIApplication()
    let testRunningFirstRun = ["test01Screenshots"]

    override func setUp() {
        super.setUp()

        app.launch()
    }

    func test01FirstRunScreens() {
        snapshot("00FirstRun")
        app.swipeLeft()
        snapshot("01FirstRun")
        app.swipeLeft()
        snapshot("02FirstRun")
        waitForExistence(app.buttons["IntroViewController.button"], timeout: 5)
        app.buttons["IntroViewController.button"].tap()
        snapshot("03Home")
    }

    func test02Settings() {
        dismissURLBarFocused()
        app.buttons["HomeView.settingsButton"].tap()
        app.tables.cells["icon_settings"].tap()
        snapshot("08Settings")
        app.swipeUp()
        snapshot("9Settings")
