diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 3552b5c2e..cfa3a9adb 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -74,6 +74,7 @@
 - **Dropdown** - Fixed issue where `forceSelection` would not occur when `pageLostFocus` (clicked into another tab and back)
 - **Dropdown/Tab** - Fixed an instance where `metadata` was not referencing settings metadata value
 - **Form Validation** - Fixed issue with `get value(s)` where unchecked checkboxes would not correctly retrieve values
+- **Input** `action input` and `labeled input` now have focused border on inner edge with label/button
 - **Form** - Dropdown in `inline field` now use auto width instead of 100%
 - **Grid / Container** - `ui relaxed grid container` and `ui very relaxed grid container` will now all render at same container width
 - **Icons** - Fixed issue where `active icon` or `emphasized icon` would not adjust opacity inside menus
diff --git a/src/definitions/collections/form.less b/src/definitions/collections/form.less
index de1c198ad..cb5f65b48 100755
--- a/src/definitions/collections/form.less
+++ b/src/definitions/collections/form.less
@@ -95,6 +95,11 @@
   vertical-align: top;
 }
 
+/* Collapse Input Flex */
+.ui.form .ui.input > input {
+  width: 0px !important;
+}
+
 /* Set max height on unusual input */
 .ui.form ::-webkit-datetime-edit,
 .ui.form ::-webkit-inner-spin-button {
@@ -130,11 +135,6 @@
   transition: @inputTransition;
 }
 
-/* Collapse Flex */
-.ui.form .ui.input > input {
-  width: 0px !important;
-}
-
 /* Text Area */
 .ui.form textarea {
   margin: 0em;
@@ -960,6 +960,15 @@
   vertical-align: middle;
   font-size: @inlineInputSize;
 }
+.ui.form .inline.fields .field > .ui.input,
+.ui.form .inline.field > .ui.input {
+  display: inline-flex;
+}
+.ui.form .inline.fields .field > .ui.input input,
+.ui.form .inline.field > .ui.input input {
+  width: 100% !important;
+}
+
 
 
 /* Label */
diff --git a/src/definitions/elements/input.less b/src/definitions/elements/input.less
index a22394f95..c87f35091 100755
--- a/src/definitions/elements/input.less
+++ b/src/definitions/elements/input.less
@@ -330,24 +330,20 @@
 
 /* Regular Label on Left */
 .ui.labeled.input:not([class*="corner labeled"]):not([class*="right labeled"]) > input {
-  /*border-left: none;*/
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
 }
 .ui.labeled.input:not([class*="corner labeled"]):not([class*="right labeled"]) > .label {
-  border-right: none;
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
 }
 
 /* Regular Label on Right */
 .ui[class*="right labeled"].input  > input {
-  /*border-right: none;*/
   border-top-right-radius: 0px !important;
   border-bottom-right-radius: 0px !important;
 }
 .ui[class*="right labeled"].input > .label {
-  border-left: none;
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
 }
@@ -412,7 +408,6 @@
 
 /* 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;
 }
@@ -428,6 +423,10 @@
 }
 
 /* Button on Left */
+.ui[class*="left action"].input > input {
+  border-top-left-radius: 0px !important;
+  border-bottom-left-radius: 0px !important;
+}
 .ui[class*="left action"].input > .dropdown,
 .ui[class*="left action"].input > .button,
 .ui[class*="left action"].input > .buttons > .button {
@@ -438,11 +437,6 @@
 .ui[class*="left action"].input > .buttons:first-child > .button {
   border-radius: @borderRadius 0px 0px @borderRadius;
 }
-.ui[class*="left action"].input > input {
-  border-left: none;
-  border-top-left-radius: 0px !important;
-  border-bottom-left-radius: 0px !important;
-}
 
 /*--------------------
        Inverted