diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs
index daf18914af..68c6bbf62c 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs
@@ -51,7 +51,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared
                     "/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/dom-event-handlers.js",
                     "/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/modal-manager.js",
                     "/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables-extensions.js",
-                    "/libs/abp/aspnetcore.mvc.ui.theme.shared/sweetalert/abp-sweetalert.js"
+                    "/libs/abp/aspnetcore.mvc.ui.theme.shared/sweetalert/abp-sweetalert.js",
+                    "/libs/abp/aspnetcore.mvc.ui.theme.shared/sweetalert/abp-toastr.js"
                 });
             });
 
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj
index e846856456..6379a37f98 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj
@@ -17,13 +17,9 @@
   <ItemGroup>
     <EmbeddedResource Include="wwwroot\**\*.*" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="wwwroot\libs\abp\aspnetcore.mvc.ui.theme.shared\toastr\" />
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/toastr/abp-toastr.js b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/toastr/abp-toastr.js
new file mode 100644
index 0000000000..01b29cdfd7
--- /dev/null
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/toastr/abp-toastr.js
@@ -0,0 +1,34 @@
+var abp = abp || {};
+(function () {
+
+    if (!toastr) {
+        return;
+    }
+
+    /* DEFAULTS *************************************************/
+
+    toastr.options.positionClass = 'toast-bottom-right';
+
+    /* NOTIFICATION *********************************************/
+
+    var showNotification = function (type, message, title, options) {
+        toastr[type](message, title, options);
+    };
+
+    abp.notify.success = function (message, title, options) {
+        showNotification('success', message, title, options);
+    };
+
+    abp.notify.info = function (message, title, options) {
+        showNotification('info', message, title, options);
+    };
+
+    abp.notify.warn = function (message, title, options) {
+        showNotification('warning', message, title, options);
+    };
+
+    abp.notify.error = function (message, title, options) {
+        showNotification('error', message, title, options);
+    };
+
+})();
\ No newline at end of file
diff --git a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestController_Tests.cs b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestController_Tests.cs
index d696c1cc08..e48c3883ef 100644
--- a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestController_Tests.cs
+++ b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestController_Tests.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling
         [Fact]
         public async Task Should_Return_RemoteServiceErrorResponse_For_UserFriendlyException_For_Void_Return_Value()
         {
-            var result = await GetResponseAsObjectAsync<RemoteServiceErrorResponse>("/api/exception-test/UserFriendlyException1", HttpStatusCode.InternalServerError);
+            var result = await GetResponseAsObjectAsync<RemoteServiceErrorResponse>("/api/exception-test/UserFriendlyException1", HttpStatusCode.Forbidden);
             result.Error.ShouldNotBeNull();
             result.Error.Message.ShouldBe("This is a sample exception!");
         }
diff --git a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Uow/UnitOfWorkMiddleware_Exception_Rollback_Tests.cs b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Uow/UnitOfWorkMiddleware_Exception_Rollback_Tests.cs
index 0fc24dee04..6400ecb88e 100644
--- a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Uow/UnitOfWorkMiddleware_Exception_Rollback_Tests.cs
+++ b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Uow/UnitOfWorkMiddleware_Exception_Rollback_Tests.cs
@@ -14,7 +14,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
         [Fact]
         public async Task Should_Rollback_Transaction_For_Handled_Exceptions()
         {
-            var result = await GetResponseAsObjectAsync<RemoteServiceErrorResponse>("/api/unitofwork-test/HandledException", HttpStatusCode.InternalServerError);
+            var result = await GetResponseAsObjectAsync<RemoteServiceErrorResponse>("/api/unitofwork-test/HandledException", HttpStatusCode.Forbidden);
             result.Error.ShouldNotBeNull();
             result.Error.Message.ShouldBe("This is a sample exception!");
         }
@@ -22,7 +22,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
         [Fact]
         public async Task Should_Gracefully_Handle_Exceptions_On_Complete()
         {
-            var response = await GetResponseAsync("/api/unitofwork-test/ExceptionOnComplete", HttpStatusCode.InternalServerError);
+            var response = await GetResponseAsync("/api/unitofwork-test/ExceptionOnComplete", HttpStatusCode.Forbidden);
 
             response.Headers.GetValues(AbpHttpConsts.AbpErrorFormat).FirstOrDefault().ShouldBe("true");