diff --git a/assets/gift-card.scss.liquid b/assets/gift-card.scss.liquid
index c1eed4b91..356e5395e 100755
--- a/assets/gift-card.scss.liquid
+++ b/assets/gift-card.scss.liquid
@@ -54,6 +54,10 @@ $gutter: 30px;
 /*============================================================================
   #Base Styles
 ==============================================================================*/
+header, nav, section, article, aside, footer {
+  display:block;
+}
+
 .template-giftcard,
 .template-giftcard body {
   background: $colorBody;
@@ -363,9 +367,12 @@ $gutter: 30px;
 
 
 .giftcard__icon {
-  width: 45px;
-  display: inline-block;
-  vertical-align: baseline;
+  display: none;
+
+  .svg & {
+    display: inline-block;
+    vertical-align: baseline;
+  }
 }
 
 #QrCode {
diff --git a/assets/ico-gift-card.svg.liquid b/assets/ico-gift-card.svg.liquid
new file mode 100644
index 000000000..6e580e5e9
--- /dev/null
+++ b/assets/ico-gift-card.svg.liquid
@@ -0,0 +1 @@
+<svg width="46" height="30" xmlns="http://www.w3.org/2000/svg" stroke="{{ settings.color_borders }}" fill="none" stroke-width="2"><g transform="translate(1 1)"><path d="M22 12c0 3.866-4.477 7-10 7M22 12c0 3.866 4.477 7 10 7"/><path d="M26 7c-2.21 0-4 1.79-4 4v3.993h3.864c.046.002.09.007.136.007 2.21 0 4-1.79 4-4s-1.79-4-4-4zM18 7c2.21 0 4 1.79 4 4v3.993h-3.865c-.045.002-.09.007-.135.007-2.21 0-4-1.79-4-4s1.79-4 4-4zM22 .5V27M1 15h42"/><rect width="44" height="28" rx="2"/></g></svg>
diff --git a/templates/gift_card.liquid b/templates/gift_card.liquid
index cd29eaa8a..7b32c1351 100755
--- a/templates/gift_card.liquid
+++ b/templates/gift_card.liquid
@@ -41,11 +41,11 @@
     <header class="giftcard-header" role="banner">
       <div class="h1 header-logo" itemscope itemtype="http://schema.org/Organization">
         {% if settings.logo_use_image %}
-          <a href="/" itemprop="url">
+          <a href="{{ shop.url }}" itemprop="url">
             <img src="{{ 'logo.png' | asset_url }}" alt="{{ shop.name }}" itemprop="logo">
           </a>
         {% else %}
-          <a href="/" itemprop="url">{{ shop.name }}</a>
+          <a href="{{ shop.url }}" itemprop="url">{{ shop.name }}</a>
         {% endif %}
       </div>
       <div class="shop-url">{{ shop.url }}</div>
@@ -115,7 +115,7 @@
     </main>
 
     <footer class="giftcard__footer" role="contentinfo">
-      <img src="{{ 'gift-card/icon-bug.png' | shopify_asset_url }}" class="giftcard__icon" alt="{{ 'gift_cards.issued.subtext' | t }}">
+      <img src="{{ 'ico-gift-card.svg' | asset_url }}" class="giftcard__icon" alt="{{ 'gift_cards.issued.subtext' | t }}">
     </footer>
 
   </div>