diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/formatters.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/formatters.less
index cfa290484..18b3299df 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/formatters.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/formatters.less
@@ -118,7 +118,7 @@
     -webkit-font-smoothing: auto;
     font-size:0.80em;
     margin:0 0.5em;
-    background:white url(@{static-root}bg-dark-diag.svg);
+    background:white url(~"@{static-root}bg-dark-diag.svg");
     
     &.primary{
         color:@color-grey-2;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
index 4ede1a630..e039b3673 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
@@ -13,7 +13,7 @@
 @import "components/formatters.less";
 
 html{
-    background:url(@{static-root}bg-body.svg);
+    background:url(~"@{static-root}bg-body.svg");
     height:100%;
 }
 
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
index ba2246350..6914e3c6d 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
@@ -6,7 +6,7 @@
 }
 
 .objects{
-    background:url(@{static-root}bg-dark-diag.svg);
+    background:url(~"@{static-root}bg-dark-diag.svg");
 }
 .object{  
     position:relative;
@@ -60,7 +60,7 @@
 
     > h2, &.single-field label{
         -webkit-font-smoothing: auto;
-        background:@color-grey-3 url(@{static-root}bg-light-diag.svg);
+        background:@color-grey-3 url(~"@{static-root}bg-light-diag.svg");
         text-transform:uppercase;
         padding:0.9em 0 0.9em 4em;
         font-size:0.95em;
diff --git a/wagtail/wagtailredirects/views.py b/wagtail/wagtailredirects/views.py
index 9a547ae3a..066d11ac5 100644
--- a/wagtail/wagtailredirects/views.py
+++ b/wagtail/wagtailredirects/views.py
@@ -4,7 +4,7 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.contrib.auth.decorators import permission_required
 
 from wagtail.wagtailadmin.edit_handlers import ObjectList
-from wagtailadmin.forms import SearchForm
+from wagtail.wagtailadmin.forms import SearchForm
 
 import models
 import forms
diff --git a/wagtail/wagtailsearch/views/editorspicks.py b/wagtail/wagtailsearch/views/editorspicks.py
index f78d8fa99..143431a25 100644
--- a/wagtail/wagtailsearch/views/editorspicks.py
+++ b/wagtail/wagtailsearch/views/editorspicks.py
@@ -3,8 +3,8 @@ from django.contrib.auth.decorators import login_required
 from wagtail.wagtailsearch import models, forms
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 
-from wagtailsearch import models, forms
-from wagtailadmin.forms import SearchForm
+from wagtail.wagtailsearch import models, forms
+from wagtail.wagtailadmin.forms import SearchForm
 
 @login_required
 def index(request):