diff --git a/src/Common/src/DpiHelper.cs b/src/Common/src/DpiHelper.cs
index c94a1afc676..ca30e7a25e2 100644
--- a/src/Common/src/DpiHelper.cs
+++ b/src/Common/src/DpiHelper.cs
@@ -287,6 +287,17 @@ public static Bitmap CreateResizedBitmap(Bitmap logicalImage, Size targetImageSi
             return ScaleBitmapToSize(logicalImage, targetImageSize);
         }
 
+        /// <summary>
+        /// Creating bitmap from Icon resource
+        /// </summary>
+        public static Bitmap GetBitmapFromIcon(Type t, string name)
+        {
+            Icon b = new Icon(t, name);
+            Bitmap bitmap = b.ToBitmap();
+            b.Dispose();
+            return bitmap;
+        }
+
         /// <summary>
         /// Create a new bitmap scaled for the device units.
         /// When displayed on the device, the scaled image will have same size as the original image would have when displayed at 96dpi.
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ActiveDocumentHost.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ActiveDocumentHost.bmp
deleted file mode 100644
index a92e932cd84..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ActiveDocumentHost.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ActiveDocumentHost.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ActiveDocumentHost.ico
new file mode 100644
index 00000000000..8547f692a9d
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ActiveDocumentHost.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Animation.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Animation.bmp
deleted file mode 100644
index e267db6a1de..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Animation.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Animation.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Animation.ico
new file mode 100644
index 00000000000..f54e2196b5b
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Animation.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/App/Timer.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/App/Timer.bmp
deleted file mode 100644
index f750fbb2d26..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/App/Timer.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/App/Timer.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/App/Timer.ico
new file mode 100644
index 00000000000..003dad76486
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/App/Timer.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Arrow.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Arrow.bmp
deleted file mode 100644
index ef847d027be..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Arrow.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Arrow.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Arrow.ico
new file mode 100644
index 00000000000..b25612d2973
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Arrow.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.AddNew.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.AddNew.bmp
deleted file mode 100644
index 324ad95e6fa..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.AddNew.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.AddNew.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.AddNew.ico
new file mode 100644
index 00000000000..8113fff9449
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.AddNew.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.Delete.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.Delete.bmp
deleted file mode 100644
index 219a72c6e84..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.Delete.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.Delete.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.Delete.ico
new file mode 100644
index 00000000000..2bf258ceee0
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.Delete.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveFirst.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveFirst.bmp
deleted file mode 100644
index a38290f3b78..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveFirst.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveFirst.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveFirst.ico
new file mode 100644
index 00000000000..9bf00477b0e
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveFirst.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveLast.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveLast.bmp
deleted file mode 100644
index f6d6ac3ec0f..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveLast.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveLast.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveLast.ico
new file mode 100644
index 00000000000..19d9dd546cf
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveLast.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveNext.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveNext.bmp
deleted file mode 100644
index fa1ceb58c4c..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveNext.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveNext.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveNext.ico
new file mode 100644
index 00000000000..328dd2f624b
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MoveNext.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MovePrevious.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MovePrevious.bmp
deleted file mode 100644
index 7c7f89c4ed7..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MovePrevious.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MovePrevious.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MovePrevious.ico
new file mode 100644
index 00000000000..071c5079a8c
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.MovePrevious.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.bmp
deleted file mode 100644
index a461710fd80..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.ico
new file mode 100644
index 00000000000..f23e9fb0615
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingNavigator.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingSource.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingSource.bmp
deleted file mode 100644
index 0bd1194cceb..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingSource.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingSource.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingSource.ico
new file mode 100644
index 00000000000..0468b8c2fb6
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/BindingSource.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Button.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Button.bmp
deleted file mode 100644
index 405f89f9ee9..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Button.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Button.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Button.ico
new file mode 100644
index 00000000000..bfbd41a2534
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Button.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/CheckBox.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/CheckBox.bmp
deleted file mode 100644
index f5c398a8802..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/CheckBox.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/CheckBox.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/CheckBox.ico
new file mode 100644
index 00000000000..49c6bb9f5e4
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/CheckBox.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Checked.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Checked.ico
index bae5a66eb47..f0801e26c4a 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Checked.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Checked.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/CheckedListBox.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/CheckedListBox.bmp
deleted file mode 100644
index 19cc16d6cc7..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/CheckedListBox.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/CheckedListBox.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/CheckedListBox.ico
new file mode 100644
index 00000000000..4cc6dd7aedc
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/CheckedListBox.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ColorDialog.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ColorDialog.bmp
deleted file mode 100644
index c0a77b56959..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ColorDialog.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ColorDialog.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ColorDialog.ico
new file mode 100644
index 00000000000..84f6d957ecd
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ColorDialog.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ComboBox.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ComboBox.bmp
deleted file mode 100644
index ec050261c3b..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ComboBox.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ComboBox.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ComboBox.ico
new file mode 100644
index 00000000000..09eee5dd8b4
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ComboBox.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ComponentModel/OrderImages.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ComponentModel/OrderImages.bmp
deleted file mode 100644
index a47a8654fb2..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ComponentModel/OrderImages.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ComponentModel/OrderImages.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ComponentModel/OrderImages.ico
new file mode 100644
index 00000000000..845cc4742bd
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ComponentModel/OrderImages.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ContextMenu.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ContextMenu.bmp
deleted file mode 100644
index 011fa7e6fbd..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ContextMenu.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ContextMenu.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ContextMenu.ico
new file mode 100644
index 00000000000..a143ca87bf9
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ContextMenu.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataConnector.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataConnector.bmp
deleted file mode 100644
index c0d2015fc43..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataConnector.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataConnector.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataConnector.ico
new file mode 100644
index 00000000000..8040cb6209f
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataConnector.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGrid.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGrid.bmp
deleted file mode 100644
index 9b6a6179aee..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGrid.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGrid.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGrid.ico
new file mode 100644
index 00000000000..1224f417dce
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGrid.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.Details.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.Details.bmp
deleted file mode 100644
index f6c73b07975..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.Details.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.Details.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.Details.ico
new file mode 100644
index 00000000000..0972abc3e68
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.Details.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.backarrow.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.backarrow.bmp
deleted file mode 100644
index e847385afe1..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.backarrow.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.backarrow.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.backarrow.ico
new file mode 100644
index 00000000000..0cc431d3289
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.backarrow.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.backarrow_bidi.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.backarrow_bidi.bmp
deleted file mode 100644
index 89378ff0e5c..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.backarrow_bidi.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.backarrow_bidi.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.backarrow_bidi.ico
new file mode 100644
index 00000000000..f40ff076e96
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.backarrow_bidi.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.down.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.down.bmp
deleted file mode 100644
index da8a6843a87..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.down.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.down.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.down.ico
new file mode 100644
index 00000000000..50d27e244e6
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.down.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.right.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.right.bmp
deleted file mode 100644
index d64896979fa..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.right.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.right.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.right.ico
new file mode 100644
index 00000000000..6746a855c5d
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.right.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.up.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.up.bmp
deleted file mode 100644
index 7367e7fd4e3..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.up.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.up.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.up.ico
new file mode 100644
index 00000000000..30b8893ae7b
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridCaption.up.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridParentRows.LeftArrow.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridParentRows.LeftArrow.bmp
deleted file mode 100644
index 7d14ee77004..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridParentRows.LeftArrow.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridParentRows.LeftArrow.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridParentRows.LeftArrow.ico
new file mode 100644
index 00000000000..071c5079a8c
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridParentRows.LeftArrow.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridParentRows.RightArrow.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridParentRows.RightArrow.bmp
deleted file mode 100644
index 84fc0e1a58c..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridParentRows.RightArrow.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridParentRows.RightArrow.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridParentRows.RightArrow.ico
new file mode 100644
index 00000000000..328dd2f624b
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridParentRows.RightArrow.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.error.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.error.bmp
deleted file mode 100644
index ab1de1cd58c..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.error.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.error.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.error.ico
new file mode 100644
index 00000000000..f9a0da7ec5d
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.error.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.left.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.left.bmp
deleted file mode 100644
index 02ce71a9aed..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.left.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.left.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.left.ico
new file mode 100644
index 00000000000..3dd5582cf2d
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.left.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.pencil.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.pencil.bmp
deleted file mode 100644
index 983725ce63b..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.pencil.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.pencil.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.pencil.ico
new file mode 100644
index 00000000000..be5398d2b44
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.pencil.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.right.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.right.bmp
deleted file mode 100644
index 0640fd62b14..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.right.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.right.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.right.ico
new file mode 100644
index 00000000000..6262753da1d
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.right.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.star.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.star.bmp
deleted file mode 100644
index 559b9e7d845..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.star.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.star.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.star.ico
new file mode 100644
index 00000000000..dbdc71ddc7e
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridRow.star.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridView.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridView.bmp
deleted file mode 100644
index 7345da04386..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridView.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridView.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridView.ico
new file mode 100644
index 00000000000..1224f417dce
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridView.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewButtonColumn.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewButtonColumn.bmp
deleted file mode 100644
index fd3e3bf92e1..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewButtonColumn.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewButtonColumn.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewButtonColumn.ico
new file mode 100644
index 00000000000..bfbd41a2534
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewButtonColumn.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewCheckBoxColumn.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewCheckBoxColumn.bmp
deleted file mode 100644
index c9661e4aafc..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewCheckBoxColumn.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewCheckBoxColumn.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewCheckBoxColumn.ico
new file mode 100644
index 00000000000..49c6bb9f5e4
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewCheckBoxColumn.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewComboBoxColumn.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewComboBoxColumn.bmp
deleted file mode 100644
index b07d897effe..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewComboBoxColumn.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewComboBoxColumn.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewComboBoxColumn.ico
new file mode 100644
index 00000000000..09eee5dd8b4
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewComboBoxColumn.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewImageColumn.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewImageColumn.bmp
deleted file mode 100644
index bff74d6d47c..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewImageColumn.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewImageColumn.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewImageColumn.ico
new file mode 100644
index 00000000000..ae863d72d5d
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewImageColumn.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewLinkColumn.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewLinkColumn.bmp
deleted file mode 100644
index a0451475ce7..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewLinkColumn.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewLinkColumn.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewLinkColumn.ico
new file mode 100644
index 00000000000..35c6a9cfd42
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewLinkColumn.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.error.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.error.bmp
deleted file mode 100644
index ab1de1cd58c..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.error.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.error.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.error.ico
new file mode 100644
index 00000000000..f9a0da7ec5d
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.error.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.left.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.left.bmp
deleted file mode 100644
index 02ce71a9aed..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.left.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.left.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.left.ico
index 0abcdb80653..3dd5582cf2d 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.left.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.left.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.leftstar.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.leftstar.bmp
deleted file mode 100644
index ac042015d56..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.leftstar.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.leftstar.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.leftstar.ico
index fd7f4307ae1..802bce06380 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.leftstar.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.leftstar.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_ltr.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_ltr.bmp
deleted file mode 100644
index 983725ce63b..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_ltr.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_ltr.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_ltr.ico
index 38e51003ff1..be5398d2b44 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_ltr.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_ltr.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_rtl.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_rtl.bmp
deleted file mode 100644
index 342da116434..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_rtl.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_rtl.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_rtl.ico
index ac25e58fbbf..600b31774f6 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_rtl.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.pencil_rtl.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.right.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.right.bmp
deleted file mode 100644
index 0640fd62b14..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.right.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.right.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.right.ico
index aeeca1b7a8f..6262753da1d 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.right.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.right.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.rightstar.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.rightstar.bmp
deleted file mode 100644
index e483e527560..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.rightstar.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.rightstar.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.rightstar.ico
index a89d769cbde..784ddf4bb01 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.rightstar.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.rightstar.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.star.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.star.bmp
deleted file mode 100644
index 559b9e7d845..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.star.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.star.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.star.ico
index c46c638e721..dbdc71ddc7e 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.star.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewRow.star.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewTextBoxColumn.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewTextBoxColumn.bmp
deleted file mode 100644
index d2894577bc0..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewTextBoxColumn.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewTextBoxColumn.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewTextBoxColumn.ico
new file mode 100644
index 00000000000..1b83771a357
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataGridViewTextBoxColumn.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.AddNew.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.AddNew.bmp
deleted file mode 100644
index b46c65f2280..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.AddNew.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.AddNew.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.AddNew.ico
new file mode 100644
index 00000000000..670bb049917
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.AddNew.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.Delete.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.Delete.bmp
deleted file mode 100644
index f009ad8bf64..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.Delete.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.Delete.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.Delete.ico
new file mode 100644
index 00000000000..bd95c7398d3
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.Delete.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveFirst.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveFirst.bmp
deleted file mode 100644
index a38290f3b78..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveFirst.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveFirst.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveFirst.ico
new file mode 100644
index 00000000000..9bf00477b0e
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveFirst.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveLast.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveLast.bmp
deleted file mode 100644
index f6d6ac3ec0f..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveLast.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveLast.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveLast.ico
new file mode 100644
index 00000000000..19d9dd546cf
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveLast.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveNext.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveNext.bmp
deleted file mode 100644
index fa1ceb58c4c..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveNext.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveNext.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveNext.ico
new file mode 100644
index 00000000000..328dd2f624b
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MoveNext.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MovePrevious.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MovePrevious.bmp
deleted file mode 100644
index 7c7f89c4ed7..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MovePrevious.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MovePrevious.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MovePrevious.ico
new file mode 100644
index 00000000000..071c5079a8c
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.MovePrevious.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.bmp
deleted file mode 100644
index a461710fd80..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.ico
new file mode 100644
index 00000000000..f23e9fb0615
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DataNavigator.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DateTimePicker.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DateTimePicker.bmp
deleted file mode 100644
index 4a96ccf8c27..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DateTimePicker.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DateTimePicker.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DateTimePicker.ico
new file mode 100644
index 00000000000..298fc1be98c
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DateTimePicker.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DefaultControl.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DefaultControl.bmp
deleted file mode 100644
index 3706785425f..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DefaultControl.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DefaultControl.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DefaultControl.ico
new file mode 100644
index 00000000000..f01f01eff8f
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DefaultControl.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Design/ComponentEditorPage.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Design/ComponentEditorPage.ico
index f0ec5f7f856..41d5510e4dc 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Design/ComponentEditorPage.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Design/ComponentEditorPage.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Design/Thumbs.db b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Design/Thumbs.db
new file mode 100644
index 00000000000..b70d974c9af
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Design/Thumbs.db differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DomainUpDown.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DomainUpDown.bmp
deleted file mode 100644
index 118cc684019..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DomainUpDown.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DomainUpDown.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DomainUpDown.ico
new file mode 100644
index 00000000000..80cf851283f
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/DomainUpDown.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Edit.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Edit.bmp
deleted file mode 100644
index 9b62d4c6aa6..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Edit.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Edit.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Edit.ico
new file mode 100644
index 00000000000..1b83771a357
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Edit.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Error.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Error.ico
index 97abee5d3b2..19788fda171 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Error.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Error.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ErrorControl.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ErrorControl.bmp
deleted file mode 100644
index 49a5c36bdec..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ErrorControl.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ErrorControl.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ErrorControl.ico
new file mode 100644
index 00000000000..19788fda171
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ErrorControl.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ErrorProvider.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ErrorProvider.bmp
deleted file mode 100644
index b0f7f59cb35..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ErrorProvider.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ErrorProvider.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ErrorProvider.ico
new file mode 100644
index 00000000000..19788fda171
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ErrorProvider.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FlowLayoutPanel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FlowLayoutPanel.bmp
deleted file mode 100644
index 2b378286617..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FlowLayoutPanel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FlowLayoutPanel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FlowLayoutPanel.ico
new file mode 100644
index 00000000000..05eec2dcfab
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FlowLayoutPanel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FolderBrowserDialog.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FolderBrowserDialog.bmp
deleted file mode 100644
index c5c673a9bef..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FolderBrowserDialog.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FolderBrowserDialog.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FolderBrowserDialog.ico
new file mode 100644
index 00000000000..5f1a9d2d945
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FolderBrowserDialog.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FontDialog.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FontDialog.bmp
deleted file mode 100644
index c6d4bfab888..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FontDialog.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FontDialog.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FontDialog.ico
new file mode 100644
index 00000000000..3986861f2ec
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/FontDialog.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Form.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Form.bmp
deleted file mode 100644
index 107d19ec99f..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Form.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Form.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Form.ico
new file mode 100644
index 00000000000..37e8b294a73
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Form.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Grid.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Grid.bmp
deleted file mode 100644
index 0492fddc306..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Grid.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Grid.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Grid.ico
new file mode 100644
index 00000000000..1224f417dce
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Grid.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/GroupBox.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/GroupBox.bmp
deleted file mode 100644
index 827dfab23ff..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/GroupBox.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/GroupBox.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/GroupBox.ico
new file mode 100644
index 00000000000..7703190e238
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/GroupBox.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HScrollBar.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HScrollBar.bmp
deleted file mode 100644
index cdd937f81b2..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HScrollBar.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HScrollBar.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HScrollBar.ico
new file mode 100644
index 00000000000..cd0dae240af
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HScrollBar.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HTMLControl.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HTMLControl.bmp
deleted file mode 100644
index 808b0acdb2c..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HTMLControl.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HTMLControl.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HTMLControl.ico
new file mode 100644
index 00000000000..fc276945d18
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HTMLControl.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HelpProvider.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HelpProvider.bmp
deleted file mode 100644
index 6de813e0b7f..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HelpProvider.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HelpProvider.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HelpProvider.ico
new file mode 100644
index 00000000000..69afaa9d433
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/HelpProvider.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/IconInError.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/IconInError.ico
index e4a925143ef..73c9ca27334 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/IconInError.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/IconInError.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ImageInError.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ImageInError.bmp
deleted file mode 100644
index 2b2dd8dbeae..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ImageInError.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ImageInError.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ImageInError.ico
new file mode 100644
index 00000000000..22cd1cd039e
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ImageInError.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ImageList.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ImageList.bmp
deleted file mode 100644
index c68414ed413..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ImageList.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ImageList.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ImageList.ico
new file mode 100644
index 00000000000..18a8f63855b
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ImageList.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/IndeterminateChecked.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/IndeterminateChecked.ico
index ff8ac4d73ee..1a40873d33d 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/IndeterminateChecked.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/IndeterminateChecked.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Label.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Label.bmp
deleted file mode 100644
index 8ab432db6ee..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Label.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Label.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Label.ico
new file mode 100644
index 00000000000..d01d5212b90
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Label.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/LinkLabel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/LinkLabel.bmp
deleted file mode 100644
index 8fa9a673bcc..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/LinkLabel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/LinkLabel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/LinkLabel.ico
new file mode 100644
index 00000000000..0380e6cfc0c
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/LinkLabel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ListBox.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ListBox.bmp
deleted file mode 100644
index 938781b4897..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ListBox.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ListBox.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ListBox.ico
new file mode 100644
index 00000000000..4cc6dd7aedc
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ListBox.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ListView.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ListView.bmp
deleted file mode 100644
index a1be5319dfb..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ListView.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ListView.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ListView.ico
new file mode 100644
index 00000000000..80af9756fc4
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ListView.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MainMenu.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MainMenu.bmp
deleted file mode 100644
index 9ce84c6248a..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MainMenu.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MainMenu.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MainMenu.ico
new file mode 100644
index 00000000000..4ed90f33d27
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MainMenu.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MaskedTextBox.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MaskedTextBox.bmp
deleted file mode 100644
index 19ba5f9d4e7..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MaskedTextBox.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MaskedTextBox.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MaskedTextBox.ico
new file mode 100644
index 00000000000..85b14283c4a
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MaskedTextBox.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MonthCalendar.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MonthCalendar.bmp
deleted file mode 100644
index b1efec72212..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MonthCalendar.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MonthCalendar.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MonthCalendar.ico
new file mode 100644
index 00000000000..8e53f6c64f5
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MonthCalendar.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MultiplexPanel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MultiplexPanel.bmp
deleted file mode 100644
index f91c6aa9b60..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MultiplexPanel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MultiplexPanel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MultiplexPanel.ico
new file mode 100644
index 00000000000..83d076ea161
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/MultiplexPanel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/NotifyIcon.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/NotifyIcon.bmp
deleted file mode 100644
index 986033cff19..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/NotifyIcon.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/NotifyIcon.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/NotifyIcon.ico
new file mode 100644
index 00000000000..059e5a1c459
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/NotifyIcon.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/NumericUpDown.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/NumericUpDown.bmp
deleted file mode 100644
index a68cbff6312..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/NumericUpDown.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/NumericUpDown.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/NumericUpDown.ico
new file mode 100644
index 00000000000..0ceca3fd328
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/NumericUpDown.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/OpenFileDialog.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/OpenFileDialog.bmp
deleted file mode 100644
index 47d90d908f5..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/OpenFileDialog.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/OpenFileDialog.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/OpenFileDialog.ico
new file mode 100644
index 00000000000..d0f633d601b
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/OpenFileDialog.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Panel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Panel.bmp
deleted file mode 100644
index 76b67b75025..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Panel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Panel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Panel.ico
new file mode 100644
index 00000000000..c17bf2770de
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Panel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PictureBox.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PictureBox.bmp
deleted file mode 100644
index 86016e9ecd7..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PictureBox.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PictureBox.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PictureBox.ico
new file mode 100644
index 00000000000..1a0c09d9ef0
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PictureBox.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PictureBox/Loading.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PictureBox/Loading.bmp
deleted file mode 100644
index c65e89c4a26..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PictureBox/Loading.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PictureBox/Loading.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PictureBox/Loading.ico
new file mode 100644
index 00000000000..7a12b86bf3a
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PictureBox/Loading.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewControl.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewControl.bmp
deleted file mode 100644
index 9e57891d3b7..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewControl.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewControl.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewControl.ico
new file mode 100644
index 00000000000..03ff7c04c2b
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewControl.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.bmp
deleted file mode 100644
index ecfa916e631..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.ico
new file mode 100644
index 00000000000..0255b5e40ad
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewStrip.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewStrip.bmp
deleted file mode 100644
index 2df8906fd2a..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewStrip.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewStrip.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewStrip.ico
new file mode 100644
index 00000000000..2d2dd145b27
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewStrip.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Printing/PageSetupDialog.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Printing/PageSetupDialog.bmp
deleted file mode 100644
index 190b8a6e6c9..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Printing/PageSetupDialog.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Printing/PageSetupDialog.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Printing/PageSetupDialog.ico
new file mode 100644
index 00000000000..d13972a3726
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Printing/PageSetupDialog.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Printing/PrintDialog.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Printing/PrintDialog.bmp
deleted file mode 100644
index 811f6a11dcb..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Printing/PrintDialog.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Printing/PrintDialog.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Printing/PrintDialog.ico
new file mode 100644
index 00000000000..f0a4a29c9d1
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Printing/PrintDialog.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ProgressBar.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ProgressBar.bmp
deleted file mode 100644
index 7edf5865344..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ProgressBar.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ProgressBar.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ProgressBar.ico
new file mode 100644
index 00000000000..04b56e6caec
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ProgressBar.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/EventsTab.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/EventsTab.bmp
deleted file mode 100644
index 8c7eb2be01f..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/EventsTab.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/EventsTab.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/EventsTab.ico
new file mode 100644
index 00000000000..556ece2d4cd
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/EventsTab.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBAlpha.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBAlpha.bmp
deleted file mode 100644
index 9b4c023aad6..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBAlpha.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBAlpha.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBAlpha.ico
new file mode 100644
index 00000000000..a92175fa529
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBAlpha.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBCatego.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBCatego.bmp
deleted file mode 100644
index febf09d45dd..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBCatego.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBCatego.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBCatego.ico
new file mode 100644
index 00000000000..e924d0678b7
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBCatego.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBEvent.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBEvent.bmp
deleted file mode 100644
index f7d321795c1..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBEvent.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBEvent.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBEvent.ico
new file mode 100644
index 00000000000..dab2c8aa092
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBEvent.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBPPage.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBPPage.bmp
deleted file mode 100644
index 2500d36b842..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBPPage.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBPPage.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBPPage.ico
new file mode 100644
index 00000000000..8db8eb917b7
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBPPage.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBProp.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBProp.bmp
deleted file mode 100644
index 5a8b72a200b..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBProp.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBProp.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBProp.ico
new file mode 100644
index 00000000000..cbabdace50a
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PBProp.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PropertiesTab.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PropertiesTab.bmp
deleted file mode 100644
index e488fb28694..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PropertiesTab.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PropertiesTab.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PropertiesTab.ico
new file mode 100644
index 00000000000..cbabdace50a
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PropertiesTab.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PropertyGrid.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PropertyGrid.bmp
deleted file mode 100644
index 5a8b72a200b..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PropertyGrid.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PropertyGrid.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PropertyGrid.ico
new file mode 100644
index 00000000000..cbabdace50a
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/PropertyGrid.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/arrow.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/arrow.ico
index 726070727a2..b25612d2973 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/arrow.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/arrow.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/dotdotdot.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/dotdotdot.ico
index 8a94f992496..4e3f5791d30 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/dotdotdot.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/dotdotdot.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/dotdotdot.png b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/dotdotdot.png
deleted file mode 100644
index d0a45d86d7b..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PropertyGrid/dotdotdot.png and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RadioButton.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RadioButton.bmp
deleted file mode 100644
index 38a344a589f..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RadioButton.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RadioButton.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RadioButton.ico
new file mode 100644
index 00000000000..c467a241981
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RadioButton.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Rebar.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Rebar.bmp
deleted file mode 100644
index d607e89472d..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Rebar.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Rebar.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Rebar.ico
new file mode 100644
index 00000000000..9d650366ae4
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Rebar.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RichEdit.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RichEdit.bmp
deleted file mode 100644
index d548137cb88..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RichEdit.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RichEdit.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RichEdit.ico
new file mode 100644
index 00000000000..d9dcc902244
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RichEdit.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RichTextBox.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RichTextBox.bmp
deleted file mode 100644
index 72641f7be77..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RichTextBox.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RichTextBox.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RichTextBox.ico
new file mode 100644
index 00000000000..d9dcc902244
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/RichTextBox.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SaveFileDialog.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SaveFileDialog.bmp
deleted file mode 100644
index ff76598cca8..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SaveFileDialog.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SaveFileDialog.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SaveFileDialog.ico
new file mode 100644
index 00000000000..aead779aa94
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SaveFileDialog.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Server/Arrow.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Server/Arrow.bmp
deleted file mode 100644
index ef847d027be..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Server/Arrow.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Server/Arrow.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Server/Arrow.ico
new file mode 100644
index 00000000000..b25612d2973
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Server/Arrow.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SplitContainer.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SplitContainer.bmp
deleted file mode 100644
index c309fdcb8e5..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SplitContainer.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SplitContainer.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SplitContainer.ico
new file mode 100644
index 00000000000..51ea4049c95
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SplitContainer.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Splitter.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Splitter.bmp
deleted file mode 100644
index b1f06be1085..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Splitter.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Splitter.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Splitter.ico
new file mode 100644
index 00000000000..ae51bbbd243
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/Splitter.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SplitterPanel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SplitterPanel.bmp
deleted file mode 100644
index 325d8021f95..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SplitterPanel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SplitterPanel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SplitterPanel.ico
new file mode 100644
index 00000000000..ae48c4d76a5
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/SplitterPanel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/StatusBar.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/StatusBar.bmp
deleted file mode 100644
index 1a5a66cbb1d..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/StatusBar.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/StatusBar.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/StatusBar.ico
new file mode 100644
index 00000000000..862dba163dc
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/StatusBar.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabControl.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabControl.bmp
deleted file mode 100644
index e7db4b7f79c..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabControl.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabControl.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabControl.ico
new file mode 100644
index 00000000000..8f90c03bbb3
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabControl.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabPage.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabPage.bmp
deleted file mode 100644
index 802536d4f47..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabPage.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabPage.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabPage.ico
new file mode 100644
index 00000000000..6ec57e37a2d
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabPage.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabStrip.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabStrip.bmp
deleted file mode 100644
index 84d62bdafad..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabStrip.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabStrip.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabStrip.ico
new file mode 100644
index 00000000000..8f90c03bbb3
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TabStrip.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TableLayoutPanel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TableLayoutPanel.bmp
deleted file mode 100644
index f6d219610c7..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TableLayoutPanel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TableLayoutPanel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TableLayoutPanel.ico
new file mode 100644
index 00000000000..f8905fd2a41
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TableLayoutPanel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TextBox.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TextBox.bmp
deleted file mode 100644
index 50f94af451d..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TextBox.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TextBox.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TextBox.ico
new file mode 100644
index 00000000000..d93d3f95516
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TextBox.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolBar.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolBar.bmp
deleted file mode 100644
index 199d58b21ef..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolBar.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolBar.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolBar.ico
new file mode 100644
index 00000000000..2beae602c8b
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolBar.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/AlignToGridHS.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/AlignToGridHS.bmp
deleted file mode 100644
index e9da561ae0f..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/AlignToGridHS.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/AlignToGridHS.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/AlignToGridHS.ico
new file mode 100644
index 00000000000..c96379552e3
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/AlignToGridHS.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/BlankToolstrip.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/BlankToolstrip.bmp
deleted file mode 100644
index 948a9df5397..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/BlankToolstrip.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/BlankToolstrip.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/BlankToolstrip.ico
new file mode 100644
index 00000000000..395bf4e2f0d
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/BlankToolstrip.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/BringToFrontHS.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/BringToFrontHS.bmp
deleted file mode 100644
index 4696efc65de..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/BringToFrontHS.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/BringToFrontHS.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/BringToFrontHS.ico
new file mode 100644
index 00000000000..b330827b311
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/BringToFrontHS.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ContextMenuStrip.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ContextMenuStrip.bmp
deleted file mode 100644
index 228448d7078..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ContextMenuStrip.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ContextMenuStrip.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ContextMenuStrip.ico
new file mode 100644
index 00000000000..f686b8fd147
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ContextMenuStrip.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ContextMenuStrip_copy.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ContextMenuStrip_copy.bmp
deleted file mode 100644
index 228448d7078..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ContextMenuStrip_copy.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ImageEditor.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ImageEditor.bmp
deleted file mode 100644
index e6c9b2eb3c6..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ImageEditor.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ImageEditor.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ImageEditor.ico
new file mode 100644
index 00000000000..a5d823e5c8b
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ImageEditor.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/MenuStrip.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/MenuStrip.bmp
deleted file mode 100644
index 9ce84c6248a..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/MenuStrip.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/MenuStrip.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/MenuStrip.ico
new file mode 100644
index 00000000000..0fdc8b09706
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/MenuStrip.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ScrollButtonDown.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ScrollButtonDown.bmp
deleted file mode 100644
index 3de97d33717..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ScrollButtonDown.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ScrollButtonDown.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ScrollButtonDown.ico
new file mode 100644
index 00000000000..0ebeec60633
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ScrollButtonDown.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ScrollButtonUp.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ScrollButtonUp.bmp
deleted file mode 100644
index 5ee7c56a85e..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ScrollButtonUp.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ScrollButtonUp.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ScrollButtonUp.ico
new file mode 100644
index 00000000000..641cadbffa8
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ScrollButtonUp.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/SendToBackHS.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/SendToBackHS.bmp
deleted file mode 100644
index 1523a3a8d62..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/SendToBackHS.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/SendToBackHS.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/SendToBackHS.ico
new file mode 100644
index 00000000000..39dbf76c0af
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/SendToBackHS.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/StatusStrip.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/StatusStrip.bmp
deleted file mode 100644
index 1a5a66cbb1d..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/StatusStrip.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/StatusStrip.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/StatusStrip.ico
new file mode 100644
index 00000000000..c7b2603f8fc
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/StatusStrip.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/StatusStripPanel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/StatusStripPanel.bmp
deleted file mode 100644
index 26b64912951..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/StatusStripPanel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/StatusStripPanel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/StatusStripPanel.ico
new file mode 100644
index 00000000000..0caff7741ad
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/StatusStripPanel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/Thumbs.db b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/Thumbs.db
new file mode 100644
index 00000000000..110548ec789
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/Thumbs.db differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolBarGrip-Temporary.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolBarGrip-Temporary.bmp
deleted file mode 100644
index 19aaccff981..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolBarGrip-Temporary.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolBarGrip-Temporary.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolBarGrip-Temporary.ico
new file mode 100644
index 00000000000..a05b7f9ac9d
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolBarGrip-Temporary.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStrip.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStrip.bmp
deleted file mode 100644
index 199d58b21ef..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStrip.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStrip.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStrip.ico
new file mode 100644
index 00000000000..3a28910d058
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStrip.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripButton.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripButton.bmp
deleted file mode 100644
index f1843f1e474..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripButton.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripButton.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripButton.ico
new file mode 100644
index 00000000000..2f9b47b5afc
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripButton.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripComboBox.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripComboBox.bmp
deleted file mode 100644
index 53d335293a4..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripComboBox.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripComboBox.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripComboBox.ico
new file mode 100644
index 00000000000..653e95ed835
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripComboBox.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer.bmp
deleted file mode 100644
index 3cadf82ac8b..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer.ico
new file mode 100644
index 00000000000..dd948315c34
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_BottomToolStripPanel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_BottomToolStripPanel.bmp
deleted file mode 100644
index 297415ad25a..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_BottomToolStripPanel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_BottomToolStripPanel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_BottomToolStripPanel.ico
new file mode 100644
index 00000000000..3b1badf4c29
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_BottomToolStripPanel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_LeftToolStripPanel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_LeftToolStripPanel.bmp
deleted file mode 100644
index b463e378778..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_LeftToolStripPanel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_LeftToolStripPanel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_LeftToolStripPanel.ico
new file mode 100644
index 00000000000..d60f798f686
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_LeftToolStripPanel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_RightToolStripPanel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_RightToolStripPanel.bmp
deleted file mode 100644
index 293ff2ac6a4..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_RightToolStripPanel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_RightToolStripPanel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_RightToolStripPanel.ico
new file mode 100644
index 00000000000..d254c488eeb
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_RightToolStripPanel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_TopToolStripPanel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_TopToolStripPanel.bmp
deleted file mode 100644
index 52db326899c..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_TopToolStripPanel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_TopToolStripPanel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_TopToolStripPanel.ico
new file mode 100644
index 00000000000..c828a45e1df
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContainer_TopToolStripPanel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContentPanel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContentPanel.bmp
deleted file mode 100644
index 83f54e7d044..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContentPanel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContentPanel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContentPanel.ico
new file mode 100644
index 00000000000..25f0077fa99
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripContentPanel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDown.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDown.bmp
deleted file mode 100644
index 228448d7078..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDown.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDown.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDown.ico
new file mode 100644
index 00000000000..f686b8fd147
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDown.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDownButton.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDownButton.bmp
deleted file mode 100644
index bdcc3d4c5ac..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDownButton.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDownButton.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDownButton.ico
new file mode 100644
index 00000000000..0fdc8b09706
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDownButton.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDownMenu.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDownMenu.bmp
deleted file mode 100644
index 228448d7078..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDownMenu.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDownMenu.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDownMenu.ico
new file mode 100644
index 00000000000..f686b8fd147
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripDropDownMenu.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripLabel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripLabel.bmp
deleted file mode 100644
index 26b64912951..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripLabel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripLabel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripLabel.ico
new file mode 100644
index 00000000000..0caff7741ad
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripLabel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripMenuItem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripMenuItem.bmp
deleted file mode 100644
index 469dc72cdb9..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripMenuItem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripMenuItem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripMenuItem.ico
new file mode 100644
index 00000000000..0fdc8b09706
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripMenuItem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripPanel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripPanel.bmp
deleted file mode 100644
index 4298bab4e2d..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripPanel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripPanel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripPanel.ico
new file mode 100644
index 00000000000..7448efb718d
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripPanel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripProgressBar.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripProgressBar.bmp
deleted file mode 100644
index 3a08885cd9a..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripProgressBar.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripProgressBar.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripProgressBar.ico
new file mode 100644
index 00000000000..ec52de79ea3
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripProgressBar.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripSeparator.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripSeparator.bmp
deleted file mode 100644
index c521d3525f5..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripSeparator.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripSeparator.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripSeparator.ico
new file mode 100644
index 00000000000..9a8f3c1d462
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripSeparator.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripSplitButton.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripSplitButton.bmp
deleted file mode 100644
index 1ee46102027..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripSplitButton.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripSplitButton.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripSplitButton.ico
new file mode 100644
index 00000000000..bd6b8d16f55
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripSplitButton.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripStatusLabel.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripStatusLabel.bmp
deleted file mode 100644
index 26b64912951..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripStatusLabel.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripStatusLabel.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripStatusLabel.ico
new file mode 100644
index 00000000000..0caff7741ad
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripStatusLabel.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripTextBox.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripTextBox.bmp
deleted file mode 100644
index 4a0bd743f6d..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripTextBox.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripTextBox.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripTextBox.ico
new file mode 100644
index 00000000000..bcca8d1aa3d
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/ToolStripTextBox.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/alignmenttoolstripmenuitem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/alignmenttoolstripmenuitem.bmp
deleted file mode 100644
index 9f1b17f84ea..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/alignmenttoolstripmenuitem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/alignmenttoolstripmenuitem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/alignmenttoolstripmenuitem.ico
new file mode 100644
index 00000000000..055ef2ac8ef
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/alignmenttoolstripmenuitem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/copyToolStripMenuItem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/copyToolStripMenuItem.bmp
deleted file mode 100644
index c1e37e4cd4d..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/copyToolStripMenuItem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/copyToolStripMenuItem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/copyToolStripMenuItem.ico
new file mode 100644
index 00000000000..80a566dd4a1
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/copyToolStripMenuItem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/cutToolStripMenuItem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/cutToolStripMenuItem.bmp
deleted file mode 100644
index 5e90e0c98f6..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/cutToolStripMenuItem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/cutToolStripMenuItem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/cutToolStripMenuItem.ico
new file mode 100644
index 00000000000..9d18330ae88
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/cutToolStripMenuItem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/deleteToolStripMenuItem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/deleteToolStripMenuItem.bmp
deleted file mode 100644
index 3b0a7002b87..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/deleteToolStripMenuItem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/deleteToolStripMenuItem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/deleteToolStripMenuItem.ico
new file mode 100644
index 00000000000..1d778197d88
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/deleteToolStripMenuItem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/displaystyletoolstripmenuitem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/displaystyletoolstripmenuitem.bmp
deleted file mode 100644
index 69d770aa21f..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/displaystyletoolstripmenuitem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/displaystyletoolstripmenuitem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/displaystyletoolstripmenuitem.ico
new file mode 100644
index 00000000000..395bf4e2f0d
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/displaystyletoolstripmenuitem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/editdropdownlisttoolstripmenuitem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/editdropdownlisttoolstripmenuitem.bmp
deleted file mode 100644
index 5c5204694b6..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/editdropdownlisttoolstripmenuitem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/editdropdownlisttoolstripmenuitem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/editdropdownlisttoolstripmenuitem.ico
new file mode 100644
index 00000000000..8a92d54bf78
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/editdropdownlisttoolstripmenuitem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/helpToolStripMenuItem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/helpToolStripMenuItem.bmp
deleted file mode 100644
index b5b89835aa9..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/helpToolStripMenuItem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/helpToolStripMenuItem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/helpToolStripMenuItem.ico
new file mode 100644
index 00000000000..802d926203c
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/helpToolStripMenuItem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/imagetoolstripmenuitem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/imagetoolstripmenuitem.bmp
deleted file mode 100644
index a4939d0635b..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/imagetoolstripmenuitem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/imagetoolstripmenuitem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/imagetoolstripmenuitem.ico
new file mode 100644
index 00000000000..c12350bfc1a
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/imagetoolstripmenuitem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/lockControls.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/lockControls.bmp
deleted file mode 100644
index 30e791a51b6..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/lockControls.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/lockControls.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/lockControls.ico
new file mode 100644
index 00000000000..da49de07db5
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/lockControls.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/newToolStripMenuItem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/newToolStripMenuItem.bmp
deleted file mode 100644
index 669f3db62e2..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/newToolStripMenuItem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/newToolStripMenuItem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/newToolStripMenuItem.ico
new file mode 100644
index 00000000000..cf7a5b43167
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/newToolStripMenuItem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/openToolStripMenuItem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/openToolStripMenuItem.bmp
deleted file mode 100644
index 98471e4f154..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/openToolStripMenuItem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/openToolStripMenuItem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/openToolStripMenuItem.ico
new file mode 100644
index 00000000000..24741579c30
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/openToolStripMenuItem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/overflowButton-Temporary.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/overflowButton-Temporary.bmp
deleted file mode 100644
index f94e99eb61f..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/overflowButton-Temporary.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/overflowButton-Temporary.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/overflowButton-Temporary.ico
new file mode 100644
index 00000000000..db06608e326
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/overflowButton-Temporary.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/pasteToolStripMenuItem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/pasteToolStripMenuItem.bmp
deleted file mode 100644
index 1cf85ec181f..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/pasteToolStripMenuItem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/pasteToolStripMenuItem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/pasteToolStripMenuItem.ico
new file mode 100644
index 00000000000..938964ae767
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/pasteToolStripMenuItem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/printPreviewToolStripMenuItem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/printPreviewToolStripMenuItem.bmp
deleted file mode 100644
index 2acae51dedd..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/printPreviewToolStripMenuItem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/printPreviewToolStripMenuItem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/printPreviewToolStripMenuItem.ico
new file mode 100644
index 00000000000..17c658a02b7
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/printPreviewToolStripMenuItem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/printToolStripMenuItem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/printToolStripMenuItem.bmp
deleted file mode 100644
index 5e897c2236d..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/printToolStripMenuItem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/printToolstripMenuItem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/printToolstripMenuItem.ico
new file mode 100644
index 00000000000..7d2f14b0a2a
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/printToolstripMenuItem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/propertiestoolstripmenuitem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/propertiestoolstripmenuitem.bmp
deleted file mode 100644
index 8b850d58a80..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/propertiestoolstripmenuitem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/propertiestoolstripmenuitem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/propertiestoolstripmenuitem.ico
new file mode 100644
index 00000000000..875258b0093
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/propertiestoolstripmenuitem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/saveToolStripMenuItem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/saveToolStripMenuItem.bmp
deleted file mode 100644
index e59f0d211d4..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/saveToolStripMenuItem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/saveToolstripMenuItem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/saveToolstripMenuItem.ico
new file mode 100644
index 00000000000..f649255281a
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/saveToolstripMenuItem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/viewcodetoolstripmenuitem.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/viewcodetoolstripmenuitem.bmp
deleted file mode 100644
index 95c27019d71..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/viewcodetoolstripmenuitem.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/viewcodetoolstripmenuitem.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/viewcodetoolstripmenuitem.ico
new file mode 100644
index 00000000000..aacb4e2e86c
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStrip/viewcodetoolstripmenuitem.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStripContainer.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStripContainer.bmp
deleted file mode 100644
index 871a41dc09f..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStripContainer.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStripContainer.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStripContainer.ico
new file mode 100644
index 00000000000..3dfc89bd28f
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolStripContainer.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolTip.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolTip.bmp
deleted file mode 100644
index 21889c998d7..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolTip.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolTip.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolTip.ico
new file mode 100644
index 00000000000..fe523f9ff44
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/ToolTip.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrackBar.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrackBar.bmp
deleted file mode 100644
index 21cc9b4b4eb..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrackBar.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrackBar.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrackBar.ico
new file mode 100644
index 00000000000..5073727fc61
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrackBar.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrayIcon.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrayIcon.bmp
deleted file mode 100644
index 16cd265f2bf..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrayIcon.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrayIcon.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrayIcon.ico
new file mode 100644
index 00000000000..4ffb3ab72bc
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrayIcon.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TreeView.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TreeView.bmp
deleted file mode 100644
index 18e858395b7..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TreeView.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TreeView.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TreeView.ico
new file mode 100644
index 00000000000..c195f3b5969
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TreeView.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrustManagerGlobe.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrustManagerGlobe.ico
new file mode 100644
index 00000000000..52d16b230c9
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrustManagerGlobe.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrustManagerHighRisk.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrustManagerHighRisk.ico
new file mode 100644
index 00000000000..ad5c8c44da0
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrustManagerHighRisk.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrustManagerOK.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrustManagerOK.ico
new file mode 100644
index 00000000000..2d1c90722ab
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrustManagerOK.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrustManagerWarning.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrustManagerWarning.ico
new file mode 100644
index 00000000000..d86eb74647b
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/TrustManagerWarning.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/UserControl.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/UserControl.bmp
deleted file mode 100644
index 3706785425f..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/UserControl.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/UserControl.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/UserControl.ico
new file mode 100644
index 00000000000..19d9c52a381
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/UserControl.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/VScrollBar.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/VScrollBar.bmp
deleted file mode 100644
index eb66caa788e..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/VScrollBar.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/VScrollBar.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/VScrollBar.ico
new file mode 100644
index 00000000000..5cb48a83a57
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/VScrollBar.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/WebBrowser.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/WebBrowser.bmp
deleted file mode 100644
index 3846d1c8ba0..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/WebBrowser.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/WebBrowser.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/WebBrowser.ico
new file mode 100644
index 00000000000..692d79b48c7
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/WebBrowser.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/checked.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/checked.bmp
deleted file mode 100644
index ba1ccb56d47..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/checked.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/down.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/down.bmp
deleted file mode 100644
index 5dd9c420122..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/down.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/down.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/down.ico
new file mode 100644
index 00000000000..152c78c80ea
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/down.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/indeterminatechecked.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/indeterminatechecked.bmp
deleted file mode 100644
index f5d637fd05a..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/indeterminatechecked.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/sm_TrustManagerGlobe.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/sm_TrustManagerGlobe.ico
new file mode 100644
index 00000000000..52d16b230c9
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/sm_TrustManagerGlobe.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/up.bmp b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/up.bmp
deleted file mode 100644
index eae5dea7c75..00000000000
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/up.bmp and /dev/null differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/up.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/up.ico
new file mode 100644
index 00000000000..133ccd66af3
Binary files /dev/null and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/up.ico differ
diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/wfc.ico b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/wfc.ico
index 982e89042bd..a04b745a865 100644
Binary files a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/wfc.ico and b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/wfc.ico differ
diff --git a/src/System.Windows.Forms/src/System.Windows.Forms.csproj b/src/System.Windows.Forms/src/System.Windows.Forms.csproj
index 5b858b8e7ca..67cc29030f3 100644
--- a/src/System.Windows.Forms/src/System.Windows.Forms.csproj
+++ b/src/System.Windows.Forms/src/System.Windows.Forms.csproj
@@ -69,425 +69,395 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\Animation.bmp">
-      <LogicalName>System.Windows.Forms.Animation.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\Animation.ico">
+      <LogicalName>System.Windows.Forms.Animation</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ActiveDocumentHost.bmp">
-      <LogicalName>System.Windows.Forms.ActiveDocumentHost.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ActiveDocumentHost.ico">
+      <LogicalName>System.Windows.Forms.ActiveDocumentHost</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.bmp">
-      <LogicalName>System.Windows.Forms.BindingNavigator.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.ico">
+      <LogicalName>System.Windows.Forms.BindingNavigator</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewButtonColumn.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewButtonColumn.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewButtonColumn.ico">
+      <LogicalName>System.Windows.Forms.DataGridViewButtonColumn</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewCheckBoxColumn.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewCheckBoxColumn.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewCheckBoxColumn.ico">
+      <LogicalName>System.Windows.Forms.DataGridViewCheckBoxColumn</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewComboBoxColumn.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewComboBoxColumn.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewComboBoxColumn.ico">
+      <LogicalName>System.Windows.Forms.DataGridViewComboBoxColumn</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewImageColumn.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewImageColumn.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewImageColumn.ico">
+      <LogicalName>System.Windows.Forms.DataGridViewImageColumn</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewLinkColumn.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewLinkColumn.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewLinkColumn.ico">
+      <LogicalName>System.Windows.Forms.DataGridViewLinkColumn</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewTextBoxColumn.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewTextBoxColumn.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewTextBoxColumn.ico">
+      <LogicalName>System.Windows.Forms.DataGridViewTextBoxColumn</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.MoveFirst.bmp">
-      <LogicalName>System.Windows.Forms.BindingNavigator.MoveFirst.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.MoveFirst.ico">
+      <LogicalName>System.Windows.Forms.BindingNavigator.MoveFirst</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.MoveLast.bmp">
-      <LogicalName>System.Windows.Forms.BindingNavigator.MoveLast.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.MoveLast.ico">
+      <LogicalName>System.Windows.Forms.BindingNavigator.MoveLast</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.MovePrevious.bmp">
-      <LogicalName>System.Windows.Forms.BindingNavigator.MovePrevious.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.MovePrevious.ico">
+      <LogicalName>System.Windows.Forms.BindingNavigator.MovePrevious</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.MoveNext.bmp">
-      <LogicalName>System.Windows.Forms.BindingNavigator.MoveNext.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.MoveNext.ico">
+      <LogicalName>System.Windows.Forms.BindingNavigator.MoveNext</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.AddNew.bmp">
-      <LogicalName>System.Windows.Forms.BindingNavigator.AddNew.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.AddNew.ico">
+      <LogicalName>System.Windows.Forms.BindingNavigator.AddNew</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.Delete.bmp">
-      <LogicalName>System.Windows.Forms.BindingNavigator.Delete.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingNavigator.Delete.ico">
+      <LogicalName>System.Windows.Forms.BindingNavigator.Delete</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingSource.bmp">
-      <LogicalName>System.Windows.Forms.BindingSource.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\BindingSource.ico">
+      <LogicalName>System.Windows.Forms.BindingSource</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\Button.bmp">
-      <LogicalName>System.Windows.Forms.Button.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\Button.ico">
+      <LogicalName>System.Windows.Forms.Button</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\CheckBox.bmp">
-      <LogicalName>System.Windows.Forms.CheckBox.bmp</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\Checked.bmp">
-      <LogicalName>System.Windows.Forms.Checked.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\CheckBox.ico">
+      <LogicalName>System.Windows.Forms.CheckBox</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\Checked.ico">
-      <LogicalName>System.Windows.Forms.Checked.ico</LogicalName>
+      <LogicalName>System.Windows.Forms.Checked</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\CheckedListBox.bmp">
-      <LogicalName>System.Windows.Forms.CheckedListBox.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\CheckedListBox.ico">
+      <LogicalName>System.Windows.Forms.CheckedListBox</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ColorDialog.bmp">
-      <LogicalName>System.Windows.Forms.ColorDialog.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ColorDialog.ico">
+      <LogicalName>System.Windows.Forms.ColorDialog</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ComboBox.bmp">
-      <LogicalName>System.Windows.Forms.ComboBox.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ComboBox.ico">
+      <LogicalName>System.Windows.Forms.ComboBox</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ContextMenu.bmp">
-      <LogicalName>System.Windows.Forms.ContextMenu.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ContextMenu.ico">
+      <LogicalName>System.Windows.Forms.ContextMenu</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGrid.bmp">
-      <LogicalName>System.Windows.Forms.DataGrid.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGrid.ico">
+      <LogicalName>System.Windows.Forms.DataGrid</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridCaption.down.bmp">
-      <LogicalName>System.Windows.Forms.DataGridCaption.down.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridCaption.down.ico">
+      <LogicalName>System.Windows.Forms.DataGridCaption.down</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridCaption.backarrow.bmp">
-      <LogicalName>System.Windows.Forms.DataGridCaption.backarrow.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridCaption.backarrow.ico">
+      <LogicalName>System.Windows.Forms.DataGridCaption.backarrow</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridCaption.backarrow_bidi.bmp">
-      <LogicalName>System.Windows.Forms.DataGridCaption.backarrow_bidi.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridCaption.backarrow_bidi.ico">
+      <LogicalName>System.Windows.Forms.DataGridCaption.backarrow_bidi</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridCaption.Details.bmp">
-      <LogicalName>System.Windows.Forms.DataGridCaption.Details.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridCaption.Details.ico">
+      <LogicalName>System.Windows.Forms.DataGridCaption.Details</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridCaption.right.bmp">
-      <LogicalName>System.Windows.Forms.DataGridCaption.right.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridCaption.right.ico">
+      <LogicalName>System.Windows.Forms.DataGridCaption.right</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridCaption.up.bmp">
-      <LogicalName>System.Windows.Forms.DataGridCaption.up.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridCaption.up.ico">
+      <LogicalName>System.Windows.Forms.DataGridCaption.up</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridRow.right.bmp">
-      <LogicalName>System.Windows.Forms.DataGridRow.right.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridRow.right.ico">
+      <LogicalName>System.Windows.Forms.DataGridRow.right</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridRow.left.bmp">
-      <LogicalName>System.Windows.Forms.DataGridRow.left.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridRow.left.ico">
+      <LogicalName>System.Windows.Forms.DataGridRow.left</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridRow.error.bmp">
-      <LogicalName>System.Windows.Forms.DataGridRow.error.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridRow.error.ico">
+      <LogicalName>System.Windows.Forms.DataGridRow.error</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridRow.star.bmp">
-      <LogicalName>System.Windows.Forms.DataGridRow.star.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridRow.star.ico">
+      <LogicalName>System.Windows.Forms.DataGridRow.star</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridRow.pencil.bmp">
-      <LogicalName>System.Windows.Forms.DataGridRow.pencil.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridRow.pencil.ico">
+      <LogicalName>System.Windows.Forms.DataGridRow.pencil</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridParentRows.LeftArrow.bmp">
-      <LogicalName>System.Windows.Forms.DataGridParentRows.LeftArrow.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridParentRows.LeftArrow.ico">
+      <LogicalName>System.Windows.Forms.DataGridParentRows.LeftArrow</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridParentRows.RightArrow.bmp">
-      <LogicalName>System.Windows.Forms.DataGridParentRows.RightArrow.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridParentRows.RightArrow.ico">
+      <LogicalName>System.Windows.Forms.DataGridParentRows.RightArrow</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataConnector.bmp">
-      <LogicalName>System.Windows.Forms.DataConnector.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataConnector.ico">
+      <LogicalName>System.Windows.Forms.DataConnector</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.bmp">
-      <LogicalName>System.Windows.Forms.DataNavigator.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.ico">
+      <LogicalName>System.Windows.Forms.DataNavigator</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.MoveFirst.bmp">
-      <LogicalName>System.Windows.Forms.DataNavigator.MoveFirst.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.MoveFirst.ico">
+      <LogicalName>System.Windows.Forms.DataNavigator.MoveFirst</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.MoveLast.bmp">
-      <LogicalName>System.Windows.Forms.DataNavigator.MoveLast.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.MoveLast.ico">
+      <LogicalName>System.Windows.Forms.DataNavigator.MoveLast</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.MovePrevious.bmp">
-      <LogicalName>System.Windows.Forms.DataNavigator.MovePrevious.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.MovePrevious.ico">
+      <LogicalName>System.Windows.Forms.DataNavigator.MovePrevious</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.MoveNext.bmp">
-      <LogicalName>System.Windows.Forms.DataNavigator.MoveNext.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.MoveNext.ico">
+      <LogicalName>System.Windows.Forms.DataNavigator.MoveNext</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.AddNew.bmp">
-      <LogicalName>System.Windows.Forms.DataNavigator.AddNew.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.AddNew.ico">
+      <LogicalName>System.Windows.Forms.DataNavigator.AddNew</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.Delete.bmp">
-      <LogicalName>System.Windows.Forms.DataNavigator.Delete.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataNavigator.Delete.ico">
+      <LogicalName>System.Windows.Forms.DataNavigator.Delete</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DateTimePicker.bmp">
-      <LogicalName>System.Windows.Forms.DateTimePicker.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DateTimePicker.ico">
+      <LogicalName>System.Windows.Forms.DateTimePicker</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DefaultControl.bmp">
-      <LogicalName>System.Windows.Forms.DefaultControl.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DefaultControl.ico">
+      <LogicalName>System.Windows.Forms.DefaultControl</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DomainUpDown.bmp">
-      <LogicalName>System.Windows.Forms.DomainUpDown.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DomainUpDown.ico">
+      <LogicalName>System.Windows.Forms.DomainUpDown</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\Edit.bmp">
-      <LogicalName>System.Windows.Forms.Edit.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\Edit.ico">
+      <LogicalName>System.Windows.Forms.Edit</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\TextBox.bmp">
-      <LogicalName>System.Windows.Forms.TextBox.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\TextBox.ico">
+      <LogicalName>System.Windows.Forms.TextBox</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\MaskedTextBox.bmp">
-      <LogicalName>System.Windows.Forms.MaskedTextBox.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\MaskedTextBox.ico">
+      <LogicalName>System.Windows.Forms.MaskedTextBox</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\Error.ico">
-      <LogicalName>System.Windows.Forms.Error.ico</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ErrorProvider.bmp">
-      <LogicalName>System.Windows.Forms.ErrorProvider.bmp</LogicalName>
+      <LogicalName>System.Windows.Forms.Error</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\FlowLayoutPanel.bmp">
-      <LogicalName>System.Windows.Forms.FlowLayoutPanel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ErrorProvider.ico">
+      <LogicalName>System.Windows.Forms.ErrorProvider</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\FolderBrowserDialog.bmp">
-      <LogicalName>System.Windows.Forms.FolderBrowserDialog.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\FlowLayoutPanel.ico">
+      <LogicalName>System.Windows.Forms.FlowLayoutPanel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\Form.bmp">
-      <LogicalName>System.Windows.Forms.Form.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\FolderBrowserDialog.ico">
+      <LogicalName>System.Windows.Forms.FolderBrowserDialog</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\FontDialog.bmp">
-      <LogicalName>System.Windows.Forms.FontDialog.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\Form.ico">
+      <LogicalName>System.Windows.Forms.Form</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\Grid.bmp">
-      <LogicalName>System.Windows.Forms.Grid.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\FontDialog.ico">
+      <LogicalName>System.Windows.Forms.FontDialog</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridView.bmp">
-      <LogicalName>System.Windows.Forms.DataGridView.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\Grid.ico">
+      <LogicalName>System.Windows.Forms.Grid</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.error.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.error.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridView.ico">
+      <LogicalName>System.Windows.Forms.DataGridView</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.left.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.left.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.error.ico">
+      <LogicalName>System.Windows.Forms.DataGridViewRow.error</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.left.ico">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.left.ico</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.leftstar.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.leftstar.bmp</LogicalName>
+      <LogicalName>System.Windows.Forms.DataGridViewRow.left</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.leftstar.ico">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.leftstar.ico</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.pencil_ltr.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.pencil_ltr.bmp</LogicalName>
+      <LogicalName>System.Windows.Forms.DataGridViewRow.leftstar</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.pencil_ltr.ico">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.pencil_ltr.ico</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.pencil_rtl.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.pencil_rtl.bmp</LogicalName>
+      <LogicalName>System.Windows.Forms.DataGridViewRow.pencil_ltr</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.pencil_rtl.ico">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.pencil_rtl.ico</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.right.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.right.bmp</LogicalName>
+      <LogicalName>System.Windows.Forms.DataGridViewRow.pencil_rtl</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.right.ico">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.right.ico</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.rightstar.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.rightstar.bmp</LogicalName>
+      <LogicalName>System.Windows.Forms.DataGridViewRow.right</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.rightstar.ico">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.rightstar.ico</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.star.bmp">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.star.bmp</LogicalName>
+      <LogicalName>System.Windows.Forms.DataGridViewRow.rightstar</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\DataGridViewRow.star.ico">
-      <LogicalName>System.Windows.Forms.DataGridViewRow.star.ico</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\GroupBox.bmp">
-      <LogicalName>System.Windows.Forms.GroupBox.bmp</LogicalName>
+      <LogicalName>System.Windows.Forms.DataGridViewRow.star</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\HelpProvider.bmp">
-      <LogicalName>System.Windows.Forms.HelpProvider.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\GroupBox.ico">
+      <LogicalName>System.Windows.Forms.GroupBox</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\HScrollBar.bmp">
-      <LogicalName>System.Windows.Forms.HScrollBar.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\HelpProvider.ico">
+      <LogicalName>System.Windows.Forms.HelpProvider</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\HTMLControl.bmp">
-      <LogicalName>System.Windows.Forms.HTMLControl.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\HScrollBar.ico">
+      <LogicalName>System.Windows.Forms.HScrollBar</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\IndeterminateChecked.bmp">
-      <LogicalName>System.Windows.Forms.IndeterminateChecked.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\HTMLControl.ico">
+      <LogicalName>System.Windows.Forms.HTMLControl</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\IndeterminateChecked.ico">
-      <LogicalName>System.Windows.Forms.IndeterminateChecked.ico</LogicalName>
+      <LogicalName>System.Windows.Forms.IndeterminateChecked</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ImageList.bmp">
-      <LogicalName>System.Windows.Forms.ImageList.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ImageList.ico">
+      <LogicalName>System.Windows.Forms.ImageList</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\Label.bmp">
-      <LogicalName>System.Windows.Forms.Label.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\Label.ico">
+      <LogicalName>System.Windows.Forms.Label</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\LinkLabel.bmp">
-      <LogicalName>System.Windows.Forms.LinkLabel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\LinkLabel.ico">
+      <LogicalName>System.Windows.Forms.LinkLabel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ListBox.bmp">
-      <LogicalName>System.Windows.Forms.ListBox.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ListBox.ico">
+      <LogicalName>System.Windows.Forms.ListBox</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ListView.bmp">
-      <LogicalName>System.Windows.Forms.ListView.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ListView.ico">
+      <LogicalName>System.Windows.Forms.ListView</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\MainMenu.bmp">
-      <LogicalName>System.Windows.Forms.MainMenu.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\MainMenu.ico">
+      <LogicalName>System.Windows.Forms.MainMenu</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\MonthCalendar.bmp">
-      <LogicalName>System.Windows.Forms.MonthCalendar.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\MonthCalendar.ico">
+      <LogicalName>System.Windows.Forms.MonthCalendar</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\MultiplexPanel.bmp">
-      <LogicalName>System.Windows.Forms.MultiplexPanel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\MultiplexPanel.ico">
+      <LogicalName>System.Windows.Forms.MultiplexPanel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\NotifyIcon.bmp">
-      <LogicalName>System.Windows.Forms.NotifyIcon.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\NotifyIcon.ico">
+      <LogicalName>System.Windows.Forms.NotifyIcon</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\NumericUpDown.bmp">
-      <LogicalName>System.Windows.Forms.NumericUpDown.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\NumericUpDown.ico">
+      <LogicalName>System.Windows.Forms.NumericUpDown</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\OpenFileDialog.bmp">
-      <LogicalName>System.Windows.Forms.OpenFileDialog.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\OpenFileDialog.ico">
+      <LogicalName>System.Windows.Forms.OpenFileDialog</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\Panel.bmp">
-      <LogicalName>System.Windows.Forms.Panel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\Panel.ico">
+      <LogicalName>System.Windows.Forms.Panel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PictureBox.bmp">
-      <LogicalName>System.Windows.Forms.PictureBox.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\PictureBox.ico">
+      <LogicalName>System.Windows.Forms.PictureBox</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PrintPreviewControl.bmp">
-      <LogicalName>System.Windows.Forms.PrintPreviewControl.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\PrintPreviewControl.ico">
+      <LogicalName>System.Windows.Forms.PrintPreviewControl</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\WebBrowser.bmp">
-      <LogicalName>System.Windows.Forms.WebBrowser.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\WebBrowser.ico">
+      <LogicalName>System.Windows.Forms.WebBrowser</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PrintPreviewDialog.bmp">
-      <LogicalName>System.Windows.Forms.PrintPreviewDialog.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\PrintPreviewDialog.ico">
+      <LogicalName>System.Windows.Forms.PrintPreviewDialog</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PrintPreviewStrip.bmp">
-      <LogicalName>System.Windows.Forms.PrintPreviewStrip.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\PrintPreviewStrip.ico">
+      <LogicalName>System.Windows.Forms.PrintPreviewStrip</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ProgressBar.bmp">
-      <LogicalName>System.Windows.Forms.ProgressBar.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ProgressBar.ico">
+      <LogicalName>System.Windows.Forms.ProgressBar</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\RadioButton.bmp">
-      <LogicalName>System.Windows.Forms.RadioButton.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\RadioButton.ico">
+      <LogicalName>System.Windows.Forms.RadioButton</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\Rebar.bmp">
-      <LogicalName>System.Windows.Forms.Rebar.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\Rebar.ico">
+      <LogicalName>System.Windows.Forms.Rebar</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\RichEdit.bmp">
-      <LogicalName>System.Windows.Forms.RichEdit.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\RichEdit.ico">
+      <LogicalName>System.Windows.Forms.RichEdit</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\RichTextBox.bmp">
-      <LogicalName>System.Windows.Forms.RichTextBox.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\RichTextBox.ico">
+      <LogicalName>System.Windows.Forms.RichTextBox</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\SaveFileDialog.bmp">
-      <LogicalName>System.Windows.Forms.SaveFileDialog.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\SaveFileDialog.ico">
+      <LogicalName>System.Windows.Forms.SaveFileDialog</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\Splitter.bmp">
-      <LogicalName>System.Windows.Forms.Splitter.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\Splitter.ico">
+      <LogicalName>System.Windows.Forms.Splitter</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\SplitterPanel.bmp">
-      <LogicalName>System.Windows.Forms.SplitterPanel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\SplitterPanel.ico">
+      <LogicalName>System.Windows.Forms.SplitterPanel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\SplitContainer.bmp">
-      <LogicalName>System.Windows.Forms.SplitContainer.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\SplitContainer.ico">
+      <LogicalName>System.Windows.Forms.SplitContainer</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ErrorControl.bmp">
-      <LogicalName>System.Windows.Forms.ErrorControl.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ErrorControl.ico">
+      <LogicalName>System.Windows.Forms.ErrorControl</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\StatusBar.bmp">
-      <LogicalName>System.Windows.Forms.StatusBar.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\StatusBar.ico">
+      <LogicalName>System.Windows.Forms.StatusBar</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\TabControl.bmp">
-      <LogicalName>System.Windows.Forms.TabControl.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\TabControl.ico">
+      <LogicalName>System.Windows.Forms.TabControl</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\TableLayoutPanel.bmp">
-      <LogicalName>System.Windows.Forms.TableLayoutPanel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\TableLayoutPanel.ico">
+      <LogicalName>System.Windows.Forms.TableLayoutPanel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\TabStrip.bmp">
-      <LogicalName>System.Windows.Forms.TabStrip.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\TabStrip.ico">
+      <LogicalName>System.Windows.Forms.TabStrip</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\TabPage.bmp">
-      <LogicalName>System.Windows.Forms.TabPage.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\TabPage.ico">
+      <LogicalName>System.Windows.Forms.TabPage</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolBar.bmp">
-      <LogicalName>System.Windows.Forms.ToolBar.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolBar.ico">
+      <LogicalName>System.Windows.Forms.ToolBar</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolTip.bmp">
-      <LogicalName>System.Windows.Forms.ToolTip.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolTip.ico">
+      <LogicalName>System.Windows.Forms.ToolTip</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\TrackBar.bmp">
-      <LogicalName>System.Windows.Forms.TrackBar.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\TrackBar.ico">
+      <LogicalName>System.Windows.Forms.TrackBar</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\TrayIcon.bmp">
-      <LogicalName>System.Windows.Forms.TrayIcon.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\TrayIcon.ico">
+      <LogicalName>System.Windows.Forms.TrayIcon</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\TreeView.bmp">
-      <LogicalName>System.Windows.Forms.TreeView.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\TreeView.ico">
+      <LogicalName>System.Windows.Forms.TreeView</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\UserControl.bmp">
-      <LogicalName>System.Windows.Forms.UserControl.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\UserControl.ico">
+      <LogicalName>System.Windows.Forms.UserControl</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\VScrollBar.bmp">
-      <LogicalName>System.Windows.Forms.VScrollBar.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\VScrollBar.ico">
+      <LogicalName>System.Windows.Forms.VScrollBar</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\wfc.ico">
-      <LogicalName>System.Windows.Forms.wfc.ico</LogicalName>
+      <LogicalName>System.Windows.Forms.wfc</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\App\Timer.bmp">
-      <LogicalName>System.Windows.Forms.Timer.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\App\Timer.ico">
+      <LogicalName>System.Windows.Forms.Timer</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ComponentModel\OrderImages.bmp">
-      <LogicalName>System.Windows.Forms.ComponentModel.OrderImages.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ComponentModel\OrderImages.ico">
+      <LogicalName>System.Windows.Forms.ComponentModel.OrderImages</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\Printing\PageSetupDialog.bmp">
-      <LogicalName>System.Windows.Forms.PageSetupDialog.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\Printing\PageSetupDialog.ico">
+      <LogicalName>System.Windows.Forms.PageSetupDialog</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\Printing\PrintDialog.bmp">
-      <LogicalName>System.Windows.Forms.PrintDialog.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\Printing\PrintDialog.ico">
+      <LogicalName>System.Windows.Forms.PrintDialog</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\Arrow.ico">
-      <LogicalName>System.Windows.Forms.Arrow.ico</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\dotdotdot.png">
-      <LogicalName>System.Windows.Forms.dotdotdot.png</LogicalName>
+      <LogicalName>System.Windows.Forms.Arrow</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\dotdotdot.ico">
-      <LogicalName>System.Windows.Forms.dotdotdot.ico</LogicalName>
+      <LogicalName>System.Windows.Forms.dotdotdot</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\EventsTab.bmp">
-      <LogicalName>System.Windows.Forms.Design.EventsTab.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\EventsTab.ico">
+      <LogicalName>System.Windows.Forms.Design.EventsTab</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PBAlpha.bmp">
-      <LogicalName>System.Windows.Forms.PBAlpha.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PBAlpha.ico">
+      <LogicalName>System.Windows.Forms.PBAlpha</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PBCatego.bmp">
-      <LogicalName>System.Windows.Forms.PBCatego.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PBCatego.ico">
+      <LogicalName>System.Windows.Forms.PBCatego</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PBEvent.bmp">
-      <LogicalName>System.Windows.Forms.PBEvent.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PBEvent.ico">
+      <LogicalName>System.Windows.Forms.PBEvent</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PBPPage.bmp">
-      <LogicalName>System.Windows.Forms.PBPPage.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PBPPage.ico">
+      <LogicalName>System.Windows.Forms.PBPPage</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PBProp.bmp">
-      <LogicalName>System.Windows.Forms.PBProp.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PBProp.ico">
+      <LogicalName>System.Windows.Forms.PBProp</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PropertiesTab.bmp">
-      <LogicalName>System.Windows.Forms.PropertyGridInternal.PropertiesTab.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PropertiesTab.ico">
+      <LogicalName>System.Windows.Forms.PropertyGridInternal.PropertiesTab</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PropertyGrid.bmp">
-      <LogicalName>System.Windows.Forms.PropertyGrid.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\PropertyGrid\PropertyGrid.ico">
+      <LogicalName>System.Windows.Forms.PropertyGrid</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\Server\Arrow.bmp">
-      <LogicalName>System.Windows.Forms.Server.Arrow.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\Server\Arrow.ico">
+      <LogicalName>System.Windows.Forms.Server.Arrow</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\PictureBox\Loading.bmp">
-      <LogicalName>System.Windows.Forms.PictureBox.Loading.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\PictureBox\Loading.ico">
+      <LogicalName>System.Windows.Forms.PictureBox.Loading</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\IconInError.ico">
-      <LogicalName>System.Windows.Forms.IconInError.ico</LogicalName>
+      <LogicalName>System.Windows.Forms.IconInError</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ImageInError.bmp">
-      <LogicalName>System.Windows.Forms.ImageInError.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ImageInError.ico">
+      <LogicalName>System.Windows.Forms.ImageInError</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\System\Windows\Forms\east.cur">
       <LogicalName>System.Windows.Forms.east.cur</LogicalName>
@@ -531,161 +501,158 @@
     <EmbeddedResource Include="Resources\System\Windows\Forms\west.cur">
       <LogicalName>System.Windows.Forms.west.cur</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="resources\System\Windows\Forms\up.bmp">
-      <LogicalName>System.Windows.Forms.up.bmp</LogicalName>
+    <EmbeddedResource Include="resources\System\Windows\Forms\up.ico">
+      <LogicalName>System.Windows.Forms.up</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="resources\System\Windows\Forms\down.bmp">
-      <LogicalName>System.Windows.Forms.down.bmp</LogicalName>
+    <EmbeddedResource Include="resources\System\Windows\Forms\down.ico">
+      <LogicalName>System.Windows.Forms.down</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="resources\System\Windows\Forms\design\componenteditorpage.ico">
-      <LogicalName>System.Windows.Forms.Design.ComponentEditorPage.ico</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ScrollButtonUp.bmp">
-      <LogicalName>System.Windows.Forms.ScrollButtonUp.bmp</LogicalName>
+      <LogicalName>System.Windows.Forms.Design.ComponentEditorPage</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ScrollButtonDown.bmp">
-      <LogicalName>System.Windows.Forms.ScrollButtonDown.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ScrollButtonUp.ico">
+      <LogicalName>System.Windows.Forms.ScrollButtonUp</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\overflowButton-Temporary.bmp">
-      <LogicalName>System.Windows.Forms.overflowButton.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ScrollButtonDown.ico">
+      <LogicalName>System.Windows.Forms.ScrollButtonDown</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolBarGrip-Temporary.bmp">
-      <LogicalName>System.Windows.Forms.ToolBarGrip.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\overflowButton-Temporary.ico">
+      <LogicalName>System.Windows.Forms.overflowButton</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStrip.bmp">
-      <LogicalName>System.Windows.Forms.ToolStrip.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolBarGrip-Temporary.ico">
+      <LogicalName>System.Windows.Forms.ToolBarGrip</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripContainer.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripContainer.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStrip.ico">
+      <LogicalName>System.Windows.Forms.ToolStrip</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripPanel.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripPanel_standalone.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripContainer.ico">
+      <LogicalName>System.Windows.Forms.ToolStripContainer</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripContentPanel.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripContentPanel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripPanel.ico">
+      <LogicalName>System.Windows.Forms.ToolStripPanel_standalone</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripContainer_TopToolStripPanel.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripContainer_TopToolStripPanel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripContentPanel.ico">
+      <LogicalName>System.Windows.Forms.ToolStripContentPanel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripContainer_BottomToolStripPanel.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripContainer_BottomToolStripPanel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripContainer_TopToolStripPanel.ico">
+      <LogicalName>System.Windows.Forms.ToolStripContainer_TopToolStripPanel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripContainer_LeftToolStripPanel.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripContainer_LeftToolStripPanel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripContainer_BottomToolStripPanel.ico">
+      <LogicalName>System.Windows.Forms.ToolStripContainer_BottomToolStripPanel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripContainer_RightToolStripPanel.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripContainer_RightToolStripPanel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripContainer_LeftToolStripPanel.ico">
+      <LogicalName>System.Windows.Forms.ToolStripContainer_LeftToolStripPanel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\MenuStrip.bmp">
-      <LogicalName>System.Windows.Forms.MenuStrip.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripContainer_RightToolStripPanel.ico">
+      <LogicalName>System.Windows.Forms.ToolStripContainer_RightToolStripPanel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\StatusStrip.bmp">
-      <LogicalName>System.Windows.Forms.StatusStrip.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\MenuStrip.ico">
+      <LogicalName>System.Windows.Forms.MenuStrip</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\StatusStripPanel.bmp">
-      <LogicalName>System.Windows.Forms.StatusStripPanel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\StatusStrip.ico">
+      <LogicalName>System.Windows.Forms.StatusStrip</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripStatusLabel.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripStatusLabel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\StatusStripPanel.ico">
+      <LogicalName>System.Windows.Forms.StatusStripPanel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripProgressBar.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripProgressBar.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripStatusLabel.ico">
+      <LogicalName>System.Windows.Forms.ToolStripStatusLabel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ContextMenuStrip.bmp">
-      <LogicalName>System.Windows.Forms.ContextMenuStrip.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripProgressBar.ico">
+      <LogicalName>System.Windows.Forms.ToolStripProgressBar</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ContextMenuStrip_copy.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripDropDownMenu.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ContextMenuStrip.ico">
+      <LogicalName>System.Windows.Forms.ContextMenuStrip</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripDropDown.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripDropDown.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripDropDown.ico">
+      <LogicalName>System.Windows.Forms.ToolStripDropDown</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripButton.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripButton.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripButton.ico">
+      <LogicalName>System.Windows.Forms.ToolStripButton</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripLabel.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripLabel.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripLabel.ico">
+      <LogicalName>System.Windows.Forms.ToolStripLabel</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripTextBox.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripTextBox.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripTextBox.ico">
+      <LogicalName>System.Windows.Forms.ToolStripTextBox</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripComboBox.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripComboBox.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripComboBox.ico">
+      <LogicalName>System.Windows.Forms.ToolStripComboBox</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripMenuItem.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.ToolStripMenuItem</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripDropDownButton.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripDropDownButton.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripDropDownButton.ico">
+      <LogicalName>System.Windows.Forms.ToolStripDropDownButton</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripSplitButton.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripSplitButton.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripSplitButton.ico">
+      <LogicalName>System.Windows.Forms.ToolStripSplitButton</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripSeparator.bmp">
-      <LogicalName>System.Windows.Forms.ToolStripSeparator.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\ToolStripSeparator.ico">
+      <LogicalName>System.Windows.Forms.ToolStripSeparator</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\copyToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.copy.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\copyToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.copy</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\cutToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.cut.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\cutToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.cut</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\helpToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.help.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\helpToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.help</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\newToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.new.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\newToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.new</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\openToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.open.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\openToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.open</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\pasteToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.paste.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\pasteToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.paste</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\deleteToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.delete.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\deleteToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.delete</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\viewcodeToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.viewcode.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\viewcodeToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.viewcode</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\propertiesToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.properties.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\propertiesToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.properties</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\imageToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.image.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\imageToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.image</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\alignmentToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.alignment.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\alignmentToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.alignment</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\displaystyleToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.displaystyle.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\displaystyleToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.displaystyle</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\editdropdownlistToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.editdropdownlist.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\editdropdownlistToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.editdropdownlist</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\printToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.print.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\printToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.print</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\printPreviewToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.printPreview.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\printPreviewToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.printPreview</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\saveToolStripMenuItem.bmp">
-      <LogicalName>System.Windows.Forms.save.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\saveToolStripMenuItem.ico">
+      <LogicalName>System.Windows.Forms.save</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\lockControls.bmp">
-      <LogicalName>System.Windows.Forms.lockControls.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\lockControls.ico">
+      <LogicalName>System.Windows.Forms.lockControls</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\AlignToGridHS.bmp">
-      <LogicalName>System.Windows.Forms.alignToGrid.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\AlignToGridHS.ico">
+      <LogicalName>System.Windows.Forms.alignToGrid</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\BringToFrontHS.bmp">
-      <LogicalName>System.Windows.Forms.bringToFront.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\BringToFrontHS.ico">
+      <LogicalName>System.Windows.Forms.bringToFront</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\SendToBackHS.bmp">
-      <LogicalName>System.Windows.Forms.sendToBack.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\SendToBackHS.ico">
+      <LogicalName>System.Windows.Forms.sendToBack</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\blanktoolStrip.bmp">
-      <LogicalName>System.Windows.Forms.blank.bmp</LogicalName>
+    <EmbeddedResource Include="Resources\System\Windows\Forms\ToolStrip\blanktoolStrip.ico">
+      <LogicalName>System.Windows.Forms.blank</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
 </Project>
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/BindingNavigator.cs b/src/System.Windows.Forms/src/System/Windows/Forms/BindingNavigator.cs
index fd2fbbe6a9b..0c09da594a4 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/BindingNavigator.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/BindingNavigator.cs
@@ -186,19 +186,13 @@ public virtual void AddStandardItems() {
             // Set up images
             //
 
-            Bitmap moveFirstImage    = new Bitmap(typeof(BindingNavigator), "BindingNavigator.MoveFirst.bmp");
-            Bitmap movePreviousImage = new Bitmap(typeof(BindingNavigator), "BindingNavigator.MovePrevious.bmp");
-            Bitmap moveNextImage     = new Bitmap(typeof(BindingNavigator), "BindingNavigator.MoveNext.bmp");
-            Bitmap moveLastImage     = new Bitmap(typeof(BindingNavigator), "BindingNavigator.MoveLast.bmp");
-            Bitmap addNewImage       = new Bitmap(typeof(BindingNavigator), "BindingNavigator.AddNew.bmp");
-            Bitmap deleteImage       = new Bitmap(typeof(BindingNavigator), "BindingNavigator.Delete.bmp");
-
-            moveFirstImage.MakeTransparent(System.Drawing.Color.Magenta);
-            movePreviousImage.MakeTransparent(System.Drawing.Color.Magenta);
-            moveNextImage.MakeTransparent(System.Drawing.Color.Magenta);
-            moveLastImage.MakeTransparent(System.Drawing.Color.Magenta);
-            addNewImage.MakeTransparent(System.Drawing.Color.Magenta);
-            deleteImage.MakeTransparent(System.Drawing.Color.Magenta);
+            Bitmap moveFirstImage    = DpiHelper.GetBitmapFromIcon(typeof(BindingNavigator), "BindingNavigator.MoveFirst");
+            Bitmap movePreviousImage = DpiHelper.GetBitmapFromIcon(typeof(BindingNavigator), "BindingNavigator.MovePrevious");
+            Bitmap moveNextImage     = DpiHelper.GetBitmapFromIcon(typeof(BindingNavigator), "BindingNavigator.MoveNext");
+            Bitmap moveLastImage     = DpiHelper.GetBitmapFromIcon(typeof(BindingNavigator), "BindingNavigator.MoveLast");
+            Bitmap addNewImage       = DpiHelper.GetBitmapFromIcon(typeof(BindingNavigator), "BindingNavigator.AddNew");
+            Bitmap deleteImage       = DpiHelper.GetBitmapFromIcon(typeof(BindingNavigator), "BindingNavigator.Delete");
+
 
             MoveFirstItem.Image    = moveFirstImage;
             MovePreviousItem.Image = movePreviousImage;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
index db22f4e6029..01ac0301b1a 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
@@ -18236,7 +18236,7 @@ public void Clone(out UnsafeNativeMethods.IEnumOLEVERB ppenum) {
             }
         }
 
-        #if ACTIVEX_SOURCING
+#if ACTIVEX_SOURCING
 
         //
         // This has been cut from the product.
@@ -18266,10 +18266,7 @@ internal ActiveXPropPage(object component) {
                     form.ControlBox = true;
                     form.SizeGripStyle = SizeGripStyle.Show;
                     form.DockPadding.Bottom = 16; // size grip size
-
-                    Bitmap bitmap = new Bitmap(grid.GetType(), "PropertyGrid.bmp");
-                    bitmap.MakeTransparent();
-                    form.Icon = Icon.FromHandle(bitmap.GetHicon());
+                    form.Icon = new Icon(grid.GetType(), "PropertyGrid");
 
                     grid.Dock = DockStyle.Fill;
 
@@ -18288,7 +18285,7 @@ internal void Edit(object editingObject) {
             }
         }
 
-        #endif
+#endif
 
         /// <devdoc>
         ///      Contains a single ambient property, including DISPID, name and value.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridCaption.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridCaption.cs
index a37be21a3a1..357dace9fab 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridCaption.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridCaption.cs
@@ -380,32 +380,30 @@ protected void OnDownClicked(EventArgs e) {
         }
 
         private Bitmap GetBitmap(string bitmapName) {
-            Bitmap b = null;
             try {
-                b = new Bitmap(typeof(DataGridCaption), bitmapName);
-                b.MakeTransparent();
+                return DpiHelper.GetBitmapFromIcon(typeof(DataGridCaption), bitmapName);
             }
             catch (Exception e) {
                 Debug.Fail("Failed to load bitmap: " + bitmapName, e.ToString());
+                return null;
             }
-            return b;
         }
 
         private Bitmap GetBackButtonBmp(bool alignRight) {
             if (alignRight) {
                 if (leftButtonBitmap_bidi == null)
-                    leftButtonBitmap_bidi = GetBitmap("DataGridCaption.backarrow_bidi.bmp");
+                    leftButtonBitmap_bidi = GetBitmap("DataGridCaption.backarrow_bidi");
                 return leftButtonBitmap_bidi;
             } else {
                 if (leftButtonBitmap == null)
-                    leftButtonBitmap = GetBitmap("DataGridCaption.backarrow.bmp");
+                    leftButtonBitmap = GetBitmap("DataGridCaption.backarrow");
                 return leftButtonBitmap;
             }
         }
 
         private Bitmap GetDetailsBmp() {
             if (magnifyingGlassBitmap == null)
-                magnifyingGlassBitmap = GetBitmap("DataGridCaption.Details.bmp");
+                magnifyingGlassBitmap = GetBitmap("DataGridCaption.Details");
             return magnifyingGlassBitmap;
         }
 
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridParentRows.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridParentRows.cs
index 42411bbfe65..b6e6d533e05 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridParentRows.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridParentRows.cs
@@ -728,29 +728,27 @@ private void PaintParentRows(Graphics g, Rectangle bounds, bool alignToRight) {
             }
         }
 
-        private Bitmap GetBitmap(string bitmapName, Color transparentColor) {
-            Bitmap b = null;
+        private Bitmap GetBitmap(string bitmapName) {
             try {
-                b = new Bitmap(typeof(DataGridParentRows), bitmapName);
-                b.MakeTransparent(transparentColor);
+                return DpiHelper.GetBitmapFromIcon(typeof(DataGridParentRows), bitmapName);
             }
             catch (Exception e) {
                 Debug.Fail("Failed to load bitmap: " + bitmapName, e.ToString());
+                return null;
             }
-            return b;
         }
 
         private Bitmap GetRightArrowBitmap()
         {
             if (rightArrow == null)
-                rightArrow = GetBitmap("DataGridParentRows.RightArrow.bmp", Color.White);
+                rightArrow = GetBitmap("DataGridParentRows.RightArrow");
             return rightArrow;
         }
 
         private Bitmap GetLeftArrowBitmap()
         {
             if (leftArrow == null)
-                leftArrow = GetBitmap("DataGridParentRows.LeftArrow.bmp", Color.White);
+                leftArrow = GetBitmap("DataGridParentRows.LeftArrow");
             return leftArrow;
         }
 
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridRow.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridRow.cs
index 6c6f51aa7d7..95821bfdaa0 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridRow.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridRow.cs
@@ -207,16 +207,13 @@ public virtual bool Selected {
         ///    <para>Gets the bitmap associated with the row.</para>
         /// </devdoc>
         protected Bitmap GetBitmap(string bitmapName) {
-            Bitmap b = null;
             try {
-                b = new Bitmap(typeof(DataGridCaption), bitmapName);
-                b.MakeTransparent();
+                return DpiHelper.GetBitmapFromIcon(typeof(DataGridCaption), bitmapName);
             }
             catch (Exception e) {
                 Debug.Fail("Failed to load bitmap: " + bitmapName, e.ToString());
                 throw e;
             }
-            return b;
         }
 
         /// <include file='doc\DataGridRow.uex' path='docs/doc[@for="DataGridRow.GetCellBounds"]/*' />
@@ -258,7 +255,7 @@ public virtual Rectangle GetNonScrollableArea() {
         /// </devdoc>
         protected Bitmap GetStarBitmap() {
             if (starBmp == null)
-                starBmp = GetBitmap("DataGridRow.star.bmp");
+                starBmp = GetBitmap("DataGridRow.star");
             return starBmp;
         }
 
@@ -269,7 +266,7 @@ protected Bitmap GetStarBitmap() {
         /// </devdoc>
         protected Bitmap GetPencilBitmap() {
             if (pencilBmp == null)
-                pencilBmp = GetBitmap("DataGridRow.pencil.bmp");
+                pencilBmp = GetBitmap("DataGridRow.pencil");
             return pencilBmp;
         }
 
@@ -279,20 +276,19 @@ protected Bitmap GetPencilBitmap() {
         /// </devdoc>
         protected Bitmap GetErrorBitmap() {
             if (errorBmp == null)
-                errorBmp = GetBitmap("DataGridRow.error.bmp");
-            errorBmp.MakeTransparent();
+                errorBmp = GetBitmap("DataGridRow.error");
             return errorBmp;
         }
 
         protected Bitmap GetLeftArrowBitmap() {
             if (leftArrow == null)
-                leftArrow = GetBitmap("DataGridRow.left.bmp");
+                leftArrow = GetBitmap("DataGridRow.left");
             return leftArrow;
         }
 
         protected Bitmap GetRightArrowBitmap() {
             if (rightArrow == null)
-                rightArrow = GetBitmap("DataGridRow.right.bmp");
+                rightArrow = GetBitmap("DataGridRow.right");
             return rightArrow;
         }
 
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewButtonColumn.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewButtonColumn.cs
index 68c72783f3c..abba3e2ba4a 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewButtonColumn.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewButtonColumn.cs
@@ -13,7 +13,7 @@ namespace System.Windows.Forms
     using System.Diagnostics.CodeAnalysis;
 
     /// <include file='doc\DataGridViewButtonColumn.uex' path='docs/doc[@for="DataGridViewButtonColumn"]/*' />
-    [ToolboxBitmapAttribute(typeof(DataGridViewButtonColumn), "DataGridViewButtonColumn.bmp")]
+    [ToolboxBitmapAttribute(typeof(DataGridViewButtonColumn), "DataGridViewButtonColumn")]
     public class DataGridViewButtonColumn : DataGridViewColumn
     {
         private static Type columnType = typeof(DataGridViewButtonColumn);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs
index dbb802b70c4..7fd6ff706ea 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs
@@ -273,7 +273,7 @@ private static Bitmap ErrorBitmap
             {
                 if (errorBmp == null)
                 {
-                    errorBmp = GetBitmap("DataGridViewRow.error.bmp");
+                    errorBmp = GetBitmap("DataGridViewRow.error");
                 }
                 return errorBmp;
             }
@@ -1522,8 +1522,7 @@ internal static void FormatPlainTextAsHtml(string s, TextWriter output)
 
         private static Bitmap GetBitmap(string bitmapName)
         {
-            Bitmap b = new Bitmap(typeof(DataGridViewCell), bitmapName);
-            b.MakeTransparent();
+            Bitmap b = DpiHelper.GetBitmapFromIcon(typeof(DataGridViewCell), bitmapName);
             if (DpiHelper.IsScalingRequired)
             {
                 Bitmap scaledBitmap = DpiHelper.CreateResizedBitmap(b, new Size(iconsWidth, iconsHeight));
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCheckBoxColumn.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCheckBoxColumn.cs
index 26bf7613a3a..d012ded1394 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCheckBoxColumn.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCheckBoxColumn.cs
@@ -13,7 +13,7 @@ namespace System.Windows.Forms
     using System.Globalization;
     
     /// <include file='doc\DataGridViewCheckBoxColumn.uex' path='docs/doc[@for="DataGridViewCheckBoxColumn"]/*' />
-    [ToolboxBitmapAttribute(typeof(DataGridViewCheckBoxColumn), "DataGridViewCheckBoxColumn.bmp")]
+    [ToolboxBitmapAttribute(typeof(DataGridViewCheckBoxColumn), "DataGridViewCheckBoxColumn")]
     public class DataGridViewCheckBoxColumn : DataGridViewColumn
     {
         /// <include file='doc\DataGridViewCheckBoxColumn.uex' path='docs/doc[@for="DataGridViewCheckBoxColumn.DataGridViewCheckBoxColumn"]/*' />
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxColumn.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxColumn.cs
index 6ee62a161cf..046435a7d66 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxColumn.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxColumn.cs
@@ -15,7 +15,7 @@ namespace System.Windows.Forms
     /// <include file='doc\DataGridViewComboBoxColumn.uex' path='docs/doc[@for="DataGridViewComboBoxColumn"]/*' />
     [
         Designer("System.Windows.Forms.Design.DataGridViewComboBoxColumnDesigner, " + AssemblyRef.SystemDesign),
-        ToolboxBitmapAttribute(typeof(DataGridViewComboBoxColumn), "DataGridViewComboBoxColumn.bmp")
+        ToolboxBitmapAttribute(typeof(DataGridViewComboBoxColumn), "DataGridViewComboBoxColumn")
     ]
     public class DataGridViewComboBoxColumn : DataGridViewColumn
     {
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewImageCell.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewImageCell.cs
index d597c3e0b9c..a98d268e004 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewImageCell.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewImageCell.cs
@@ -105,7 +105,7 @@ static internal Bitmap ErrorBitmap
             {
                 if (errorBmp == null)
                 {
-                    errorBmp = new Bitmap(typeof(DataGridView), "ImageInError.bmp");
+                    errorBmp = DpiHelper.GetBitmapFromIcon(typeof(DataGridView), "ImageInError");
                 }
                 return errorBmp;
             }
@@ -117,7 +117,7 @@ static internal Icon ErrorIcon
             {
                 if (errorIco == null)
                 {
-                    errorIco = new Icon(typeof(DataGridView), "IconInError.ico");
+                    errorIco = new Icon(typeof(DataGridView), "IconInError");
                 }
                 return errorIco;
             }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewImageColumn.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewImageColumn.cs
index 66bdb33cc60..4389ab1725e 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewImageColumn.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewImageColumn.cs
@@ -14,7 +14,7 @@ namespace System.Windows.Forms
     using System.Globalization;
 
     /// <include file='doc\DataGridViewImageColumn.uex' path='docs/doc[@for="DataGridViewImageColumn"]/*' />
-    [ToolboxBitmapAttribute(typeof(DataGridViewImageColumn), "DataGridViewImageColumn.bmp")]
+    [ToolboxBitmapAttribute(typeof(DataGridViewImageColumn), "DataGridViewImageColumn")]
     public class DataGridViewImageColumn : DataGridViewColumn
     {
         private static Type columnType = typeof(DataGridViewImageColumn);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewLinkColumn.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewLinkColumn.cs
index 814554c98a1..77a4dbbeb76 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewLinkColumn.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewLinkColumn.cs
@@ -12,7 +12,7 @@ namespace System.Windows.Forms
     using System.Globalization;
 
     /// <include file='doc\DataGridViewLinkColumn.uex' path='docs/doc[@for="DataGridViewLinkColumn"]/*' />
-    [ToolboxBitmapAttribute(typeof(DataGridViewLinkColumn), "DataGridViewLinkColumn.bmp")]
+    [ToolboxBitmapAttribute(typeof(DataGridViewLinkColumn), "DataGridViewLinkColumn")]
     public class DataGridViewLinkColumn : DataGridViewColumn
     {
         private static Type columnType = typeof(DataGridViewLinkColumn);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.cs
index 7e77bf99fc6..511b91281f9 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.cs
@@ -50,27 +50,13 @@ public DataGridViewRowHeaderCell()
         {
         }
 
-        /* Unused for now.
-        private static Bitmap ErrorBitmap
-        {
-            get
-            {
-                if (errorBmp == null)
-                {
-                    errorBmp = GetBitmap("DataGridViewRow.error.bmp");
-                }
-                return errorBmp;
-            }
-        }
-        */
-
         private static Bitmap LeftArrowBitmap
         {
             get
             {
                 if (leftArrowBmp == null)
                 {
-                    leftArrowBmp = GetBitmapFromIcon("DataGridViewRow.left.ico");
+                    leftArrowBmp = GetBitmapFromIcon("DataGridViewRow.left");
                 }
                 return leftArrowBmp;
             }
@@ -82,7 +68,7 @@ private static Bitmap LeftArrowStarBitmap
             {
                 if (leftArrowStarBmp == null)
                 {
-                    leftArrowStarBmp = GetBitmapFromIcon("DataGridViewRow.leftstar.ico");
+                    leftArrowStarBmp = GetBitmapFromIcon("DataGridViewRow.leftstar");
                 }
                 return leftArrowStarBmp;
             }
@@ -94,7 +80,7 @@ private static Bitmap PencilLTRBitmap
             {
                 if (pencilLTRBmp == null)
                 {
-                    pencilLTRBmp = GetBitmapFromIcon("DataGridViewRow.pencil_ltr.ico");
+                    pencilLTRBmp = GetBitmapFromIcon("DataGridViewRow.pencil_ltr");
                 }
                 return pencilLTRBmp;
             }
@@ -106,7 +92,7 @@ private static Bitmap PencilRTLBitmap
             {
                 if (pencilRTLBmp == null)
                 {
-                    pencilRTLBmp = GetBitmapFromIcon("DataGridViewRow.pencil_rtl.ico");
+                    pencilRTLBmp = GetBitmapFromIcon("DataGridViewRow.pencil_rtl");
                 }
                 return pencilRTLBmp;
             }
@@ -118,7 +104,7 @@ private static Bitmap RightArrowBitmap
             {
                 if (rightArrowBmp == null)
                 {
-                    rightArrowBmp = GetBitmapFromIcon("DataGridViewRow.right.ico");
+                    rightArrowBmp = GetBitmapFromIcon("DataGridViewRow.right");
                 }
                 return rightArrowBmp;
             }
@@ -130,7 +116,7 @@ private static Bitmap RightArrowStarBitmap
             {
                 if (rightArrowStarBmp == null)
                 {
-                    rightArrowStarBmp = GetBitmapFromIcon("DataGridViewRow.rightstar.ico");
+                    rightArrowStarBmp = GetBitmapFromIcon("DataGridViewRow.rightstar");
                 }
                 return rightArrowStarBmp;
             }
@@ -142,7 +128,7 @@ private static Bitmap StarBitmap
             {
                 if (starBmp == null)
                 {
-                    starBmp = GetBitmapFromIcon("DataGridViewRow.star.ico");
+                    starBmp = GetBitmapFromIcon("DataGridViewRow.star");
                 }
                 return starBmp;
             }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxColumn.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxColumn.cs
index be4bd49f9bb..b18cf0b3d76 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxColumn.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxColumn.cs
@@ -12,7 +12,7 @@ namespace System.Windows.Forms
     using System.Globalization;
     
     /// <include file='doc\DataGridViewTextBoxColumn.uex' path='docs/doc[@for="DataGridViewTextBoxColumn"]/*' />
-    [ToolboxBitmapAttribute(typeof(DataGridViewTextBoxColumn), "DataGridViewTextBoxColumn.bmp")]
+    [ToolboxBitmapAttribute(typeof(DataGridViewTextBoxColumn), "DataGridViewTextBoxColumn")]
     public class DataGridViewTextBoxColumn : DataGridViewColumn
     {
         private const int DATAGRIDVIEWTEXTBOXCOLUMN_maxInputLength = 32767;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Design/ComponentEditorPage.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Design/ComponentEditorPage.cs
index a859c05b042..40549affdac 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Design/ComponentEditorPage.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Design/ComponentEditorPage.cs
@@ -162,7 +162,7 @@ public Icon Icon {
             
             get {
                 if (icon == null) {
-                    icon = new Icon(typeof(ComponentEditorPage), "ComponentEditorPage.ico");
+                    icon = new Icon(typeof(ComponentEditorPage), "ComponentEditorPage");
                 }
                 return icon;
             }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Design/PropertyTab.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Design/PropertyTab.cs
index 2346f00e8f3..4f3f92935c5 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Design/PropertyTab.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Design/PropertyTab.cs
@@ -37,13 +37,11 @@ public virtual Bitmap Bitmap {
             
             get {
                 if (!checkedBmp && bitmap == null) {
-                    string bmpName = GetType().Name + ".bmp";
-                    try
-                    {
-                        bitmap = new Bitmap(GetType(), bmpName);
+                    string bmpName = GetType().Name + "";
+                    try {
+                        bitmap = DpiHelper.GetBitmapFromIcon(GetType(), bmpName);
                     }
-                    catch (Exception ex)
-                    {
+                    catch (Exception ex) {
                         Debug.Fail("Failed to find bitmap '" + bmpName + "' for class " + GetType().FullName, ex.ToString());
                     }
                     checkedBmp = true;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.cs
index ee5389f1ed9..f9ea48461ad 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.cs
@@ -555,7 +555,7 @@ static Icon DefaultIcon {
                 if (defaultIcon == null) {
                     lock (typeof(ErrorProvider)) {
                         if (defaultIcon == null) {
-                            defaultIcon = new Icon(typeof(ErrorProvider), "Error.ico");
+                            defaultIcon = new Icon(typeof(ErrorProvider), "Error");
                         }
                     }
                 }
@@ -1662,7 +1662,6 @@ public Region Region {
                         try {
                             Size size = icon.Size;
                             Bitmap bitmap = icon.ToBitmap();
-                            bitmap.MakeTransparent();
                             mask = ControlPaint.CreateHBitmapTransparencyMask(bitmap);
                             bitmap.Dispose();
 
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Form.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Form.cs
index 0529ced7681..33eadfc0ca6 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Form.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Form.cs
@@ -962,7 +962,7 @@ internal static Icon DefaultIcon {
                         // race condition.
                         //
                         if (defaultIcon == null) {
-                            defaultIcon = new Icon(typeof(Form), "wfc.ico");
+                            defaultIcon = new Icon(typeof(Form), "wfc");
                         }
                     }
                 }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ImageList.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ImageList.cs
index 3e66668854c..8ebbadd755a 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ImageList.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ImageList.cs
@@ -746,7 +746,9 @@ private Bitmap GetBitmap(int index) {
             }
 
             // gpr: See Icon for description of fakeTransparencyColor
-            result.MakeTransparent(fakeTransparencyColor);
+            if (result.RawFormat.Guid != ImageFormat.Icon.Guid) {
+                result.MakeTransparent(fakeTransparencyColor);
+            }
             return result;
         }
 
@@ -1116,7 +1118,7 @@ public Image this[int index] {
                     Bitmap bitmap = (Bitmap)value;
 
                     bool ownsImage = false;
-                    if (owner.UseTransparentColor) {
+                    if (owner.UseTransparentColor && bitmap.RawFormat.Guid != ImageFormat.Icon.Guid) {
                         // Since there's no ImageList_ReplaceMasked, we need to generate
                         // a transparent bitmap
                         Bitmap source = bitmap;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PictureBox.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PictureBox.cs
index 9b240f4c79e..9ff91456c89 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PictureBox.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PictureBox.cs
@@ -292,9 +292,7 @@ public Image ErrorImage {
                         // Can't share images across threads.
                         if (defaultErrorImageForThread == null)
                         {
-                            defaultErrorImageForThread =
-                                new Bitmap(typeof(PictureBox),
-                                           "ImageInError.bmp");
+                            defaultErrorImageForThread = DpiHelper.GetBitmapFromIcon(typeof(PictureBox), "ImageInError");
                         }
                         defaultErrorImage = defaultErrorImageForThread;
                     }
@@ -493,9 +491,7 @@ public Image InitialImage {
                         // Can't share images across threads.
                         if (defaultInitialImageForThread == null)
                         {
-                            defaultInitialImageForThread =
-                                new Bitmap(typeof(PictureBox),
-                                           "PictureBox.Loading.bmp");
+                            defaultInitialImageForThread =  DpiHelper.GetBitmapFromIcon(typeof(PictureBox), "PictureBox.Loading");
                         }
                         defaultInitialImage = defaultInitialImageForThread;
                     }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewDialog.cs
index 07e68bc7019..aa592a61bba 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewDialog.cs
@@ -63,24 +63,15 @@ public class PrintPreviewDialog : Form {
         /// <para>Initializes a new instance of the <see cref='System.Windows.Forms.PrintPreviewDialog'/> class.</para>
         /// </devdoc>
         public PrintPreviewDialog() {
-
             
             #pragma warning disable 618
             base.AutoScaleBaseSize = new Size(5, 13);
             #pragma warning restore 618
-            
-            
 
             this.previewControl = new PrintPreviewControl();
             this.imageList = new ImageList();
-            
-            Bitmap bitmaps = new Bitmap(typeof(PrintPreviewDialog), "PrintPreviewStrip.bmp");
-            bitmaps.MakeTransparent();
-            imageList.Images.AddStrip(bitmaps);
-
+            imageList.Images.AddStrip(DpiHelper.GetBitmapFromIcon(typeof(PrintPreviewDialog), "PrintPreviewStrip"));
             InitForm();
-
-            
         }
 
         //subhag addition
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.cs
index a1e1dbd74b9..1af10070a3c 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.cs
@@ -12,6 +12,7 @@ namespace System.Windows.Forms {
     using System.Diagnostics.CodeAnalysis;
     using System.Drawing;
     using System.Drawing.Design;
+    using System.Drawing.Imaging;
     using System.Globalization;
     using System.IO;
     using System.Reflection;
@@ -1588,8 +1589,9 @@ public Color ViewBorderColor {
         }
 
         private int AddImage(Bitmap image) {
-            
-            image.MakeTransparent();
+            if (image.RawFormat.Guid != ImageFormat.Icon.Guid) {
+                image.MakeTransparent();
+            }
             // Resize bitmap only if resizing is needed in order to avoid image distortion.
             if (DpiHelper.IsScalingRequired && (image.Size.Width != normalButtonSize.Width || image.Size.Height != normalButtonSize.Height)) {
                 image = DpiHelper.CreateResizedBitmap(image, normalButtonSize);
@@ -2386,7 +2388,6 @@ private void AddLargeImage(Bitmap originalBitmap) {
             Bitmap largeBitmap = null;
             try {
                 Bitmap transparentBitmap = new Bitmap(originalBitmap);
-                transparentBitmap.MakeTransparent();
                 largeBitmap = DpiHelper.CreateResizedBitmap(transparentBitmap, largeButtonSize);
                 transparentBitmap.Dispose();
 
@@ -4403,7 +4404,7 @@ protected void ShowEventsButton(bool value) {
         ]
         protected virtual Bitmap SortByPropertyImage {
             get {
-                return new Bitmap(typeof(PropertyGrid), "PBAlpha.bmp");
+                return DpiHelper.GetBitmapFromIcon(typeof(PropertyGrid), "PBAlpha");
             }
         }
 
@@ -4418,7 +4419,7 @@ protected virtual Bitmap SortByPropertyImage {
         ]
         protected virtual Bitmap SortByCategoryImage {
             get {
-                return new Bitmap(typeof(PropertyGrid), "PBCatego.bmp");
+                return DpiHelper.GetBitmapFromIcon(typeof(PropertyGrid), "PBCatego");
             }
         }
 
@@ -4433,7 +4434,7 @@ protected virtual Bitmap SortByCategoryImage {
         ]
         protected virtual Bitmap ShowPropertyPageImage {
             get {
-                return new Bitmap(typeof(PropertyGrid), "PBPPage.bmp");
+                return DpiHelper.GetBitmapFromIcon(typeof(PropertyGrid), "PBPPage");
             }
         }
 
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridErrorDlg.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridErrorDlg.cs
index 29358955926..320b738caab 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridErrorDlg.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridErrorDlg.cs
@@ -73,13 +73,11 @@ public string Message {
         ]
         public GridErrorDlg(PropertyGrid owner) {
             ownerGrid = owner;
-            expandImage = new Bitmap(typeof(ThreadExceptionDialog), "down.bmp");
-            expandImage.MakeTransparent();
+            expandImage = DpiHelper.GetBitmapFromIcon(typeof(ThreadExceptionDialog), "down");
             if (DpiHelper.IsScalingRequired) {
                 DpiHelper.ScaleBitmapLogicalToDevice(ref expandImage);
             }
-            collapseImage = new Bitmap(typeof(ThreadExceptionDialog), "up.bmp");
-            collapseImage.MakeTransparent();
+            collapseImage = DpiHelper.GetBitmapFromIcon(typeof(ThreadExceptionDialog), "up");
             if (DpiHelper.IsScalingRequired) {
                 DpiHelper.ScaleBitmapLogicalToDevice(ref collapseImage);
             }
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs
index 5cd5e232c5f..17c72c4aa23 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs
@@ -275,7 +275,7 @@ internal DropDownButton DropDownButton {
                     
                     btnDropDown = new DropDownButton();
                     btnDropDown.UseComboBoxTheme = true;
-                    Bitmap bitmap = CreateResizedBitmap("Arrow.ico", DOWNARROW_ICONWIDTH, DOWNARROW_ICONHEIGHT);
+                    Bitmap bitmap = CreateResizedBitmap("Arrow", DOWNARROW_ICONWIDTH, DOWNARROW_ICONHEIGHT);
                     btnDropDown.Image = bitmap;
                     btnDropDown.BackColor = SystemColors.Control;
                     btnDropDown.ForeColor = SystemColors.ControlText;
@@ -303,7 +303,7 @@ private Button DialogButton {
                     btnDialog.BackColor = SystemColors.Control;
                     btnDialog.ForeColor = SystemColors.ControlText;
                     btnDialog.TabIndex = 3;
-                    btnDialog.Image = CreateResizedBitmap("dotdotdot.ico", DOTDOTDOT_ICONWIDTH, DOTDOTDOT_ICONHEIGHT);
+                    btnDialog.Image = CreateResizedBitmap("dotdotdot", DOTDOTDOT_ICONWIDTH, DOTDOTDOT_ICONHEIGHT);
                     btnDialog.Click += new EventHandler(this.OnBtnClick);
                     btnDialog.KeyDown += new KeyEventHandler(this.OnBtnKeyDown);
                     btnDialog.GotFocus += new EventHandler(OnDropDownButtonGotFocus);
@@ -5115,11 +5115,11 @@ private void UpdateUIBasedOnFont(bool layoutRequired) {
                         if (btnDialog != null) {
                             DialogButton.Size = DropDownButton.Size;
                             if (isScalingRequirementMet) {
-                                btnDialog.Image = CreateResizedBitmap("dotdotdot.ico", DOTDOTDOT_ICONWIDTH, DOTDOTDOT_ICONHEIGHT);
+                                btnDialog.Image = CreateResizedBitmap("dotdotdot", DOTDOTDOT_ICONWIDTH, DOTDOTDOT_ICONHEIGHT);
                             }
                         }
                         if (isScalingRequirementMet) {
-                            btnDropDown.Image = CreateResizedBitmap("Arrow.ico", DOWNARROW_ICONWIDTH, DOWNARROW_ICONHEIGHT);
+                            btnDropDown.Image = CreateResizedBitmap("Arrow", DOWNARROW_ICONWIDTH, DOWNARROW_ICONHEIGHT);
                         }
                     }
 
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ThreadExceptionDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ThreadExceptionDialog.cs
index a86798530ce..34a1926bcc7 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ThreadExceptionDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ThreadExceptionDialog.cs
@@ -23,8 +23,8 @@ namespace System.Windows.Forms {
         ClassInterface(ClassInterfaceType.AutoDispatch)]
     public class ThreadExceptionDialog : Form {
 
-        private const string DownBitmapName = "down.bmp";
-        private const string UpBitmapName = "up.bmp";
+        private const string DownBitmapName = "down";
+        private const string UpBitmapName = "up";
 
         private const int MAXWIDTH = 440;
         private const int MAXHEIGHT = 325;
@@ -280,10 +280,8 @@ public ThreadExceptionDialog(Exception t) {
             if (detailAnchor) {
                 b = detailsButton;
 
-                expandImage = new Bitmap(GetType(), DownBitmapName);
-                expandImage.MakeTransparent();
-                collapseImage = new Bitmap(GetType(), UpBitmapName);
-                collapseImage.MakeTransparent();
+                expandImage = DpiHelper.GetBitmapFromIcon(GetType(), DownBitmapName);
+                collapseImage = DpiHelper.GetBitmapFromIcon(GetType(), UpBitmapName);
 
                 if (DpiHelper.IsScalingRequirementMet)
                 {
@@ -327,14 +325,12 @@ private void ThreadExceptionDialog_DpiChanged(object sender, DpiChangedEventArgs
             if (expandImage != null) {
                 expandImage.Dispose();
             }
-            expandImage = new Bitmap(GetType(), DownBitmapName);
-            expandImage.MakeTransparent();
+            expandImage = DpiHelper.GetBitmapFromIcon(GetType(), DownBitmapName);
 
             if (collapseImage != null) {
                 collapseImage.Dispose();
             }
-            collapseImage = new Bitmap(GetType(), UpBitmapName);
-            collapseImage.MakeTransparent();
+            collapseImage = DpiHelper.GetBitmapFromIcon(GetType(), UpBitmapName);
 
             ScaleBitmapLogicalToDevice(ref expandImage);
             ScaleBitmapLogicalToDevice(ref collapseImage);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripMenuItem.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripMenuItem.cs
index 2cce7d73698..fe30ae8cdc7 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripMenuItem.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripMenuItem.cs
@@ -274,13 +274,11 @@ internal Image CheckedImage {
                 if (checkedState == CheckState.Indeterminate) {
                     if (indeterminateCheckedImage == null) {
                         if (DpiHelper.IsScalingRequirementMet) {
-                            indeterminateCheckedImage = GetBitmapFromIcon("IndeterminateChecked.ico", scaledCheckMarkBitmapSize);
+                            indeterminateCheckedImage = GetBitmapFromIcon("IndeterminateChecked", scaledCheckMarkBitmapSize);
                         }
                         else {
-                            Bitmap indeterminateCheckedBmp = new Bitmap(typeof(ToolStripMenuItem), "IndeterminateChecked.bmp");
+                            Bitmap indeterminateCheckedBmp = DpiHelper.GetBitmapFromIcon(typeof(ToolStripMenuItem), "IndeterminateChecked");
                             if (indeterminateCheckedBmp != null) {
-                                // 
-                                indeterminateCheckedBmp.MakeTransparent(indeterminateCheckedBmp.GetPixel(1, 1));
                                 if (DpiHelper.IsScalingRequired) {
                                     DpiHelper.ScaleBitmapLogicalToDevice(ref indeterminateCheckedBmp);
                                 }
@@ -293,13 +291,11 @@ internal Image CheckedImage {
                 else if (checkedState == CheckState.Checked) {
                     if (checkedImage == null) {
                         if (DpiHelper.IsScalingRequirementMet) {
-                            checkedImage = GetBitmapFromIcon("Checked.ico", scaledCheckMarkBitmapSize);
+                            checkedImage = GetBitmapFromIcon("Checked", scaledCheckMarkBitmapSize);
                         }
                         else {
-                            Bitmap checkedBmp = new Bitmap(typeof(ToolStripMenuItem), "Checked.bmp");
+                            Bitmap checkedBmp = DpiHelper.GetBitmapFromIcon(typeof(ToolStripMenuItem), "Checked");
                             if (checkedBmp != null) {
-                                // 
-                                checkedBmp.MakeTransparent(checkedBmp.GetPixel(1, 1));
                                 if (DpiHelper.IsScalingRequired) {
                                     DpiHelper.ScaleBitmapLogicalToDevice(ref checkedBmp);
                                 }
@@ -330,7 +326,6 @@ private static Bitmap GetBitmapFromIcon(string iconName, Size desiredIconSize)
 
                         if (b != null)
                         {
-                            b.MakeTransparent(b.GetPixel(1, 1));
                             if (DpiHelper.IsScalingRequired && (b.Size.Width != desiredIconSize.Width || b.Size.Height != desiredIconSize.Height))
                             {
                                 Bitmap scaledBitmap = DpiHelper.CreateResizedBitmap(b, desiredIconSize);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripPanel.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripPanel.cs
index ca51b943379..ea718baee62 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripPanel.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripPanel.cs
@@ -23,7 +23,7 @@ namespace System.Windows.Forms {
     [ComVisible(true)]
     [ClassInterface(ClassInterfaceType.AutoDispatch)]
     [Designer("System.Windows.Forms.Design.ToolStripPanelDesigner, " + AssemblyRef.SystemDesign)]
-    [ToolboxBitmapAttribute(typeof(ToolStripPanel), "ToolStripPanel_standalone.bmp")]
+    [ToolboxBitmapAttribute(typeof(ToolStripPanel), "ToolStripPanel_standalone")]
     public class ToolStripPanel : ContainerControl, IArrangedElement {
 
 
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripScrollButton.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripScrollButton.cs
index 24c7b9407e2..5af12fc5e27 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripScrollButton.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripScrollButton.cs
@@ -60,9 +60,7 @@ protected override Padding DefaultPadding {
          private static Image DownImage {
             get { 
                 if (downScrollImage == null) {
-                      downScrollImage = new Bitmap(typeof(ToolStripScrollButton), "ScrollButtonDown.bmp"); 
-                      downScrollImage.MakeTransparent(Color.White);
-
+                    downScrollImage = DpiHelper.GetBitmapFromIcon(typeof(ToolStripScrollButton), "ScrollButtonDown");
                 }
                 return downScrollImage;
             }
@@ -78,9 +76,7 @@ internal StickyLabel Label {
         private static Image UpImage {
             get { 
                 if (upScrollImage == null) {
-                      upScrollImage = new Bitmap(typeof(ToolStripScrollButton), "ScrollButtonUp.bmp"); 
-                      upScrollImage.MakeTransparent(Color.White);
-
+                    upScrollImage = DpiHelper.GetBitmapFromIcon(typeof(ToolStripScrollButton), "ScrollButtonUp");
                 }
                 return upScrollImage;
             }