diff --git a/conversation.html b/conversation.html
index c23c1dee7..640ae553f 100644
--- a/conversation.html
+++ b/conversation.html
@@ -7,7 +7,7 @@
         <title></title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link href='/icon.png' rel='shortcut icon'>
+        <link href='/images/icon.png' rel='shortcut icon'>
         <link href="/stylesheets/manifest.css" rel="stylesheet" type="text/css" />
         <script type="text/javascript" src="js/chromium.js"></script>
     </head>
diff --git a/icon.png b/images/icon.png
similarity index 100%
rename from icon.png
rename to images/icon.png
diff --git a/index.html b/index.html
index a71e5db9b..59babc7a9 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
         <title>Signal</title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link href='/icon.png' rel='shortcut icon'>
+        <link href='/images/icon.png' rel='shortcut icon'>
         <link href="/stylesheets/manifest.css" rel="stylesheet" type="text/css" />
         <script type="text/javascript" src="js/chromium.js"></script>
     </head>
diff --git a/manifest.json b/manifest.json
index 89f29c55f..3ce1a8699 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,11 +10,11 @@
       "unlimitedStorage"
     ],
 
-    "icons": { "128": "icon.png" },
+    "icons": { "128": "images/icon.png" },
 
     "browser_action": {
         "default_icon": {
-            "19": "icon.png"
+            "19": "images/icon.png"
         },
         "default_title": "TextSecure",
         "default_popup": "index.html"
diff --git a/options.html b/options.html
index 2e7b793cb..6f5090156 100644
--- a/options.html
+++ b/options.html
@@ -26,7 +26,7 @@
       <div class='container'>
         <div class='row'>
           <div class='col-xs-2 col-md-1'>
-            <img id='textsecure-icon' src='icon.png'/>
+            <img id='textsecure-icon' src='/images/icon.png'/>
           </div>
           <div class='col-xs-10 col-md-11'>
             <h1>Welcome to Signal for Chrome</h1>
@@ -82,7 +82,7 @@
       <div class='container'>
         <div class='row'>
           <div class='col-xs-2 col-md-1'>
-            <img id='textsecure-icon' src='icon.png'/>
+            <img id='textsecure-icon' src='/images/icon.png'/>
           </div>
           <div class='col-xs-10 col-md-11'>
             <h1>Signal for Chrome</h1>
diff --git a/register.html b/register.html
index 8e65a2f21..fc51175f5 100644
--- a/register.html
+++ b/register.html
@@ -26,7 +26,7 @@
     <div class='container'>
       <div class='row'>
         <div class='col-xs-2 col-md-1'>
-          <img id='textsecure-icon' src='icon.png'/>
+          <img id='textsecure-icon' src='/images/icon.png'/>
         </div>
         <div class='col-xs-10 col-md-11'>
           <h1>Create your Signal Account</h1>