diff --git a/src/theme.less b/src/theme.less
index 12e1443196..4a0e6e5e0d 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -20,11 +20,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-@input-border-radius: 0;
-@input-border-radius-large: 0;
-@input-border-radius-small: 0;
-@input-bg-disabled: transparent;
-
 .navbar {
     border: none;
     .box-shadow(0 1px 2px rgba(0,0,0,.3));
@@ -93,6 +88,16 @@ THE SOFTWARE.
     }
 }
 
+.form-control {
+    border: transparent;
+
+    &[disabled],
+    &[readonly],
+    fieldset[disabled] & {
+        background-color: transparent;
+    }
+}
+
 textarea,
 textarea.form-control,
 input.form-control,
@@ -140,6 +145,20 @@ input[type=number],
     padding: 0 5px;
 }
 
+.input-group-addon {
+    background-color: transparent;
+    border: transparent;
+    border-radius: 0;
+
+    &.input-sm {
+        border-radius: 0;
+    }
+
+    &.input-lg {
+        border-radius: 0;
+    }
+}
+
 select,
 select.form-control {
     border: 0;