1 files changed, 12 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
index 177a4fe75..37e35b1ab 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
@@ -63,6 +63,13 @@
         <!--Fonts-->
         <ResourceDictionary>
             <FontFamily x:Key="digital-7">../Fonts/#digital-7</FontFamily>
+            <FontFamily x:Key="flexo">../Fonts/#flexo</FontFamily>
+        </ResourceDictionary>
+        
+        <!--Images-->
+        <ResourceDictionary>
+            <BitmapImage x:Key="MachineBig" UriSource="../Images/machine_new.png"></BitmapImage>
+            <BitmapImage x:Key="MachineSmall" UriSource="../Images/machine_new_small.png"></BitmapImage>
         </ResourceDictionary>
 
         <!--Styles-->
@@ -526,7 +533,7 @@
                     </Setter.Value>
                 </Setter>
             </Style>
-            
+
             <ControlTemplate x:Key="TransparentPopupContentDownTemplate" TargetType="ContentControl">
                 <Grid MinWidth="{Binding ElementName=templateRoot, Path=ActualWidth, Converter={StaticResource MathAddConverter}, ConverterParameter=32}"
               Margin="6" Background="Transparent">
@@ -774,6 +781,10 @@
                     </Setter.Value>
                 </Setter>
             </Style>
+
+            <Style TargetType="Window">
+                <Setter Property="FontFamily" Value="{StaticResource flexo}"></Setter>
+            </Style>
         </ResourceDictionary>
 
     </ResourceDictionary.MergedDictionaries>