diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index 5673a41e1..c426b54e6 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -6,6 +6,8 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
   _docTitle: document.title,
 
   getURL: function(url) {
+    if (!url) { return url; }
+
     // If it's a non relative URL, return it.
     if (url.indexOf('http') === 0) return url;
 
diff --git a/app/assets/javascripts/discourse/components/cdn-img.js.es6 b/app/assets/javascripts/discourse/components/cdn-img.js.es6
new file mode 100644
index 000000000..007d9cb90
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/cdn-img.js.es6
@@ -0,0 +1,8 @@
+export default Ember.Component.extend({
+  tagName: 'img',
+  attributeBindings: ['cdnSrc:src'],
+
+  cdnSrc: function() {
+    return Discourse.getURLWithCDN(this.get('src'));
+  }.property('src')
+});
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index 4eb82f2fe..5e511700e 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -15,18 +15,18 @@
 {{/if}}
 
 {{#if canCreateTopic}}
-  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n 'topic.create'}}</button>
+  {{d-button id="create-topic" class="btn-default" action="createTopic" icon="plus" label="topic.create"}}
 {{/if}}
 
 {{#if canEditCategory}}
-  <button class='btn btn-default' {{action "editCategory" category}}><i class="fa fa-wrench"></i> {{i18n 'category.edit_long'}}</button>
+  {{d-button class="btn-default" action="editCategory" actionParam=category icon="wrench" label="category.edit_long"}}
 {{/if}}
 
 <section class='category-heading'>
   {{#if category.logo_url}}
-    <img {{bind-attr src=category.logo_url}} class="category-logo">
+    {{cdn-img src=category.logo_url class="category-logo"}}
     {{#if category.description}}
-    <p>{{{category.description}}}</p>
+      <p>{{{category.description}}}</p>
     {{/if}}
   {{/if}}
 </section>