             make.size.equalTo(toolset.backButton)
         }
 
+        buttonContainer.snp.makeConstraints { make in
+            make.centerY.equalTo(self)
+
+            preActivationConstraints.append(contentsOf: [
+                make.size.equalTo(0).constraint,
+                make.leading.equalTo(urlTextContainer.snp.trailing).inset(-UIConstants.layout.urlBarMargin).constraint,
+                make.trailing.equalTo(toolset.sendButton.snp.leading).constraint,
+            ])
+
+            postActivationConstraints.append(contentsOf: [
+                make.width.greaterThanOrEqualTo(hiddenDeleteButton).constraint,
+                make.width.greaterThanOrEqualTo(cancelButton).constraint,
+                make.width.greaterThanOrEqualTo(self).multipliedBy(toolsetButtonWidthMultiplier).constraint,
+                make.leading.equalTo(urlTextContainer.snp.trailing).inset(-12).constraint,
+                make.trailing.equalTo(toolset.sendButton.snp.leading).inset(-12).constraint,
+            ])
+        }
+
         deleteButton.snp.makeConstraints { make in
-            make.centerY.equalTo(urlTextContainer)
+            make.center.equalTo(buttonContainer)
             isEditingConstraints.append(make.size.equalTo(0).constraint)
-            notEditingConstraints.append(make.leading.equalTo(urlTextContainer.snp.trailing).inset(-8).constraint)
-            notEditingConstraints.append(make.trailing.equalTo(toolset.sendButton.snp.leading).inset(-8).constraint)
-            notEditingConstraints.append(make.width.greaterThanOrEqualTo(cancelButton).constraint)
+        }
+
+        hiddenDeleteButton.snp.makeConstraints { make in
+            make.center.equalTo(buttonContainer)
         }
 
         cancelButton.snp.makeConstraints { make in
-            make.center.equalTo(deleteButton)
-            isEditingConstraints.append(make.leading.equalTo(urlTextContainer.snp.trailing).inset(-8).priority(999).constraint)
-            isEditingConstraints.append(make.trailing.equalTo(toolset.sendButton.snp.leading).inset(-8).constraint)
-            preActivationConstraints.append(make.leading.equalTo(urlTextContainer.snp.trailing).constraint)
-            preActivationConstraints.append(make.size.equalTo(0).constraint)
-            postActivationConstraints.append(make.width.greaterThanOrEqualTo(self).multipliedBy(toolsetButtonWidthMultiplier).constraint)
+            make.center.equalTo(buttonContainer)
         }
 
         progressBar.snp.makeConstraints { make in

            make.leading.greaterThanOrEqualTo(urlTextContainer).priority(999)
            make.trailing.lessThanOrEqualTo(urlTextContainer)

            centeredURLConstraint = make.centerX.equalTo(self).constraint
            fullWidthURLTextConstraint = make.leading.trailing.equalTo(urlTextContainer).constraint
        }

        lockIcon.snp.makeConstraints { make in

            make.edges.equalTo(urlTextContainer)
        }

        centeredURLConstraints.forEach { $0.deactivate() }
        showToolsetConstraints.forEach { $0.deactivate() }
        postActivationConstraints.forEach { $0.deactivate() }
    }

