diff --git a/MultiTerm.Wpf/Helpers/InvertedExtension.cs b/MultiTerm.Wpf/Helpers/InvertedExtension.cs
deleted file mode 100644
index 15ce128..0000000
--- a/MultiTerm.Wpf/Helpers/InvertedExtension.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using MultiTerm.Wpf.ValueConverters;
-using System;
-using System.Windows.Data;
-using System.Windows.Markup;
-
-namespace MultiTerm.Wpf.Helpers;
-
-/// <summary>
-/// Extension that uses an <see cref="InverterConverter"/>.
-/// Inspired by: https://stackoverflow.com/questions/58519440/is-there-some-way-to-invert-a-converter
-/// </summary>
-public class InvertedExtension : MarkupExtension
-{
-    public IValueConverter Converter { get; set; }
-
-    public InvertedExtension(IValueConverter converter)
-    {
-        Converter = new InverterConverter() { Converter = converter };
-    }
-
-    public override object ProvideValue(IServiceProvider serviceProvider)
-    {
-        return Converter;
-    }
-}
diff --git a/MultiTerm.Wpf/ValueConverters/InverterConverter.cs b/MultiTerm.Wpf/ValueConverters/InverterConverter.cs
deleted file mode 100644
index d24885e..0000000
--- a/MultiTerm.Wpf/ValueConverters/InverterConverter.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace MultiTerm.Wpf.ValueConverters;
-
-/// <summary>
-/// Reverses <see cref="IValueConverter"/>s.
-/// </summary>
-public class InverterConverter : IValueConverter
-{
-    public IValueConverter? Converter { get; set; }
-
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return Converter.ConvertBack(value, targetType, parameter, culture);
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return Converter.Convert(value, targetType, parameter, culture);
-    }
-}
diff --git a/MultiTerm.Wpf/View/ShellView.xaml b/MultiTerm.Wpf/View/ShellView.xaml
index e2ece5c..5fe4ccc 100644
--- a/MultiTerm.Wpf/View/ShellView.xaml
+++ b/MultiTerm.Wpf/View/ShellView.xaml
@@ -317,18 +317,26 @@
                         <Label Content="Protocol type:"/>
                         <!-- ListBox with Protocol types-->
                         <ListBox BorderBrush="Transparent"
-                                 ItemsSource="{Binding Source={StaticResource ProtocolTypeValues}, Converter={StaticResource EnumValToDescConv}}"
+                                 ItemsSource="{Binding Source={StaticResource ProtocolTypeValues}}"
+                                 SelectionMode="Single"
                                  x:Name="listBoxStartMenuProtocols">
                             <ListBox.Resources>
                                 <Style TargetType="{x:Type ListBoxItem}">
                                     <Setter Property="Template">
                                         <Setter.Value>
                                             <ControlTemplate>
-                                                <!-- Button Command binds with DataContext of parent ListBox, CommandParameter binds with the item -->
-                                                <Button Margin="0 2"
-                                                    Content="{TemplateBinding ContentPresenter.Content}">
-                                                    <!--Command="{Binding Path=DataContext.AppendTerminalWithSelectedViewTypeTestCommand, ElementName=listBoxStartMenuProtocols}"
-                                                    CommandParameter="{Binding Path=., Converter={helpers:Inverted {StaticResource EnumValToDescConv}}}">-->
+                                                <Button Margin="0 2" Width="Auto" HorizontalContentAlignment="Stretch"
+                                                        Command="{Binding Path=Data.AppendTerminalWithSelectedViewTypeCommand, Source={StaticResource proxy}}"
+                                                        CommandParameter="{Binding Path=.}">
+                                                    <DockPanel LastChildFill="False">
+                                                        <Image DockPanel.Dock="Left"
+                                                               Height="17" Stretch="Fill" Margin="5 0 0 0" 
+                                                               Source="{Binding Path=., Converter={StaticResource ProtocolTypeIconConverter}}"
+                                                               ToolTip="{Binding Path=., Converter={StaticResource EnumValToDescConv}}"
+                                                               ToolTipService.InitialShowDelay="200"/>
+                                                        <TextBlock DockPanel.Dock="Left" Margin="10 0 10 0"
+                                                            Text="{Binding Path=., Converter={StaticResource EnumValToDescConv}}"/>
+                                                    </DockPanel>
                                                 </Button>
                                             </ControlTemplate>
                                         </Setter.Value>