diff --git a/packages/tabs/src/views/BottomTabBar.js b/packages/tabs/src/views/BottomTabBar.js
index 2679aaa8..758bc2de 100644
--- a/packages/tabs/src/views/BottomTabBar.js
+++ b/packages/tabs/src/views/BottomTabBar.js
@@ -129,7 +129,6 @@ class TabBarBottom extends React.Component<Props> {
         renderIcon={renderIcon}
         style={[
           styles.iconWithExplicitHeight,
-          styles.iconWithLabel,
           showLabel === false && !horizontal && styles.iconWithoutLabel,
           showLabel !== false && !horizontal && styles.iconWithLabel,
         ]}
@@ -213,7 +212,6 @@ class TabBarBottom extends React.Component<Props> {
                   this._shouldUseHorizontalLabels()
                     ? styles.tabLandscape
                     : styles.tabPortrait,
-                  styles.tabPortrait,
                   tabStyle,
                 ]}
               >
diff --git a/packages/tabs/src/views/CrossFadeIcon.js b/packages/tabs/src/views/CrossFadeIcon.js
index 9e57d606..ff291468 100644
--- a/packages/tabs/src/views/CrossFadeIcon.js
+++ b/packages/tabs/src/views/CrossFadeIcon.js
@@ -59,5 +59,7 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     height: '100%',
     width: '100%',
+    // Workaround for react-native >= 0.54 layout bug
+    minWidth: 25,
   },
 });