diff --git a/Swashbuckle.Core/Application/SwaggerUiConfig.cs b/Swashbuckle.Core/Application/SwaggerUiConfig.cs
index f5e75aab8..7b7dc2526 100644
--- a/Swashbuckle.Core/Application/SwaggerUiConfig.cs
+++ b/Swashbuckle.Core/Application/SwaggerUiConfig.cs
@@ -46,6 +46,10 @@ public SwaggerUiConfig(IEnumerable<string> discoveryPaths, Func<HttpRequestMessa
             CustomAsset("index", thisAssembly, "Swashbuckle.SwaggerUi.CustomAssets.index.html", isTemplate: true);
             CustomAsset("css/screen-css", thisAssembly, "Swashbuckle.SwaggerUi.CustomAssets.screen.css");
             CustomAsset("css/typography-css", thisAssembly, "Swashbuckle.SwaggerUi.CustomAssets.typography.css");
+
+            // Map route-path for logos to the embedded png's
+            CustomAsset("images/favicon-32x32-png", thisAssembly, "favicon-32x32.png");
+            CustomAsset("images/favicon-16x16-png", thisAssembly, "favicon-16x16.png");
         }
 
         public void InjectStylesheet(Assembly resourceAssembly, string resourceName, string media = "screen", bool isTemplate = false)
diff --git a/Swashbuckle.Tests/SwaggerUi/SwaggerUiTests.cs b/Swashbuckle.Tests/SwaggerUi/SwaggerUiTests.cs
index 07f7079b3..db336eb3d 100644
--- a/Swashbuckle.Tests/SwaggerUi/SwaggerUiTests.cs
+++ b/Swashbuckle.Tests/SwaggerUi/SwaggerUiTests.cs
@@ -197,7 +197,8 @@ public void It_exposes_config_for_apiKey_name_and_location()
             StringAssert.Contains("apiKeyIn: 'header'", content);
         }
 
-        [TestCase("http://tempuri.org/swagger/ui/images/logo_small-png", "image/png")]
+        [TestCase("http://tempuri.org/swagger/ui/images/favicon-32x32-png", "image/png")]
+        [TestCase("http://tempuri.org/swagger/ui/images/favicon-16x16-png", "image/png")]
         [TestCase("http://tempuri.org/swagger/ui/css/typography-css", "text/css")]
         public void It_returns_correct_asset_mime_type(string resourceUri, string expectedMimeType)
         {
diff --git a/swagger-ui b/swagger-ui
index 64dc3060b..080c70ae7 160000
--- a/swagger-ui
+++ b/swagger-ui
@@ -1 +1 @@
-Subproject commit 64dc3060b3700b12e466f8d67b7d7ec3574b015f
+Subproject commit 080c70ae76299199320670cd9be04fc77999b626