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

diff --combined app/assets/stylesheets/common.scss
index 40d873efb58b8b82b2c2de60c03ef9e67fe802ea,0a0310af46539f9ce46b97a5bdbdcdc15e9c0ebd..c7b733f2605616d583dc0d98c77081e1a012a246
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -79,7 -79,7 +79,7 @@@ time[title] 
    position: absolute;
    top: 0;
    right: 0;
-   background: image-url("menu-icon.png") no-repeat;
+   background: image-url("menu-icon.svg") no-repeat;
    background-size: 30px 30px;
    width: 30px;
    height: 30px;
@@@ -566,7 -566,7 +566,7 @@@ header .search_forms
  /* Rules for routing */
  
  div.direction {
 -  background-image: image-url('routing-sprite.png');
 +  background-image: image-url('routing-sprite.svg');
    width: 20px;
    height: 20px;
    background-repeat: no-repeat;
@@@ -894,7 -894,7 +894,7 @@@ div.secondary-actions 
  /* Rules for the "Welcome" page */
  .site-welcome, .site-fixthemap {
    .sprite {
 -    background-image: image-url("welcome-sprite.png");
 +    background-image: image-url("welcome-sprite.svg");
      background-size: 500px 250px;
      display: block;
    }
@@@ -911,7 -911,6 +911,7 @@@
    .sprite.term {
      margin-right: 10px;
      vertical-align: middle;
 +    display: inline-block;
    }
  
    .sprite.node {