diff --git a/templates/default/404.html b/templates/default/404.html
index 3f2a7385c..f7b47381e 100644
--- a/templates/default/404.html
+++ b/templates/default/404.html
@@ -12,30 +12,11 @@
 
 {block name="main-content"}
 <div class="main">
-    <article id="cart" class="col-main" role="main" aria-labelledby="main-label">
-
-        <h1 id="main-label" class="page_404">
+    <article class="col-main" role="main" aria-labelledby="main-label">
+        <h1 id="main-label">
             404
             <span>{intl l="The page cannot be found"}</span>
         </h1>
-
-
-
-        {ifloop rel="product_upsell"}
-            <aside id="products-upsell" role="complementary" aria-labelledby="products-upsell-label">
-                <div class="products-heading">
-                    <h3 id="products-upsell-label">{intl l="Upsell Products"}</h3>
-                </div>
-
-                <div class="products-content">
-                    <ul class="products-grid product-col-5 hover-effect">
-                        {loop name="product_upsell" type="product" promo="yes" limit="5"}
-                            {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=true width="218" height="146"}
-                        {/loop}
-                    </ul>
-                </div>
-            </aside><!-- #products-upsell -->
-        {/ifloop}
-
-    </div>
+    </article>
+</div>
 {/block}
diff --git a/templates/default/assets/less/thelia/global.less b/templates/default/assets/less/thelia/global.less
index 378af265c..29c19c0c5 100755
--- a/templates/default/assets/less/thelia/global.less
+++ b/templates/default/assets/less/thelia/global.less
@@ -3,19 +3,6 @@
 // Main Title
 .page-header { margin-top: 0; }
 
-// 404 Page
-.page_404{
-  color: @brand-primary;
-  font-size: 9em; font-weight: bold;
-  text-align: center;
-
-  span{
-    color : #CCC;
-    display: block;
-    font-size: 15px; font-weight: normal;
-  }
-}
-
 // Collapse
 .no-js .collapse { display: block!important; }
 
diff --git a/templates/default/assets/less/thelia/import.less b/templates/default/assets/less/thelia/import.less
index b18246f32..594ee91b3 100755
--- a/templates/default/assets/less/thelia/import.less
+++ b/templates/default/assets/less/thelia/import.less
@@ -30,5 +30,5 @@
 
 // Thelia : Pages
 @import "page-home.less";
+@import "page-error.less";
 //@import "page-login.less";
-//@import "page-error.less";
\ No newline at end of file
diff --git a/templates/default/assets/less/thelia/page-error.less b/templates/default/assets/less/thelia/page-error.less
new file mode 100755
index 000000000..8f5f1df72
--- /dev/null
+++ b/templates/default/assets/less/thelia/page-error.less
@@ -0,0 +1,15 @@
+// 404 Page
+.page-404 {
+  .main { padding: 10px 0 100px; }
+  #main-label {
+    color: @brand-primary;
+    font-size: 9em; font-weight: bold;
+    text-align: center;
+
+    span{
+      color : #CCC;
+      display: block;
+      font-size: 15px; font-weight: normal;
+    }
+  }
+}