Fix reference merge.

Author: comintern

Rubberduck.Resources/CodeExplorer/CodeExplorerUI.resx

@@ -379,4 +379,16 @@
   <data name="CodeExplorer_AddTemplatesSubMenu" xml:space="preserve">
     <value>Templates</value>
   </data>
+  <data name="BrokenReference" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Icons\Custom\PNG\BrokenReference.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LockedReference" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Icons\Custom\PNG\LockedReference.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ObjectAssembly" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\icons\custom\png\objectassembly.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Reference" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\icons\fugue\node-select-all.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

Rubberduck.Resources/Resources/BrokenReference.png renamed to Rubberduck.Resources/Icons/Custom/PNG/BrokenReference.png

@@ -30,11 +30,4 @@
     <None Remove="Icons\Fugue\plus-circle-pinned.png" />
     <None Remove="Icons\Fugue\tick-circle-pinned.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Remove="Resources\BrokenReference.png" />
-    <Resource Remove="Resources\lock.png" />
-    <Resource Remove="Resources\LockedReference.png" />
-    <Resource Remove="Resources\ObjectAssembly.bmp" />
-    <Resource Remove="Resources\PinnedReference.png" />
-  </ItemGroup>
 </Project>

Rubberduck.Resources/Resources/LockedReference.png renamed to Rubberduck.Resources/Icons/Custom/PNG/LockedReference.png

@@ -1290,13 +1290,13 @@ NOTE: Restart is required for the setting to take effect.</value>
     <value>References</value>
   </data>
   <data name="padlock" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Icons\Fugue\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="BrokenReference" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\BrokenReference.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Icons\Custom\PNG\BrokenReference.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="LockedReference" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\LockedReference.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Icons\Custom\PNG\LockedReference.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ApplyButtonText" xml:space="preserve">
     <value>Apply</value>