diff --git a/src/popup/app/accounts/views/accountsLoginTwoFactor.html b/src/popup/app/accounts/views/accountsLoginTwoFactor.html
index d2519011d86..fee1be6919f 100644
--- a/src/popup/app/accounts/views/accountsLoginTwoFactor.html
+++ b/src/popup/app/accounts/views/accountsLoginTwoFactor.html
@@ -86,7 +86,7 @@
     <div class="content">
         <div class="two-factor-key-page">
             <p>{{i18n.insertYubiKey}}</p>
-            <img src="../../../../images/two-factor/yubikey.jpg" alt="" class="img-rounded img-responsive" />
+            <img src="../../../images/two-factor/yubikey.jpg" alt="" class="img-rounded img-responsive" />
         </div>
         <div class="list">
             <div class="list-section">
@@ -125,7 +125,7 @@
             <p ng-if="!u2fReady">Loading...</p>
             <div ng-if="u2fReady">
                 <p>{{i18n.insertU2f}}</p>
-                <img src="../../../../images/two-factor/u2fkey.jpg" alt="" class="img-rounded img-responsive" />
+                <img src="../../../images/two-factor/u2fkey.jpg" alt="" class="img-rounded img-responsive" />
             </div>
         </div>
         <div class="list">
diff --git a/src/popup/app/global/home.html b/src/popup/app/global/home.html
index fac40c5ffdc..5b451834bc1 100644
--- a/src/popup/app/global/home.html
+++ b/src/popup/app/global/home.html
@@ -2,7 +2,7 @@
     <a ui-sref="environment({animation: 'in-slide-up'})" class="settings-icon">
         <i class="fa fa-cog fa-lg"></i><span>&nbsp;Settings</span>
     </a>
-    <img src="../../../images/logo@2x.png" alt="bitwarden" />
+    <img src="../../images/logo@2x.png" alt="bitwarden" />
     <p>{{i18n.loginOrCreateNewAccount}}</p>
     <div class="bottom-buttons">
         <a class="btn btn-lg btn-primary btn-block" ui-sref="register({animation: 'in-slide-up'})"
diff --git a/src/popup/app/global/splash.html b/src/popup/app/global/splash.html
index ca75c7de895..4a088fc1031 100644
--- a/src/popup/app/global/splash.html
+++ b/src/popup/app/global/splash.html
@@ -1,5 +1,5 @@
 <div class="content">
     <div class="splash-page">
-        <img src="../../../images/logo@3x.png" alt="bitwarden" />
+        <img src="../../images/logo@3x.png" alt="bitwarden" />
     </div>
 </div>
diff --git a/src/popup/app/settings/about.component.html b/src/popup/app/settings/about.component.html
index 1de6951dc21..3fcff756cbc 100644
--- a/src/popup/app/settings/about.component.html
+++ b/src/popup/app/settings/about.component.html
@@ -6,7 +6,7 @@
 </div>
 <div class="content">
     <div class="about-page">
-        <img src="../../../images/logo@3x.png" alt="bitwarden" />
+        <img src="../../images/logo@3x.png" alt="bitwarden" />
         {{$ctrl.i18n.version}} {{$ctrl.version}}<br />
         &copy; 8bit Solutions LLC 2015-{{$ctrl.year}}
     </div>
diff --git a/src/images/loading.svg b/src/popup/images/loading.svg
similarity index 100%
rename from src/images/loading.svg
rename to src/popup/images/loading.svg
diff --git a/src/images/logo.png b/src/popup/images/logo.png
similarity index 100%
rename from src/images/logo.png
rename to src/popup/images/logo.png
diff --git a/src/images/logo@2x.png b/src/popup/images/logo@2x.png
similarity index 100%
rename from src/images/logo@2x.png
rename to src/popup/images/logo@2x.png
diff --git a/src/images/logo@3x.png b/src/popup/images/logo@3x.png
similarity index 100%
rename from src/images/logo@3x.png
rename to src/popup/images/logo@3x.png
diff --git a/src/images/two-factor/u2fkey.jpg b/src/popup/images/two-factor/u2fkey.jpg
similarity index 100%
rename from src/images/two-factor/u2fkey.jpg
rename to src/popup/images/two-factor/u2fkey.jpg
diff --git a/src/images/two-factor/yubikey.jpg b/src/popup/images/two-factor/yubikey.jpg
similarity index 100%
rename from src/images/two-factor/yubikey.jpg
rename to src/popup/images/two-factor/yubikey.jpg
diff --git a/src/popup/less/components.less b/src/popup/less/components.less
index 058a1f73967..07504fa0ea7 100644
--- a/src/popup/less/components.less
+++ b/src/popup/less/components.less
@@ -588,7 +588,7 @@
 }
 
 #duoFrameWrapper {
-    background: ~"url('../../images/loading.svg') 0 0 no-repeat";
+    background: ~"url('../images/loading.svg') 0 0 no-repeat";
     width: 100%;
     height: 470px;
     margin-bottom: -10px;
diff --git a/webpack.common.js b/webpack.common.js
index e7e10cb99c6..4e620aed530 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -48,11 +48,13 @@ module.exports = {
             },
             {
                 test: /\.(jpe?g|png|gif|svg)$/i,
+                exclude: /.*(fontawesome-webfont|glyphicons-halflings-regular)\.svg/,
                 use: [{
                     loader: 'file-loader',
                     options: {
-                        name: '[name].[ext]',
-                        useRelativePath: true
+                        name: '[name].[hash].[ext]',
+                        outputPath: 'popup/images/',
+                        publicPath: '/'
                     }
                 }]
             }