Merge remote-tracking branch 'upstream/pull/3702'

diff --combined app/assets/stylesheets/common.scss
index d71538e66f1ddaaeba97449678f7f84b2b7f2b5a,dfe99d1e2751f9af765a31ae84e3f0e7d74da5c8..ece6fb1f66daaaec2dd4cd56855fe792dd862a33
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -510,14 -510,6 +510,6 @@@ body.small-nav 
        border-bottom: 1px solid $grey;
        padding: 10px 20px;
      }
- 
-     .tooltip {
-       opacity: 1;
-       border: 1px solid $grey;
-       .tooltip-arrow {
-         border-top-color: $grey;
-       }
-     }
    }
  }
  
@@@ -1606,6 -1598,8 +1598,6 @@@ dl.dl-inline 
    .icon {
      width: 30px;
      height: 30px;
 -    margin-right: 10px;
 -    vertical-align: middle;
      background: 40px 40px image-url('about/sprite.png') no-repeat;
  
      &.local {