diff --git a/app/stylesheets/base/_#header.sass b/app/stylesheets/base/_#header.sass
index 71a4cef26b9..e7cf3a6d263 100644
--- a/app/stylesheets/base/_#header.sass
+++ b/app/stylesheets/base/_#header.sass
@@ -104,16 +104,18 @@
   .user_name
     @if $is-k12 == false
       margin-right: 15px
-    a
-      @if $is-k12 == false
-        text-decoration: none !important
   a
     @if $is-k12
       color: $k12-header-text
+      text-decoration: none
       &:hover, &:focus
         text-decoration: underline
     @else
       color: $identity_link_color
+      @if $use_high_contrast
+        text-decoration: none
+      &:hover, &:focus
+        text-decoration: underline
 
   .emphasize-name
     color: $masquerade-link-color
@@ -160,6 +162,8 @@
   .menu-item-title, .menu-item-no-drop
     position: relative
     z-index: 100
+    text-decoration: none
+
     @if $is-k12
       +border-box
       transition: background 0.2s linear
@@ -178,26 +182,13 @@
       display: block
       padding: 6px 17px 5px
       height: 29px
-      text-decoration: none
       color: #fff
       font-size: 15px
   
-  .menu-item-title
-    @if $is-k12
-      &:focus
-        outline: none
-        box-shadow: inset 0 0 0 2px $orange
-      @if $use_high_contrast == false
-        &:hover, &:focus
-          text-decoration: none
-
-  .menu-item-no-drop
+  .menu-item-no-drop, .menu-item-title
     &:hover, &:focus
       text-decoration: underline
     @if $is-k12
-      &:focus
-        outline: none
-        box-shadow: inset 0 0 0 2px $orange
       &:hover, &:focus
         background: rgba($k12-header-text, 0.15)
         @if $use_high_contrast == false
@@ -211,7 +202,8 @@
       @if $is-k12
         background: rgba($k12-header-text, 0.1)
         color: $k12-header-text
-        text-decoration: none
+        @if $use_high_contrast == false
+          text-decoration: none
       @else
         color: $menu-text-color
         border-top-color: $menu-border-color
diff --git a/app/stylesheets/base/_#right-side.sass b/app/stylesheets/base/_#right-side.sass
index d4035c0da5f..c6e9ad4e3e1 100644
--- a/app/stylesheets/base/_#right-side.sass
+++ b/app/stylesheets/base/_#right-side.sass
@@ -51,7 +51,8 @@
       display: block
       border-bottom: 1px solid #d6d6d6
       box-shadow: 0 1px 0 rgba(255, 255, 255, 0.85)
-
+      @if $use_high_contrast
+        text-decoration: none
       &:hover, &:focus
         b, &.more_link
           text-decoration: underline
diff --git a/app/stylesheets/components/_components.scss b/app/stylesheets/components/_components.scss
index c253fb6dd78..305542bb416 100644
--- a/app/stylesheets/components/_components.scss
+++ b/app/stylesheets/components/_components.scss
@@ -69,9 +69,9 @@
       & > a {
         display: block;
         color: ensure-contrast($gray, $lightBackground);
-        &:hover { text-decoration: none; }
-        &:focus { text-decoration: underline; }
+        text-decoration: none;
         
+        // K-12 styles
         @if $is-k12 { 
           padding: ($k12-sp - 4) $k12-sp;
           border-radius: $k12-sp/2;
@@ -85,12 +85,15 @@
           @else { &:hover, &:focus { background: #f2f2f2; } }
         }
         
+        // Default UI styles
         @else {
           padding: 4px 8px;
-          &:hover {
+
+          &:hover, &:focus {
             @if $use_high_contrast {
               background: #333;
               color: #fff;
+              text-decoration: underline; 
             } 
             @else { background: $white; }
           }
@@ -173,10 +176,9 @@
     box-shadow: 0 1px 0px rgba(255, 255, 255, 0.85);
     padding: 8px 0;
 
-    &:hover {
-      text-decoration: none;
-      color: $blue;
-    }
+    &:hover, &:focus { color: $blue; }
+
+    @if $use_high_contrast { text-decoration: none; }
 
     &:active {
       color: $grayLight;
diff --git a/app/stylesheets/components/_g_syllabus.sass b/app/stylesheets/components/_g_syllabus.sass
index f9135e4cd28..176fa9e0b7d 100644
--- a/app/stylesheets/components/_g_syllabus.sass
+++ b/app/stylesheets/components/_g_syllabus.sass
@@ -70,6 +70,10 @@
       tr.syllabus_assignment
         .name a
           :font-weight bold
+          @if $use_high_contrast
+            :text-decoration none
+            &:hover, &:focus
+              :text-decoration underline
 
       td.not_last
         :border-bottom 1px solid #ddd
diff --git a/app/stylesheets/pages/context_list.sass b/app/stylesheets/pages/context_list.sass
index d1640c1a17d..bcdd0d4a349 100644
--- a/app/stylesheets/pages/context_list.sass
+++ b/app/stylesheets/pages/context_list.sass
@@ -23,6 +23,7 @@ ul.context_list
 
     a
       font-weight: bold
+      display: block
       
       .subtitle
         color: #888
@@ -36,7 +37,6 @@ ul.context_list
       font-weight: normal
 
   .name
-    display: block
     font-size: 1.5em
 
   .subtitle
diff --git a/app/stylesheets/pages/discussions.scss b/app/stylesheets/pages/discussions.scss
index de6906886a9..151188de23c 100644
--- a/app/stylesheets/pages/discussions.scss
+++ b/app/stylesheets/pages/discussions.scss
@@ -245,8 +245,11 @@ body.with-right-side.with-left-side {
 
 .discussion-reply-action {
   @if $use_high_contrast { color: #666; }
-  @else { color: #888; }
-  text-decoration: none;
+  @else {
+    text-decoration: none;
+    color: #888; 
+  }
+  
   &:hover, &:focus {
     text-decoration: none;
     color: #444;
diff --git a/app/stylesheets/vendor/bootstrap/_buttons.scss b/app/stylesheets/vendor/bootstrap/_buttons.scss
index c278730dfd1..05907657257 100644
--- a/app/stylesheets/vendor/bootstrap/_buttons.scss
+++ b/app/stylesheets/vendor/bootstrap/_buttons.scss
@@ -82,6 +82,7 @@ listen to the "click" and "keyclick" events and add tabindex="0" and role="butto
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
+  text-decoration: none;
   @include buttonBackground($btnBackground, $btnBackgroundHighlight, $grayDark, 0 1px 1px rgba(255,255,255,.75));
   border: 1px solid $btnBorder;
   *border: 0; // Remove the border to prevent IE7's black border on input:focus
diff --git a/app/stylesheets/vendor/bootstrap/_scaffolding.scss b/app/stylesheets/vendor/bootstrap/_scaffolding.scss
index de7c83bae20..b3f94b60714 100644
--- a/app/stylesheets/vendor/bootstrap/_scaffolding.scss
+++ b/app/stylesheets/vendor/bootstrap/_scaffolding.scss
@@ -21,14 +21,23 @@ body {
 
 a {
   color: $linkColor;
-  text-decoration: none;  
-  &:hover {
-    color: $linkColorHover;
-    text-decoration: underline;
-  }
+  
+  &:hover { color: $linkColorHover; }
   &:focus { @include button-focus; }
+
+  @if $use_high_contrast { 
+    text-decoration: underline;
+    &:hover { text-decoration: none; }
+  }
+
+  @else { 
+    text-decoration: none;
+    &:hover { text-decoration: underline; }
+  }
+
 }
 
+
 // Images
 // -------------------------