 }
 
 
-public class ElloPostButton: ElloButton {
-    var pencilView: UIImageView!
-
-    override public var highlighted: Bool {
-        didSet {
-            updateStyle()
-        }
-    }
-
-    override func sharedSetup() {
-        setTitle(NSLocalizedString("Post", comment: "Post button title"), forState: .Normal)
-        titleLabel?.font = UIFont.defaultFont()
-        setTitleColor(UIColor.whiteColor(), forState: .Normal)
-        setTitleColor(UIColor.greyA(), forState: .Highlighted)
-        setTitleColor(UIColor.whiteColor(), forState: .Disabled)
-
-        let image = Interface.Image.Pencil.whiteImage
-        pencilView = UIImageView(image: image)
-        pencilView.center = bounds.center
-        pencilView.autoresizingMask = [.FlexibleRightMargin, .FlexibleTopMargin, .FlexibleBottomMargin]
-        addSubview(pencilView)
-
-        updateStyle()
-    }
-
-    override func updateStyle() {
-        let image = highlighted ? Interface.Image.Pencil.normalImage : Interface.Image.Pencil.whiteImage
-        pencilView.image = image
-
-        backgroundColor = enabled ? .blackColor() : .greyA()
-    }
-
-    override public func layoutSubviews() {
-        super.layoutSubviews()
-        pencilView.frame.origin.x = 10
-        pencilView.center.y = bounds.size.height / 2
-        layer.cornerRadius = min(bounds.size.width, bounds.size.height) / 2
-    }
-
-}
-
-
 public class OmnibarScreen: UIView, OmnibarScreenProtocol {
     struct Size {
-        static let margins = UIEdgeInsets(top: 17, left: 15, bottom: 10, right: 15)
+        static let margins = UIEdgeInsets(top: 17, left: 15, bottom: 10, right: 21)
         static let toolbarMargin = CGFloat(10)
         static let tableTopInset = CGFloat(22.5)
         static let bottomTextMargin = CGFloat(1)

            x += Size.keyboardButtonMargin
        }
        let remainingCameraWidth = frame.width - x
        keyboardCameraButton.frame.origin.x = keyboardButtonView.frame.width - remainingCameraWidth
        keyboardCameraButton.frame.size.width = remainingCameraWidth
    }

    private func synchronizeScrollViews() {


        let toolbarTop = screenTop + Size.margins.top
        var buttonX = frame.width - Size.margins.right
        for view in toolbarButtonViews.reverse() {
            view.frame.size = view.intrinsicContentSize()
            buttonX -= view.frame.size.width
            view.frame.origin = CGPoint(x: buttonX, y: toolbarTop)
        }

        let avatarViewLeft = Size.margins.left
