diff --git a/Filtration/Converters/IconShapeToSourceConverter.cs b/Filtration/Converters/IconShapeToSourceConverter.cs
deleted file mode 100644
index c727045..0000000
--- a/Filtration/Converters/IconShapeToSourceConverter.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Filtration.ObjectModel.Enums;
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace Filtration.Converters
-{
-    internal class IconShapeToSourceConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            var iconShape = (IconShape)(int)value;
-            switch (iconShape)
-            {
-                case IconShape.Circle:
-                    return "/Filtration;component/Resources/DropIcons/Circle.png";
-                case IconShape.Diamond:
-                    return "/Filtration;component/Resources/DropIcons/Diamond.png";
-                case IconShape.Hexagon:
-                    return "/Filtration;component/Resources/DropIcons/Hexagon.png";
-                case IconShape.Square:
-                    return "/Filtration;component/Resources/DropIcons/Square.png";
-                case IconShape.Star:
-                    return "/Filtration;component/Resources/DropIcons/Star.png";
-                case IconShape.Triangle:
-                    return "/Filtration;component/Resources/DropIcons/Triangle.png";
-            }
-
-            return "/Filtration;component/Resources/DropIcons/NoIcon.png";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Filtration/Converters/MinimapIconConverter.cs b/Filtration/Converters/MinimapIconConverter.cs
new file mode 100644
index 0000000..6bc729a
--- /dev/null
+++ b/Filtration/Converters/MinimapIconConverter.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using Filtration.ObjectModel.Enums;
+
+namespace Filtration.Converters
+{
+	internal class MinimapIconConverter : IMultiValueConverter
+	{
+		public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+		{
+			var prefix = "pack://application:,,,/Filtration;component/Resources/DropIcons";
+			var noIconPath = $"{prefix}/none.png";
+
+			if (values[0] == DependencyProperty.UnsetValue ||
+				values[1] == DependencyProperty.UnsetValue ||
+				values[2] == DependencyProperty.UnsetValue) {
+				return new BitmapImage(new Uri(noIconPath, UriKind.Absolute));
+			}
+
+			var iconSize = (IconSize)(int)(values[0]);
+			var iconColor = (IconColor)(int)(values[1]);
+			var iconShape = (IconShape)(int)(values[2]);
+			string iconSizeText, iconColorText, iconShapeText;
+
+			switch (iconSize) {
+				case IconSize.Largest:
+					iconSizeText = "0";
+					break;
+				case IconSize.Medium:
+					iconSizeText = "1";
+					break;
+				case IconSize.Small:
+					iconSizeText = "2";
+					break;
+				default:
+					return new BitmapImage(new Uri(noIconPath, UriKind.Absolute));
+			}
+
+			switch (iconColor) {
+				case IconColor.Blue:
+					iconColorText = "blue";
+					break;
+				case IconColor.Brown:
+					iconColorText = "brown";
+					break;
+				case IconColor.Green:
+					iconColorText = "green";
+					break;
+				case IconColor.Red:
+					iconColorText = "red";
+					break;
+				case IconColor.White:
+					iconColorText = "white";
+					break;
+				case IconColor.Yellow:
+					iconColorText = "yellow";
+					break;
+				default:
+					return new BitmapImage(new Uri(noIconPath, UriKind.Absolute));
+			}
+
+			switch (iconShape) {
+				case IconShape.Circle:
+					iconShapeText = "circle";
+					break;
+				case IconShape.Diamond:
+					iconShapeText = "diamond";
+					break;
+				case IconShape.Hexagon:
+					iconShapeText = "hexagon";
+					break;
+				case IconShape.Square:
+					iconShapeText = "square";
+					break;
+				case IconShape.Star:
+					iconShapeText = "star";
+					break;
+				case IconShape.Triangle:
+					iconShapeText = "triangle";
+					break;
+				default:
+					return new BitmapImage(new Uri(noIconPath, UriKind.Relative));
+			}
+
+			return new BitmapImage(new Uri($"{prefix}/{iconShapeText}_{iconColorText}_{iconSizeText}.png",
+				UriKind.Absolute));
+		}
+
+		public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
diff --git a/Filtration/Converters/SizeColorToRectConverter.cs b/Filtration/Converters/SizeColorToRectConverter.cs
deleted file mode 100644
index 5facce6..0000000
--- a/Filtration/Converters/SizeColorToRectConverter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Filtration.Converters
-{
-    internal class SizeColorToRectConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (values[0] == DependencyProperty.UnsetValue ||
-                values[1] == DependencyProperty.UnsetValue)
-                return new Rect(0, 0, 0, 0);
-
-            var size = (int)(values[0]);
-            var color = (int)(values[1]);
-
-            if (size < 0 || color < 0)
-                return new Rect(0, 0, 0, 0);
-
-            var cropArea = new Rect
-            {
-                Width = 64,
-                Height = 64,
-                X = 0 + size * 64,
-                Y = 0 + color * 64
-            };
-
-            return cropArea;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index 6a1ac98..fcfc3e6 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -167,9 +167,8 @@
     <Compile Include="Converters\BooleanToBlockActionInverseConverter.cs" />
     <Compile Include="Converters\BooleanToBlockActionConverter.cs" />
     <Compile Include="Converters\BlockItemToRemoveEnabledVisibilityConverter.cs" />
-    <Compile Include="Converters\SizeColorToRectConverter.cs" />
+    <Compile Include="Converters\MinimapIconConverter.cs" />
     <Compile Include="Converters\HashSignRemovalConverter.cs" />
-    <Compile Include="Converters\IconShapeToSourceConverter.cs" />
     <Compile Include="Converters\ItemRarityConverter.cs" />
     <Compile Include="Converters\TreeViewMarginConverter.cs" />
     <Compile Include="Models\UpdateData.cs" />
@@ -190,9 +189,6 @@
     <Compile Include="UserControls\EditableListBoxControl.xaml.cs">
       <DependentUpon>EditableListBoxControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControls\ImageComboBoxControl.xaml.cs">
-      <DependentUpon>ImageComboBoxControl.xaml</DependentUpon>
-    </Compile>
     <Compile Include="UserControls\ItemPreviewControl.xaml.cs">
       <DependentUpon>ItemPreviewControl.xaml</DependentUpon>
     </Compile>
@@ -233,10 +229,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControls\ImageComboBoxControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="UserControls\ThemeComponentSelectionControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -545,13 +537,115 @@
     </None>
     <Resource Include="Resources\Icons\redo_icon.png" />
     <Resource Include="Resources\Icons\undo_icon.png" />
-    <Resource Include="Resources\DropIcons\NoIcon.png" />
-    <Resource Include="Resources\DropIcons\Circle.png" />
-    <Resource Include="Resources\DropIcons\Diamond.png" />
-    <Resource Include="Resources\DropIcons\Hexagon.png" />
-    <Resource Include="Resources\DropIcons\Square.png" />
-    <Resource Include="Resources\DropIcons\Star.png" />
-    <Resource Include="Resources\DropIcons\Triangle.png" />
+    <Resource Include="Resources\DropIcons\circle_red_0.png" />
+    <Resource Include="Resources\DropIcons\circle_blue_0.png" />
+    <Resource Include="Resources\DropIcons\circle_blue_1.png" />
+    <Resource Include="Resources\DropIcons\circle_blue_2.png" />
+    <Resource Include="Resources\DropIcons\circle_brown_0.png" />
+    <Resource Include="Resources\DropIcons\circle_brown_1.png" />
+    <Resource Include="Resources\DropIcons\circle_brown_2.png" />
+    <Resource Include="Resources\DropIcons\circle_green_0.png" />
+    <Resource Include="Resources\DropIcons\circle_green_1.png" />
+    <Resource Include="Resources\DropIcons\circle_green_2.png" />
+    <Resource Include="Resources\DropIcons\circle_red_1.png" />
+    <Resource Include="Resources\DropIcons\circle_red_2.png" />
+    <Resource Include="Resources\DropIcons\circle_white_0.png" />
+    <Resource Include="Resources\DropIcons\circle_white_1.png" />
+    <Resource Include="Resources\DropIcons\circle_white_2.png" />
+    <Resource Include="Resources\DropIcons\circle_yellow_0.png" />
+    <Resource Include="Resources\DropIcons\circle_yellow_1.png" />
+    <Resource Include="Resources\DropIcons\circle_yellow_2.png" />
+    <Resource Include="Resources\DropIcons\diamond_blue_0.png" />
+    <Resource Include="Resources\DropIcons\diamond_blue_1.png" />
+    <Resource Include="Resources\DropIcons\diamond_blue_2.png" />
+    <Resource Include="Resources\DropIcons\diamond_brown_0.png" />
+    <Resource Include="Resources\DropIcons\diamond_brown_1.png" />
+    <Resource Include="Resources\DropIcons\diamond_brown_2.png" />
+    <Resource Include="Resources\DropIcons\diamond_green_0.png" />
+    <Resource Include="Resources\DropIcons\diamond_green_1.png" />
+    <Resource Include="Resources\DropIcons\diamond_green_2.png" />
+    <Resource Include="Resources\DropIcons\diamond_red_0.png" />
+    <Resource Include="Resources\DropIcons\diamond_red_1.png" />
+    <Resource Include="Resources\DropIcons\diamond_red_2.png" />
+    <Resource Include="Resources\DropIcons\diamond_white_0.png" />
+    <Resource Include="Resources\DropIcons\diamond_white_1.png" />
+    <Resource Include="Resources\DropIcons\diamond_white_2.png" />
+    <Resource Include="Resources\DropIcons\diamond_yellow_0.png" />
+    <Resource Include="Resources\DropIcons\diamond_yellow_1.png" />
+    <Resource Include="Resources\DropIcons\diamond_yellow_2.png" />
+    <Resource Include="Resources\DropIcons\hexagon_blue_0.png" />
+    <Resource Include="Resources\DropIcons\hexagon_blue_1.png" />
+    <Resource Include="Resources\DropIcons\hexagon_blue_2.png" />
+    <Resource Include="Resources\DropIcons\hexagon_brown_0.png" />
+    <Resource Include="Resources\DropIcons\hexagon_brown_1.png" />
+    <Resource Include="Resources\DropIcons\hexagon_brown_2.png" />
+    <Resource Include="Resources\DropIcons\hexagon_green_0.png" />
+    <Resource Include="Resources\DropIcons\hexagon_green_1.png" />
+    <Resource Include="Resources\DropIcons\hexagon_green_2.png" />
+    <Resource Include="Resources\DropIcons\hexagon_red_0.png" />
+    <Resource Include="Resources\DropIcons\hexagon_red_1.png" />
+    <Resource Include="Resources\DropIcons\hexagon_red_2.png" />
+    <Resource Include="Resources\DropIcons\hexagon_white_0.png" />
+    <Resource Include="Resources\DropIcons\hexagon_white_1.png" />
+    <Resource Include="Resources\DropIcons\hexagon_white_2.png" />
+    <Resource Include="Resources\DropIcons\hexagon_yellow_0.png" />
+    <Resource Include="Resources\DropIcons\hexagon_yellow_1.png" />
+    <Resource Include="Resources\DropIcons\hexagon_yellow_2.png" />
+    <Resource Include="Resources\DropIcons\none.png" />
+    <Resource Include="Resources\DropIcons\square_blue_0.png" />
+    <Resource Include="Resources\DropIcons\square_blue_1.png" />
+    <Resource Include="Resources\DropIcons\square_blue_2.png" />
+    <Resource Include="Resources\DropIcons\square_brown_0.png" />
+    <Resource Include="Resources\DropIcons\square_brown_1.png" />
+    <Resource Include="Resources\DropIcons\square_brown_2.png" />
+    <Resource Include="Resources\DropIcons\square_green_0.png" />
+    <Resource Include="Resources\DropIcons\square_green_1.png" />
+    <Resource Include="Resources\DropIcons\square_green_2.png" />
+    <Resource Include="Resources\DropIcons\square_red_0.png" />
+    <Resource Include="Resources\DropIcons\square_red_1.png" />
+    <Resource Include="Resources\DropIcons\square_red_2.png" />
+    <Resource Include="Resources\DropIcons\square_white_0.png" />
+    <Resource Include="Resources\DropIcons\square_white_1.png" />
+    <Resource Include="Resources\DropIcons\square_white_2.png" />
+    <Resource Include="Resources\DropIcons\square_yellow_0.png" />
+    <Resource Include="Resources\DropIcons\square_yellow_1.png" />
+    <Resource Include="Resources\DropIcons\square_yellow_2.png" />
+    <Resource Include="Resources\DropIcons\star_blue_0.png" />
+    <Resource Include="Resources\DropIcons\star_blue_1.png" />
+    <Resource Include="Resources\DropIcons\star_blue_2.png" />
+    <Resource Include="Resources\DropIcons\star_brown_0.png" />
+    <Resource Include="Resources\DropIcons\star_brown_1.png" />
+    <Resource Include="Resources\DropIcons\star_brown_2.png" />
+    <Resource Include="Resources\DropIcons\star_green_0.png" />
+    <Resource Include="Resources\DropIcons\star_green_1.png" />
+    <Resource Include="Resources\DropIcons\star_green_2.png" />
+    <Resource Include="Resources\DropIcons\star_red_0.png" />
+    <Resource Include="Resources\DropIcons\star_red_1.png" />
+    <Resource Include="Resources\DropIcons\star_red_2.png" />
+    <Resource Include="Resources\DropIcons\star_white_0.png" />
+    <Resource Include="Resources\DropIcons\star_white_1.png" />
+    <Resource Include="Resources\DropIcons\star_white_2.png" />
+    <Resource Include="Resources\DropIcons\star_yellow_0.png" />
+    <Resource Include="Resources\DropIcons\star_yellow_1.png" />
+    <Resource Include="Resources\DropIcons\star_yellow_2.png" />
+    <Resource Include="Resources\DropIcons\triangle_blue_0.png" />
+    <Resource Include="Resources\DropIcons\triangle_blue_1.png" />
+    <Resource Include="Resources\DropIcons\triangle_blue_2.png" />
+    <Resource Include="Resources\DropIcons\triangle_brown_0.png" />
+    <Resource Include="Resources\DropIcons\triangle_brown_1.png" />
+    <Resource Include="Resources\DropIcons\triangle_brown_2.png" />
+    <Resource Include="Resources\DropIcons\triangle_green_0.png" />
+    <Resource Include="Resources\DropIcons\triangle_green_1.png" />
+    <Resource Include="Resources\DropIcons\triangle_green_2.png" />
+    <Resource Include="Resources\DropIcons\triangle_red_0.png" />
+    <Resource Include="Resources\DropIcons\triangle_red_1.png" />
+    <Resource Include="Resources\DropIcons\triangle_red_2.png" />
+    <Resource Include="Resources\DropIcons\triangle_white_0.png" />
+    <Resource Include="Resources\DropIcons\triangle_white_1.png" />
+    <Resource Include="Resources\DropIcons\triangle_white_2.png" />
+    <Resource Include="Resources\DropIcons\triangle_yellow_0.png" />
+    <Resource Include="Resources\DropIcons\triangle_yellow_1.png" />
+    <Resource Include="Resources\DropIcons\triangle_yellow_2.png" />
     <Content Include="Resources\ItemBaseTypes.txt" />
     <Content Include="Resources\ItemClasses.txt" />
   </ItemGroup>
@@ -598,11 +692,11 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(XamlSpyInstallPath)MSBuild\FirstFloor.XamlSpy.WPF.targets" Condition="'$(XamlSpyInstallPath)' != '' and '$(Configuration)' == 'DEBUG'" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Filtration/Resources/DropIcons/Circle.png b/Filtration/Resources/DropIcons/Circle.png
deleted file mode 100644
index 296d755..0000000
Binary files a/Filtration/Resources/DropIcons/Circle.png and /dev/null differ
diff --git a/Filtration/Resources/DropIcons/Diamond.png b/Filtration/Resources/DropIcons/Diamond.png
deleted file mode 100644
index 3c6041d..0000000
Binary files a/Filtration/Resources/DropIcons/Diamond.png and /dev/null differ
diff --git a/Filtration/Resources/DropIcons/Hexagon.png b/Filtration/Resources/DropIcons/Hexagon.png
deleted file mode 100644
index 1694503..0000000
Binary files a/Filtration/Resources/DropIcons/Hexagon.png and /dev/null differ
diff --git a/Filtration/Resources/DropIcons/Square.png b/Filtration/Resources/DropIcons/Square.png
deleted file mode 100644
index 3b8e6e4..0000000
Binary files a/Filtration/Resources/DropIcons/Square.png and /dev/null differ
diff --git a/Filtration/Resources/DropIcons/Star.png b/Filtration/Resources/DropIcons/Star.png
deleted file mode 100644
index 2695433..0000000
Binary files a/Filtration/Resources/DropIcons/Star.png and /dev/null differ
diff --git a/Filtration/Resources/DropIcons/Triangle.png b/Filtration/Resources/DropIcons/Triangle.png
deleted file mode 100644
index 88f8ca1..0000000
Binary files a/Filtration/Resources/DropIcons/Triangle.png and /dev/null differ
diff --git a/Filtration/Resources/DropIcons/circle_blue_0.png b/Filtration/Resources/DropIcons/circle_blue_0.png
new file mode 100644
index 0000000..25b8b63
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_blue_0.png differ
diff --git a/Filtration/Resources/DropIcons/circle_blue_1.png b/Filtration/Resources/DropIcons/circle_blue_1.png
new file mode 100644
index 0000000..6fca770
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_blue_1.png differ
diff --git a/Filtration/Resources/DropIcons/circle_blue_2.png b/Filtration/Resources/DropIcons/circle_blue_2.png
new file mode 100644
index 0000000..deb0775
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_blue_2.png differ
diff --git a/Filtration/Resources/DropIcons/circle_brown_0.png b/Filtration/Resources/DropIcons/circle_brown_0.png
new file mode 100644
index 0000000..fa0c60e
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_brown_0.png differ
diff --git a/Filtration/Resources/DropIcons/circle_brown_1.png b/Filtration/Resources/DropIcons/circle_brown_1.png
new file mode 100644
index 0000000..8b45f84
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_brown_1.png differ
diff --git a/Filtration/Resources/DropIcons/circle_brown_2.png b/Filtration/Resources/DropIcons/circle_brown_2.png
new file mode 100644
index 0000000..d2788ae
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_brown_2.png differ
diff --git a/Filtration/Resources/DropIcons/circle_green_0.png b/Filtration/Resources/DropIcons/circle_green_0.png
new file mode 100644
index 0000000..fc3bc5f
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_green_0.png differ
diff --git a/Filtration/Resources/DropIcons/circle_green_1.png b/Filtration/Resources/DropIcons/circle_green_1.png
new file mode 100644
index 0000000..5a5a264
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_green_1.png differ
diff --git a/Filtration/Resources/DropIcons/circle_green_2.png b/Filtration/Resources/DropIcons/circle_green_2.png
new file mode 100644
index 0000000..211f02c
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_green_2.png differ
diff --git a/Filtration/Resources/DropIcons/circle_red_0.png b/Filtration/Resources/DropIcons/circle_red_0.png
new file mode 100644
index 0000000..7eec849
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_red_0.png differ
diff --git a/Filtration/Resources/DropIcons/circle_red_1.png b/Filtration/Resources/DropIcons/circle_red_1.png
new file mode 100644
index 0000000..d74cb39
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_red_1.png differ
diff --git a/Filtration/Resources/DropIcons/circle_red_2.png b/Filtration/Resources/DropIcons/circle_red_2.png
new file mode 100644
index 0000000..5a0d051
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_red_2.png differ
diff --git a/Filtration/Resources/DropIcons/circle_white_0.png b/Filtration/Resources/DropIcons/circle_white_0.png
new file mode 100644
index 0000000..30a1aaa
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_white_0.png differ
diff --git a/Filtration/Resources/DropIcons/circle_white_1.png b/Filtration/Resources/DropIcons/circle_white_1.png
new file mode 100644
index 0000000..e765fd4
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_white_1.png differ
diff --git a/Filtration/Resources/DropIcons/circle_white_2.png b/Filtration/Resources/DropIcons/circle_white_2.png
new file mode 100644
index 0000000..08f7b17
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_white_2.png differ
diff --git a/Filtration/Resources/DropIcons/circle_yellow_0.png b/Filtration/Resources/DropIcons/circle_yellow_0.png
new file mode 100644
index 0000000..f64072a
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_yellow_0.png differ
diff --git a/Filtration/Resources/DropIcons/circle_yellow_1.png b/Filtration/Resources/DropIcons/circle_yellow_1.png
new file mode 100644
index 0000000..8ce033e
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_yellow_1.png differ
diff --git a/Filtration/Resources/DropIcons/circle_yellow_2.png b/Filtration/Resources/DropIcons/circle_yellow_2.png
new file mode 100644
index 0000000..37593b9
Binary files /dev/null and b/Filtration/Resources/DropIcons/circle_yellow_2.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_blue_0.png b/Filtration/Resources/DropIcons/diamond_blue_0.png
new file mode 100644
index 0000000..2b9bbda
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_blue_0.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_blue_1.png b/Filtration/Resources/DropIcons/diamond_blue_1.png
new file mode 100644
index 0000000..a3cb78f
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_blue_1.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_blue_2.png b/Filtration/Resources/DropIcons/diamond_blue_2.png
new file mode 100644
index 0000000..d85c914
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_blue_2.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_brown_0.png b/Filtration/Resources/DropIcons/diamond_brown_0.png
new file mode 100644
index 0000000..8382195
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_brown_0.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_brown_1.png b/Filtration/Resources/DropIcons/diamond_brown_1.png
new file mode 100644
index 0000000..1fcf946
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_brown_1.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_brown_2.png b/Filtration/Resources/DropIcons/diamond_brown_2.png
new file mode 100644
index 0000000..25e8860
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_brown_2.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_green_0.png b/Filtration/Resources/DropIcons/diamond_green_0.png
new file mode 100644
index 0000000..61f711f
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_green_0.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_green_1.png b/Filtration/Resources/DropIcons/diamond_green_1.png
new file mode 100644
index 0000000..51cf88d
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_green_1.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_green_2.png b/Filtration/Resources/DropIcons/diamond_green_2.png
new file mode 100644
index 0000000..f4ca9e5
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_green_2.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_red_0.png b/Filtration/Resources/DropIcons/diamond_red_0.png
new file mode 100644
index 0000000..af40116
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_red_0.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_red_1.png b/Filtration/Resources/DropIcons/diamond_red_1.png
new file mode 100644
index 0000000..0dc15c1
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_red_1.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_red_2.png b/Filtration/Resources/DropIcons/diamond_red_2.png
new file mode 100644
index 0000000..86c24b8
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_red_2.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_white_0.png b/Filtration/Resources/DropIcons/diamond_white_0.png
new file mode 100644
index 0000000..7ea5758
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_white_0.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_white_1.png b/Filtration/Resources/DropIcons/diamond_white_1.png
new file mode 100644
index 0000000..34b9bf3
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_white_1.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_white_2.png b/Filtration/Resources/DropIcons/diamond_white_2.png
new file mode 100644
index 0000000..5cd417c
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_white_2.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_yellow_0.png b/Filtration/Resources/DropIcons/diamond_yellow_0.png
new file mode 100644
index 0000000..04e7930
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_yellow_0.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_yellow_1.png b/Filtration/Resources/DropIcons/diamond_yellow_1.png
new file mode 100644
index 0000000..fd562dd
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_yellow_1.png differ
diff --git a/Filtration/Resources/DropIcons/diamond_yellow_2.png b/Filtration/Resources/DropIcons/diamond_yellow_2.png
new file mode 100644
index 0000000..9f5343a
Binary files /dev/null and b/Filtration/Resources/DropIcons/diamond_yellow_2.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_blue_0.png b/Filtration/Resources/DropIcons/hexagon_blue_0.png
new file mode 100644
index 0000000..4f61f0f
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_blue_0.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_blue_1.png b/Filtration/Resources/DropIcons/hexagon_blue_1.png
new file mode 100644
index 0000000..11de4b8
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_blue_1.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_blue_2.png b/Filtration/Resources/DropIcons/hexagon_blue_2.png
new file mode 100644
index 0000000..d7969e1
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_blue_2.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_brown_0.png b/Filtration/Resources/DropIcons/hexagon_brown_0.png
new file mode 100644
index 0000000..811b111
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_brown_0.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_brown_1.png b/Filtration/Resources/DropIcons/hexagon_brown_1.png
new file mode 100644
index 0000000..f21a007
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_brown_1.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_brown_2.png b/Filtration/Resources/DropIcons/hexagon_brown_2.png
new file mode 100644
index 0000000..6f79247
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_brown_2.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_green_0.png b/Filtration/Resources/DropIcons/hexagon_green_0.png
new file mode 100644
index 0000000..b71fc83
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_green_0.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_green_1.png b/Filtration/Resources/DropIcons/hexagon_green_1.png
new file mode 100644
index 0000000..a111483
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_green_1.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_green_2.png b/Filtration/Resources/DropIcons/hexagon_green_2.png
new file mode 100644
index 0000000..30550c6
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_green_2.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_red_0.png b/Filtration/Resources/DropIcons/hexagon_red_0.png
new file mode 100644
index 0000000..4df94e6
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_red_0.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_red_1.png b/Filtration/Resources/DropIcons/hexagon_red_1.png
new file mode 100644
index 0000000..1bc6490
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_red_1.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_red_2.png b/Filtration/Resources/DropIcons/hexagon_red_2.png
new file mode 100644
index 0000000..c444fe9
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_red_2.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_white_0.png b/Filtration/Resources/DropIcons/hexagon_white_0.png
new file mode 100644
index 0000000..cf01a9b
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_white_0.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_white_1.png b/Filtration/Resources/DropIcons/hexagon_white_1.png
new file mode 100644
index 0000000..4e70647
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_white_1.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_white_2.png b/Filtration/Resources/DropIcons/hexagon_white_2.png
new file mode 100644
index 0000000..126f0d0
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_white_2.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_yellow_0.png b/Filtration/Resources/DropIcons/hexagon_yellow_0.png
new file mode 100644
index 0000000..d3a5e3b
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_yellow_0.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_yellow_1.png b/Filtration/Resources/DropIcons/hexagon_yellow_1.png
new file mode 100644
index 0000000..acc2c46
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_yellow_1.png differ
diff --git a/Filtration/Resources/DropIcons/hexagon_yellow_2.png b/Filtration/Resources/DropIcons/hexagon_yellow_2.png
new file mode 100644
index 0000000..9bf83ff
Binary files /dev/null and b/Filtration/Resources/DropIcons/hexagon_yellow_2.png differ
diff --git a/Filtration/Resources/DropIcons/NoIcon.png b/Filtration/Resources/DropIcons/none.png
similarity index 100%
rename from Filtration/Resources/DropIcons/NoIcon.png
rename to Filtration/Resources/DropIcons/none.png
diff --git a/Filtration/Resources/DropIcons/square_blue_0.png b/Filtration/Resources/DropIcons/square_blue_0.png
new file mode 100644
index 0000000..b76e255
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_blue_0.png differ
diff --git a/Filtration/Resources/DropIcons/square_blue_1.png b/Filtration/Resources/DropIcons/square_blue_1.png
new file mode 100644
index 0000000..26bec56
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_blue_1.png differ
diff --git a/Filtration/Resources/DropIcons/square_blue_2.png b/Filtration/Resources/DropIcons/square_blue_2.png
new file mode 100644
index 0000000..46ab78a
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_blue_2.png differ
diff --git a/Filtration/Resources/DropIcons/square_brown_0.png b/Filtration/Resources/DropIcons/square_brown_0.png
new file mode 100644
index 0000000..e6abd08
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_brown_0.png differ
diff --git a/Filtration/Resources/DropIcons/square_brown_1.png b/Filtration/Resources/DropIcons/square_brown_1.png
new file mode 100644
index 0000000..7ec344c
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_brown_1.png differ
diff --git a/Filtration/Resources/DropIcons/square_brown_2.png b/Filtration/Resources/DropIcons/square_brown_2.png
new file mode 100644
index 0000000..7039ea9
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_brown_2.png differ
diff --git a/Filtration/Resources/DropIcons/square_green_0.png b/Filtration/Resources/DropIcons/square_green_0.png
new file mode 100644
index 0000000..029b654
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_green_0.png differ
diff --git a/Filtration/Resources/DropIcons/square_green_1.png b/Filtration/Resources/DropIcons/square_green_1.png
new file mode 100644
index 0000000..8360b07
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_green_1.png differ
diff --git a/Filtration/Resources/DropIcons/square_green_2.png b/Filtration/Resources/DropIcons/square_green_2.png
new file mode 100644
index 0000000..71f06f9
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_green_2.png differ
diff --git a/Filtration/Resources/DropIcons/square_red_0.png b/Filtration/Resources/DropIcons/square_red_0.png
new file mode 100644
index 0000000..e46a551
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_red_0.png differ
diff --git a/Filtration/Resources/DropIcons/square_red_1.png b/Filtration/Resources/DropIcons/square_red_1.png
new file mode 100644
index 0000000..f69fdd6
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_red_1.png differ
diff --git a/Filtration/Resources/DropIcons/square_red_2.png b/Filtration/Resources/DropIcons/square_red_2.png
new file mode 100644
index 0000000..7c1117f
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_red_2.png differ
diff --git a/Filtration/Resources/DropIcons/square_white_0.png b/Filtration/Resources/DropIcons/square_white_0.png
new file mode 100644
index 0000000..e1a8180
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_white_0.png differ
diff --git a/Filtration/Resources/DropIcons/square_white_1.png b/Filtration/Resources/DropIcons/square_white_1.png
new file mode 100644
index 0000000..cc86036
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_white_1.png differ
diff --git a/Filtration/Resources/DropIcons/square_white_2.png b/Filtration/Resources/DropIcons/square_white_2.png
new file mode 100644
index 0000000..de7979a
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_white_2.png differ
diff --git a/Filtration/Resources/DropIcons/square_yellow_0.png b/Filtration/Resources/DropIcons/square_yellow_0.png
new file mode 100644
index 0000000..75d48c7
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_yellow_0.png differ
diff --git a/Filtration/Resources/DropIcons/square_yellow_1.png b/Filtration/Resources/DropIcons/square_yellow_1.png
new file mode 100644
index 0000000..222993b
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_yellow_1.png differ
diff --git a/Filtration/Resources/DropIcons/square_yellow_2.png b/Filtration/Resources/DropIcons/square_yellow_2.png
new file mode 100644
index 0000000..5882791
Binary files /dev/null and b/Filtration/Resources/DropIcons/square_yellow_2.png differ
diff --git a/Filtration/Resources/DropIcons/star_blue_0.png b/Filtration/Resources/DropIcons/star_blue_0.png
new file mode 100644
index 0000000..7076a40
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_blue_0.png differ
diff --git a/Filtration/Resources/DropIcons/star_blue_1.png b/Filtration/Resources/DropIcons/star_blue_1.png
new file mode 100644
index 0000000..e72ea7f
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_blue_1.png differ
diff --git a/Filtration/Resources/DropIcons/star_blue_2.png b/Filtration/Resources/DropIcons/star_blue_2.png
new file mode 100644
index 0000000..d47b3a1
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_blue_2.png differ
diff --git a/Filtration/Resources/DropIcons/star_brown_0.png b/Filtration/Resources/DropIcons/star_brown_0.png
new file mode 100644
index 0000000..54b301c
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_brown_0.png differ
diff --git a/Filtration/Resources/DropIcons/star_brown_1.png b/Filtration/Resources/DropIcons/star_brown_1.png
new file mode 100644
index 0000000..4590695
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_brown_1.png differ
diff --git a/Filtration/Resources/DropIcons/star_brown_2.png b/Filtration/Resources/DropIcons/star_brown_2.png
new file mode 100644
index 0000000..e54d8d7
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_brown_2.png differ
diff --git a/Filtration/Resources/DropIcons/star_green_0.png b/Filtration/Resources/DropIcons/star_green_0.png
new file mode 100644
index 0000000..c6ac1af
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_green_0.png differ
diff --git a/Filtration/Resources/DropIcons/star_green_1.png b/Filtration/Resources/DropIcons/star_green_1.png
new file mode 100644
index 0000000..4d0ccf6
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_green_1.png differ
diff --git a/Filtration/Resources/DropIcons/star_green_2.png b/Filtration/Resources/DropIcons/star_green_2.png
new file mode 100644
index 0000000..18cc6b2
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_green_2.png differ
diff --git a/Filtration/Resources/DropIcons/star_red_0.png b/Filtration/Resources/DropIcons/star_red_0.png
new file mode 100644
index 0000000..e0d64ef
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_red_0.png differ
diff --git a/Filtration/Resources/DropIcons/star_red_1.png b/Filtration/Resources/DropIcons/star_red_1.png
new file mode 100644
index 0000000..74afa3d
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_red_1.png differ
diff --git a/Filtration/Resources/DropIcons/star_red_2.png b/Filtration/Resources/DropIcons/star_red_2.png
new file mode 100644
index 0000000..73c8186
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_red_2.png differ
diff --git a/Filtration/Resources/DropIcons/star_white_0.png b/Filtration/Resources/DropIcons/star_white_0.png
new file mode 100644
index 0000000..0a1df65
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_white_0.png differ
diff --git a/Filtration/Resources/DropIcons/star_white_1.png b/Filtration/Resources/DropIcons/star_white_1.png
new file mode 100644
index 0000000..55f8d8b
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_white_1.png differ
diff --git a/Filtration/Resources/DropIcons/star_white_2.png b/Filtration/Resources/DropIcons/star_white_2.png
new file mode 100644
index 0000000..e12f008
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_white_2.png differ
diff --git a/Filtration/Resources/DropIcons/star_yellow_0.png b/Filtration/Resources/DropIcons/star_yellow_0.png
new file mode 100644
index 0000000..f3df2bb
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_yellow_0.png differ
diff --git a/Filtration/Resources/DropIcons/star_yellow_1.png b/Filtration/Resources/DropIcons/star_yellow_1.png
new file mode 100644
index 0000000..9802f02
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_yellow_1.png differ
diff --git a/Filtration/Resources/DropIcons/star_yellow_2.png b/Filtration/Resources/DropIcons/star_yellow_2.png
new file mode 100644
index 0000000..59d945e
Binary files /dev/null and b/Filtration/Resources/DropIcons/star_yellow_2.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_blue_0.png b/Filtration/Resources/DropIcons/triangle_blue_0.png
new file mode 100644
index 0000000..a99442c
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_blue_0.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_blue_1.png b/Filtration/Resources/DropIcons/triangle_blue_1.png
new file mode 100644
index 0000000..a6b88c5
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_blue_1.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_blue_2.png b/Filtration/Resources/DropIcons/triangle_blue_2.png
new file mode 100644
index 0000000..1d3ac56
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_blue_2.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_brown_0.png b/Filtration/Resources/DropIcons/triangle_brown_0.png
new file mode 100644
index 0000000..a8d3c05
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_brown_0.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_brown_1.png b/Filtration/Resources/DropIcons/triangle_brown_1.png
new file mode 100644
index 0000000..bcde958
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_brown_1.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_brown_2.png b/Filtration/Resources/DropIcons/triangle_brown_2.png
new file mode 100644
index 0000000..be0980f
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_brown_2.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_green_0.png b/Filtration/Resources/DropIcons/triangle_green_0.png
new file mode 100644
index 0000000..227506f
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_green_0.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_green_1.png b/Filtration/Resources/DropIcons/triangle_green_1.png
new file mode 100644
index 0000000..a45e58d
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_green_1.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_green_2.png b/Filtration/Resources/DropIcons/triangle_green_2.png
new file mode 100644
index 0000000..328af7b
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_green_2.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_red_0.png b/Filtration/Resources/DropIcons/triangle_red_0.png
new file mode 100644
index 0000000..1dcb51b
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_red_0.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_red_1.png b/Filtration/Resources/DropIcons/triangle_red_1.png
new file mode 100644
index 0000000..1cff004
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_red_1.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_red_2.png b/Filtration/Resources/DropIcons/triangle_red_2.png
new file mode 100644
index 0000000..fb5d009
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_red_2.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_white_0.png b/Filtration/Resources/DropIcons/triangle_white_0.png
new file mode 100644
index 0000000..67148dd
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_white_0.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_white_1.png b/Filtration/Resources/DropIcons/triangle_white_1.png
new file mode 100644
index 0000000..ff2c909
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_white_1.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_white_2.png b/Filtration/Resources/DropIcons/triangle_white_2.png
new file mode 100644
index 0000000..baa304a
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_white_2.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_yellow_0.png b/Filtration/Resources/DropIcons/triangle_yellow_0.png
new file mode 100644
index 0000000..9612f66
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_yellow_0.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_yellow_1.png b/Filtration/Resources/DropIcons/triangle_yellow_1.png
new file mode 100644
index 0000000..6c4d528
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_yellow_1.png differ
diff --git a/Filtration/Resources/DropIcons/triangle_yellow_2.png b/Filtration/Resources/DropIcons/triangle_yellow_2.png
new file mode 100644
index 0000000..a0e25fd
Binary files /dev/null and b/Filtration/Resources/DropIcons/triangle_yellow_2.png differ
diff --git a/Filtration/UserControls/ImageComboBoxControl.xaml b/Filtration/UserControls/ImageComboBoxControl.xaml
deleted file mode 100644
index 88b1726..0000000
--- a/Filtration/UserControls/ImageComboBoxControl.xaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<UserControl
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Filtration.UserControls"
-             xmlns:Converters="clr-namespace:Filtration.Converters" x:Class="Filtration.UserControls.ImageComboBoxControl"
-             mc:Ignorable="d">
-
-    <UserControl.Resources>
-        <Converters:SizeColorToRectConverter x:Key="DropIconConverter"/>
-    </UserControl.Resources>
-
-    <Grid>
-        <ComboBox ItemsSource="{Binding DataContext.IconsAvailable, ElementName=BlockItemContentControl}" SelectedValue="{Binding Value}" Style="{StaticResource MetroComboBox}">
-            <ComboBox.ItemTemplate>
-                <DataTemplate>
-                    <StackPanel Orientation="Horizontal">
-                        <Image MaxWidth="20" MaxHeight="20" Source="{Binding Converter={StaticResource DropIconConverter}, Mode=OneWay}" />
-                        <Label Content="{Binding}" VerticalAlignment="Stretch"/>
-                    </StackPanel>
-                </DataTemplate>
-            </ComboBox.ItemTemplate>
-        </ComboBox>
-    </Grid>
-</UserControl>
diff --git a/Filtration/UserControls/ImageComboBoxControl.xaml.cs b/Filtration/UserControls/ImageComboBoxControl.xaml.cs
deleted file mode 100644
index 0921355..0000000
--- a/Filtration/UserControls/ImageComboBoxControl.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Filtration.UserControls
-{
-    /// <summary>
-    /// Interaction logic for ImageComboBoxControl.xaml
-    /// </summary>
-    public partial class ImageComboBoxControl : UserControl
-    {
-        public ImageComboBoxControl()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Filtration/Views/ItemFilterBlockView.xaml b/Filtration/Views/ItemFilterBlockView.xaml
index af675b4..5009b07 100644
--- a/Filtration/Views/ItemFilterBlockView.xaml
+++ b/Filtration/Views/ItemFilterBlockView.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="Filtration.Views.ItemFilterBlockView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:viewModels="clr-namespace:Filtration.ViewModels"
              xmlns:userControls="clr-namespace:Filtration.UserControls"
@@ -9,7 +9,7 @@
              xmlns:converters="clr-namespace:Filtration.Converters"
              xmlns:blockItemBaseTypes="clr-namespace:Filtration.ObjectModel.BlockItemBaseTypes;assembly=Filtration.ObjectModel"
              xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DataContext="{d:DesignInstance Type=viewModels:ItemFilterBlockViewModel}"
              d:DesignHeight="200" d:DesignWidth="800">
     <UserControl.Resources>
@@ -18,8 +18,7 @@
                 <ResourceDictionary>
                     <views:BindingProxy x:Key="Proxy" Data="{Binding}" />
                     <converters:BlockGroupAdvancedFillColorConverter x:Key="BlockGroupAdvancedFillColorConverter" />
-                    <converters:IconShapeToSourceConverter x:Key="IconShapeToSourceConverter"/>
-                    <converters:SizeColorToRectConverter x:Key="SizeColorToRectConverter"/>
+                    <converters:MinimapIconConverter x:Key="MinimapIconConverter"/>
                     <Style TargetType="{x:Type ContentPresenter}" x:Key="BlockItemFadeInStyle">
                         <Setter Property="LayoutTransform">
                             <Setter.Value>
@@ -134,14 +133,14 @@
                             <WrapPanel Grid.Row="0" Grid.Column="2" VerticalAlignment="Center">
                                 <Rectangle Height="40" Width="40" Margin="0,0,10,0">
                                     <Rectangle.Fill>
-                                        <ImageBrush ImageSource="{Binding DisplayIconShape, Converter={StaticResource IconShapeToSourceConverter}, Mode=OneWay}"
-                                            ViewboxUnits="Absolute" Stretch="Fill">
-                                            <ImageBrush.Viewbox>
-                                                <MultiBinding Converter="{StaticResource SizeColorToRectConverter}">
+                                        <ImageBrush ViewboxUnits="Absolute" Stretch="Fill" Viewbox="0,0,64,64">
+                                            <ImageBrush.ImageSource>
+                                                <MultiBinding Converter="{StaticResource MinimapIconConverter}">
                                                     <Binding Path="DisplayIconSize"/>
                                                     <Binding Path="DisplayIconColor"/>
+                                                    <Binding Path="DisplayIconShape"/>
                                                 </MultiBinding>
-                                            </ImageBrush.Viewbox>
+                                            </ImageBrush.ImageSource>
                                         </ImageBrush>
                                     </Rectangle.Fill>
                                 </Rectangle>
@@ -206,7 +205,7 @@
                             <RowDefinition />
                             <RowDefinition />
                         </Grid.RowDefinitions>
-                        
+
                         <Grid Grid.Row="0" Visibility="{Binding AudioVisualBlockItemsGridVisible, Converter={StaticResource InverseBooleanVisibilityConverter}}">
                             <Grid.RowDefinitions>
                                 <RowDefinition />
@@ -221,7 +220,7 @@
                                     Switch to Appearance Block Items
                                 </Hyperlink>
                             </TextBlock>
-                        
+
                             <!-- Add Block Item Links -->
                             <ItemsControl Grid.Column="0" ItemsSource="{Binding BlockItemTypesAvailable}" Grid.Row="0" Margin="0,0,0,10">
                                 <ItemsControl.ItemsPanel>
@@ -243,7 +242,7 @@
                             <!-- Enable/Disable Block Button -->
                             <ToggleButton Grid.Row="0"
                                           Grid.Column="1"
-                                          Style="{StaticResource ChromelessToggleButton}" 
+                                          Style="{StaticResource ChromelessToggleButton}"
                                           IsChecked="{Binding BlockEnabled}"
                                           Margin="0,0,5,0"
                                           ToolTip="Enable/Disable Block"
@@ -265,7 +264,7 @@
                                     </Image.Style>
                                 </Image>
                             </ToggleButton>
-                            
+
                             <!-- Block Items -->
                             <WrapPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" MaxHeight="200">
                                 <WrapPanel.Resources>
@@ -319,7 +318,7 @@
                             </ItemsControl>
 
                             <TextBlock Grid.Row="1" FontStyle="Italic" HorizontalAlignment="Left" Visibility="{Binding HasAudioVisualBlockItems, Converter={StaticResource InverseBooleanVisibilityConverter}}">To change the appearance of this block, add a Text, Background or Border Block Item above.</TextBlock>
-                            
+
                             <!-- Block Items -->
                             <WrapPanel Grid.Row="1" MaxHeight="200">
                                 <WrapPanel.Resources>