diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index 8cde7393ade..e27f2b16b14 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -1507,8 +1507,8 @@
     <Resource Include="UI\Images\caret_down.png" />
     <Resource Include="UI\Images\down-hover-16px.png" />
     <Resource Include="UI\Images\down_16_16.png" />
-    <Resource Include="UI\Images\folder_16_16.png" />
-    <Resource Include="UI\Images\folder-hover-16px.png" />
+    <Resource Include="UI\Images\edit_folder_16px_default.png" />
+    <Resource Include="UI\Images\edit_folder_16px_hover.png" />
     <Resource Include="UI\Images\up_16_16.png" />
     <Resource Include="UI\Images\up-hover-16px.png" />
     <Resource Include="UI\Images\link-16px.png" />
diff --git a/src/DynamoCoreWpf/UI/Images/edit_folder_16px_default.png b/src/DynamoCoreWpf/UI/Images/edit_folder_16px_default.png
new file mode 100644
index 00000000000..f4040d633f3
Binary files /dev/null and b/src/DynamoCoreWpf/UI/Images/edit_folder_16px_default.png differ
diff --git a/src/DynamoCoreWpf/UI/Images/edit_folder_16px_hover.png b/src/DynamoCoreWpf/UI/Images/edit_folder_16px_hover.png
new file mode 100644
index 00000000000..6b6f890317b
Binary files /dev/null and b/src/DynamoCoreWpf/UI/Images/edit_folder_16px_hover.png differ
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
index 9a298e86437..6b90cc0d5bc 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -2875,17 +2875,17 @@
         </Setter>
     </Style>
 
-    <Style x:Key="FolderButtonStyle" TargetType="Button">
+    <Style x:Key="EditFolderButtonStyle" TargetType="Button">
         <Setter Property="Cursor" Value="Hand"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
                     <Grid>
-                        <Image Name="folderIcon"  Width="16" Height="16" Source="pack://application:,,,/DynamoCoreWpf;component/UI/Images/folder_16_16.png"/>
+                        <Image Name="folderIcon"  Width="16" Height="16" Source="pack://application:,,,/DynamoCoreWpf;component/UI/Images/edit_folder_16px_default.png"/>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="folderIcon" Property="Source" Value="pack://application:,,,/DynamoCoreWpf;component/UI/Images/folder-hover-16px.png" />
+                            <Setter TargetName="folderIcon" Property="Source" Value="pack://application:,,,/DynamoCoreWpf;component/UI/Images/edit_folder_16px_hover.png" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Opacity" Value=".5" />
diff --git a/src/DynamoCoreWpf/ViewModels/Menu/TrustedPathViewModel.cs b/src/DynamoCoreWpf/ViewModels/Menu/TrustedPathViewModel.cs
index 1101fe6ff13..4c2e6aecf72 100644
--- a/src/DynamoCoreWpf/ViewModels/Menu/TrustedPathViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Menu/TrustedPathViewModel.cs
@@ -132,6 +132,14 @@ private void ShowFileDialog(TrustedPathEventArgs e)
                 e.Cancel = true;
         }
 
+        private void ShowFileDialogUpdatePath(TrustedPathEventArgs e)
+        {
+            OnRequestShowFileDialog(this, e);
+
+            if (e.Cancel == false && TrustedLocations.Contains(e.Path))
+                e.Cancel = true;
+        }
+
         private void UpdatePathAt(int index)
         {
             var args = new TrustedPathEventArgs
@@ -139,7 +147,7 @@ private void UpdatePathAt(int index)
                 Path = TrustedLocations[index]
             };
 
-            ShowFileDialog(args);
+            ShowFileDialogUpdatePath(args);
 
             if (args.Cancel)
                 return;
diff --git a/src/DynamoCoreWpf/Views/Menu/TrustedPathView.xaml b/src/DynamoCoreWpf/Views/Menu/TrustedPathView.xaml
index 6ca09cf406f..f1d0636cb54 100644
--- a/src/DynamoCoreWpf/Views/Menu/TrustedPathView.xaml
+++ b/src/DynamoCoreWpf/Views/Menu/TrustedPathView.xaml
@@ -46,7 +46,7 @@
                          CommandParameter="{Binding}"
                          ToolTipService.ShowOnDisabled="True"
                          Background="{StaticResource PreferencesWindowBackgroundColor}"
-                         Style="{StaticResource FolderButtonStyle}">
+                         Style="{StaticResource EditFolderButtonStyle}">
                         <Button.ToolTip>
                             <ToolTip Content="{x:Static p:Resources.PackagePathUpdatePathTooltip}" Style="{StaticResource GenericToolTipLight}"/>
                         </Button.ToolTip>
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackagePathView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackagePathView.xaml
index 4149b563f4a..fc49971cec8 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackagePathView.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/PackagePathView.xaml
@@ -77,7 +77,7 @@
                          CommandParameter="{Binding}"
                          ToolTipService.ShowOnDisabled="True"
                          Background="{StaticResource PreferencesWindowBackgroundColor}"
-                         Style="{StaticResource FolderButtonStyle}">
+                         Style="{StaticResource EditFolderButtonStyle}">
                         <Button.ToolTip>
                             <ToolTip Content="{x:Static p:Resources.PackagePathUpdatePathTooltip}" Style="{StaticResource GenericToolTipLight}"/>
                         </Button.ToolTip>