diff --git a/iphone/Maps/Common/Common.swift b/iphone/Maps/Common/Common.swift
index 9122f11925..418dd226eb 100644
--- a/iphone/Maps/Common/Common.swift
+++ b/iphone/Maps/Common/Common.swift
@@ -1,5 +1,18 @@
 import Foundation
 
-func IPAD() -> Bool { return UI_USER_INTERFACE_IDIOM() == .pad }
+fileprivate func IPAD() -> Bool { return UI_USER_INTERFACE_IDIOM() == .pad }
 
 func L(_ key: String) -> String { return NSLocalizedString(key, comment: "") }
+
+func val<T>(iPhone: T, iPad: T) -> T { return IPAD() ? iPad : iPhone }
+
+func iPadSpecific( _ f: () -> Void) {
+  if IPAD() {
+    f()
+  }
+}
+func iPhoneSpecific( _ f: () -> Void) {
+  if !IPAD() {
+    f()
+  }
+}
diff --git a/iphone/Maps/UI/Search/SearchBar.swift b/iphone/Maps/UI/Search/SearchBar.swift
index d2fa0bb167..f4e1ba5d51 100644
--- a/iphone/Maps/UI/Search/SearchBar.swift
+++ b/iphone/Maps/UI/Search/SearchBar.swift
@@ -2,5 +2,5 @@ import UIKit
 
 class SearchBar: SolidTouchView {
 
-  override var visibleAreaAffectDirection: VisibleArea.Direction { return IPAD() ? .left : .top }
+  override var visibleAreaAffectDirection: VisibleArea.Direction { return val(iPhone: .top, iPad: .left) }
 }
diff --git a/iphone/Maps/UI/Welcome/WelcomePageController.swift b/iphone/Maps/UI/Welcome/WelcomePageController.swift
index a60d868c49..47dcf37c80 100644
--- a/iphone/Maps/UI/Welcome/WelcomePageController.swift
+++ b/iphone/Maps/UI/Welcome/WelcomePageController.swift
@@ -50,7 +50,7 @@ final class WelcomePageController: UIPageViewController {
   override func viewDidLoad() {
     super.viewDidLoad()
     view.backgroundColor = UIColor.white()
-    if IPAD() {
+    iPadSpecific {
       let parentView = parentController.view!
       iPadBackgroundView = SolidTouchView(frame: parentView.bounds)
       iPadBackgroundView!.backgroundColor = UIColor.fadeBackground()
@@ -105,7 +105,8 @@ final class WelcomePageController: UIPageViewController {
 
   private func updateFrame() {
     let parentView = parentController.view!
-    view.frame = IPAD() ? CGRect(x: parentView.center.x - 260, y: parentView.center.y - 300, width: 520, height: 600) : CGRect(origin: CGPoint(), size: parentView.size)
+    view.frame = val(iPhone: CGRect(origin: CGPoint(), size: parentView.size),
+                     iPad: CGRect(x: parentView.center.x - 260, y: parentView.center.y - 300, width: 520, height: 600))
     (currentController as! WelcomeProtocolBase).updateSize()
   }