diff --git a/app/pods/application/template.hbs b/app/pods/application/template.hbs
index 78cabb1..6e52a50 100644
--- a/app/pods/application/template.hbs
+++ b/app/pods/application/template.hbs
@@ -1,7 +1,5 @@
   <div class="flakes-navigation">
-    {{#link-to 'index' class='logo'}}
-      {{globals.genus}}.info
-    {{/link-to}}
+    {{site-logo}}
     {{#if session.isAuthenticated}}
       <ul>
         {{#link-to 'compare' tagName='li' href=false}}
@@ -38,9 +36,7 @@
 
   <div class="flakes-content">
     <div class="flakes-mobile-top-bar">
-      <a href="" class="logo-wrap">
-        {{globals.genus}}.info
-      </a>
+      {{site-logo}}
       <a href="" class="navigation-expand-target">
         <img src="img/navigation-expand-target.png" height="26px">
       </a>
diff --git a/app/pods/components/site-logo/template.hbs b/app/pods/components/site-logo/template.hbs
new file mode 100644
index 0000000..4219c12
--- /dev/null
+++ b/app/pods/components/site-logo/template.hbs
@@ -0,0 +1,3 @@
+{{#link-to 'index' class='logo'}}
+  <h2>{{globals.genus}}.info</h2>
+{{/link-to}}
diff --git a/tests/unit/pods/components/site-logo/component-test.js b/tests/unit/pods/components/site-logo/component-test.js
new file mode 100644
index 0000000..a0efeea
--- /dev/null
+++ b/tests/unit/pods/components/site-logo/component-test.js
@@ -0,0 +1,19 @@
+import { moduleForComponent, test } from 'ember-qunit';
+
+moduleForComponent('site-logo', 'Unit | Component | site logo', {
+  // Specify the other units that are required for this test
+  // needs: ['component:foo', 'helper:bar'],
+  unit: true
+});
+
+test('it renders', function(assert) {
+  assert.expect(2);
+
+  // Creates the component instance
+  var component = this.subject();
+  assert.equal(component._state, 'preRender');
+
+  // Renders the component to the page
+  this.render();
+  assert.equal(component._state, 'inDOM');
+});