diff --git a/src/Shared/HandyControl_Shared/Media/Effects/BlendEffectBox.cs b/src/Shared/HandyControl_Shared/Controls/Other/BlendEffectBox.cs
similarity index 99%
rename from src/Shared/HandyControl_Shared/Media/Effects/BlendEffectBox.cs
rename to src/Shared/HandyControl_Shared/Controls/Other/BlendEffectBox.cs
index 1a5b47db..4c9a45e1 100644
--- a/src/Shared/HandyControl_Shared/Media/Effects/BlendEffectBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/BlendEffectBox.cs
@@ -7,7 +7,7 @@ using System.Windows.Data;
 using System.Windows.Markup;
 using System.Windows.Media.Effects;
 
-namespace HandyControl.Media.Effects
+namespace HandyControl.Controls
 {
     [DefaultProperty("Content")]
     [ContentProperty("Content")]
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 36356852..e92e18b9 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -114,7 +114,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Media\Animation\LinearGeometryKeyFrame.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Media\Animation\ResolvedKeyFrameEntry.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Media\Animation\SplineGeometryKeyFrame.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Media\Effects\BlendEffectBox.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\BlendEffectBox.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Media\Effects\BrightnessEffect.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Media\Effects\ColorComplementEffect.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Media\Effects\ColorMatrixEffect.cs" />
@@ -1102,7 +1102,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.AnimationPath.icon.bmp" />
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Arc.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Expression.Shapes.Arc.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Badge.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.BlendEffectBox.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.ButtonGroup.icon.bmp" />
@@ -1139,5 +1139,35 @@
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.LoadingCircle.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.LoadingLine.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Magnifier.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.NotifyIcon.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.NumericUpDown.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.OutlineText.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Pagination.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.PinBox.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Poptip.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.PreviewSlider.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.ProgressButton.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.PropertyGrid.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.RangeSlider.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.RelativePanel.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Row.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.RunningBlock.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.SearchBar.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Shield.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.SideMenu.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.SimplePanel.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.SimpleText.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.SplitButton.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.StepBar.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Tag.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.TimeBar.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.TimePicker.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.ToggleBlock.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Transfer.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.TransitioningContentControl.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.WaterfallPanel.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Watermark.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.WatermarkTextBox.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.WaveProgressBar.icon.bmp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.FlipClock.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.FlipClock.icon.bmp
index c432a7c7..5b7c6ebf 100644
Binary files a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.FlipClock.icon.bmp and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.FlipClock.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.NotifyIcon.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.NotifyIcon.icon.bmp
new file mode 100644
index 00000000..f0a6c5dc
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.NotifyIcon.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.NumericUpDown.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.NumericUpDown.icon.bmp
new file mode 100644
index 00000000..372c41eb
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.NumericUpDown.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.OutlineText.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.OutlineText.icon.bmp
new file mode 100644
index 00000000..907d60d3
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.OutlineText.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Pagination.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Pagination.icon.bmp
new file mode 100644
index 00000000..a34ea8a6
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Pagination.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.PinBox.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.PinBox.icon.bmp
new file mode 100644
index 00000000..7b5d6288
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.PinBox.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Poptip.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Poptip.icon.bmp
new file mode 100644
index 00000000..eb1d4713
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Poptip.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.PreviewSlider.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.PreviewSlider.icon.bmp
new file mode 100644
index 00000000..8e3d111b
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.PreviewSlider.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ProgressButton.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ProgressButton.icon.bmp
new file mode 100644
index 00000000..8b03f289
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ProgressButton.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.PropertyGrid.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.PropertyGrid.icon.bmp
new file mode 100644
index 00000000..2d2e33c3
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.PropertyGrid.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.RangeSlider.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.RangeSlider.icon.bmp
new file mode 100644
index 00000000..c2a02a92
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.RangeSlider.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.RelativePanel.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.RelativePanel.icon.bmp
new file mode 100644
index 00000000..611af09f
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.RelativePanel.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Row.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Row.icon.bmp
new file mode 100644
index 00000000..374d090e
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Row.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.RunningBlock.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.RunningBlock.icon.bmp
new file mode 100644
index 00000000..66857dd5
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.RunningBlock.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SearchBar.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SearchBar.icon.bmp
new file mode 100644
index 00000000..a60b5a78
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SearchBar.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Shield.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Shield.icon.bmp
new file mode 100644
index 00000000..23462467
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Shield.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SideMenu.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SideMenu.icon.bmp
new file mode 100644
index 00000000..7ed5e151
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SideMenu.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SimplePanel.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SimplePanel.icon.bmp
new file mode 100644
index 00000000..8f3e97b1
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SimplePanel.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SimpleText.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SimpleText.icon.bmp
new file mode 100644
index 00000000..0600eba2
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SimpleText.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SplitButton.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SplitButton.icon.bmp
new file mode 100644
index 00000000..3f118d31
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SplitButton.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.StepBar.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.StepBar.icon.bmp
new file mode 100644
index 00000000..472782fe
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.StepBar.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Tag.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Tag.icon.bmp
new file mode 100644
index 00000000..4bfd97c0
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Tag.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TimeBar.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TimeBar.icon.bmp
new file mode 100644
index 00000000..961e3972
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TimeBar.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TimePicker.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TimePicker.icon.bmp
new file mode 100644
index 00000000..4d62b7a6
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TimePicker.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ToggleBlock.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ToggleBlock.icon.bmp
new file mode 100644
index 00000000..a8c9fe93
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ToggleBlock.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Transfer.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Transfer.icon.bmp
new file mode 100644
index 00000000..b55175bf
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Transfer.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TransitioningContentControl.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TransitioningContentControl.icon.bmp
new file mode 100644
index 00000000..5400dfd3
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TransitioningContentControl.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.WaterfallPanel.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.WaterfallPanel.icon.bmp
new file mode 100644
index 00000000..c33eec1f
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.WaterfallPanel.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Watermark.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Watermark.icon.bmp
new file mode 100644
index 00000000..4f4c8c1e
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Watermark.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.WatermarkTextBox.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.WatermarkTextBox.icon.bmp
new file mode 100644
index 00000000..07e94848
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.WatermarkTextBox.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.WaveProgressBar.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.WaveProgressBar.icon.bmp
new file mode 100644
index 00000000..fc3a39ec
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.WaveProgressBar.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Arc.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Expression.Shapes.Arc.icon.bmp
similarity index 100%
rename from src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Arc.icon.bmp
rename to src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Expression.Shapes.Arc.icon.bmp
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/BlendEffectBox.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/BlendEffectBox.xaml
index e10faffb..4df1aec2 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/BlendEffectBox.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/BlendEffectBox.xaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:effects="clr-namespace:HandyControl.Media.Effects">
+                    xmlns:hc="clr-namespace:HandyControl.Controls">
 
-    <Style TargetType="effects:BlendEffectBox">
+    <Style TargetType="hc:BlendEffectBox">
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="effects:BlendEffectBox">
+                <ControlTemplate TargetType="hc:BlendEffectBox">
                     <ContentPresenter ContentSource="ActualContent"/>
                 </ControlTemplate>
             </Setter.Value>