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

diff --combined app/assets/stylesheets/common.scss
index 2cdb617bec83fa6a52d9c4ac71e8412ea26aae1b,6eafb89d18b3249e6c5b8c80e2f8253223a6ff28..40d873efb58b8b82b2c2de60c03ef9e67fe802ea
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -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,6 -911,7 +911,7 @@@
    .sprite.term {
      margin-right: 10px;
      vertical-align: middle;
+     display: inline-block;
    }
  
    .sprite.node {