diff --git a/scss/_alert.scss b/scss/_alert.scss
index 2e6f46b166..b264dc5af2 100644
--- a/scss/_alert.scss
+++ b/scss/_alert.scss
@@ -9,7 +9,7 @@
 
 .alert {
   padding: $alert-padding;
-  margin-bottom: $line-height-computed;
+  margin-bottom: $spacer-y;
   border: 1px solid transparent;
   @include border-radius($alert-border-radius);
 
diff --git a/scss/_breadcrumb.scss b/scss/_breadcrumb.scss
index 73698c46b1..7cccd182a2 100644
--- a/scss/_breadcrumb.scss
+++ b/scss/_breadcrumb.scss
@@ -5,7 +5,7 @@
 
 .breadcrumb {
   padding: $breadcrumb-padding-vertical $breadcrumb-padding-horizontal;
-  margin-bottom: $line-height-computed;
+  margin-bottom: $spacer-y;
   list-style: none;
   background-color: $breadcrumb-bg;
   @include border-radius($border-radius-base);
diff --git a/scss/_forms.scss b/scss/_forms.scss
index 154430119d..671be46fb9 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -117,7 +117,7 @@
 // horizontal form layout.
 
 .form-control-static {
-  min-height: ($line-height-computed + $font-size-base);
+  min-height: $input-height-base;
   // Size it appropriately next to real form controls
   padding-top: ($padding-base-vertical + $border-width);
   padding-bottom: ($padding-base-vertical + $border-width);
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 801e671356..513ed00004 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -103,7 +103,7 @@
   margin-right: $spacer;
   margin-bottom: 0; // For headings
   font-size: $font-size-lg;
-  line-height: $line-height-computed;
+  line-height: 1;
   background: none;
   border: 0;
 
diff --git a/scss/_pager.scss b/scss/_pager.scss
index cb4ccfb354..98db07500f 100644
--- a/scss/_pager.scss
+++ b/scss/_pager.scss
@@ -5,7 +5,8 @@
 
 .pager {
   padding-left: 0;
-  margin: $line-height-computed 0;
+  margin-top: $spacer-y;
+  margin-bottom: $spacer-y;
   text-align: center;
   list-style: none;
   @include clearfix();
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index 01e4c3f081..0c00bd89e3 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -6,6 +6,8 @@
 .pagination {
   display: inline-block;
   padding-left: 0;
+  margin-top: $spacer-y;
+  margin-bottom: $spacer-y;
   margin: $line-height-computed 0;
   @include border-radius();
 
diff --git a/scss/_progress.scss b/scss/_progress.scss
index beeff3816e..c99b5af923 100644
--- a/scss/_progress.scss
+++ b/scss/_progress.scss
@@ -8,7 +8,7 @@
 //
 
 @keyframes progress-bar-stripes {
-  from  { background-position: $line-height-computed 0; }
+  from  { background-position: $spacer-y 0; }
   to    { background-position: 0 0; }
 }
 
@@ -20,8 +20,8 @@
 .progress {
   display: block;
   width: 100%;
-  height: $line-height-computed;
-  margin-bottom: $line-height-computed;
+  height: $spacer-y; // todo: make a new var for this
+  margin-bottom: $spacer-y;
 }
 .progress[value] {
   // IE10 uses `color` to set the bar background-color
@@ -85,7 +85,7 @@
   }
   .progress-bar {
     display: inline-block;
-    height: $line-height-computed;
+    height: $spacer-y;
     text-indent: -999rem; // Simulate hiding of value as in native `<progress>`
     background-color: #0074d9;
     border-top-left-radius: $border-radius-base;
@@ -110,16 +110,16 @@
 
 .progress-striped[value]::-webkit-progress-value {
   @include gradient-striped();
-  background-size: $line-height-computed $line-height-computed;
+  background-size: $spacer-y $spacer-y;
 }
 .progress-striped[value]::-moz-progress-bar {
   @include gradient-striped();
-  background-size: $line-height-computed $line-height-computed;
+  background-size: $spacer-y $spacer-y;
 }
 @media screen and ("min-width:0\0") {
   .progress-bar-striped {
     @include gradient-striped();
-    background-size: $line-height-computed $line-height-computed;
+    background-size: $spacer-y $spacer-y;
   }
 }
 
diff --git a/scss/mixins/_nav-divider.scss b/scss/mixins/_nav-divider.scss
index 2e6da02a47..fb3d12e9f6 100644
--- a/scss/mixins/_nav-divider.scss
+++ b/scss/mixins/_nav-divider.scss
@@ -4,7 +4,7 @@
 
 @mixin nav-divider($color: #e5e5e5) {
   height: 1px;
-  margin: (($line-height-computed / 2) - 1) 0;
+  margin: ($spacer-y / 2) 0;
   overflow: hidden;
   background-color: $color;
 }