diff --git a/src/definitions/collections/menu.less b/src/definitions/collections/menu.less
index 0520c7283..7821e90bd 100755
--- a/src/definitions/collections/menu.less
+++ b/src/definitions/collections/menu.less
@@ -198,23 +198,12 @@
 
   width: 100%;
 }
-.ui.menu:not(.vertical) .item > .icon.input .icon {
-  top: @inputIconOffset;
-}
-.ui.menu:not(.vertical) .item > .transparent.icon.input .icon {
-  top: @inputVerticalPadding;
-}
 .ui.menu:not(.vertical) .item > .input input {
   font-size: @inputSize;
   padding-top: @inputVerticalPadding;
   padding-bottom: @inputVerticalPadding;
 }
 
-/* Labeled Button */
-.ui.menu:not(.vertical) .item > .labeled.button > .icon {
-  padding-top: @labeledButtonPadding;
-}
-
 /* Action Input */
 .ui.menu:not(.vertical) .item .action.input > .button {
   font-size: @buttonSize;
diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less
index ac22e6f5f..0d7eac173 100755
--- a/src/definitions/elements/button.less
+++ b/src/definitions/elements/button.less
@@ -509,10 +509,6 @@
 .ui.compact.labeled.icon.button {
   padding: @compactVerticalPadding (@compactHorizontalPadding + @labeledIconWidth) ( @compactVerticalPadding + @shadowOffset );
 }
-.ui.compact.labeled.icon.buttons > .button > .icon,
-.ui.compact.labeled.icon.button > .icon {
-  padding-top: (@compactVerticalPadding + @iconOffset) !important;
-}
 
 /*-------------------
         Sizes
@@ -611,9 +607,6 @@
   text-shadow: none !important;
   box-shadow: @basicBoxShadow;
 }
-.ui.basic.labeled.icon.button > .icon {
-  padding-top: (@verticalPadding + @iconOffset) !important;
-}
 .ui.basic.buttons {
   box-shadow: @basicGroupBoxShadow;
   border-radius: @borderRadius;
@@ -723,7 +716,6 @@
 
   width: @labeledIconWidth;
   height: 100%;
-  padding-top: (@verticalPadding + @iconOffset);
 
   background-color: @labeledIconBackgroundColor;
   text-align: center;
@@ -733,6 +725,17 @@
   line-height: 1;
   box-shadow: @labeledIconLeftShadow;
 }
+.ui.labeled.icon.buttons > .button > .icon:before,
+.ui.labeled.icon.button > .icon:before,
+.ui.labeled.icon.buttons > .button > .icon:after,
+.ui.labeled.icon.button > .icon:after {
+  display: block;
+  position: absolute;
+  width: 100%;
+  top: 50%;
+  text-align: center;
+  margin-top: -0.5em;
+}
 
 .ui.labeled.icon.buttons .button > .icon {
   border-radius: 0em;
diff --git a/src/definitions/elements/input.less b/src/definitions/elements/input.less
index fc8944920..381f83380 100755
--- a/src/definitions/elements/input.less
+++ b/src/definitions/elements/input.less
@@ -171,7 +171,6 @@
   margin: 0em;
   width: @iconWidth;
   height: 100%;
-  padding-top: @iconOffset;
 
   text-align: center;
 
@@ -179,6 +178,15 @@
   box-sizing: border-box;
   transition: @iconTransition;
 }
+.ui.icon.input > .icon:before,
+.ui.icon.input > .icon:after {
+  left: 0;
+  position: absolute;
+  text-align: center;
+  top: 50%;
+  width: 100%;
+  margin-top: -0.5em;
+}
 .ui.icon.input > .link.icon {
   cursor: pointer;
 }
@@ -208,7 +216,6 @@
 /* Transparent Icon */
 .ui.transparent.icon.input > .icon {
   width: @transparentIconWidth;
-  padding-top: @transparentIconOffset;
 }
 .ui.transparent.icon.input > input {
   padding-left: 0em !important;
diff --git a/src/definitions/modules/dropdown.less b/src/definitions/modules/dropdown.less
index becd87a54..4b1e4b58b 100755
--- a/src/definitions/modules/dropdown.less
+++ b/src/definitions/modules/dropdown.less
@@ -147,9 +147,6 @@
 .ui.dropdown .menu > .input:not(.transparent) input {
   padding: @menuInputPadding;
 }
-.ui.dropdown .menu > .input:not(.transparent) .icon {
-  padding-top: @menuInputIconOffset;
-}
 
 /*--------------
    Item Image
diff --git a/src/themes/packages/default/collections/menu.variables b/src/themes/packages/default/collections/menu.variables
index 5f6a5dc40..8ee62537c 100755
--- a/src/themes/packages/default/collections/menu.variables
+++ b/src/themes/packages/default/collections/menu.variables
@@ -95,14 +95,11 @@
 @buttonSize: 0.875em;
 @actionButtonHorizontalPadding: 0.8em;
 
-@labeledButtonPadding: 0.6em;
-
 /* Input */
 @inputSize: 1em;
 @inputVerticalMargin: -0.6em;
 @inputOffset: 0em;
 @inputVerticalPadding: 0.35em;
-@inputIconOffset: -0.35em;
 
 @smallInputOffset: 0em;
 @smallInputVerticalPadding: 0.4em;
diff --git a/src/themes/packages/default/elements/input.variables b/src/themes/packages/default/elements/input.variables
index 0498121ca..950b2481c 100755
--- a/src/themes/packages/default/elements/input.variables
+++ b/src/themes/packages/default/elements/input.variables
@@ -36,14 +36,12 @@
 @glyphWidth: 1.25em;
 @iconWidth: (@verticalPadding * 2) + @glyphWidth;
 @iconOpacity: 0.5;
-@iconOffset: 0.9em;
 @iconFocusOpacity: 1;
-@iconSpacing: 0.5em;
+@iconSpacing: 0em;
 @iconMargin: @iconWidth + @iconSpacing;
 @iconTransition: opacity 0.3s @defaultEasing;
 
-@transparentIconWidth: auto;
-@transparentIconOffset: (@lineOffset * 2);
+@transparentIconWidth: @glyphWidth;
 @transparentIconMargin: 1.75em;
 
 /* Circular Icon Input */
diff --git a/src/themes/packages/default/modules/dropdown.variables b/src/themes/packages/default/modules/dropdown.variables
index e51c35fa0..4fb1dcb60 100755
--- a/src/themes/packages/default/modules/dropdown.variables
+++ b/src/themes/packages/default/modules/dropdown.variables
@@ -68,7 +68,6 @@
 @menuInputMargin: 0.75rem @itemHorizontalPadding 0.25rem;
 @menuInputMinWidth: 200px;
 @menuInputPadding: 0.5em 1em;
-@menuInputIconOffset: 0.7em;
 
 /* Menu Image */
 @menuImageMaxHeight: 2.5em;