diff --git a/scripts/boxesserver b/scripts/boxesserver
index 93e250b..cc91f64 100755
--- a/scripts/boxesserver
+++ b/scripts/boxesserver
@@ -155,6 +155,8 @@ class BServer:
 <html>
 <head>
     <title>Boxes - """, name, """</title>
+    <link rel="icon" type="image/svg+xml" href="static/boxes-logo.svg" sizes="any">
+    <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico">
     <link rel="stylesheet" href="static/self.css" type="text/css" />
 """, self.scripts % (len(box.argparser._action_groups)-3), """
    <meta name="flattr:id" content="456799">
@@ -166,8 +168,8 @@ class BServer:
 <div style="float: left;">
 <a href="./"><h1>Boxes.py</h1></a>
 </div>
-<div style="width: 150px; float: right;">
-<img alt="self-Logo" src="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e8/Gray_shaded_3D_cube.svg/2000px-Gray_shaded_3D_cube.svg.png" width="150" >
+<div style="width: 120px; float: right;">
+<img alt="self-Logo" src="static/boxes-logo.svg" width="120" >
 </div>
 <div>
 <div class="clear"></div>
@@ -227,6 +229,8 @@ class BServer:
 <html>
 <head>
     <title>Boxes.py</title>
+    <link rel="icon" type="image/svg+xml" href="static/boxes-logo.svg" sizes="any">
+    <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico">
     <link rel="stylesheet" href="static/self.css" type="text/css" />
     <script>
 	function change(group, img_link){
@@ -243,7 +247,7 @@ class BServer:
 </head>
 <body onload="hideargs()">
 <div class="container" style="background-color: #FFF8EA;">
-<div style="width: 70%; float: left;">
+<div style="width: 75%; float: left;">
 <h1>Boxes.py</h1>
 <p>
 Create boxes and more with a laser cutter!
@@ -255,8 +259,8 @@ Create boxes and more with a laser cutter!
 
 
 </div>
-<div style="width: 30%; float: left;">
-<img alt="self-Logo" src="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e8/Gray_shaded_3D_cube.svg/2000px-Gray_shaded_3D_cube.svg.png" width="300" >
+<div style="width: 25%; float: left;">
+<img alt="self-Logo" src="static/boxes-logo.svg" width="250" >
 </div>
 <div>
 <div class="clear"></div>
diff --git a/static/boxes-logo.svg b/static/boxes-logo.svg
new file mode 100644
index 0000000..dd5dd8a
--- /dev/null
+++ b/static/boxes-logo.svg
@@ -0,0 +1,340 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96.005951mm"
+   height="96mm"
+   viewBox="0 0 96.005951 96.000001"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="boxes-logo.svg">
+  <defs
+     id="defs2">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 143.86828 : 1"
+       inkscape:vp_y="0 : 872.74541 : 0"
+       inkscape:vp_z="211.88988 : 155.08409 : 1"
+       inkscape:persp3d-origin="105 : 100.66739 : 1"
+       id="perspective815" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="54.453654"
+     inkscape:cy="16.311013"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:snap-global="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     inkscape:window-x="1920"
+     inkscape:window-y="31"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <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(-68.791665,-36.197187)">
+    <rect
+       style="fill:#89a02c;stroke:none;stroke-width:0.50514621;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+       id="rect861-7"
+       width="46.089851"
+       height="45.580322"
+       x="79.889076"
+       y="-147.79665"
+       ry="4.9136906"
+       transform="matrix(0.86108975,-0.50845299,0,-1,0,0)" />
+    <rect
+       style="fill:#677821;stroke:none;stroke-width:0.50514621;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+       id="rect861-3-5"
+       width="46.089851"
+       height="45.133945"
+       x="-172.06879"
+       y="-19.241495"
+       ry="4.9136906"
+       transform="matrix(-0.86108975,-0.508453,0,-1,0,0)" />
+    <rect
+       style="fill:#abc837;stroke:none;stroke-width:0.50514621;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+       id="rect861"
+       width="45.650902"
+       height="45.580326"
+       x="79.889076"
+       y="20.976589"
+       ry="4.9136906"
+       transform="matrix(0.86108975,0.50845299,0,1,0,0)" />
+    <rect
+       style="fill:#bcd35f;stroke:none;stroke-width:0.50514621;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+       id="rect861-3"
+       width="46.528809"
+       height="45.133953"
+       x="-172.06879"
+       y="149.08537"
+       ry="4.9136906"
+       transform="matrix(-0.86108975,0.508453,0,1,0,0)" />
+    <g
+       id="g4893"
+       transform="translate(24.946429,-146.20121)">
+      <g
+         style="fill:#ff6600"
+         id="g4708"
+         transform="matrix(0.3639968,0.1462834,-0.15538534,0.33780911,77.739475,139.34285)">
+        <rect
+           style="fill:#ff6600;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           id="rect4692"
+           width="44.223213"
+           height="7.1815472"
+           x="108.10117"
+           y="214.97917"
+           ry="3.5907736"
+           inkscape:transform-center-x="-21.544643"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:tile-x0="106.96724"
+           inkscape:tile-y0="215.73512" />
+        <rect
+           transform="rotate(45)"
+           style="fill:#ff6600;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           id="rect4694"
+           width="44.223213"
+           height="7.1815472"
+           x="230.29077"
+           y="75.568596"
+           ry="3.5907736"
+           inkscape:transform-center-x="-21.544643"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:tile-x0="106.96724"
+           inkscape:tile-y0="215.73512" />
+        <rect
+           transform="rotate(90)"
+           style="fill:#ff6600;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           id="rect4696"
+           width="44.223213"
+           height="7.1815472"
+           x="218.38095"
+           y="-110.74701"
+           ry="3.5907736"
+           inkscape:transform-center-x="-21.544643"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:tile-x0="106.96724"
+           inkscape:tile-y0="215.73512" />
+        <rect
+           transform="rotate(135)"
+           style="fill:#ff6600;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           id="rect4698"
+           width="44.223213"
+           height="7.1815472"
+           x="78.214424"
+           y="-234.07053"
+           ry="3.5907736"
+           inkscape:transform-center-x="-21.544643"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:tile-x0="106.96724"
+           inkscape:tile-y0="215.73512" />
+        <rect
+           transform="scale(-1)"
+           style="fill:#ff6600;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           id="rect4700"
+           width="44.223213"
+           height="7.1815472"
+           x="-108.10117"
+           y="-222.16072"
+           ry="3.5907736"
+           inkscape:transform-center-x="-21.544643"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:tile-x0="106.96724"
+           inkscape:tile-y0="215.73512" />
+        <rect
+           transform="rotate(-135)"
+           style="fill:#ff6600;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           id="rect4702"
+           width="44.223213"
+           height="7.1815472"
+           x="-231.4247"
+           y="-81.994186"
+           ry="3.5907736"
+           inkscape:transform-center-x="-21.544643"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:tile-x0="106.96724"
+           inkscape:tile-y0="215.73512" />
+        <rect
+           transform="rotate(-90)"
+           style="fill:#ff6600;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           id="rect4704"
+           width="44.223213"
+           height="7.1815472"
+           x="-219.51488"
+           y="104.32141"
+           ry="3.5907736"
+           inkscape:transform-center-x="-21.544643"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:tile-x0="106.96724"
+           inkscape:tile-y0="215.73512" />
+        <rect
+           transform="rotate(-45)"
+           style="fill:#ff6600;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           id="rect4706"
+           width="44.223213"
+           height="7.1815472"
+           x="-79.348351"
+           y="227.64493"
+           ry="3.5907736"
+           inkscape:transform-center-x="-21.544643"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:tile-x0="106.96724"
+           inkscape:tile-y0="215.73512" />
+      </g>
+      <ellipse
+         ry="7.272727"
+         rx="7.8205128"
+         cy="229.03592"
+         cx="83.002831"
+         id="path907"
+         style="fill:#ff0000;stroke:none;stroke-width:0.35351479;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" />
+      <g
+         transform="matrix(0.52136751,0,0,0.48484848,26.642386,122.87936)"
+         id="g4690">
+        <rect
+           inkscape:tile-y0="215.73512"
+           inkscape:tile-x0="106.96724"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:transform-center-x="-21.544643"
+           ry="3.5907736"
+           y="214.97917"
+           x="108.10117"
+           height="7.1815472"
+           width="44.223213"
+           id="use4632"
+           style="fill:#ff0000;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" />
+        <rect
+           inkscape:tile-y0="215.73512"
+           inkscape:tile-x0="106.96724"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:transform-center-x="-21.544643"
+           ry="3.5907736"
+           y="75.568596"
+           x="230.29077"
+           height="7.1815472"
+           width="44.223213"
+           id="use4634"
+           style="fill:#ff0000;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           transform="rotate(45)" />
+        <rect
+           inkscape:tile-y0="215.73512"
+           inkscape:tile-x0="106.96724"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:transform-center-x="-21.544643"
+           ry="3.5907736"
+           y="-110.74701"
+           x="218.38095"
+           height="7.1815472"
+           width="44.223213"
+           id="use4636"
+           style="fill:#ff0000;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           transform="rotate(90)" />
+        <rect
+           inkscape:tile-y0="215.73512"
+           inkscape:tile-x0="106.96724"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:transform-center-x="-21.544643"
+           ry="3.5907736"
+           y="-234.07053"
+           x="78.214424"
+           height="7.1815472"
+           width="44.223213"
+           id="use4638"
+           style="fill:#ff0000;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           transform="rotate(135)" />
+        <rect
+           inkscape:tile-y0="215.73512"
+           inkscape:tile-x0="106.96724"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:transform-center-x="-21.544643"
+           ry="3.5907736"
+           y="-222.16072"
+           x="-108.10117"
+           height="7.1815472"
+           width="44.223213"
+           id="use4640"
+           style="fill:#ff0000;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           transform="scale(-1)" />
+        <rect
+           inkscape:tile-y0="215.73512"
+           inkscape:tile-x0="106.96724"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:transform-center-x="-21.544643"
+           ry="3.5907736"
+           y="-81.994186"
+           x="-231.4247"
+           height="7.1815472"
+           width="44.223213"
+           id="use4642"
+           style="fill:#ff0000;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           transform="rotate(-135)" />
+        <rect
+           inkscape:tile-y0="215.73512"
+           inkscape:tile-x0="106.96724"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:transform-center-x="-21.544643"
+           ry="3.5907736"
+           y="104.32141"
+           x="-219.51488"
+           height="7.1815472"
+           width="44.223213"
+           id="use4644"
+           style="fill:#ff0000;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           transform="rotate(-90)" />
+        <rect
+           inkscape:tile-y0="215.73512"
+           inkscape:tile-x0="106.96724"
+           inkscape:transform-center-y="0.37797619"
+           inkscape:transform-center-x="-21.544643"
+           ry="3.5907736"
+           y="227.64493"
+           x="-79.348351"
+           height="7.1815472"
+           width="44.223213"
+           id="use4646"
+           style="fill:#ff0000;stroke:none;stroke-width:0.46875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+           transform="rotate(-45)" />
+      </g>
+      <rect
+         ry="4.3467264"
+         y="224.68919"
+         x="82.020828"
+         height="8.6934528"
+         width="57.830357"
+         id="rect4731"
+         style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.39821634;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" />
+    </g>
+  </g>
+</svg>
diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 0000000..3a7f135
Binary files /dev/null and b/static/favicon.ico differ
