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

diff --combined app/assets/stylesheets/common.scss
index 71649fbce4f6386c7952cd9fa4997c07056b7efd,4a3317edcd78110ea2a98aa4baf5f7c08908bbfd..9aefd3d695978e929ac7517497c26a13f6bbb3ba
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -21,6 -21,11 +21,6 @@@ time[title] 
  
  #container { position: relative; }
  
 -.small_icon {
 -  vertical-align: middle;
 -  margin-right: $lineheight * 0.25;
 -}
 -
  /* Rules for icons */
  
  .icon {
@@@ -924,11 -929,6 +924,6 @@@ div.secondary-actions 
    .sprite.rules {
      /*rtl:ignore*/ background-position: -350px 0;
    }
- 
-   .icon.note {
-     background-color: #333;
-     border-radius: 4px;
-   }
  }
  
  .site-about #content {