diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
index b9fae638ef..294e2767ac 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
@@ -7,7 +7,7 @@
 (function() {
    'use strict';
 
-   function OverlayDirective($timeout, formHelper, overlayHelper) {
+   function OverlayDirective($timeout, formHelper, overlayHelper, localizationService) {
 
       function link(scope, el, attr, ctrl) {
 
@@ -21,6 +21,8 @@
 
             setView();
 
+            setButtonText();
+
             registerOverlay();
 
             modelCopy = makeModelCopy(scope.model);
@@ -50,6 +52,15 @@
 
          }
 
+         function setButtonText() {
+             if (!scope.model.closeButtonLabelKey && !scope.model.closeButtonLabel) {
+                 scope.model.closeButtonLabel = localizationService.localize("general_close").then(function (value) {return value;});
+             }
+             if (!scope.model.submitButtonLabelKey && !scope.model.submitButtonLabel) {
+                 scope.model.submitButtonLabel = localizationService.localize("general_submit").then(function (value) {return value;});
+             }
+         }
+
          function registerOverlay() {
 
             overlayNumber = overlayHelper.registerOverlay();
@@ -234,6 +245,7 @@
                scope.model = modelCopy;
                scope.model.close(scope.model);
             } else {
+                scope.model.show = false;
                scope.model = null;
             }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js
new file mode 100644
index 0000000000..89f490d0d8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js
@@ -0,0 +1,13 @@
+angular.module("umbraco")
+    .controller("Umbraco.Overlays.YsodController", function ($scope, legacyResource, treeService, navigationService) {
+
+        if (!$scope.model.title) {
+            $scope.model.title = "Received an error from the server";
+        }
+
+        if ($scope.model.data && $scope.model.data.StackTrace) {
+            //trim whitespace
+            $scope.model.data.StackTrace = $scope.model.data.StackTrace.trim();
+        }
+
+    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.html
new file mode 100644
index 0000000000..f28648a42a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.html
@@ -0,0 +1,15 @@
+<div ng-controller="Umbraco.Overlays.YsodController">
+
+    <h4 class="heading red">{{model.errorMsg}}</h4>
+    <p>{{model.data.ExceptionMessage || model.data.Message}}</p>
+
+    <div class="umb-control-group">
+        <h5>Exception Details: </h5>
+        {{model.data.ExceptionType}}: {{model.data.ExceptionMessage}}
+    </div>
+
+    <div class="umb-control-group">
+        <h5>Stacktrace: </h5>
+        <pre style="white-space: pre-wrap; overflow-x: auto;">{{model.data.StackTrace}}</pre>
+    </div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
index eb4478e4e7..5e060b0919 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
@@ -21,10 +21,10 @@
 
     </div>
 
-    <div class="umb-overlay-drawer" ng-if="model.close || model.submit">
+    <div class="umb-overlay-drawer">
       <div class="umb-overlay-drawer-content">
-        <umb-button ng-if="model.close" type="button" label="Cancel" action="closeOverLay()" button-style="link"></umb-button>
-        <umb-button ng-if="model.submit" type="submit" label="Submit" button-style="success"></umb-button>
+        <umb-button type="button" label-key="{{model.closeButtonLabelKey}}" label="{{model.closeButtonLabel}}" action="closeOverLay()" button-style="link"></umb-button>
+        <umb-button ng-if="model.submit" type="submit" label-key="{{model.submitButtonLabelKey}}" label="{{model.submitButtonLabel}}" button-style="success"></umb-button>
       </div>
     </div>
   </form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index d499ad6142..fe5868c139 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -107,7 +107,14 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
 
         //check if response is ysod
         if(err.status && err.status >= 500) {
-            dialogService.ysodDialog(err);
+
+            // Open ysod overlay
+            $scope.ysodOverlay = {
+                view : "ysod",
+                errorMsg : err.errorMsg,
+                data : err.data,
+                show : true
+            };
         }
 
         $timeout(function() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index cd7a74c910..879471e6bc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -169,4 +169,11 @@
       view="copyDialog.view">
     </umb-overlay>
 
+    <umb-overlay
+        ng-if="ysodOverlay.show"
+        model="ysodOverlay"
+        position="right"
+        view="ysodOverlay.view">
+    </umb-overlay>
+
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
index 2c6a71b8ea..17ef64c9ca 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
@@ -375,6 +375,7 @@
     <key alias="showPageOnSend">Zobrazit stránku při odeslání</key>
     <key alias="size">Rozměr</key>
     <key alias="sort">Seřadit</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">Typ</key>
     <key alias="typeToSearch">Pro hledání pište...</key>
     <key alias="up">Nahoru</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 6baccf2680..e8f6ba6b89 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -389,6 +389,7 @@
     <key alias="showPageOnSend">Hvilken side skal vises efter at formularen er sendt</key>
     <key alias="size">Størrelse</key>
     <key alias="sort">Sortér</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">Type</key>
     <key alias="typeToSearch">Skriv for at søge...</key>
     <key alias="up">Op</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
index 8e9bc9687c..9ed3e5c7ca 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
@@ -390,6 +390,7 @@
     <key alias="showPageOnSend">Seite beim Senden anzeigen</key>
     <key alias="size">Größe</key>
     <key alias="sort">Sortieren</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">Typ</key>
     <key alias="typeToSearch">Durchsuchen ...</key>
     <key alias="up">nach oben</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index e4d7d8f4d6..18ee3aa54d 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -404,6 +404,7 @@
     <key alias="showPageOnSend">Show page on Send</key>
     <key alias="size">Size</key>
     <key alias="sort">Sort</key>
+    <key alias="submit">Submit</key> <!-- TODO: Add to other languasge files -->
     <key alias="type">Type</key>
     <key alias="typeToSearch">Type to search...</key>
     <key alias="up">Up</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 7cd3b28b59..94fa9b4cf6 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -67,7 +67,7 @@
   <area alias="buttons">
     <key alias="select">Select</key>
     <key alias="selectCurrentFolder">Select current folder</key>
-    <key alias="somethingElse">Do something else</key>    
+    <key alias="somethingElse">Do something else</key>
     <key alias="bold">Bold</key>
     <key alias="deindent">Cancel Paragraph Indent</key>
     <key alias="formFieldInsert">Insert form field</key>
@@ -404,6 +404,7 @@
     <key alias="showPageOnSend">Show page on Send</key>
     <key alias="size">Size</key>
     <key alias="sort">Sort</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">Type</key>
     <key alias="typeToSearch">Type to search...</key>
     <key alias="up">Up</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
index 801be4fc7a..89fe01519f 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
@@ -393,6 +393,7 @@
     <key alias="showPageOnSend">Mostrar página al enviar</key>
     <key alias="size">Tamaño</key>
     <key alias="sort">Ordenar</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">Tipo</key>
     <key alias="typeToSearch">Tipo que buscar...</key>
     <key alias="up">Arriba</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
index 667e5dc30f..370e4aabc0 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
@@ -380,6 +380,7 @@
     <key alias="showPageOnSend">Afficher la page à l'envoi</key>
     <key alias="size">Taille</key>
     <key alias="sort">Trier</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">Type</key>
     <key alias="typeToSearch">Rechercher...</key>
     <key alias="up">Haut</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
index dbb17c9d58..3f98296ed3 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
@@ -316,6 +316,7 @@
     <key alias="showPageOnSend">הצג עמוד בשליחה</key>
     <key alias="size">גודל</key>
     <key alias="sort">סדר</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">סוג</key>
     <key alias="typeToSearch">הקלד לחיפוש...</key>
     <key alias="up">למעלה</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
index d1a2761221..e5322a6b45 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
@@ -309,6 +309,7 @@
     <key alias="showPageOnSend">Mostra la pagina inviata</key>
     <key alias="size">Dimensione</key>
     <key alias="sort">Ordina</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">Tipo</key>
     <key alias="typeToSearch"><![CDATA[Parola da cercare...]]></key>
     <key alias="up">Su</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
index 2087a7cb35..216877a80c 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
@@ -394,6 +394,7 @@
     <key alias="showPageOnSend">送信後にページを表示</key>
     <key alias="size">サイズ</key>
     <key alias="sort">並べ替え</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">型</key>
     <key alias="typeToSearch">検索...</key>
     <key alias="up">上</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
index 8d98f5cebd..463612f781 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
@@ -309,6 +309,7 @@
     <key alias="showPageOnSend">전송된 페이지보기</key>
     <key alias="size">사이즈</key>
     <key alias="sort">정렬</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">타입</key>
     <key alias="typeToSearch">검색유형...</key>
     <key alias="up">위로</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
index 6d0fdc3c80..2c01de8fc7 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
@@ -397,6 +397,7 @@
     <key alias="showPageOnSend">Toon pagina bij versturen</key>
     <key alias="size">Formaat</key>
     <key alias="sort">Sorteren</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">Type</key>
     <key alias="typeToSearch">Type om te zoeken...</key>
     <key alias="up">Omhoog</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml
index bbd1edd4cc..b839146f77 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml
@@ -319,6 +319,7 @@
     <key alias="showPageOnSend">Hvilken side skal vises etter at skjemaet er sendt</key>
     <key alias="size">Størrelse</key>
     <key alias="sort">Sorter</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">Type</key>
     <key alias="typeToSearch">Søk...</key>
     <key alias="up">Opp</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
index a56138fd2f..4426a682d0 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
@@ -307,6 +307,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
     <key alias="showPageOnSend">Pokaż stronę "wyślij"</key>
     <key alias="size">Rozmiar</key>
     <key alias="sort">Sortuj</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">Typ</key>
     <key alias="typeToSearch">Szukaj</key>
     <key alias="up">W górę</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
index 19d4e97a62..fe89656dfc 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
@@ -306,6 +306,7 @@
     <key alias="showPageOnSend">Mostrar página durante envio</key>
     <key alias="size">Tamanho</key>
     <key alias="sort">Classificar</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">Tipo</key>
     <key alias="typeToSearch">Digite para buscar...</key>
     <key alias="up">Acima</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
index 678a08659a..70eb37f6f8 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
@@ -386,6 +386,7 @@
     <key alias="showPageOnSend">Показать страницу при отправке</key>
     <key alias="size">Размер</key>
     <key alias="sort">Сортировать</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">Тип</key>
     <key alias="typeToSearch">Что искать?</key>
     <key alias="up">Вверх</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
index 0f1f4d8b21..e81e9ccc13 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
@@ -378,6 +378,7 @@
     <key alias="showPageOnSend">Vilken sida skall visas när formuläret är skickat</key>
     <key alias="size">Storlek</key>
     <key alias="sort">Sortera</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">Skriv</key>
     <key alias="typeToSearch">Skriv för att söka...</key>
     <key alias="up">Upp</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
index 408d1c0194..5d5e123cc3 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
@@ -349,6 +349,7 @@
     <key alias="showPageOnSend">在发送时预览</key>
     <key alias="size">大小</key>
     <key alias="sort">排序</key>
+    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
     <key alias="type">类型</key>
     <key alias="typeToSearch">输入内容开始查找…</key>
     <key alias="up">上</key>