Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r223b2a4edc4ac816051c7eeecb735c34a6246574 -rd8fbeb182d1b3615105c982ab5fc76ce8a2cad2f
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 223b2a4edc4ac816051c7eeecb735c34a6246574)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision d8fbeb182d1b3615105c982ab5fc76ce8a2cad2f)
@@ -205,12 +205,6 @@
       <DependentUpon>MessageWindow.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\MessageWindow\MessageWindowLogAppender.cs" />
-    <Compile Include="Forms\Options\OptionsDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\Options\OptionsDialog.Designer.cs">
-      <DependentUpon>OptionsDialog.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\PropertyGridView\PropertyGridView.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -310,10 +304,6 @@
     <EmbeddedResource Include="Forms\MessageWindow\MessageWindowDialog.resx">
       <DependentUpon>MessageWindowDialog.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Options\OptionsDialog.resx">
-      <DependentUpon>OptionsDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\ProgressDialog\ActivityProgressDialog.resx">
       <DependentUpon>ActivityProgressDialog.cs</DependentUpon>
     </EmbeddedResource>
@@ -386,7 +376,6 @@
     <Resource Include="Resources\manual.png" />
     <Resource Include="Resources\map.png" />
     <Resource Include="Resources\openfolderHS.png" />
-    <Resource Include="Resources\OptionsHS.png" />
     <Resource Include="Resources\Paste.png" />
     <Resource Include="Resources\PasteLarge.png" />
     <Resource Include="Resources\PropertiesHS.png" />
@@ -397,9 +386,6 @@
     <Resource Include="Resources\startpage.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\OptionsHS.ico" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Resources\arrow-000-medium-question-mark.ico" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -r223b2a4edc4ac816051c7eeecb735c34a6246574 -rd8fbeb182d1b3615105c982ab5fc76ce8a2cad2f
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 223b2a4edc4ac816051c7eeecb735c34a6246574)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision d8fbeb182d1b3615105c982ab5fc76ce8a2cad2f)
@@ -97,11 +97,6 @@
                             </fluent:BackstageTabControl>
                         </fluent:BackstageTabItem>
                         
-                        <fluent:Button Header="{x:Static Properties:Resources.Ribbon_Options}"
-                                       Icon="/Core.Common.Gui;component\Resources\OptionsHS.png"
-                                       fluent:KeyTip.Keys="T"
-                                       Click="OnFileOptionsClicked" />
-
                         <fluent:Button Header="{x:Static Properties:Resources.Ribbon_Exit}"
                                        Icon="/Core.Common.Gui;component\Resources\ClosePreviewHH.png"
                                        fluent:KeyTip.Keys="X"
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r223b2a4edc4ac816051c7eeecb735c34a6246574 -rd8fbeb182d1b3615105c982ab5fc76ce8a2cad2f
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 223b2a4edc4ac816051c7eeecb735c34a6246574)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision d8fbeb182d1b3615105c982ab5fc76ce8a2cad2f)
@@ -34,7 +34,6 @@
 using System.Windows.Media.Imaging;
 using Core.Common.Gui.Commands;
 using Core.Common.Gui.Forms.MessageWindow;
-using Core.Common.Gui.Forms.Options;
 using Core.Common.Gui.Forms.ViewHost;
 using Core.Common.Gui.Selection;
 using Core.Common.Gui.Settings;
@@ -687,14 +686,6 @@
             }
         }
 
-        private void OnFileOptionsClicked(object sender, RoutedEventArgs e)
-        {
-            using (var optionsDialog = new OptionsDialog(this, settings.UserSettings))
-            {
-                optionsDialog.ShowDialog();
-            }
-        }
-
         private void ButtonShowProperties_Click(object sender, RoutedEventArgs e)
         {
             var active = viewController.ViewHost.ToolViews.Contains(PropertyGrid);
Fisheye: Tag d8fbeb182d1b3615105c982ab5fc76ce8a2cad2f refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d8fbeb182d1b3615105c982ab5fc76ce8a2cad2f refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d8fbeb182d1b3615105c982ab5fc76ce8a2cad2f refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r223b2a4edc4ac816051c7eeecb735c34a6246574 -rd8fbeb182d1b3615105c982ab5fc76ce8a2cad2f
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 223b2a4edc4ac816051c7eeecb735c34a6246574)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d8fbeb182d1b3615105c982ab5fc76ce8a2cad2f)
@@ -966,28 +966,8 @@
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap OptionsHS {
-            get {
-                object obj = ResourceManager.GetObject("OptionsHS", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        public static System.Drawing.Icon OptionsHS1 {
-            get {
-                object obj = ResourceManager.GetObject("OptionsHS1", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
-        /// </summary>
         public static System.Drawing.Icon plus {
             get {
                 object obj = ResourceManager.GetObject("plus", resourceCulture);
@@ -1225,15 +1205,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Opties.
-        /// </summary>
-        public static string Ribbon_Options {
-            get {
-                return ResourceManager.GetString("Ribbon_Options", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Eigenschappen.
         /// </summary>
         public static string Ribbon_Properties {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -r223b2a4edc4ac816051c7eeecb735c34a6246574 -rd8fbeb182d1b3615105c982ab5fc76ce8a2cad2f
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 223b2a4edc4ac816051c7eeecb735c34a6246574)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision d8fbeb182d1b3615105c982ab5fc76ce8a2cad2f)
@@ -127,9 +127,6 @@
   <data name="brick_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>../Resources/brick_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Ribbon_Options" xml:space="preserve">
-    <value>Opties</value>
-  </data>
   <data name="SelectItemDialog_ListViewItemTypesOnHandleCreated_Explorer" xml:space="preserve">
     <value>Verkenner</value>
   </data>
@@ -274,9 +271,6 @@
   <data name="GuiCore_ShowSplashScreen_User_has_cancelled_start_Exiting" xml:space="preserve">
     <value>Gebruiker heeft het opstarten onderbroken. Het programma wordt afgesloten...</value>
   </data>
-  <data name="OptionsHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\OptionsHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Ribbon_About" xml:space="preserve">
     <value>Over</value>
   </data>
@@ -493,9 +487,6 @@
   <data name="GuiImportHandler_GetSupportedImporterForTargetType_Error" xml:space="preserve">
     <value>Fout</value>
   </data>
-  <data name="OptionsHS1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\OptionsHS.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="FailureMechanismContributionView_GridColumn_ProbabilitySpace" xml:space="preserve">
     <value>Faalkansruimte [1/jaar]</value>
   </data>
Index: Core/Common/src/Core.Common.Gui/Resources/OptionsHS.ico
===================================================================
diff -u -rc321601e82e383960d4bb357d72b56da81fae253 -rd8fbeb182d1b3615105c982ab5fc76ce8a2cad2f
Binary files differ
Index: Core/Common/src/Core.Common.Gui/Resources/OptionsHS.png
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rd8fbeb182d1b3615105c982ab5fc76ce8a2cad2f
Binary files differ