diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html
index 50578dd07bb..03c73aa8682 100644
--- a/addons/base/static/src/base.html
+++ b/addons/base/static/src/base.html
@@ -5,9 +5,9 @@
     <title>OpenERP</title>
     <link rel="shortcut icon" href="/base/static/openerp/img/favicon.ico" type="image/x-icon"/>
 
-    <link rel="stylesheet" type="text/css" media="screen" href="/base/static/src/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css" />
-    <link rel="stylesheet" type="text/css" media="screen" href="/base/static/src/jquery.jqGrid/css/ui.jqgrid.css" />
-    <link rel="stylesheet" type="text/css" href="/base/static/src/jquery.superfish/css/superfish.css" media="screen">
+    <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css" />
+    <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.jqGrid/css/ui.jqgrid.css" />
+    <link rel="stylesheet" type="text/css" href="/base/static/lib/jquery.superfish/css/superfish.css" media="screen">
     <link rel="stylesheet" href="/base/static/src/css/base.css" type="text/css"/>
     
     <script type="text/javascript" src="/base/static/lib/LABjs/LAB.js"></script>
diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 02a5af04c64..58adf4183e4 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -93,7 +93,7 @@ body.openerp {
     height: 34px;
     position: relative;
     white-space: nowrap;
-    background: url(img/menu-bg.png) repeat-x;
+    background: url(../img/menu-bg.png) repeat-x;
 }
 .openerp .menu ul {
     margin: 0;
@@ -117,7 +117,7 @@ body.openerp {
     display: block;
     float: left;
     padding: 0 0 0 3px;
-    background: url(img/menu-item.png) no-repeat;
+    background: url(../img/menu-item.png) no-repeat;
     color: #eee;
     text-shadow: #222 0 1px 0;
     text-decoration: none;
@@ -128,7 +128,7 @@ body.openerp {
     min-width: 60px;
     height: 23px;
     padding: 0 9px 0 6px;
-    background: url(img/menu-item.png) 100% 0 no-repeat;
+    background: url(../img/menu-item.png) 100% 0 no-repeat;
     line-height: 22px;
     font-weight: bold;
     font-size: 85%;
@@ -161,7 +161,7 @@ body.openerp {
 }
 .openerp .secondary_menu h3 {
     padding: 0 0 2px;
-    background: url(img/secondary_menu-bg.gif) 0 100% repeat-x;
+    background: url(../img/secondary_menu-bg.gif) 0 100% repeat-x;
     border: none;
 }
 .openerp .secondary_menu h4 {
@@ -181,7 +181,7 @@ body.openerp {
     text-shadow: 0 1px 0 #333;
 }
 .openerp .secondary_menu h3 a {
-    background: url(img/secondary_menu-h3-bg.png) 0 100% repeat-x;
+    background: url(../img/secondary_menu-h3-bg.png) 0 100% repeat-x;
 }
 .openerp .secondary_menu a.leaf:hover,
 .openerp .secondary_menu a.leaf:active,
@@ -192,7 +192,7 @@ body.openerp {
 .openerp .secondary_menu h4:hover a,
 .openerp .secondary_menu h4:active a,
 .openerp .secondary_menu h4.active a {
-    background: url(img/secondary_menu-link-bg.gif) repeat-x;
+    background: url(../img/secondary_menu-link-bg.gif) repeat-x;
     color: #3f3d3d;
     text-shadow: #fff 0 1px 0;
     border: none !important;
@@ -201,7 +201,7 @@ body.openerp {
 /* Header */
 .openerp .header {
     height: 65px;
-    background: url("img/header-background.png") repeat-x scroll left top transparent;
+    background: url("../img/header-background.png") repeat-x scroll left top transparent;
     color: #FFFFFF;
     letter-spacing: 0.5px;
     text-shadow: 0 1px 0 #333333;
@@ -380,13 +380,13 @@ body.openerp {
     background-color: #ccc;
 }
 .openerp .searchview_group.folded .searchview_group_string {
-    background: url("img/ui/group-folded.png") no-repeat scroll 0 50%;
+    background: url("../img/ui/group-folded.png") no-repeat scroll 0 50%;
 }
 .openerp .searchview_group.folded .searchview_group_content {
     display: none;
 }
 .openerp .searchview_group.expanded .searchview_group_string {
-    background: url("img/ui/group-expanded.png") no-repeat scroll 0 50%;
+    background: url("../img/ui/group-expanded.png") no-repeat scroll 0 50%;
 }
 .openerp .searchview_group.expanded .searchview_group_content {
     display: block;
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 2980cc20f4d..1fa14b7fa56 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -54,7 +54,7 @@
 </t>
 <t t-name="Header">
     <a href="/" class="company_logo_link">
-        <img src="/base/static/openerp/img/logo.png" border="0" class="company_logo"/>
+        <img src="/base/static/src/img/logo.png" border="0" class="company_logo"/>
     </a>
     <h1 class="header_title" t-if="session.session_is_valid()">
         <span class="company">$company</span> - (<span class="database">$database</span>)<br/>
@@ -63,19 +63,19 @@
     <div class="header_corner">
         <ul class="block" t-if="session.session_is_valid()">
             <li>
-                <a href="#home" title="Home" class="home"><img src="/base/static/openerp/img/header-home.png" width="16" height="16" border="0"/></a>
+                <a href="#home" title="Home" class="home"><img src="/base/static/src/img/header-home.png" width="16" height="16" border="0"/></a>
             </li>
             <li>
-                <a href="#requests" title="Requests" class="requests"><img src="/base/static/openerp/img/header-requests.png" width="16" height="16" border="0"/><small>1</small></a>
+                <a href="#requests" title="Requests" class="requests"><img src="/base/static/src/img/header-requests.png" width="16" height="16" border="0"/><small>1</small></a>
             </li>
             <li class="preferences">
-                <a href="#preferences" title="Preferences" class="preferences"><img src="/base/static/openerp/img/header-preferences.png" width="16" height="16" border="0"/></a>
+                <a href="#preferences" title="Preferences" class="preferences"><img src="/base/static/src/img/header-preferences.png" width="16" height="16" border="0"/></a>
             </li>
             <li>
-                <a href="#about" title="About" class="about"><img src="/base/static/openerp/img/header-about.png" width="16" height="16" border="0"/></a>
+                <a href="#about" title="About" class="about"><img src="/base/static/src/img/header-about.png" width="16" height="16" border="0"/></a>
             </li>
             <li>
-                <a href="http://doc.openerp.com/v6.0/book?version=$version" title="Help" target="_blank" class="help"><img src="/base/static/openerp/img/header-help.png" width="16" height="16" border="0"/></a>
+                <a href="http://doc.openerp.com/v6.0/book?version=$version" title="Help" target="_blank" class="help"><img src="/base/static/src/img/header-help.png" width="16" height="16" border="0"/></a>
             </li>
         </ul>
         <div class="block">
@@ -269,7 +269,7 @@
 </t>
 <t t-name="WidgetButton">
     <button type="button" t-att-id="widget.element_id" t-att-title="widget.help" style="width: 100%" class="button">
-        <img t-if="widget.node.attrs.icon" t-att-src="'/base/static/openerp/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
+        <img t-if="widget.node.attrs.icon" t-att-src="'/base/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
         <t t-esc="widget.string"/>
     </button>
 </t>
@@ -299,7 +299,7 @@
         t-att-id="element_id"
         t-att-title="attrs.help"
         t-att-class="classes.join(' ')">
-    <img t-if="attrs.icon" t-att-src="'/base/static/openerp/img/icons/' + attrs.icon + '.png'" width="16" height="16"/>
+    <img t-if="attrs.icon" t-att-src="'/base/static/src/img/icons/' + attrs.icon + '.png'" width="16" height="16"/>
     <br t-if="attrs.icon and attrs.string"/>
     <t t-esc="attrs.string"/>
 </button>