diff --git a/Wallet.makefile b/Wallet.makefile
index 707bcffd39..20ead97244 100644
--- a/Wallet.makefile
+++ b/Wallet.makefile
@@ -12,7 +12,7 @@ WALLET_BUCK_OPTIONS=\
 	--config custom.distributionProvisioningProfileApp="${WALLET_DISTRIBUTION_PROVISIONING_PROFILE_APP}" \
 	--config custom.apiId="${API_ID}" \
 	--config custom.apiHash="${API_HASH}" \
-	--config custom.hockeyAppId="${HOCKEYAPP_ID}" \
+	--config custom.appCenterId="0" \
 	--config custom.isInternalBuild="${IS_INTERNAL_BUILD}" \
 	--config custom.isAppStoreBuild="${IS_APPSTORE_BUILD}" \
 	--config custom.appStoreId="${APPSTORE_ID}" \
diff --git a/Wallet/Sources/AppDelegate.swift b/Wallet/Sources/AppDelegate.swift
index ebc8cc17ed..cefa741684 100644
--- a/Wallet/Sources/AppDelegate.swift
+++ b/Wallet/Sources/AppDelegate.swift
@@ -595,7 +595,8 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
                     secondaryColor: UIColor(rgb: 0x5e5e5e),
                     accentColor: accentColor,
                     destructiveColor: UIColor(rgb: 0xff3b30),
-                    disabledColor: UIColor(rgb: 0xd0d0d0)
+                    disabledColor: UIColor(rgb: 0xd0d0d0),
+                    baseFontSize: 17.0
                 ),
                 actionSheet: ActionSheetControllerTheme(
                     dimColor: UIColor(white: 0.0, alpha: 0.4),
@@ -611,7 +612,8 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
                     controlColor: UIColor(rgb: 0x7e8791),
                     switchFrameColor: UIColor(rgb: 0xe0e0e0),
                     switchContentColor: UIColor(rgb: 0x77d572),
-                    switchHandleColor: UIColor(rgb: 0xffffff)
+                    switchHandleColor: UIColor(rgb: 0xffffff),
+                    baseFontSize: 17.0
                 )
             ), strings: WalletStrings(
                 primaryComponent: WalletStringsComponent(
diff --git a/submodules/WalletUI/BUCK b/submodules/WalletUI/BUCK
index cbda117102..5194a2e218 100644
--- a/submodules/WalletUI/BUCK
+++ b/submodules/WalletUI/BUCK
@@ -37,8 +37,8 @@ static_library(
         "//submodules/LocalAuth:LocalAuth",
         "//submodules/ScreenCaptureDetection:ScreenCaptureDetection",
         "//submodules/AnimatedStickerNode:AnimatedStickerNode",
-        #"//submodules/WalletUrl:WalletUrl",
-        #"//submodules/WalletCore:WalletCore",
+        "//submodules/WalletUrl:WalletUrl",
+        "//submodules/WalletCore:WalletCore",
         "//submodules/StringPluralization:StringPluralization",
         "//submodules/ActivityIndicator:ActivityIndicator",
         "//submodules/ProgressNavigationButtonNode:ProgressNavigationButtonNode",