diff --git a/app/hosts/index/template.hbs b/app/hosts/index/template.hbs
index a94ee204e..c1afa68c8 100644
--- a/app/hosts/index/template.hbs
+++ b/app/hosts/index/template.hbs
@@ -14,11 +14,7 @@
       {{/tooltip-element}}
     </div>
 
-    {{#if app.isCaas}}
-      {{#link-to "hosts.container-cloud" classNames="btn btn-sm bg-primary"}}{{t 'hostsPage.index.addHost'}}{{/link-to}}
-    {{else}}
-      {{#link-to "hosts.new" classNames="btn btn-sm bg-primary"}}{{t 'hostsPage.index.addHost'}}{{/link-to}}
-    {{/if}}
+    {{#link-to "hosts.new" classNames="btn btn-sm bg-primary"}}{{t 'hostsPage.index.addHost'}}{{/link-to}}
   </div>
 </section>
 
diff --git a/app/models/machinedriver.js b/app/models/machinedriver.js
index 15bfcd035..45e1e2ed3 100644
--- a/app/models/machinedriver.js
+++ b/app/models/machinedriver.js
@@ -50,7 +50,11 @@ var machineDriver = Resource.extend(PolledResource, {
       return null;
     }
 
-    return this.get('catalog').getTemplateFromCache(parsedExtId.templateId).get('links.icon');
+    if (this.get('catalog').getTemplateFromCache(parsedExtId.templateId)) {
+      return this.get('catalog').getTemplateFromCache(parsedExtId.templateId).get('links.icon');
+    } else {
+      return `${this.get('app.baseAssets')}assets/images/providers/generic-driver.svg`;
+    }
 
   }),