--- a/static/bootstrap/less/forms.less	Wed Apr 03 23:59:07 2013 -0700
+++ b/static/bootstrap/less/forms.less	Fri Apr 05 08:08:12 2013 -0700
@@ -422,7 +422,9 @@
 // Allow us to put symbols and text within the input field for a cleaner look
 .input-append,
 .input-prepend {
-  margin-bottom: 5px;
+  display: inline-block;
+  margin-bottom: @baseLineHeight / 2;
+  vertical-align: middle;
   font-size: 0; // white space collapse hack
   white-space: nowrap; // Prevent span and input from separating
 
@@ -430,7 +432,8 @@
   input,
   select,
   .uneditable-input,
-  .dropdown-menu {
+  .dropdown-menu,
+  .popover {
     font-size: @baseFontSize;
   }