diff --git a/app/images/beta.png b/app/images/beta.png
new file mode 100644
index 00000000..47a8a37e
Binary files /dev/null and b/app/images/beta.png differ
diff --git a/app/images/logo-optimized.svg b/app/images/logo-optimized.svg
deleted file mode 100644
index 563da6aa..00000000
--- a/app/images/logo-optimized.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" id="svg4647" version="1.1" viewBox=".." preserveAspectRatio="xMidYMid meet">
-  <defs id="defs4649"/>
-  <metadata id="metadata4652"/>
-  <style>
-      .top {
-          transform-origin: 193px 164px;
-          -webkit-animation: rotate 4s cubic-bezier(.49,.05,.32,1.04) infinite alternate;
-          -webkit-transform-origin: 50% 50%;
-          animation: rotate 6s cubic-bezier(.49,.05,.32,1.04) infinite alternate;
-      }
-      .top rect {
-          fill-opacity: 1;
-          fill: #fff;
-          opacity: .6
-      }
-      @-webkit-keyframes rotate {
-          50% {
-              -webkit-transform: rotate(360deg);
-          }
-      }
-      @keyframes rotate {
-          50% {
-              transform: rotate(360deg);
-          }
-      }
-  </style>
-  <g id="layer1" transform="translate(-307.87667,-465.22863)">
-    <g transform="matrix(0.135464,0,0,0.135464,307.268,457.53699)" id="layer1-1" display="inline">
-      <g transform="matrix(1.1783562,0,0,1.1783562,2450.4425,-1298.9778)" id="g6368" display="inline">
-        <g id="g6358" transform="translate(-905.09668,1190.7678)">
-          <g class="bottom">
-              <rect transform="matrix(-0.1406648,0.99005728,-0.99005728,0.14066481,0,0)" y="453.99191" x="19.390564" height="263.03665" width="263.03665" id="rect6306" style="fill-opacity:1;fill:#fff;opacity:0.7"/>
-              <rect transform="matrix(0.1406648,-0.99005728,0.99005728,-0.14066481,0,0)" y="-980.32068" x="-545.35144" height="263.03665" width="263.03665" id="rect6298" style="fill-opacity:1;fill:#fff;opacity:0.5"/>
-              <rect transform="matrix(0.99005728,0.1406648,0.14066481,0.99005728,0,0)" y="239.36371" x="-1091.8109" height="263.03665" width="263.03665" id="rect6290" style="fill-opacity:1;fill:#fff;opacity:0.7"/>
-              <rect transform="matrix(-0.99005728,-0.1406648,-0.14066481,-0.99005728,0,0)" y="-765.04388" x="565.75031" height="263.03665" width="263.03665" id="rect6302" style="fill-opacity:1;fill:#fff;opacity:0.5"/>
-          </g>
-          <g class="top">
-              <rect id="rect6300" width="263.03665" height="263.03665" x="123.24944" y="-1124.9786" transform="matrix(-0.60061118,-0.79954125,0.60061117,-0.79954125,0,0)" />
-              <rect id="rect6304" width="263.03665" height="263.03665" x="522.39832" y="-110.13736" transform="matrix(-0.79954125,0.60061118,-0.79954125,-0.60061117,0,0)" />
-              <rect id="rect6288" width="263.03665" height="263.03665" x="-649.58295" y="599.28192" transform="matrix(0.60061118,0.79954125,-0.60061118,0.79954125,0,0)" />
-              <rect id="rect6296" width="263.03665" height="263.03665" x="-1048.9221" y="-415.20911" transform="matrix(0.79954125,-0.60061118,0.79954125,0.60061117,0,0)" />
-          </g>
-        </g>
-        <rect id="rect6286" width="141.42136" height="141.42136" x="-130.17999" y="2210.6592" transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" style="fill-opacity:1;fill:#fff"/>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/app/images/logo.svg b/app/images/logo.svg
deleted file mode 100644
index cc0be845..00000000
--- a/app/images/logo.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?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="134.24667"
-     height="134.26709"
-     id="svg4647"
-     version="1.1"
-     inkscape:version="0.48.5 r10040"
-     sodipodi:docname="New document 13">
-    <defs
-         id="defs4649" />
-    <sodipodi:namedview
-         id="base"
-         pagecolor="#ffffff"
-         bordercolor="#666666"
-         borderopacity="1.0"
-         inkscape:pageopacity="0.0"
-         inkscape:pageshadow="2"
-         inkscape:zoom="0.35"
-         inkscape:cx="67.123334"
-         inkscape:cy="67.133542"
-         inkscape:document-units="px"
-         inkscape:current-layer="layer1"
-         showgrid="false"
-         fit-margin-top="0"
-         fit-margin-left="0"
-         fit-margin-right="0"
-         fit-margin-bottom="0"
-         inkscape:window-width="501"
-         inkscape:window-height="456"
-         inkscape:window-x="1920"
-         inkscape:window-y="590"
-         inkscape:window-maximized="0" />
-    <metadata
-         id="metadata4652">
-        <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(-307.87667,-465.22863)">
-        <g
-             style="display:inline"
-             transform="matrix(0.135464,0,0,0.135464,307.268,457.53699)"
-             id="layer1-1"
-             inkscape:label="Capa 1">
-            <g
-                 transform="matrix(1.1783562,0,0,1.1783562,2450.4425,-1298.9778)"
-                 id="g6368"
-                 style="display:inline">
-                <g
-                     id="g6358"
-                     transform="translate(-905.09668,1190.7678)">
-                    <rect
-                         transform="matrix(-0.1406648,0.99005728,-0.99005728,0.14066481,0,0)"
-                         y="453.99191"
-                         x="19.390564"
-                         height="263.03665"
-                         width="263.03665"
-                         id="rect6306"
-                         style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke:none" />
-                    <rect
-                         transform="matrix(0.1406648,-0.99005728,0.99005728,-0.14066481,0,0)"
-                         y="-980.32068"
-                         x="-545.35144"
-                         height="263.03665"
-                         width="263.03665"
-                         id="rect6298"
-                         style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:none" />
-                    <rect
-                         transform="matrix(0.99005728,0.1406648,0.14066481,0.99005728,0,0)"
-                         y="239.36371"
-                         x="-1091.8109"
-                         height="263.03665"
-                         width="263.03665"
-                         id="rect6290"
-                         style="opacity:0.7;fill:#ffffff;fill-opacity:1;stroke:none" />
-                    <rect
-                         transform="matrix(-0.99005728,-0.1406648,-0.14066481,-0.99005728,0,0)"
-                         y="-765.04388"
-                         x="565.75031"
-                         height="263.03665"
-                         width="263.03665"
-                         id="rect6302"
-                         style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:none" />
-                    <rect
-                         style="opacity:0.4;fill:#ffffff;fill-opacity:1;stroke:none"
-                         id="rect6300"
-                         width="263.03665"
-                         height="263.03665"
-                         x="123.24944"
-                         y="-1124.9786"
-                         transform="matrix(-0.60061118,-0.79954125,0.60061117,-0.79954125,0,0)" />
-                    <rect
-                         style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:none"
-                         id="rect6304"
-                         width="263.03665"
-                         height="263.03665"
-                         x="522.39832"
-                         y="-110.13736"
-                         transform="matrix(-0.79954125,0.60061118,-0.79954125,-0.60061117,0,0)" />
-                    <rect
-                         style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke:none"
-                         id="rect6288"
-                         width="263.03665"
-                         height="263.03665"
-                         x="-649.58295"
-                         y="599.28192"
-                         transform="matrix(0.60061118,0.79954125,-0.60061118,0.79954125,0,0)" />
-                    <rect
-                         style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:none"
-                         id="rect6296"
-                         width="263.03665"
-                         height="263.03665"
-                         x="-1048.9221"
-                         y="-415.20911"
-                         transform="matrix(0.79954125,-0.60061118,0.79954125,0.60061117,0,0)" />
-                </g>
-                <rect
-                     style="fill:#ffffff;fill-opacity:1;stroke:none"
-                     id="rect6286"
-                     width="141.42136"
-                     height="141.42136"
-                     x="-130.17999"
-                     y="2210.6592"
-                     transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/app/images/project-selector.jpg b/app/images/project-selector.jpg
deleted file mode 100644
index 88f6a1d8..00000000
Binary files a/app/images/project-selector.jpg and /dev/null differ
diff --git a/app/partials/forgot-password.jade b/app/partials/forgot-password.jade
index 87ffe0a5..939f1535 100644
--- a/app/partials/forgot-password.jade
+++ b/app/partials/forgot-password.jade
@@ -4,6 +4,7 @@ block head
     title Taiga  Your agile, free, and open source project management tool
 
 block content
+    include views/common/beta
     div.wrapper
         div.login-main
             div.login-container
diff --git a/app/partials/login-layout.jade b/app/partials/login-layout.jade
index 5b62e060..4f8497b5 100644
--- a/app/partials/login-layout.jade
+++ b/app/partials/login-layout.jade
@@ -1,13 +1,14 @@
 doctype html
 html(lang="en")
-  head
-      title= Taiga
-      meta(http-equiv="content-type", content="text/html; charset=utf-8")
-      meta(name="description", content="Taiga Landing page")
-      meta(name="keywords", content="Agile, Taiga, Management, Github")
-      meta(name="viewport", content="width=device-width, user-scalable=no")
-      link(rel="stylesheet", href="/styles/main.css")
-      block head
+    head
+        title= Taiga
+        meta(http-equiv="content-type", content="text/html; charset=utf-8")
+        meta(name="description", content="Taiga Landing page")
+        meta(name="keywords", content="Agile, Taiga, Management, Github")
+        meta(name="viewport", content="width=device-width, user-scalable=no")
+        link(rel="stylesheet", href="/styles/main.css")
+        block head
   body
-    div.master
-      block content
\ No newline at end of file
+      div.master
+          img.beta(src="images/beta.png", title="We are on beta!")
+          block content
diff --git a/app/partials/login.jade b/app/partials/login.jade
index ff83e7aa..44fc4172 100644
--- a/app/partials/login.jade
+++ b/app/partials/login.jade
@@ -4,6 +4,7 @@ block head
     title Taiga  Your agile, free, and open source project management tool
 
 block content
+    include views/common/beta
     div.wrapper
         div.login-main
             div.login-container
diff --git a/app/partials/register.jade b/app/partials/register.jade
index aae8f578..defb2724 100644
--- a/app/partials/register.jade
+++ b/app/partials/register.jade
@@ -4,6 +4,7 @@ block head
     title Taiga  Your agile, free, and open source project management tool
 
 block content
+    include views/common/beta
     div.wrapper
         div.login-main
             div.login-container
diff --git a/app/partials/views/common/beta.jade b/app/partials/views/common/beta.jade
new file mode 100644
index 00000000..08f38297
--- /dev/null
+++ b/app/partials/views/common/beta.jade
@@ -0,0 +1 @@
+img.beta(src="/images/beta.png", title="We are on beta!")
diff --git a/app/styles/components/beta.scss b/app/styles/components/beta.scss
new file mode 100644
index 00000000..6856d586
--- /dev/null
+++ b/app/styles/components/beta.scss
@@ -0,0 +1,6 @@
+.beta {
+    left: 0;
+    position: absolute;
+    top: 0;
+    z-index: 9999;
+}
diff --git a/app/styles/main.scss b/app/styles/main.scss
index 999f5739..43c1aee0 100755
--- a/app/styles/main.scss
+++ b/app/styles/main.scss
@@ -47,6 +47,7 @@ $prefix-for-spec:      true;
 @import 'components/loader';
 @import 'components/spinner';
 @import 'components/help-notion-button';
+@import 'components/beta';
 
 //#################################################
 //             Modules