diff --git a/server/documents/elements/input.html.eco b/server/documents/elements/input.html.eco
index 7ab783665..59a65b5c4 100755
--- a/server/documents/elements/input.html.eco
+++ b/server/documents/elements/input.html.eco
@@ -102,10 +102,22 @@ themes      : ['Default']
       <div class="ui button">Search</div>
     </div>
   </div>
+  <div class="another example">
+    <div class="ui left action input">
+      <div class="ui teal labeled icon button">
+        <i class="cart icon"></i>
+        Checkout
+      </div>
+      <input type="text" value="$52.03">
+    </div>
+  </div>
   <div class="another example">
     <div class="ui action input">
       <input type="text" value="http://ww.short.url/c0opq">
-      <div class="ui teal right labeled icon button"><i class="copy icon"></i> Copy</div>
+      <div class="ui teal right labeled icon button">
+        <i class="copy icon"></i>
+        Copy
+      </div>
     </div>
   </div>
   <div class="another example">
diff --git a/src/definitions/elements/input.less b/src/definitions/elements/input.less
index 95ca39b32..48e543116 100755
--- a/src/definitions/elements/input.less
+++ b/src/definitions/elements/input.less
@@ -200,16 +200,16 @@
 }
 
 /* Left Icon Input */
-.ui.left.icon.input > .icon {
+.ui[class*="left icon"].input > .icon {
   right: auto;
   left: @borderWidth;
   border-radius: @borderRadius 0em 0em @borderRadius;
 }
-.ui.left.icon.input > .circular.icon {
+.ui[class*="left icon"].input > .circular.icon {
   right: auto;
   left: @circularIconHorizontalOffset;
 }
-.ui.left.icon.input > input {
+.ui[class*="left icon"].input > input {
   padding-left: @iconMargin !important;
   padding-right: @horizontalPadding !important;
 }
@@ -222,7 +222,7 @@
   padding-left: 0em !important;
   padding-right: @transparentIconMargin !important;
 }
-.ui.transparent.left.icon.input > input {
+.ui.transparent[class*="left icon"].input > input {
   padding-left: 0em !important;
   padding-left: @transparentIconMargin !important;
 }
@@ -266,16 +266,11 @@
 .ui.action.input > input {
   display: table-cell;
   vertical-align: top;
-  border-top-right-radius: 0px !important;
-  border-bottom-right-radius: 0px !important;
-  border-right: none;
 }
 .ui.action.input > .button,
 .ui.action.input > .buttons {
   display: table-cell;
   vertical-align: top;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
   white-space: nowrap;
 }
 .ui.action.input > .button > .icon,
@@ -292,6 +287,30 @@
   width: 0.01%;
 }
 
+/* Button on Right */
+.ui.action.input:not([class*="left action"]) > input {
+  border-right: none;
+  border-top-right-radius: 0px !important;
+  border-bottom-right-radius: 0px !important;
+}
+.ui.action.input:not([class*="left action"]) > .button,
+.ui.action.input:not([class*="left action"]) > .buttons {
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+
+/* Button on Left */
+.ui[class*="left action"].input > .button,
+.ui[class*="left action"].input > .buttons {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+.ui[class*="left action"].input  > input {
+  border-left: none;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+
 /*--------------------
         Fluid
 ---------------------*/