diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -96,15 +96,6 @@ def url(*args, **kw):
     return pylons_url(*args, **kw)
 
 
-def url_replace(**qargs):
-    """ Returns the current request url while replacing query string args """
-
-    request = get_current_request()
-    new_args = request.GET.mixed()
-    new_args.update(qargs)
-    return url('', **new_args)
-
-
 def asset(path, ver=None, **kwargs):
     """
     Helper to generate a static asset file path for rhodecode assets
diff --git a/rhodecode/templates/codeblocks/diffs.mako b/rhodecode/templates/codeblocks/diffs.mako
--- a/rhodecode/templates/codeblocks/diffs.mako
+++ b/rhodecode/templates/codeblocks/diffs.mako
@@ -641,12 +641,12 @@ from rhodecode.lib.diffs import NEW_FILE
                 <a
                   class="btn ${c.diffmode == 'sideside' and 'btn-primary'} tooltip"
                   title="${h.tooltip(_('View side by side'))}"
-                  href="${h.url_replace(diffmode='sideside')}">
+                  href="${h.current_route_path(request, diffmode='sideside')}">
                     <span>${_('Side by Side')}</span>
                 </a>
                 <a
                   class="btn ${c.diffmode == 'unified' and 'btn-primary'} tooltip"
-                  title="${h.tooltip(_('View unified'))}" href="${h.url_replace(diffmode='unified')}">
+                  title="${h.tooltip(_('View unified'))}" href="${h.current_route_path(request, diffmode='unified')}">
                     <span>${_('Unified')}</span>
                 </a>
             </div>