diff --git a/build/tools/VisualStudioToolsManifest.xml b/build/tools/VisualStudioToolsManifest.xml
index 095614221..217bf875a 100644
--- a/build/tools/VisualStudioToolsManifest.xml
+++ b/build/tools/VisualStudioToolsManifest.xml
@@ -3,6 +3,7 @@
     <ToolboxItems UIFramework="WPF" VSCategory="HandyControl" BlendCategory="HandyControl">
       <Item Type="HandyControl.Controls.AnimationPath" />
       <Item Type="HandyControl.Expression.Shapes.Arc" />
+      <Item Type="HandyControl.Controls.AxleCanvas" />
       <Item Type="HandyControl.Controls.Badge" />
       <Item Type="HandyControl.Controls.BlendEffectBox" />
       <Item Type="HandyControl.Controls.ButtonGroup" />
@@ -28,6 +29,7 @@
       <Item Type="HandyControl.Controls.DialogContainer" />
       <Item Type="HandyControl.Controls.Divider" />
       <Item Type="HandyControl.Controls.Drawer" />
+      <Item Type="HandyControl.Controls.Empty" />
       <Item Type="HandyControl.Controls.FlexPanel" />
       <Item Type="HandyControl.Controls.FlipClock" />
       <Item Type="HandyControl.Controls.FloatingBlock" />
@@ -62,17 +64,20 @@
       <Item Type="HandyControl.Controls.Shield" />
       <Item Type="HandyControl.Controls.SideMenu" />
       <Item Type="HandyControl.Controls.SimplePanel" />
+      <Item Type="HandyControl.Controls.SimpleStackPanel" />
       <Item Type="HandyControl.Controls.SimpleText" />
       <Item Type="HandyControl.Controls.SplitButton" />
       <Item Type="HandyControl.Controls.StepBar" />
       <Item Type="HandyControl.Controls.TabControl" />
       <Item Type="HandyControl.Controls.Tag" />
+      <Item Type="HandyControl.Controls.TagContainer" />
       <Item Type="HandyControl.Controls.TextBox" />
       <Item Type="HandyControl.Controls.TimeBar" />
       <Item Type="HandyControl.Controls.TimePicker" />
       <Item Type="HandyControl.Controls.ToggleBlock" />
       <Item Type="HandyControl.Controls.Transfer" />
       <Item Type="HandyControl.Controls.TransitioningContentControl" />
+      <Item Type="HandyControl.Controls.UniformSpacingPanel" />
       <Item Type="HandyControl.Controls.WaterfallPanel" />
       <Item Type="HandyControl.Controls.Watermark" />
       <Item Type="HandyControl.Controls.WaveProgressBar" />
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 190ac5a69..e7b9e0523 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -943,6 +943,7 @@
   <ItemGroup>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.AnimationPath.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Expression.Shapes.Arc.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.AxleCanvas.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" />
@@ -965,6 +966,7 @@
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Dialog.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Divider.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Drawer.icon.bmp" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.Empty.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.FlexPanel.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.FlipClock.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.GifImage.icon.bmp" />
@@ -996,15 +998,18 @@
     <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.SimpleStackPanel.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.TagContainer.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.UniformSpacingPanel.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" />
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.AxleCanvas.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.AxleCanvas.icon.bmp
new file mode 100644
index 000000000..6174db838
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.AxleCanvas.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Empty.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Empty.icon.bmp
new file mode 100644
index 000000000..5bb3ad51f
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Empty.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SimpleStackPanel.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SimpleStackPanel.icon.bmp
new file mode 100644
index 000000000..499dfbbaf
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.SimpleStackPanel.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TagContainer.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TagContainer.icon.bmp
new file mode 100644
index 000000000..15f9c5437
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.TagContainer.icon.bmp differ
diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.UniformSpacingPanel.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.UniformSpacingPanel.icon.bmp
new file mode 100644
index 000000000..731060112
Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.UniformSpacingPanel.icon.bmp differ