diff --git a/src/OneWare.Core/Styles/IdeStyles.axaml b/src/OneWare.Core/Styles/IdeStyles.axaml
index 8150df2f..543ca549 100644
--- a/src/OneWare.Core/Styles/IdeStyles.axaml
+++ b/src/OneWare.Core/Styles/IdeStyles.axaml
@@ -174,5 +174,21 @@
         <Setter Property="Width" Value="NaN" />
         <Setter Property="Padding" Value="5 0" />
     </Style>
+    
+    <Style Selector="ToolTip">
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Border Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Padding="{TemplateBinding Padding}">
+                    <ContentPresenter Content="{TemplateBinding Content}" />
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </Style>
 
 </Styles>
\ No newline at end of file
diff --git a/src/OneWare.ErrorList/Views/ErrorListView.axaml b/src/OneWare.ErrorList/Views/ErrorListView.axaml
index 7a2654e3..18a225c3 100644
--- a/src/OneWare.ErrorList/Views/ErrorListView.axaml
+++ b/src/OneWare.ErrorList/Views/ErrorListView.axaml
@@ -19,30 +19,27 @@
             <Setter Property="Padding" Value="5" />
             <Setter Property="Height" Value="30" />
         </Style>
+        
         <Style Selector="Border.ChildBorder">
             <Setter Property="Padding" Value="5,0,1,0" />
             <Setter Property="Margin" Value="0,2,0,2" />
         </Style>
+        
         <Style Selector="TextBlock.ChildText">
             <Setter Property="Margin" Value="0,0,0,1" />
         </Style>
+        
         <Style Selector="ListBoxItem">
             <Setter Property="Padding" Value="0" />
             <Setter Property="Margin" Value="0" />
         </Style>
-
+        
         <Style Selector="ToolTip">
             <Setter Property="MaxWidth" Value="300" />
-            <Setter Property="Template">
-                <ControlTemplate>
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Padding="{TemplateBinding Padding}">
-                        <TextBlock Text="{TemplateBinding Content}" TextWrapping="Wrap" />
-                    </Border>
-                </ControlTemplate>
-            </Setter>
+        </Style>
+        
+        <Style Selector="ToolTip TextBlock">
+            <Setter Property="TextWrapping" Value="Wrap"/>
         </Style>
 
         <Style Selector="ToggleButton.ErrorToggle">
diff --git a/src/OneWare.SearchList/Views/SearchListView.axaml b/src/OneWare.SearchList/Views/SearchListView.axaml
index bb9eb629..a7504973 100644
--- a/src/OneWare.SearchList/Views/SearchListView.axaml
+++ b/src/OneWare.SearchList/Views/SearchListView.axaml
@@ -10,19 +10,13 @@
              x:Class="OneWare.SearchList.Views.SearchListView" x:DataType="viewModels:SearchListViewModel"
              Background="{DynamicResource ThemeControlLowBrush}">
     <UserControl.Styles>
-
+        
         <Style Selector="ToolTip">
             <Setter Property="MaxWidth" Value="300" />
-            <Setter Property="Template">
-                <ControlTemplate>
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Padding="{TemplateBinding Padding}">
-                        <TextBlock Text="{TemplateBinding Content}" TextWrapping="Wrap" />
-                    </Border>
-                </ControlTemplate>
-            </Setter>
+        </Style>
+        
+        <Style Selector="ToolTip TextBlock">
+            <Setter Property="TextWrapping" Value="Wrap"/>
         </Style>
 
     </UserControl.Styles>