diff --git a/gimp/plus-child.xcf b/gimp/plus-child.xcf
new file mode 100644
index 0000000..7eeefc5
Binary files /dev/null and b/gimp/plus-child.xcf differ
diff --git a/zaaReloaded2/Icons/plus-child.png b/zaaReloaded2/Icons/plus-child.png
new file mode 100644
index 0000000..bccea0b
Binary files /dev/null and b/zaaReloaded2/Icons/plus-child.png differ
diff --git a/zaaReloaded2/ViewModels/ControlElementViewModel.cs b/zaaReloaded2/ViewModels/ControlElementViewModel.cs
index c0c09eb..fa55d8f 100755
--- a/zaaReloaded2/ViewModels/ControlElementViewModel.cs
+++ b/zaaReloaded2/ViewModels/ControlElementViewModel.cs
@@ -45,7 +45,9 @@ namespace zaaReloaded2.ViewModels
             {
                 return ((ControlElementBase)Element).CanHaveChildren;
             }
-        } 
+        }
+
+        public override string ToolTip { get { return Element.Label; } }
 
         #endregion
 
diff --git a/zaaReloaded2/ViewModels/ElementViewModel.cs b/zaaReloaded2/ViewModels/ElementViewModel.cs
index c56b175..2fe3d61 100755
--- a/zaaReloaded2/ViewModels/ElementViewModel.cs
+++ b/zaaReloaded2/ViewModels/ElementViewModel.cs
@@ -39,6 +39,8 @@ namespace zaaReloaded2.ViewModels
             get { return Element.Label;  }
         }
 
+        public abstract string ToolTip { get;  }
+
         #endregion
 
         #region Constructors
diff --git a/zaaReloaded2/ViewModels/FormatElementViewModel.cs b/zaaReloaded2/ViewModels/FormatElementViewModel.cs
index 00810fa..61ae81b 100755
--- a/zaaReloaded2/ViewModels/FormatElementViewModel.cs
+++ b/zaaReloaded2/ViewModels/FormatElementViewModel.cs
@@ -46,6 +46,8 @@ namespace zaaReloaded2.ViewModels
         /// </summary>
         public ControlElementViewModel Parent { get; set; }
 
+        public override string ToolTip { get { return Element.Label; } }
+
         #endregion
 
         #region Commands
diff --git a/zaaReloaded2/Views/SettingsView.xaml b/zaaReloaded2/Views/SettingsView.xaml
index cf53d63..e5137bc 100755
--- a/zaaReloaded2/Views/SettingsView.xaml
+++ b/zaaReloaded2/Views/SettingsView.xaml
@@ -60,29 +60,39 @@
                       x:Name="ReferenceStyleChooser" HorizontalAlignment="Stretch" />
         </DockPanel>
         <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Command="{Binding CloseViewCommand}" Content="Schließen" IsDefault="True" IsCancel="True" Margin="0 10 0 0"
-                    Width="{Binding ElementName=NewElementButton,Path=ActualWidth}"/>
+            <Button Command="{Binding CloseViewCommand}" Content="Schließen" IsDefault="True" IsCancel="True"
+                    Margin="0 10 0 0" />
         </StackPanel>
         <GroupBox Header="Elemente" Margin="0 10 0 0">
             <DockPanel LastChildFill="True">
                 <StackPanel DockPanel.Dock="Right" Margin="10 0 0 0">
-                    <Button Command="{Binding AddElementCommand}" Content="Neues Element" Margin="0 0 0 10"
-                            x:Name="NewElementButton"/>
-                    <Button Command="{Binding AddChildElementCommand}" Content="Neues Kindelement" Margin="0 0 0 10" />
-                    <Button Command="{Binding EditElementCommand}" IsDefault="True" Content="Bearbeiten" Margin="0 0 0 10" />
-                    <Button Command="{Binding CopyElementCommand}" Content="Kopieren" Margin="0 0 0 10" />
-                    <Button Command="{Binding DeleteElementCommand}" Content="Entfernen" Margin="0 0 0 10" />
+                    <Button Command="{Binding AddElementCommand}" ToolTip="Neues Element" Margin="0 0 0 10">
+                        <Image Source="/zaaReloaded2;component/Icons/plus.png" Width="24" />
+                    </Button>
+                    <Button Command="{Binding AddChildElementCommand}" ToolTip="Neues Kindelement" Margin="0 0 0 10">
+                        <Image Source="/zaaReloaded2;component/Icons/plus-child.png" Width="24" />
+                    </Button>
+                    <Button Command="{Binding DeleteElementCommand}" ToolTip="Entfernen" Margin="0 0 0 10">
+                        <Image Source="/zaaReloaded2;component/Icons/minus.png" Width="24" />
+                    </Button>
+                    <Button Command="{Binding EditElementCommand}" IsDefault="True" ToolTip="Bearbeiten" Margin="0 0 0 10">
+                        <Image Source="/zaaReloaded2;component/Icons/pen.png" Width="24" />
+                    </Button>
+                    <Button Command="{Binding CopyElementCommand}" ToolTip="Kopieren" Margin="0 0 0 10">
+                        <Image Source="/zaaReloaded2;component/Icons/duplicate.png" Width="24" />
+                    </Button>
                 </StackPanel>
                 <TreeView ItemsSource="{Binding Elements}">
                     <TreeView.ItemContainerStyle>
                         <Style TargetType="{x:Type TreeViewItem}">
                             <!--<Setter Property="IsExpanded" Value="True" />-->
                             <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                            <Setter Property="ToolTip" Value="{Binding ToolTip}" />
                         </Style>
                     </TreeView.ItemContainerStyle>
                     <TreeView.ItemTemplate>
                         <HierarchicalDataTemplate ItemsSource="{Binding Elements}">
-                            <TextBlock Text="{Binding DisplayString}" />
+                            <TextBlock Text="{Binding DisplayString}" ToolTip="{Binding ToolTip}" />
                         </HierarchicalDataTemplate>
                     </TreeView.ItemTemplate>
                 </TreeView>
diff --git a/zaaReloaded2/zaaReloaded2.csproj b/zaaReloaded2/zaaReloaded2.csproj
index 676868d..853000a 100755
--- a/zaaReloaded2/zaaReloaded2.csproj
+++ b/zaaReloaded2/zaaReloaded2.csproj
@@ -398,6 +398,9 @@
   <ItemGroup>
     <Resource Include="Icons\exit.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Icons\plus-child.png" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>