diff --git a/.gitignore b/.gitignore
index 485dee6..08fe6ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .idea
+build
diff --git a/README.md b/README.md
index 6ecb828..6c65c6e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # JSON Editor Online
-http://jsoneditoronline.org
+http://jsoneditoronline.org/
 
 
 ### Description
@@ -21,10 +21,10 @@ formatted plain text.
 
 ### Getting started
 
-- Website:    http://jsoneditoronline.org
-- Wiki:       https://github.com/wjosdejong/jsoneditoronline/wiki
-- Sourcecode: https://github.com/wjosdejong/jsoneditoronline
-- Downloads:  https://github.com/wjosdejong/jsoneditoronline/tree/master/build/lib
+- Website:    http://jsoneditoronline.org/
+- Wiki:       https://github.com/wjosdejong/jsoneditoronline/wiki/
+- Sourcecode: https://github.com/wjosdejong/jsoneditoronline/
+- Downloads:  https://github.com/wjosdejong/jsoneditoronline/tree/master/build/lib/
 
 
 ### Screenshot
diff --git a/build.xml b/build.xml
index 37e5af9..ea375f1 100644
--- a/build.xml
+++ b/build.xml
@@ -7,7 +7,8 @@
 
     <property name="root" location="" />
     <property name="lib" location="build/lib" />
-    <property name="site" location="build/site" />
+    <property name="web" location="build/web" />
+    <property name="chrome_app" location="build/app/chrome" />
     <property name="compressor" value="tools/yuicompressor-2.4.7.jar" />
 
     <target name="minify" description="minify jsoneditor libraries">
@@ -55,22 +56,46 @@
         </zip>
     </target>
 
-    <target name="buildsite" depends="minify" description="copy all files for the site to the build directory">
-        <delete dir="${site}" />
-        <mkdir dir="${site}" />
-        <copy file="LICENSE" todir="${site}" />
-        <copy file="NOTICE" todir="${site}" />
-        <copy file="robots.txt" todir="${site}" />
-        <copy file="changelog.txt" todir="${site}" />
-        <copy file="index.html" todir="${site}" />
-        <copy file="favicon.ico" todir="${site}" />
-        <copy file="interface/interface.js" todir="${site}/interface" />
-        <copy file="interface/interface.css" todir="${site}/interface" />
-        <copy file="jsoneditor/jsoneditor-min.js" todir="${site}/jsoneditor" />
-        <copy file="jsoneditor/jsoneditor-min.css" todir="${site}/jsoneditor" />
-        <copy file="jsoneditor/img/jsoneditor-icons.png" todir="${site}/jsoneditor/img" />
+    <target name="build_site" depends="minify" description="copy all files for the site to the build directory">
+        <delete dir="${web}" />
+        <mkdir dir="${web}" />
+        <copy file="LICENSE" todir="${web}" />
+        <copy file="NOTICE" todir="${web}" />
+        <copy file="README.md" todir="${web}" />
+        <copy file="robots.txt" todir="${web}" />
+        <copy file="changelog.txt" todir="${web}" />
+        <copy file="index.html" todir="${web}" />
+        <copy file="favicon.ico" todir="${web}" />
+        <copy file="interface/interface.js" todir="${web}/interface" />
+        <copy file="interface/interface.css" todir="${web}/interface" />
+        <copy file="interface/img/logo.png" todir="${web}/interface/img" />
+        <copy file="interface/img/header_background.png" todir="${web}/interface/img" />
+        <copy file="jsoneditor/jsoneditor-min.js" todir="${web}/jsoneditor" />
+        <copy file="jsoneditor/jsoneditor-min.css" todir="${web}/jsoneditor" />
+        <copy file="jsoneditor/img/jsoneditor-icons.png" todir="${web}/jsoneditor/img" />
     </target>
 
-    <target name="main" depends="minify,zip,buildsite" />
+    <target name="build_chrome_app" depends="minify" description="copy all files for the chrome app to the build directory">
+        <delete dir="${chrome_app}" />
+        <mkdir dir="${chrome_app}" />
+        <copy file="app/chrome/manifest.json" todir="${chrome_app}" />
+        <copy file="app/chrome/index.html" todir="${chrome_app}" />
+        <copy file="interface/img/icon_128.png" todir="${chrome_app}" />
+        <copy file="interface/img/icon_16.png" todir="${chrome_app}" />
+        <copy file="LICENSE" todir="${chrome_app}" />
+        <copy file="NOTICE" todir="${chrome_app}" />
+        <copy file="README.md" todir="${chrome_app}" />
+        <copy file="changelog.txt" todir="${chrome_app}" />
+        <copy file="favicon.ico" todir="${chrome_app}" />
+        <copy file="interface/interface.js" todir="${chrome_app}/interface" />
+        <copy file="interface/interface.css" todir="${chrome_app}/interface" />
+        <copy file="interface/img/logo_app.png" todir="${chrome_app}/interface/img" />
+        <copy file="interface/img/header_background.png" todir="${chrome_app}/interface/img" />
+        <copy file="jsoneditor/jsoneditor-min.js" todir="${chrome_app}/jsoneditor" />
+        <copy file="jsoneditor/jsoneditor-min.css" todir="${chrome_app}/jsoneditor" />
+        <copy file="jsoneditor/img/jsoneditor-icons.png" todir="${chrome_app}/jsoneditor/img" />
+    </target>
+
+    <target name="main" depends="minify, zip, build_site, build_chrome_app" />
 
 </project>
\ No newline at end of file
diff --git a/favicon.ico b/favicon.ico
index 50363bb..e535075 100644
Binary files a/favicon.ico and b/favicon.ico differ
diff --git a/index.html b/index.html
index 8f3a6d7..e4edc86 100644
--- a/index.html
+++ b/index.html
@@ -59,15 +59,9 @@
 <body spellcheck="false" >
 
 <div id="header">
-    <!--
-    <h1>JSON Editor Online</h1>
-    -->
-    <h1><a href="http://jsoneditoronline.org" class="header">
-        JSON <span class="header-light">=
-    {"</span>Editor<span class="header-light">":
-    "</span>Online<span class="header-light">"}</span>
+    <a href="http://jsoneditoronline.org" class="header">
+        <img alt="JSON Editor Online" src="interface/img/logo.png" id="logo">
     </a>
-    </h1>
 
     <!-- TODO: info, links, faq -->
     <!--
diff --git a/interface/img/description.txt b/interface/img/description.txt
new file mode 100644
index 0000000..215eb62
--- /dev/null
+++ b/interface/img/description.txt
@@ -0,0 +1,20 @@
+JSON Editor Online Logo
+
+font: Source Sans Pro, 19.2pt (24px)
+    "JSON Editor" -> "Source Sans Pro"
+    "Online"      -> "Source Sans Pro Light"
+
+color: white
+
+logo size: 32x200 px
+
+
+JSON Editor Online Icon
+
+Icon 128x128px
+    background is 100x100px, color #4d4d4d, border radius 10px
+    glass is white, opacity 10%
+    text "{ }" is Arial, 78px, white
+
+Icon 16x16px
+    background full 16x16px. Scaled down from the 128x128px icon
diff --git a/interface/img/header_background.png b/interface/img/header_background.png
new file mode 100644
index 0000000..df756d2
Binary files /dev/null and b/interface/img/header_background.png differ
diff --git a/interface/img/icon_128.png b/interface/img/icon_128.png
new file mode 100644
index 0000000..48b5f75
Binary files /dev/null and b/interface/img/icon_128.png differ
diff --git a/interface/img/icon_16.png b/interface/img/icon_16.png
new file mode 100644
index 0000000..f1b2b91
Binary files /dev/null and b/interface/img/icon_16.png differ
diff --git a/interface/img/icon_gray.svg b/interface/img/icon_gray.svg
new file mode 100644
index 0000000..443dc40
--- /dev/null
+++ b/interface/img/icon_gray.svg
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon_gray.svg"
+   inkscape:export-filename="/home/jos/jsoneditoronline/interface/img/jsoneditor_gray_128.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3873">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3875" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3877" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3831">
+      <stop
+         style="stop-color:#88a4f7;stop-opacity:1;"
+         offset="0"
+         id="stop3833" />
+      <stop
+         style="stop-color:#88a4f7;stop-opacity:0;"
+         offset="1"
+         id="stop3835" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3782">
+      <stop
+         style="stop-color:#88a4f7;stop-opacity:1;"
+         offset="0"
+         id="stop3784" />
+      <stop
+         style="stop-color:#88a4f7;stop-opacity:0;"
+         offset="1"
+         id="stop3786" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient3879"
+       x1="-52.789062"
+       y1="95.528737"
+       x2="46.478516"
+       y2="95.528737"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient3885"
+       gradientUnits="userSpaceOnUse"
+       x1="-52.789062"
+       y1="95.528737"
+       x2="46.478516"
+       y2="95.528737"
+       gradientTransform="matrix(1.2781663,0,0,1.2781663,-0.56683723,-27.178371)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="74.123"
+     inkscape:cy="63.939559"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1600"
+     inkscape:window-height="849"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="0,1"
+       position="62.57895,132.22897"
+       id="guide3871" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36218)">
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect3004"
+       width="100"
+       height="100"
+       x="14"
+       y="938.36218"
+       ry="10"
+       rx="10" />
+    <path
+       style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:none"
+       d="M 14,50.875 14.03125,23 c 0.0926,-4.543321 4.895309,-8.941992 9.125,-9 l 81.96875,0 c 4.49471,0.0913 8.85437,5.039189 8.875,9.125 L 114,51 C 80.492943,56.594067 47.17385,55.936454 14,50.875 z"
+       id="path3768"
+       inkscape:connector-curvature="0"
+       transform="translate(0,924.36218)"
+       sodipodi:nodetypes="ccccccc" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3815"
+       style="font-size:100px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial Bold"
+       transform="matrix(0.78237078,0,0,0.78237078,65.80062,914.91146)"><flowRegion
+         id="flowRegion3817"
+         style="fill:url(#linearGradient3885);fill-opacity:1"><rect
+           id="rect3819"
+           width="208.57143"
+           height="192.14285"
+           x="-55.714287"
+           y="23"
+           style="font-size:100px;font-style:normal;fill:#ffffff;fill-opacity:1;-inkscape-font-specification:Arial Bold" /></flowRegion><flowPara
+         id="flowPara3821"
+         style="font-size:100px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial Bold">{ }</flowPara></flowRoot>  </g>
+</svg>
diff --git a/interface/img/icon_gray_16.svg b/interface/img/icon_gray_16.svg
new file mode 100644
index 0000000..d947eca
--- /dev/null
+++ b/interface/img/icon_gray_16.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon_gray_16.svg"
+   inkscape:export-filename="/home/jos/jsoneditoronline/interface/img/icon_16.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3873">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3875" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3877" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3831">
+      <stop
+         style="stop-color:#88a4f7;stop-opacity:1;"
+         offset="0"
+         id="stop3833" />
+      <stop
+         style="stop-color:#88a4f7;stop-opacity:0;"
+         offset="1"
+         id="stop3835" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3782">
+      <stop
+         style="stop-color:#88a4f7;stop-opacity:1;"
+         offset="0"
+         id="stop3784" />
+      <stop
+         style="stop-color:#88a4f7;stop-opacity:0;"
+         offset="1"
+         id="stop3786" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient3879"
+       x1="-52.789062"
+       y1="95.52874"
+       x2="46.478516"
+       y2="95.52874"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient3885"
+       gradientUnits="userSpaceOnUse"
+       x1="-52.789062"
+       y1="95.52874"
+       x2="46.478516"
+       y2="95.52874"
+       gradientTransform="matrix(7.98854,0,0,7.9885394,455.89837,-215.38857)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="1.8526919"
+     inkscape:cy="9.2265399"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1600"
+     inkscape:window-height="849"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="0,1"
+       position="62.57895,132.22897"
+       id="guide3871" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect3004"
+       width="15.999998"
+       height="15.999999"
+       x="0"
+       y="1036.3622"
+       ry="1.25"
+       rx="1.25" />
+    <path
+       style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 1.3156105e-7,1042.2621 0.004999998439,-4.46 c -0.0086175,-1.0941 0.3535625,-1.4385 1.45999997,-1.44 l 13.1149989,0 c 0.94181,-6e-4 1.428418,0.3571 1.42,1.46 l 0,4.46 c -5.361129,0.8951 -10.6921826,0.7899 -15.99999886843895,-0.02 z"
+       id="path3768"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3815"
+       style="font-size:100px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial Bold"
+       transform="matrix(0.12517931,0,0,0.12517932,8.2880984,1032.61)"><flowRegion
+         id="flowRegion3817"
+         style="fill:url(#linearGradient3885);fill-opacity:1"><rect
+           id="rect3819"
+           width="208.57143"
+           height="192.14285"
+           x="-55.714287"
+           y="23"
+           style="font-size:100px;font-style:normal;fill:#ffffff;fill-opacity:1;-inkscape-font-specification:Arial Bold" /></flowRegion><flowPara
+         id="flowPara3821"
+         style="font-size:100px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial Bold">{ }</flowPara></flowRoot>  </g>
+</svg>
diff --git a/interface/img/icon_orange.svg b/interface/img/icon_orange.svg
new file mode 100644
index 0000000..e1fc668
--- /dev/null
+++ b/interface/img/icon_orange.svg
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon_orange.svg"
+   inkscape:export-filename="/home/jos/jsoneditoronline/interface/img/jsoneditor_gray_128.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3873">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3875" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3877" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3831">
+      <stop
+         style="stop-color:#88a4f7;stop-opacity:1;"
+         offset="0"
+         id="stop3833" />
+      <stop
+         style="stop-color:#88a4f7;stop-opacity:0;"
+         offset="1"
+         id="stop3835" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3782">
+      <stop
+         style="stop-color:#88a4f7;stop-opacity:1;"
+         offset="0"
+         id="stop3784" />
+      <stop
+         style="stop-color:#88a4f7;stop-opacity:0;"
+         offset="1"
+         id="stop3786" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient3879"
+       x1="-52.789062"
+       y1="95.528737"
+       x2="46.478516"
+       y2="95.528737"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient3885"
+       gradientUnits="userSpaceOnUse"
+       x1="-52.789062"
+       y1="95.528737"
+       x2="46.478516"
+       y2="95.528737"
+       gradientTransform="matrix(1.2781663,0,0,1.2781663,-0.56683723,-27.178371)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="26.373"
+     inkscape:cy="63.939559"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1600"
+     inkscape:window-height="849"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="0,1"
+       position="62.57895,132.22897"
+       id="guide3871" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36218)">
+    <rect
+       style="fill:#ffcb00;fill-opacity:1;stroke:none"
+       id="rect3004"
+       width="100"
+       height="100"
+       x="14"
+       y="938.36218"
+       ry="10"
+       rx="10" />
+    <path
+       style="opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none"
+       d="M 14,50.875 14.03125,23 c 0.0926,-4.543321 4.895309,-8.941992 9.125,-9 l 81.96875,0 c 4.49471,0.0913 8.85437,5.039189 8.875,9.125 L 114,51 C 80.492943,56.594067 47.17385,55.936454 14,50.875 z"
+       id="path3768"
+       inkscape:connector-curvature="0"
+       transform="translate(0,924.36218)"
+       sodipodi:nodetypes="ccccccc" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3815"
+       style="font-size:100px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial Bold"
+       transform="matrix(0.78237078,0,0,0.78237078,65.80062,914.91146)"><flowRegion
+         id="flowRegion3817"
+         style="fill:url(#linearGradient3885);fill-opacity:1"><rect
+           id="rect3819"
+           width="208.57143"
+           height="192.14285"
+           x="-55.714287"
+           y="23"
+           style="font-size:100px;font-style:normal;fill:#ffffff;fill-opacity:1;-inkscape-font-specification:Arial Bold" /></flowRegion><flowPara
+         id="flowPara3821"
+         style="font-size:100px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial Bold">{ }</flowPara></flowRoot>  </g>
+</svg>
diff --git a/interface/img/logo.png b/interface/img/logo.png
new file mode 100644
index 0000000..dae856d
Binary files /dev/null and b/interface/img/logo.png differ
diff --git a/interface/img/logo.xcf b/interface/img/logo.xcf
new file mode 100644
index 0000000..3dce68c
Binary files /dev/null and b/interface/img/logo.xcf differ
diff --git a/interface/img/logo_app.png b/interface/img/logo_app.png
new file mode 100644
index 0000000..41cd0ce
Binary files /dev/null and b/interface/img/logo_app.png differ
diff --git a/interface/img/logo_app.xcf b/interface/img/logo_app.xcf
new file mode 100644
index 0000000..c074f83
Binary files /dev/null and b/interface/img/logo_app.xcf differ
diff --git a/interface/interface.css b/interface/interface.css
index a945dce..c9d4562 100644
--- a/interface/interface.css
+++ b/interface/interface.css
@@ -10,12 +10,6 @@ body, html {
     overflow: hidden;
 }
 
-h1 {
-    font-size: 18px;
-    padding: 10px 15px;
-    margin: 0;
-}
-
 span.header-light {
     color: gray;
 }
@@ -25,10 +19,16 @@ span.header-light {
     height: 40px;
     overflow: hidden;
 
-    background-color: #4D4D4D;
+    background: #4D4D4D url('img/header_background.png');
     color: white;
 }
 
+#logo {
+    height: 32px;
+    margin: 4px 10px;
+    border: none;
+}
+
 #auto {
     width: 100%;
     height: 100%;
diff --git a/interface/interface.js b/interface/interface.js
index 0f3e7f9..7b84fc4 100644
--- a/interface/interface.js
+++ b/interface/interface.js
@@ -323,6 +323,8 @@ main.showError = function (message) {
 
 main.hideAds = function() {
     var domAd = document.getElementById("ad");
-    domAd.parentNode.removeChild(domAd);
-    main.resize();
+    if (domAd) {
+        domAd.parentNode.removeChild(domAd);
+        main.resize();
+    }
 };
diff --git a/jsoneditor/img/colors.txt b/jsoneditor/img/description.txt
similarity index 74%
rename from jsoneditor/img/colors.txt
rename to jsoneditor/img/description.txt
index ff848ac..ad8f3c8 100644
--- a/jsoneditor/img/colors.txt
+++ b/jsoneditor/img/description.txt
@@ -1,6 +1,7 @@
 JSON Editor Online Icons
 
-size:             16x16 px
+size:             outer: 24x24 px
+                  inner: 16x16 px 
 
 blue background:  RGBA 97b0f8ff
 gray background:  RGBA d3d3d3ff
diff --git a/jsoneditor/jsoneditor.js b/jsoneditor/jsoneditor.js
index de7ba4a..33ac5b9 100644
--- a/jsoneditor/jsoneditor.js
+++ b/jsoneditor/jsoneditor.js
@@ -2,7 +2,8 @@
  * @file jsoneditor.js
  *
  * @brief
- * JSONEditor is an editor to display and edit JSON data in a treeview.
+ * JSONEditor is a web-based tool to view, edit, and format JSON.
+ * It shows data a clear, editable treeview.
  *
  * Supported browsers: Chrome, Firefox, Safari, Opera, Internet Explorer 8+
  *
diff --git a/test.html b/test.html
index febe2a3..0cbdc2b 100644
--- a/test.html
+++ b/test.html
@@ -43,7 +43,7 @@
     <meta name="keywords" content="json, editor, formatter, online, format, parser, json editor, json editor online, online json editor, javascript, javascript object notation, tools, tool, json tools, treeview, open source, free, json parser, json parser online, json formatter, json formatter online, online json formatter, online json parser, format json online">
     <meta name="author" content="Jos de Jong">
 
-    <link rel="shortcut icon" href="favicon.ico">
+    <link rel="shortcut icon" href="favicon_yellow.ico">
 
     <link href="interface/interface.css" rel="stylesheet" type="text/css">
     <link href="jsoneditor/jsoneditor.css" rel="stylesheet" type="text/css">
@@ -58,16 +58,11 @@
 
 <body spellcheck="false" >
 
-<div id="header">
-    <!--
-    <h1>JSON Editor Online</h1>
-    -->
-    <h1><a href="http://jsoneditoronline.org" class="header">
-        JSON <span class="header-light">=
-    {"</span>Editor<span class="header-light">":
-    "</span>Online<span class="header-light">"}</span>
+<div id="header" >
+    <a href="http://jsoneditoronline.org" class="header">
+        <img alt="JSON Editor Online" src="interface/img/logo.png" id="logo">
     </a>
-    </h1>
+
 
     <!-- TODO: info, links, faq -->
     <!--