diff --git a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
index 8e5336fa6f94..ce9999a2ee6c 100644
--- a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
+++ b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
@@ -39,7 +39,7 @@ enum FeatureFlag: Int, CaseIterable {
         case .googleDomainsCard:
             return false
         case .newTabIcons:
-            return BuildConfiguration.current == .localDeveloper
+            return true
         }
     }
 
diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController+Swift.swift b/WordPress/Classes/ViewRelated/System/WPTabBarController+Swift.swift
index a6becc8df5a2..98d2a9e5e4eb 100644
--- a/WordPress/Classes/ViewRelated/System/WPTabBarController+Swift.swift
+++ b/WordPress/Classes/ViewRelated/System/WPTabBarController+Swift.swift
@@ -109,8 +109,13 @@ extension WPTabBarController {
 
     @objc func animateSelectedItem(_ item: UITabBarItem, for tabBar: UITabBar) {
 
-        guard let index = tabBar.items?.firstIndex(of: item), tabBar.subviews.count > index + 1,
-              let imageView = tabBar.subviews[index + 1].subviews.last as? UIImageView else {
+        guard let index = tabBar.items?.firstIndex(of: item), tabBar.subviews.count > index + 1 else {
+            return
+        }
+
+        let button = tabBar.subviews[(index + 1)]
+
+        guard let imageView = button.subviews.lazy.compactMap({ $0 as? UIImageView }).first else {
             return
         }