diff --git a/ui_framework/components/form/_check_box.scss b/ui_framework/components/form/_check_box.scss
index 2d3b73ea7008a..ad5cf90581802 100644
--- a/ui_framework/components/form/_check_box.scss
+++ b/ui_framework/components/form/_check_box.scss
@@ -20,8 +20,7 @@
 
   &:before {
     position: relative;
-    top: -0.05em;
-    left: 0.15em;
+    left: 0.25em;
     font-family: FontAwesome;
     content: "\F00C";
     font-size: 1em;
diff --git a/ui_framework/components/index.scss b/ui_framework/components/index.scss
index 1f919e32752b6..870485c85adf3 100644
--- a/ui_framework/components/index.scss
+++ b/ui_framework/components/index.scss
@@ -229,6 +229,11 @@ $verticalRhythm: 10px;
 
 * {
   box-sizing: border-box;
+
+  &:before,
+  &:after {
+    box-sizing: border-box;
+  }
 }
 
 body {
diff --git a/ui_framework/components/tool_bar/_tool_bar_search.scss b/ui_framework/components/tool_bar/_tool_bar_search.scss
index 67ad2a543eb15..20905bcd93233 100644
--- a/ui_framework/components/tool_bar/_tool_bar_search.scss
+++ b/ui_framework/components/tool_bar/_tool_bar_search.scss
@@ -27,12 +27,14 @@
 .kuiToolBarSearchBox {
   flex: 1 1 auto;
   position: relative;
+  font-size: $fontSize;
 }
 
   .kuiToolBarSearchBox__icon {
     position: absolute;
-    top: 6px;
-    left: 8px;
+    top: 0.5em;
+    left: 0.7em;
+    font-size: 1em;
     font-size: 14px;
     color: #ACACAC;
   }
@@ -43,14 +45,15 @@
   .kuiToolBarSearchBox__input {
     width: 100%;
     min-width: 200px;
-    padding: 5px 12px 6px 28px;
+    padding: 4px 12px 5px 28px;
+    font-family: $font; /* 1 */
     background-color: #FFFFFF;
     color: $fontColor;
-    border: 1px solid #FFFFFF;
     border-radius: $buttonBorderRadius;
-    font-size: $fontSize;
+    font-size: 1em;
     border: 1px solid #ffffff;
     line-height: normal; /* 1 */
+    transition: border-color $formTransitionTiming;
 
     &:focus {
       @include formControlFocus;
diff --git a/ui_framework/dist/ui_framework.css b/ui_framework/dist/ui_framework.css
index 87b70556c9e44..7a285748e2159 100644
--- a/ui_framework/dist/ui_framework.css
+++ b/ui_framework/dist/ui_framework.css
@@ -25,6 +25,8 @@
  */
 * {
   box-sizing: border-box; }
+  *:before, *:after {
+    box-sizing: border-box; }
 
 body {
   font-family: "Open Sans", Helvetica, Arial, sans-serif; }
@@ -302,8 +304,7 @@ body {
   transition: background-color 0.1s linear; }
   .kuiCheckBox:before {
     position: relative;
-    top: -0.05em;
-    left: 0.15em;
+    left: 0.25em;
     font-family: FontAwesome;
     content: "\F00C";
     font-size: 1em;
@@ -1663,12 +1664,14 @@ body {
   -webkit-flex: 1 1 auto;
       -ms-flex: 1 1 auto;
           flex: 1 1 auto;
-  position: relative; }
+  position: relative;
+  font-size: 14px; }
 
 .kuiToolBarSearchBox__icon {
   position: absolute;
-  top: 6px;
-  left: 8px;
+  top: 0.5em;
+  left: 0.7em;
+  font-size: 1em;
   font-size: 14px;
   color: #ACACAC; }
 
@@ -1678,15 +1681,18 @@ body {
 .kuiToolBarSearchBox__input {
   width: 100%;
   min-width: 200px;
-  padding: 5px 12px 6px 28px;
+  padding: 4px 12px 5px 28px;
+  font-family: "Open Sans", Helvetica, Arial, sans-serif;
+  /* 1 */
   background-color: #FFFFFF;
   color: #191E23;
-  border: 1px solid #FFFFFF;
   border-radius: 4px;
-  font-size: 14px;
+  font-size: 1em;
   border: 1px solid #ffffff;
   line-height: normal;
-  /* 1 */ }
+  /* 1 */
+  -webkit-transition: border-color 0.1s linear;
+  transition: border-color 0.1s linear; }
   .kuiToolBarSearchBox__input:focus {
     outline: none;
     border-color: #6EADC1; }
diff --git a/ui_framework/doc_site/src/views/table/controlled_table.html b/ui_framework/doc_site/src/views/table/controlled_table.html
index 93dad0f2700ad..80128bd45f73c 100644
--- a/ui_framework/doc_site/src/views/table/controlled_table.html
+++ b/ui_framework/doc_site/src/views/table/controlled_table.html
@@ -67,13 +67,19 @@
     <tbody>
       <tr class="kuiTableRow">
         <td class="kuiTableRowCell kuiTableRowCell--checkBox">
-          <input type="checkbox" class="kuiCheckBox">
+          <div class="kuiTableRowCell__liner">
+            <input type="checkbox" class="kuiCheckBox">
+          </div>
         </td>
         <td class="kuiTableRowCell">
-          <a class="kuiLink" href="#">Alligator</a>
+          <div class="kuiTableRowCell__liner">
+            <a class="kuiLink" href="#">Alligator</a>
+          </div>
         </td>
         <td class="kuiTableRowCell">
-          <div class="kuiIcon kuiIcon--success fa-check"></div>
+          <div class="kuiTableRowCell__liner">
+            <div class="kuiIcon kuiIcon--success fa-check"></div>
+          </div>
         </td>
         <td class="kuiTableRowCell">
           <div class="kuiTableRowCell__liner">
@@ -89,13 +95,19 @@
 
       <tr class="kuiTableRow">
         <td class="kuiTableRowCell kuiTableRowCell--checkBox">
-          <input type="checkbox" class="kuiCheckBox">
+          <div class="kuiTableRowCell__liner">
+            <input type="checkbox" class="kuiCheckBox">
+          </div>
         </td>
         <td class="kuiTableRowCell">
-          <a class="kuiLink" href="#">Boomerang</a>
+          <div class="kuiTableRowCell__liner">
+            <a class="kuiLink" href="#">Boomerang</a>
+          </div>
         </td>
         <td class="kuiTableRowCell">
-          <div class="kuiIcon kuiIcon--success fa-check"></div>
+          <div class="kuiTableRowCell__liner">
+            <div class="kuiIcon kuiIcon--success fa-check"></div>
+          </div>
         </td>
         <td class="kuiTableRowCell">
           <div class="kuiTableRowCell__liner">
@@ -111,13 +123,19 @@
 
       <tr class="kuiTableRow">
         <td class="kuiTableRowCell kuiTableRowCell--checkBox">
-          <input type="checkbox" class="kuiCheckBox">
+          <div class="kuiTableRowCell__liner">
+            <input type="checkbox" class="kuiCheckBox">
+          </div>
         </td>
         <td class="kuiTableRowCell">
-          <a class="kuiLink" href="#">Celebration</a>
+          <div class="kuiTableRowCell__liner">
+            <a class="kuiLink" href="#">Celebration</a>
+          </div>
         </td>
         <td class="kuiTableRowCell">
-          <div class="kuiIcon kuiIcon--warning fa-bolt"></div>
+          <div class="kuiTableRowCell__liner">
+            <div class="kuiIcon kuiIcon--warning fa-bolt"></div>
+          </div>
         </td>
         <td class="kuiTableRowCell">
           <div class="kuiTableRowCell__liner">
@@ -133,13 +151,19 @@
 
       <tr class="kuiTableRow">
         <td class="kuiTableRowCell kuiTableRowCell--checkBox">
-          <input type="checkbox" class="kuiCheckBox">
+          <div class="kuiTableRowCell__liner">
+            <input type="checkbox" class="kuiCheckBox">
+          </div>
         </td>
         <td class="kuiTableRowCell">
-          <a class="kuiLink" href="#">Dog</a>
+          <div class="kuiTableRowCell__liner">
+            <a class="kuiLink" href="#">Dog</a>
+          </div>
         </td>
         <td class="kuiTableRowCell">
-          <div class="kuiIcon kuiIcon--error fa-warning"></div>
+          <div class="kuiTableRowCell__liner">
+            <div class="kuiIcon kuiIcon--error fa-warning"></div>
+          </div>
         </td>
         <td class="kuiTableRowCell">
           <div class="kuiTableRowCell__liner">
diff --git a/ui_framework/doc_site/src/views/table/table.html b/ui_framework/doc_site/src/views/table/table.html
index 536bcf0e08b84..e1659e1dcf6b0 100644
--- a/ui_framework/doc_site/src/views/table/table.html
+++ b/ui_framework/doc_site/src/views/table/table.html
@@ -26,13 +26,19 @@
   <tbody>
     <tr class="kuiTableRow">
       <td class="kuiTableRowCell kuiTableRowCell--checkBox">
-        <input type="checkbox" class="kuiCheckBox">
+        <div class="kuiTableRowCell__liner">
+          <input type="checkbox" class="kuiCheckBox">
+        </div>
       </td>
       <td class="kuiTableRowCell">
-        <a class="kuiLink" href="#">Alligator</a>
+        <div class="kuiTableRowCell__liner">
+          <a class="kuiLink" href="#">Alligator</a>
+        </div>
       </td>
       <td class="kuiTableRowCell">
-        <div class="kuiIcon kuiIcon--success fa-check"></div>
+        <div class="kuiTableRowCell__liner">
+          <div class="kuiIcon kuiIcon--success fa-check"></div>
+        </div>
       </td>
       <td class="kuiTableRowCell">
         <div class="kuiTableRowCell__liner">
@@ -48,13 +54,19 @@
 
     <tr class="kuiTableRow">
       <td class="kuiTableRowCell kuiTableRowCell--checkBox">
-        <input type="checkbox" class="kuiCheckBox">
+        <div class="kuiTableRowCell__liner">
+          <input type="checkbox" class="kuiCheckBox">
+        </div>
       </td>
       <td class="kuiTableRowCell">
-        <a class="kuiLink" href="#">Boomerang</a>
+        <div class="kuiTableRowCell__liner">
+          <a class="kuiLink" href="#">Boomerang</a>
+        </div>
       </td>
       <td class="kuiTableRowCell">
-        <div class="kuiIcon kuiIcon--success fa-check"></div>
+        <div class="kuiTableRowCell__liner">
+          <div class="kuiIcon kuiIcon--success fa-check"></div>
+        </div>
       </td>
       <td class="kuiTableRowCell">
         <div class="kuiTableRowCell__liner">
@@ -70,13 +82,19 @@
 
     <tr class="kuiTableRow">
       <td class="kuiTableRowCell kuiTableRowCell--checkBox">
-        <input type="checkbox" class="kuiCheckBox">
+        <div class="kuiTableRowCell__liner">
+          <input type="checkbox" class="kuiCheckBox">
+        </div>
       </td>
       <td class="kuiTableRowCell">
-        <a class="kuiLink" href="#">Celebration</a>
+        <div class="kuiTableRowCell__liner">
+          <a class="kuiLink" href="#">Celebration</a>
+        </div>
       </td>
       <td class="kuiTableRowCell">
-        <div class="kuiIcon kuiIcon--warning fa-bolt"></div>
+        <div class="kuiTableRowCell__liner">
+          <div class="kuiIcon kuiIcon--warning fa-bolt"></div>
+        </div>
       </td>
       <td class="kuiTableRowCell">
         <div class="kuiTableRowCell__liner">
@@ -92,13 +110,19 @@
 
     <tr class="kuiTableRow">
       <td class="kuiTableRowCell kuiTableRowCell--checkBox">
-        <input type="checkbox" class="kuiCheckBox">
+        <div class="kuiTableRowCell__liner">
+          <input type="checkbox" class="kuiCheckBox">
+        </div>
       </td>
       <td class="kuiTableRowCell">
-        <a class="kuiLink" href="#">Dog</a>
+        <div class="kuiTableRowCell__liner">
+          <a class="kuiLink" href="#">Dog</a>
+        </div>
       </td>
       <td class="kuiTableRowCell">
-        <div class="kuiIcon kuiIcon--error fa-warning"></div>
+        <div class="kuiTableRowCell__liner">
+          <div class="kuiIcon kuiIcon--error fa-warning"></div>
+        </div>
       </td>
       <td class="kuiTableRowCell">
         <div class="kuiTableRowCell__liner">