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

diff --combined app/assets/stylesheets/common.scss
index ece6fb1f66daaaec2dd4cd56855fe792dd862a33,f3013adf820cf8905a3f27a7f8f3404c4870077f..6d73ffb7e76775d912e6ee1e0c468dd9c83377f3
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -510,6 -510,14 +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;
 -      }
 -    }
    }
  }
  
@@@ -1506,15 -1514,6 +1506,6 @@@ dl.dl-inline 
      display: block;
    }
  
-   .icon-list {
-     padding-bottom: 20px;
-     div {
-       margin-bottom: 10px;
-       p {
-         padding-top: 10px;
-       }
-     }
-   }
    .sprite.small {
      width: 50px;
      height: 50px;
@@@ -1598,6 -1597,8 +1589,6 @@@
    .icon {
      width: 30px;
      height: 30px;
 -    margin-right: 10px;
 -    vertical-align: middle;
      background: 40px 40px image-url('about/sprite.png') no-repeat;
  
      &.local {