diff --git a/dashboard-ui/components/directorybrowser/directorybrowser.css b/dashboard-ui/components/directorybrowser/directorybrowser.css
index 2fe861ee16..a985a800d7 100644
--- a/dashboard-ui/components/directorybrowser/directorybrowser.css
+++ b/dashboard-ui/components/directorybrowser/directorybrowser.css
@@ -12,4 +12,5 @@
     background: #fff3a5;
     padding: 1em;
     border-radius: 5px;
+    margin-bottom: 1.5em;
 }
\ No newline at end of file
diff --git a/dashboard-ui/components/directorybrowser/directorybrowser.js b/dashboard-ui/components/directorybrowser/directorybrowser.js
index 5d73df62e6..f7ecbbdd39 100644
--- a/dashboard-ui/components/directorybrowser/directorybrowser.js
+++ b/dashboard-ui/components/directorybrowser/directorybrowser.js
@@ -152,7 +152,7 @@
         }
 
         if (options.enableNetworkSharePath) {
-            html += '<div class="inputContainer">';
+            html += '<div class="inputContainer" style="margin-top:2em;">';
             html += '<input is="emby-input" id="txtNetworkPath" type="text" label="' + Globalize.translate('LabelOptionalNetworkPath') + '"/>';
             html += '<div class="fieldDescription">';
             html += Globalize.translate('LabelOptionalNetworkPathHelp');
diff --git a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
index 0459d164e9..a313400053 100644
--- a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
+++ b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
@@ -25,7 +25,6 @@
 
     function updateMediaLocation(page, path, networkSharePath) {
         var virtualFolder = currentOptions.library;
-
         ApiClient.updateMediaPath(virtualFolder.Name, {
 
             Path: path,
diff --git a/dashboard-ui/dashboard/librarydisplay.js b/dashboard-ui/dashboard/librarydisplay.js
index bd7b0271c9..7d3e758640 100644
--- a/dashboard-ui/dashboard/librarydisplay.js
+++ b/dashboard-ui/dashboard/librarydisplay.js
@@ -4,7 +4,7 @@
         return [
         {
             href: 'library.html',
-            name: globalize.translate('TabFolders')
+            name: globalize.translate('HeaderLibraries')
         },
          {
              href: 'librarydisplay.html',
diff --git a/dashboard-ui/dashboard/librarysettings.js b/dashboard-ui/dashboard/librarysettings.js
index 97e880457a..fc0438f1c8 100644
--- a/dashboard-ui/dashboard/librarysettings.js
+++ b/dashboard-ui/dashboard/librarysettings.js
@@ -94,7 +94,7 @@
         return [
         {
             href: 'library.html',
-            name: Globalize.translate('TabFolders')
+            name: Globalize.translate('HeaderLibraries')
         },
          {
              href: 'librarydisplay.html',
diff --git a/dashboard-ui/librarypathmapping.html b/dashboard-ui/librarypathmapping.html
index 5303346f84..1583065488 100644
--- a/dashboard-ui/librarypathmapping.html
+++ b/dashboard-ui/librarypathmapping.html
@@ -10,26 +10,12 @@
 
             <br />
 
-            <form class="libraryPathMappingForm">
-
-                <div>
-                    <h3 class="detailSectionHeader">${ButtonAddPathSubstitution}</h3>
-                    <div>
-                        <label for="txtFrom">${LabelFrom}</label>
-                        <input id="txtFrom" type="text" required="required" data-mini="true" />
-                        <div class="fieldDescription labelFromHelp"></div>
-                    </div>
-                    <br />
-                    <div>
-                        <label for="txtTo">${LabelTo}</label>
-                        <input id="txtTo" type="text" required="required" data-mini="true" />
-                        <div class="fieldDescription">${LabelToHelp}</div>
-                    </div>
-                    <br />
-                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">add</i><span>${ButtonAdd}</span></button>
-                </div>
-
-            </form>
+            <p>
+                Path Substitutions can no longer be added. This feature is being replaced by the network share setup.
+            </p>
+            <p>
+                To configure network shares, edit an existing media library, then click on one of the existing folders. You'll then be able to map a network path to a library path.
+            </p>
 
         </div>
     </div>
diff --git a/dashboard-ui/scripts/librarypathmapping.js b/dashboard-ui/scripts/librarypathmapping.js
index a619f7d228..d53050ee24 100644
--- a/dashboard-ui/scripts/librarypathmapping.js
+++ b/dashboard-ui/scripts/librarypathmapping.js
@@ -114,7 +114,7 @@
         return [
         {
             href: 'library.html',
-            name: Globalize.translate('TabFolders')
+            name: Globalize.translate('HeaderLibraries')
         },
          {
              href: 'librarydisplay.html',
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index 9da6ef58cf..de2ea55339 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -328,7 +328,7 @@
         if (!imgUrl && virtualFolder.showNameWithIcon) {
             html += '<h1 class="cardImageContainer addLibrary" style="position:absolute;top:0;left:0;right:0;bottom:0;cursor:pointer;flex-direction:column;">';
 
-            html += '<i class="cardImageIcon md-icon" style="font-size:300%;color:#888;height:auto;width:auto;">' + (virtualFolder.icon || getIcon(virtualFolder.CollectionType)) + '</i>';
+            html += '<i class="cardImageIcon md-icon" style="font-size:240%;color:#888;height:auto;width:auto;">' + (virtualFolder.icon || getIcon(virtualFolder.CollectionType)) + '</i>';
 
             if (virtualFolder.showNameWithIcon) {
                 html += '<div style="margin:1em 0;position:width:100%;font-weight:500;color:#444;">';
@@ -435,7 +435,7 @@
         return [
         {
             href: 'library.html',
-            name: Globalize.translate('TabFolders')
+            name: Globalize.translate('HeaderLibraries')
         },
          {
              href: 'librarydisplay.html',