diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -412,10 +412,12 @@ def bool2icon(value):
     """
 
     if value is True:
-        return HTML.tag('img', src="/images/icons/accept.png", alt=_('True'))
+        return HTML.tag('img', src=url("/images/icons/accept.png"),
+                        alt=_('True'))
 
     if value is False:
-        return HTML.tag('img', src="/images/icons/cancel.png", alt=_('False'))
+        return HTML.tag('img', src=url("/images/icons/cancel.png"),
+                        alt=_('False'))
 
     return value
 
@@ -518,7 +520,7 @@ def action_parser_icon(user_log):
     if len(x) > 1:
         action, action_params = x
 
-    tmpl = """<img src="/images/icons/%s" alt="%s"/>"""
+    tmpl = """<img src="%s/%s" alt="%s"/>"""
     map = {'user_deleted_repo':'database_delete.png',
            'user_created_repo':'database_add.png',
            'user_forked_repo':'arrow_divide.png',
@@ -532,7 +534,8 @@ def action_parser_icon(user_log):
            'started_following_repo':'heart_add.png',
            'stopped_following_repo':'heart_delete.png',
             }
-    return literal(tmpl % (map.get(action, action), action))
+    return literal(tmpl % ((url('/images/icons/')),
+                           map.get(action, action), action))
 
 
 #==============================================================================
diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css
--- a/rhodecode/public/css/style.css
+++ b/rhodecode/public/css/style.css
@@ -311,7 +311,7 @@ overflow:hidden;
 color:#FFF;
 font-weight:700;
 text-decoration:none;
-background:#369 url("../../images/quick_l.png") no-repeat top left;
+background:#369 url("../images/quick_l.png") no-repeat top left;
 padding:0;
 }
 
@@ -325,7 +325,7 @@ right:0;
 height:1%;
 display:block;
 float:left;
-background:url("../../images/quick_r.png") no-repeat top right;
+background:url("../images/quick_r.png") no-repeat top right;
 border-left:1px solid #3f6f9f;
 margin:0;
 padding:10px 12px 8px 10px;
@@ -340,7 +340,7 @@ padding:10px 12px 8px;
 top:0;
 left:0;
 border-left:none;
-background:url("../../images/quick_l.png") no-repeat top left;
+background:url("../images/quick_l.png") no-repeat top left;
 border-right:1px solid #2e5c89;
 padding:8px 8px 4px;
 }
@@ -349,24 +349,24 @@ padding:8px 8px 4px;
 top:0;
 left:0;
 border-left:none;
-background:url("../../images/quick_l.png") no-repeat top left;
+background:url("../images/quick_l.png") no-repeat top left;
 border-right:1px solid #2e5c89;
 padding:9px 4px 4px;
 }
 
 #header #header-inner #quick li a:hover {
-background:#4e4e4e url("../../images/quick_l_selected.png") no-repeat top left;
+background:#4e4e4e url("../images/quick_l_selected.png") no-repeat top left;
 }
 
 #header #header-inner #quick li a:hover span {
 border-left:1px solid #545454;
-background:url("../../images/quick_r_selected.png") no-repeat top right;
+background:url("../images/quick_r_selected.png") no-repeat top right;
 }
 
 #header #header-inner #quick li a:hover span.icon,#header #header-inner #quick li a:hover span.icon_short {
 border-left:none;
 border-right:1px solid #464646;
-background:url("../../images/quick_l_selected.png") no-repeat top left;
+background:url("../images/quick_l_selected.png") no-repeat top left;
 }
 
 
@@ -1004,7 +1004,7 @@ padding:6px 12px;
 }
 
 #content div.box div.form div.fields div.buttons div.highlight input.ui-button {
-background:#4e85bb url("../../images/button_highlight.png") repeat-x;
+background:#4e85bb url("../images/button_highlight.png") repeat-x;
 border-top:1px solid #5c91a4;
 border-left:1px solid #2a6f89;
 border-right:1px solid #2b7089;
@@ -1015,7 +1015,7 @@ padding:6px 12px;
 }
 
 #content div.box div.form div.fields div.buttons div.highlight input.ui-state-hover {
-background:#46a0c1 url("../../images/button_highlight_selected.png") repeat-x;
+background:#46a0c1 url("../images/button_highlight_selected.png") repeat-x;
 border-top:1px solid #78acbf;
 border-left:1px solid #34819e;
 border-right:1px solid #35829f;
@@ -1292,7 +1292,7 @@ width:420px;
 clear:both;
 overflow:hidden;
 position:relative;
-background:#003367 url("../../images/header_inner.png") repeat-x;
+background:#003367 url("../images/header_inner.png") repeat-x;
 margin:0 auto;
 padding:0;
 }
@@ -1778,7 +1778,7 @@ padding-left:4px;
 }
 
 .info_box * {
-background:url("../../images/pager.png") repeat-x scroll 0 0 #EBEBEB;
+background:url("../images/pager.png") repeat-x scroll 0 0 #EBEBEB;
 color:#4A4A4A;
 font-weight:700;
 height:1%;
@@ -2020,28 +2020,28 @@ padding:0 0 10px;
 
 .error_msg {
 background-color:#FFCFCF;
-background-image:url("../../images/icons/error_msg.png");
+background-image:url("../images/icons/error_msg.png");
 border:1px solid #FF9595;
 color:#C30;
 }
 
 .warning_msg {
 background-color:#FFFBCC;
-background-image:url("../../images/icons/warning_msg.png");
+background-image:url("../images/icons/warning_msg.png");
 border:1px solid #FFF35E;
 color:#C69E00;
 }
 
 .success_msg {
 background-color:#D5FFCF;
-background-image:url("../../images/icons/success_msg.png");
+background-image:url("../images/icons/success_msg.png");
 border:1px solid #97FF88;
 color:#090;
 }
 
 .notice_msg {
 background-color:#DCE3FF;
-background-image:url("../../images/icons/notice_msg.png");
+background-image:url("../images/icons/notice_msg.png");
 border:1px solid #93A8FF;
 color:#556CB5;
 }
@@ -2061,7 +2061,7 @@ padding:6px 10px 6px 40px;
 }
 
 #msg_close {
-background:transparent url("../../icons/cross_grey_small.png") no-repeat scroll 0 0;
+background:transparent url("../icons/cross_grey_small.png") no-repeat scroll 0 0;
 cursor:pointer;
 height:16px;
 position:absolute;
@@ -2111,7 +2111,7 @@ padding:14px 30px;
 }
 
 #content div.box div.title div.search {
-background:url("../../images/title_link.png") no-repeat top left;
+background:url("../images/title_link.png") no-repeat top left;
 border-left:1px solid #316293;
 }
 
@@ -2120,21 +2120,21 @@ border:1px solid #316293;
 }
 
 #content div.box div.title div.search div.button input.ui-button {
-background:#4e85bb url("../../images/button_highlight.png") repeat-x;
+background:#4e85bb url("../images/button_highlight.png") repeat-x;
 border:1px solid #316293;
 border-left:none;
 color:#FFF;
 }
 
 #content div.box div.title div.search div.button input.ui-state-hover {
-background:#46a0c1 url("../../images/button_highlight_selected.png") repeat-x;
+background:#46a0c1 url("../images/button_highlight_selected.png") repeat-x;
 border:1px solid #316293;
 border-left:none;
 color:#FFF;
 }
 
 #content div.box div.form div.fields div.field div.highlight .ui-button {
-background:#4e85bb url("../../images/button_highlight.png") repeat-x;
+background:#4e85bb url("../images/button_highlight.png") repeat-x;
 border-top:1px solid #5c91a4;
 border-left:1px solid #2a6f89;
 border-right:1px solid #2b7089;
@@ -2143,7 +2143,7 @@ color:#fff;
 }
 
 #content div.box div.form div.fields div.field div.highlight .ui-state-hover {
-background:#46a0c1 url("../../images/button_highlight_selected.png") repeat-x;
+background:#46a0c1 url("../images/button_highlight_selected.png") repeat-x;
 border-top:1px solid #78acbf;
 border-left:1px solid #34819e;
 border-right:1px solid #35829f;
diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html
--- a/rhodecode/templates/base/base.html
+++ b/rhodecode/templates/base/base.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
 <head>
     <title>${next.title()}</title>
-    <link rel="icon" href="${h.url('/images/icons/database_gear.png',_static=True)}" type="image/png" />
+    <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" />
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <meta name="robots" content="index, nofollow"/>
     <!-- stylesheets -->
@@ -326,21 +326,21 @@
 
 
 <%def name="css()">
-<link rel="stylesheet" type="text/css" href="${h.url('/css/style.css',_static=True)}" media="screen" />
-<link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css',_static=True)}"  />
-<link rel="stylesheet" type="text/css" href="${h.url('/css/diff.css',_static=True)}"  />
+<link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />
+<link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css')}"  />
+<link rel="stylesheet" type="text/css" href="${h.url('/css/diff.css')}"  />
 </%def>
 
 <%def name="js()">
-##<script type="text/javascript" src="${h.url('/js/yui/utilities/utilities.js',_static=True)}"></script>
-##<script type="text/javascript" src="${h.url('/js/yui/container/container.js',_static=True)}"></script>
-##<script type="text/javascript" src="${h.url('/js/yui/datasource/datasource.js',_static=True)}"></script>
-##<script type="text/javascript" src="${h.url('/js/yui/autocomplete/autocomplete.js',_static=True)}"></script>
-##<script type="text/javascript" src="${h.url('/js/yui/selector/selector-min.js',_static=True)}"></script>
+##<script type="text/javascript" src="${h.url('/js/yui/utilities/utilities.js')}"></script>
+##<script type="text/javascript" src="${h.url('/js/yui/container/container.js')}"></script>
+##<script type="text/javascript" src="${h.url('/js/yui/datasource/datasource.js')}"></script>
+##<script type="text/javascript" src="${h.url('/js/yui/autocomplete/autocomplete.js')}"></script>
+##<script type="text/javascript" src="${h.url('/js/yui/selector/selector-min.js')}"></script>
 
-<script type="text/javascript" src="${h.url('/js/yui2a.js',_static=True)}"></script>
-<!--[if IE]><script language="javascript" type="text/javascript" src="${h.url('/js/excanvas.min.js',_static=True)}"></script><![endif]-->
-<script type="text/javascript" src="${h.url('/js/yui.flot.js',_static=True)}"></script>
+<script type="text/javascript" src="${h.url('/js/yui2a.js')}"></script>
+<!--[if IE]><script language="javascript" type="text/javascript" src="${h.url('/js/excanvas.min.js')}"></script><![endif]-->
+<script type="text/javascript" src="${h.url('/js/yui.flot.js')}"></script>
 
 <script type="text/javascript">
 var base_url  = "${h.url('toggle_following')}";
diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html
--- a/rhodecode/templates/changelog/changelog.html
+++ b/rhodecode/templates/changelog/changelog.html
@@ -101,7 +101,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.r
 				</div>
 			</div>
 			
-			<script type="text/javascript" src="${h.url('/js/graph.js',_static=True)}"></script>
+			<script type="text/javascript" src="${h.url('/js/graph.js')}"></script>
 			<script type="text/javascript">
 				YAHOO.util.Event.onDOMReady(function(){
 					
diff --git a/rhodecode/templates/errors/error_document.html b/rhodecode/templates/errors/error_document.html
--- a/rhodecode/templates/errors/error_document.html
+++ b/rhodecode/templates/errors/error_document.html
@@ -11,7 +11,7 @@
         <meta name="robots" content="index, nofollow"/>
             
         <!-- stylesheets -->
-        <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css',_static=True)}" media="screen" />
+        <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />
 	    <style type="text/css">
 	     #main_div{
 	       border: 0px solid #000;
diff --git a/rhodecode/templates/login.html b/rhodecode/templates/login.html
--- a/rhodecode/templates/login.html
+++ b/rhodecode/templates/login.html
@@ -8,7 +8,7 @@
         <meta name="robots" content="index, nofollow"/>
             
         <!-- stylesheets -->
-        <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css',_static=True)}" media="screen" />
+        <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />
 
     </head>
     <body>
diff --git a/rhodecode/templates/password_reset.html b/rhodecode/templates/password_reset.html
--- a/rhodecode/templates/password_reset.html
+++ b/rhodecode/templates/password_reset.html
@@ -8,7 +8,7 @@
         <meta name="robots" content="index, nofollow"/>
             
         <!-- stylesheets -->
-        <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css',_static=True)}" media="screen" />
+        <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />
 
     </head>
     <body>
diff --git a/rhodecode/templates/register.html b/rhodecode/templates/register.html
--- a/rhodecode/templates/register.html
+++ b/rhodecode/templates/register.html
@@ -8,7 +8,7 @@
         <meta name="robots" content="index, nofollow"/>
             
         <!-- stylesheets -->
-        <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css',_static=True)}" media="screen" />
+        <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />
 
     </head>
     <body>