diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
index 87039bba..3a728481 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
@@ -489,6 +489,11 @@
         <property id="6910723851735134393" name="hasFitSizeAllDiagramButton" index="3sAy83" />
         <property id="6910723851735134386" name="hasZoomOutButton" index="3sAy88" />
         <property id="6910723851735134380" name="hasZoomInButton" index="3sAy8m" />
+        <property id="5128117196765949674" name="hasUseGridSnappingButton" index="3wTdm1" />
+        <property id="5128117196765949417" name="hasShowGridButton" index="3wTdq2" />
+        <property id="3457085882766355628" name="hasTranslateToOriginButton" index="1JH6nB" />
+        <property id="3457085882766358673" name="hasSVGExportButton" index="1JH77q" />
+        <property id="3457085882766356966" name="hasPNGExportButton" index="1JH7yH" />
       </concept>
       <concept id="4717906927461703453" name="de.itemis.mps.editor.diagram.structure.SNodeConnectionType_ValidStart" flags="ig" index="3vNc17" />
       <concept id="4717906927461703977" name="de.itemis.mps.editor.diagram.structure.SNodeConnectionType_ValidEnd" flags="ig" index="3vNfTN" />
@@ -7279,7 +7284,12 @@
         <property role="3sAwEb" value="true" />
         <property role="3sAy8m" value="true" />
         <property role="3sAy88" value="true" />
-        <property role="3sAy83" value="false" />
+        <property role="3sAy83" value="true" />
+        <property role="1JH7yH" value="true" />
+        <property role="1JH77q" value="true" />
+        <property role="3wTdm1" value="true" />
+        <property role="3wTdq2" value="true" />
+        <property role="1JH6nB" value="true" />
       </node>
     </node>
   </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
index 8ba4b59c..69983b70 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
@@ -3152,6 +3152,44 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbF" id="1PcolARwcfX" role="3cqZAp">
+              <node concept="2OqwBi" id="1PcolARwcfY" role="3clFbG">
+                <node concept="37vLTw" id="1PcolARwcfZ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5Imyhiim4lz" resolve="buttons" />
+                </node>
+                <node concept="TSZUe" id="1PcolARwcg0" role="2OqNvi">
+                  <node concept="2ShNRf" id="1PcolARwcg1" role="25WWJ7">
+                    <node concept="1pGfFk" id="1PcolARwcg2" role="2ShVmc">
+                      <ref role="37wK5l" to="r3rm:4sEIQIBu97K" resolve="ToggleGridDiagramButton" />
+                      <node concept="10M0yZ" id="1PcolARwcg3" role="37wK5m">
+                        <ref role="3cqZAo" to="r3rm:17I5kyiXMqc" resolve="DEFAULT_BUTTON_SIZE" />
+                        <ref role="1PxDUh" to="r3rm:2KWY$Um6wZH" resolve="ContextButton" />
+                      </node>
+                      <node concept="1Q80Hy" id="1PcolARwcg4" role="37wK5m" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="1PcolARwUch" role="3cqZAp">
+              <node concept="2OqwBi" id="1PcolARwUci" role="3clFbG">
+                <node concept="37vLTw" id="1PcolARwUcj" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5Imyhiim4lz" resolve="buttons" />
+                </node>
+                <node concept="TSZUe" id="1PcolARwUck" role="2OqNvi">
+                  <node concept="2ShNRf" id="1PcolARwUcl" role="25WWJ7">
+                    <node concept="1pGfFk" id="1PcolARwUcm" role="2ShVmc">
+                      <ref role="37wK5l" to="r3rm:4sEIQIBMnTa" resolve="ToggleGridSnappingDiagramButton" />
+                      <node concept="10M0yZ" id="1PcolARwUcn" role="37wK5m">
+                        <ref role="3cqZAo" to="r3rm:17I5kyiXMqc" resolve="DEFAULT_BUTTON_SIZE" />
+                        <ref role="1PxDUh" to="r3rm:2KWY$Um6wZH" resolve="ContextButton" />
+                      </node>
+                      <node concept="1Q80Hy" id="1PcolARwUco" role="37wK5m" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3clFbF" id="5Imyhiim4mE" role="3cqZAp">
               <node concept="2OqwBi" id="5Imyhiim4mF" role="3clFbG">
                 <node concept="37vLTw" id="5Imyhiim4mG" role="2Oq$k0">