diff --git a/README.md b/README.md
index 172dc50..873c4c5 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 <!-- default badges list -->
-![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/501623058/21.2.7%2B)
 [![](https://img.shields.io/badge/Open_in_DevExpress_Support_Center-FF7200?style=flat-square&logo=DevExpress&logoColor=white)](https://supportcenter.devexpress.com/ticket/details/T1094617)
 [![](https://img.shields.io/badge/📖_How_to_use_DevExpress_Examples-e9f6fc?style=flat-square)](https://docs.devexpress.com/GeneralInformation/403183)
 <!-- default badges end -->
diff --git a/VB/WPFGrid_ColumnChooser.sln b/VB/WPFGrid_ColumnChooser.sln
new file mode 100644
index 0000000..813530a
--- /dev/null
+++ b/VB/WPFGrid_ColumnChooser.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32526.322
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WPFGrid_ColumnChooser", "WPFGrid_ColumnChooser\WPFGrid_ColumnChooser.vbproj", "{9EE1C7A2-3D3A-48F2-89C5-489E3E4BD3A7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9EE1C7A2-3D3A-48F2-89C5-489E3E4BD3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EE1C7A2-3D3A-48F2-89C5-489E3E4BD3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EE1C7A2-3D3A-48F2-89C5-489E3E4BD3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9EE1C7A2-3D3A-48F2-89C5-489E3E4BD3A7}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B36B3597-E875-467D-8E74-C57CF84F9580}
+	EndGlobalSection
+EndGlobal
diff --git a/VB/WPFGrid_ColumnChooser/App.xaml b/VB/WPFGrid_ColumnChooser/App.xaml
new file mode 100644
index 0000000..19c0617
--- /dev/null
+++ b/VB/WPFGrid_ColumnChooser/App.xaml
@@ -0,0 +1,9 @@
+<Application x:Class="WPFGrid_ColumnChooser.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:WPFGrid_ColumnChooser"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/VB/WPFGrid_ColumnChooser/App.xaml.vb b/VB/WPFGrid_ColumnChooser/App.xaml.vb
new file mode 100644
index 0000000..3d1c0ee
--- /dev/null
+++ b/VB/WPFGrid_ColumnChooser/App.xaml.vb
@@ -0,0 +1,12 @@
+Imports System.Windows
+
+Namespace WPFGrid_ColumnChooser
+
+    ''' <summary>
+    ''' Interaction logic for App.xaml
+    ''' </summary>
+    Public Partial Class App
+        Inherits Application
+
+    End Class
+End Namespace
diff --git a/VB/WPFGrid_ColumnChooser/AssemblyInfo.vb b/VB/WPFGrid_ColumnChooser/AssemblyInfo.vb
new file mode 100644
index 0000000..83c1fb4
--- /dev/null
+++ b/VB/WPFGrid_ColumnChooser/AssemblyInfo.vb
@@ -0,0 +1,8 @@
+Imports System.Windows
+
+'(used if a resource is not found in the page,
+' or application resource dictionaries)
+'(used if a resource is not found in the page,
+' app, or any theme specific resource dictionaries)
+<Assembly:ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)> 'where theme specific resource dictionaries are located
+'where the generic resource dictionary is located
diff --git a/VB/WPFGrid_ColumnChooser/MainWindow.xaml b/VB/WPFGrid_ColumnChooser/MainWindow.xaml
new file mode 100644
index 0000000..14d0caa
--- /dev/null
+++ b/VB/WPFGrid_ColumnChooser/MainWindow.xaml
@@ -0,0 +1,28 @@
+<Window
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:WPFGrid_ColumnChooser"
+        xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" 
+        x:Class="WPFGrid_ColumnChooser.MainWindow"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="300" Width="500">
+    <Window.Resources>
+        <DataTemplate x:Key="columnChooserTemplate">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="{Binding}"/>
+                <Button Content="Click" Margin="5,0,0,0"/>
+            </StackPanel>
+        </DataTemplate>
+
+        <local:HeaderTemplateSelector x:Key="headerTemplateSelector" 
+                                      ColumnChooserTemplate="{StaticResource columnChooserTemplate}"/>
+    </Window.Resources>
+
+    <dxg:GridControl x:Name="grid" AutoGenerateColumns="AddNew">
+        <dxg:GridControl.View>
+            <dxg:TableView x:Name="view" ColumnHeaderTemplateSelector="{StaticResource headerTemplateSelector}"/>
+        </dxg:GridControl.View>
+    </dxg:GridControl>
+</Window>
diff --git a/VB/WPFGrid_ColumnChooser/MainWindow.xaml.vb b/VB/WPFGrid_ColumnChooser/MainWindow.xaml.vb
new file mode 100644
index 0000000..40cdc7a
--- /dev/null
+++ b/VB/WPFGrid_ColumnChooser/MainWindow.xaml.vb
@@ -0,0 +1,40 @@
+Imports DevExpress.Xpf.Grid
+Imports System.Collections.ObjectModel
+Imports System.Windows
+Imports System.Windows.Controls
+
+Namespace WPFGrid_ColumnChooser
+
+    Public Partial Class MainWindow
+        Inherits Window
+
+        Public Sub New()
+            Me.InitializeComponent()
+            Dim items As ObservableCollection(Of Item) = New ObservableCollection(Of Item)()
+            For i As Integer = 1 To 30 - 1
+                items.Add(New Item() With {.Id = i, .Name = "Name" & i})
+            Next
+
+            Me.grid.ItemsSource = items
+            Me.view.ShowColumnChooser()
+        End Sub
+    End Class
+
+    Public Class HeaderTemplateSelector
+        Inherits DataTemplateSelector
+
+        Public Property ColumnChooserTemplate As DataTemplate
+
+        Public Overrides Function SelectTemplate(ByVal item As Object, ByVal container As DependencyObject) As DataTemplate
+            If ColumnBase.GetHeaderPresenterType(container) = HeaderPresenterType.ColumnChooser AndAlso Equals(CStr(item), NameOf(WPFGrid_ColumnChooser.Item.Id)) Then Return ColumnChooserTemplate
+            Return MyBase.SelectTemplate(item, container)
+        End Function
+    End Class
+
+    Public Class Item
+
+        Public Property Id As Integer
+
+        Public Property Name As String
+    End Class
+End Namespace
diff --git a/VB/WPFGrid_ColumnChooser/WPFGrid_ColumnChooser.vbproj b/VB/WPFGrid_ColumnChooser/WPFGrid_ColumnChooser.vbproj
new file mode 100644
index 0000000..0b5aa7d
--- /dev/null
+++ b/VB/WPFGrid_ColumnChooser/WPFGrid_ColumnChooser.vbproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+    <EnableDefaultApplicationDefinition>false</EnableDefaultApplicationDefinition>
+  </PropertyGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="devexpress.wpf.grid.core" Version="21.2.8" />
+  </ItemGroup>
+</Project>
\ No newline at end of file