diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputView.axaml b/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputView.axaml
index c84206870..f9c883e17 100644
--- a/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputView.axaml
+++ b/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputView.axaml
@@ -10,7 +10,7 @@
              x:DataType="propertyInput:BrushPropertyInputViewModel">
 
 	<UserControl.Styles>
-		<Style Selector="ComboBox.brush /template/ ContentControl#ContentPresenter">
+		<Style Selector="ComboBox.brush /template/ ContentPresenter#ContentPresenter">
 			<Setter Property="ContentTemplate">
 				<Setter.Value>
 					<DataTemplate DataType="{x:Type layerBrushes:LayerBrushDescriptor}">
diff --git a/src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLayoutTabView.axaml b/src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLayoutTabView.axaml
index cf1a9027c..21afbf386 100644
--- a/src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLayoutTabView.axaml
+++ b/src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLayoutTabView.axaml
@@ -65,7 +65,7 @@
                             </StackPanel>
                             <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center">
                                 <StackPanel.Styles>
-                                    <Style Selector="ComboBox.layoutProvider /template/ ContentControl#ContentPresenter">
+                                    <Style Selector="ComboBox.layoutProvider /template/ ContentPresenter#ContentPresenter">
                                         <Setter Property="ContentTemplate">
                                             <Setter.Value>
                                                 <DataTemplate x:DataType="layoutProviders:ILayoutProviderViewModel">
diff --git a/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml b/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml
index 38c1e2eef..1020b7d03 100644
--- a/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml
+++ b/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml
@@ -17,7 +17,7 @@
             </StackPanel>
             <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Spacing="5">
                 <StackPanel.Styles>
-                    <Style Selector="ComboBox.layoutProvider /template/ ContentControl#ContentPresenter">
+                    <Style Selector="ComboBox.layoutProvider /template/ ContentPresenter#ContentPresenter">
                         <Setter Property="ContentTemplate">
                             <Setter.Value>
                                 <DataTemplate x:DataType="models:InstalledEntry">
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml
index 3a45411d3..d0352947e 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml
@@ -7,7 +7,7 @@
              x:Class="Artemis.UI.Screens.ProfileEditor.DisplayCondition.DisplayConditionScriptView"
              x:DataType="displayCondition:DisplayConditionScriptViewModel">
     <UserControl.Styles>
-        <Style Selector="ComboBox.condition-type /template/ ContentControl#ContentPresenter">
+        <Style Selector="ComboBox.condition-type /template/ ContentPresenter#ContentPresenter">
             <Setter Property="ContentTemplate">
                 <Setter.Value>
                     <DataTemplate DataType="{x:Type displayCondition:ConditionTypeViewModel}">
@@ -35,7 +35,13 @@
                             <TextBlock Text="{CompiledBinding Description}" Foreground="{DynamicResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" MaxWidth="350" />
                         </StackPanel>
                     </DataTemplate>
+
                 </ComboBox.ItemTemplate>
+                <ComboBox.SelectionBoxItemTemplate>
+                    <DataTemplate DataType="{x:Type displayCondition:ConditionTypeViewModel}">
+                        <TextBlock Text="{CompiledBinding Name}" TextWrapping="Wrap" MaxWidth="350" />
+                    </DataTemplate>
+                </ComboBox.SelectionBoxItemTemplate>
             </ComboBox>
             <ContentControl Grid.Row="2" Content="{CompiledBinding ConditionViewModel}" />
         </Grid>
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml b/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml
index 89666ed0a..c1ee681de 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml
+++ b/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml
@@ -267,7 +267,7 @@
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
                             <StackPanel.Styles>
-                                <Style Selector="ComboBox.brush /template/ ContentControl#ContentPresenter">
+                                <Style Selector="ComboBox.brush /template/ ContentPresenter#ContentPresenter">
                                     <Setter Property="ContentTemplate">
                                         <Setter.Value>
                                             <DataTemplate DataType="{x:Type layerBrushes:LayerBrushDescriptor}">
diff --git a/src/Artemis.UI/Styles/Artemis.axaml b/src/Artemis.UI/Styles/Artemis.axaml
index 06f47dae4..0bab794ae 100644
--- a/src/Artemis.UI/Styles/Artemis.axaml
+++ b/src/Artemis.UI/Styles/Artemis.axaml
@@ -38,6 +38,14 @@
         <Setter Property="VerticalScrollBarVisibility" Value="Disabled"></Setter>
     </Style>
     
+    <!-- Workaround for https://github.com/amwx/FluentAvalonia/issues/648 -->
+    <Style Selector="controls|FontIcon">
+        <Setter Property="Width" Value="24" />
+    </Style>
+    <Style Selector="controls|SymbolIcon">
+        <Setter Property="Width" Value="24" />
+    </Style>
+    
     <Styles.Resources>
         <ResourceDictionary>
             <FontFamily x:Key="RobotoMono">avares://Artemis.UI/Assets/Fonts#Roboto Mono</FontFamily>