diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html
index f634daadd..6a3d86eba 100644
--- a/public/views/disclaimer.html
+++ b/public/views/disclaimer.html
@@ -10,7 +10,7 @@
 <div class="content p20b" ng-class="{'disclaimer':!index.hasProfile}">
   <h4 class="title m0" ng-show="!index.hasProfile">
     <span translate>Terms of Use</span>
-    <img class="right" src="img/logo.png" alt="Copay" width="40" height="18">
+    <logo class="right" width="40"></logo>
   </h4>
   <div class="p20h m10t">
     <p class="enable_text_select text-light size-14 text-gray" translate>
diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html
index e1742550c..fe2ceab1b 100644
--- a/public/views/includes/sidebar.html
+++ b/public/views/includes/sidebar.html
@@ -1,6 +1,6 @@
 <nav class="sidebar left-off-canvas-menu" ng-controller="sidebarController as sidebar">
   <header>
-    <img src="img/logo-negative.svg" alt="Copay" width="80">
+    <logo negative="true" width="80"></logo>
     <div ng-include="'views/includes/version.html'"></div>
   </header>
   <ul class="off-canvas-list">
diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html
index 17ce28a14..a1c98de61 100644
--- a/public/views/preferencesAbout.html
+++ b/public/views/preferencesAbout.html
@@ -6,7 +6,7 @@
 
 <div class="content preferences p20v" ng-controller="preferencesAbout as about">
     <div class="text-center small-5 small-centered columns m20b" >
-      <img src="img/logo.png" alt="Copay">
+      <logo></logo>
     </div>
     <h4 class="title m0" translate>Release Information</h4>
 
diff --git a/public/views/unsupported.html b/public/views/unsupported.html
index 25b3df702..8571a3feb 100644
--- a/public/views/unsupported.html
+++ b/public/views/unsupported.html
@@ -1,6 +1,6 @@
 <div class="row columns p20">
   <div class="text-center">
-    <img src="img/logo.svg" alt="Copay" width="146" height="59">
+    <logo width="146"></logo>
     <div class="text-white" ng-include="'views/includes/version.html'"></div>
   </div>
   <h1 translate class="text-center">Browser unsupported</h1>
diff --git a/src/css/main.css b/src/css/main.css
index ba8a7564a..a140d1787 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -168,12 +168,6 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
   top: 0;
 }
 
-.logo-setup {
-  text-align: center;
-  margin: 0 0 0.1rem 0;
-  color: #8597A7;
-}
-
 .box-setup-footer {
   overflow: hidden;
   margin-top: 1rem;
@@ -522,11 +516,6 @@ ul.pagination li.current a {
   background: #1ABC9C;
 }
 
-.logo {
-  background: transparent url('../img/logo-negative-beta.svg') no-repeat;
-  background-size: 130px 51px;
-}
-
 input {
   border-radius: 2px;
   background: #EDEDED;
diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js
index 4388f99c4..2816a7509 100644
--- a/src/js/directives/directives.js
+++ b/src/js/directives/directives.js
@@ -302,4 +302,18 @@ angular.module('copayApp.directives')
       replace: true,
       templateUrl: 'views/includes/menu-toggle.html'
     }
+  })
+  .directive('logo', function() {
+    return {
+      restrict: 'E',
+      scope: {
+        width: "@",
+        negative: "="
+      },
+      controller: function($scope) {
+        $scope.logo_url = $scope.negative ? 'img/logo-negative.png' : 'img/logo.png';
+      },
+      replace: true,
+      template: '<img ng-src="{{ logo_url }}" alt="Copay">'
+    }
   });