diff --git a/ionic/components/item/item.scss b/ionic/components/item/item.scss
index 3a90d459e7..11ce11c488 100644
--- a/ionic/components/item/item.scss
+++ b/ionic/components/item/item.scss
@@ -32,6 +32,7 @@
   align-self: stretch;
   box-sizing: border-box;
   flex: 1;
+  flex-direction: inherit;
 }
 
 .item-group {
diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss
index d422e8c326..11af19ebfb 100644
--- a/ionic/components/list/modes/ios.scss
+++ b/ionic/components/list/modes/ios.scss
@@ -77,10 +77,6 @@ $list-ios-header-color:               #333 !default;
     }
   }
 
-  ion-input.item {
-    border-bottom: 1px solid $item-ios-border-color;
-  }
-
   // If the item has the no-lines attribute remove the bottom border from:
   // the item itself (for last-child items)
   // the item-inner class (if it is not last)
diff --git a/ionic/components/text-input/modes/ios.scss b/ionic/components/text-input/modes/ios.scss
index b1d3f38a98..e793b76705 100644
--- a/ionic/components/text-input/modes/ios.scss
+++ b/ionic/components/text-input/modes/ios.scss
@@ -7,12 +7,9 @@ $input-label-ios-color:         #7f7f7f !default;
 
 .list,
 ion-card {
-  ion-input {
-    padding-right: ($item-ios-padding-right / 2);
-  }
 
   [text-input] {
-    margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom ($item-ios-padding-left / 2);
+    margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0;
     padding: 0;
   }
 
@@ -22,7 +19,7 @@ ion-card {
   }
 
   ion-label {
-    margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom ($item-ios-padding-left / 2);
+    margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0;
     color: $input-label-ios-color;
   }
 
diff --git a/ionic/components/text-input/text-input.ts b/ionic/components/text-input/text-input.ts
index 8f6e62e29c..f5e5f032ea 100644
--- a/ionic/components/text-input/text-input.ts
+++ b/ionic/components/text-input/text-input.ts
@@ -20,8 +20,10 @@ import {Platform} from '../../platform/platform';
     '(mouseup)': 'pointerEnd($event)'
   },
   template:
-    '<ng-content></ng-content>' +
-    '<input [type]="type" aria-hidden="true" scroll-assist *ng-if="scrollAssist">',
+    '<div class="item-inner">' +
+      '<ng-content></ng-content>' +
+      '<input [type]="type" aria-hidden="true" scroll-assist *ng-if="scrollAssist">' +
+    '</div>',
   directives: [NgIf, forwardRef(() => InputScrollAssist)]
 })
 export class TextInput {