Adjustments to math punctuation and arrows

36 files changed, 573 insertions, 440 deletions

diff --git a/src/Inter-UI-Regular.ufo/glyphs/I_otatonos.glif b/src/Inter-UI-Regular.ufo/glyphs/I_otatonos.glif
index 751b29678..cf8fe5587 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/I_otatonos.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/I_otatonos.glif
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Iotatonos" format="2">
-  <advance width="1040.0"/>
+  <advance width="856.0"/>
   <unicode hex="038A"/>
   <outline>
-    <component base="I" xOffset="296.0"/>
-    <component base="tonos" xOffset="-24.0"/>
+    <component base="I" xOffset="112.0"/>
+    <component base="tonos" xOffset="-208.0"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.layer.leftMetricsKey</key>
+      <string>=+112</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/approxequal.case.glif b/src/Inter-UI-Regular.ufo/glyphs/approxequal.case.glif
new file mode 100644
index 000000000..94f4d8b4b
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/approxequal.case.glif
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="approxequal.case" format="2">
+  <advance width="1808.0"/>
+  <outline>
+    <component base="approxequal" yOffset="224.0"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
+      <key>public.markColor</key>
+      <string>0.67,0.95,0.38,1</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/approxequal.glif b/src/Inter-UI-Regular.ufo/glyphs/approxequal.glif
index 928838ca8..f1e93c142 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/approxequal.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/approxequal.glif
@@ -2,66 +2,69 @@
 <glyph name="approxequal" format="2">
   <advance width="1808.0"/>
   <unicode hex="2248"/>
+  <guideline x="268.0" y="800.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="264.0" y="972.0" type="line"/>
-      <point x="348.0" y="1080.0"/>
-      <point x="480.0" y="1144.0"/>
-      <point x="600.0" y="1144.0" type="curve"/>
-      <point x="756.0" y="1152.0"/>
-      <point x="812.0" y="1100.0"/>
-      <point x="924.0" y="1044.0" type="curve" smooth="yes"/>
-      <point x="1032.0" y="992.0"/>
-      <point x="1084.0" y="952.0"/>
-      <point x="1220.0" y="952.0" type="curve" smooth="yes"/>
-      <point x="1336.0" y="952.0"/>
-      <point x="1456.0" y="1004.0"/>
-      <point x="1544.0" y="1096.0" type="curve"/>
-      <point x="1544.0" y="1372.0" type="line"/>
-      <point x="1456.0" y="1264.0"/>
-      <point x="1336.0" y="1200.0"/>
-      <point x="1220.0" y="1200.0" type="curve" smooth="yes"/>
-      <point x="1084.0" y="1200.0"/>
-      <point x="1032.0" y="1240.0"/>
-      <point x="924.0" y="1292.0" type="curve" smooth="yes"/>
-      <point x="808.0" y="1352.0"/>
-      <point x="748.0" y="1396.0"/>
-      <point x="600.0" y="1392.0" type="curve"/>
-      <point x="480.0" y="1392.0"/>
-      <point x="348.0" y="1340.0"/>
-      <point x="264.0" y="1248.0" type="curve"/>
+      <point x="208.0" y="900.0" type="curve"/>
+      <point x="424.0" y="900.0" type="line"/>
+      <point x="420.0" y="1076.0"/>
+      <point x="500.0" y="1144.0"/>
+      <point x="608.0" y="1144.0" type="curve" smooth="yes"/>
+      <point x="680.0" y="1144.0"/>
+      <point x="728.0" y="1112.0"/>
+      <point x="824.0" y="1028.0" type="curve" smooth="yes"/>
+      <point x="972.0" y="900.0"/>
+      <point x="1068.0" y="844.0"/>
+      <point x="1204.0" y="844.0" type="curve" smooth="yes"/>
+      <point x="1408.0" y="844.0"/>
+      <point x="1608.0" y="972.0"/>
+      <point x="1600.0" y="1304.0" type="curve"/>
+      <point x="1384.0" y="1304.0" type="line"/>
+      <point x="1388.0" y="1144.0"/>
+      <point x="1316.0" y="1060.0"/>
+      <point x="1200.0" y="1060.0" type="curve" smooth="yes"/>
+      <point x="1128.0" y="1060.0"/>
+      <point x="1084.0" y="1092.0"/>
+      <point x="984.0" y="1176.0" type="curve" smooth="yes"/>
+      <point x="840.0" y="1304.0"/>
+      <point x="740.0" y="1360.0"/>
+      <point x="604.0" y="1360.0" type="curve" smooth="yes"/>
+      <point x="400.0" y="1360.0"/>
+      <point x="204.0" y="1232.0"/>
     </contour>
     <contour>
-      <point x="264.0" y="396.0" type="line"/>
-      <point x="348.0" y="504.0"/>
-      <point x="480.0" y="568.0"/>
-      <point x="600.0" y="568.0" type="curve"/>
-      <point x="736.0" y="572.0"/>
-      <point x="796.0" y="532.0"/>
-      <point x="924.0" y="468.0" type="curve" smooth="yes"/>
-      <point x="1032.0" y="412.0"/>
-      <point x="1084.0" y="372.0"/>
-      <point x="1220.0" y="372.0" type="curve" smooth="yes"/>
-      <point x="1336.0" y="372.0"/>
-      <point x="1456.0" y="428.0"/>
-      <point x="1544.0" y="520.0" type="curve"/>
-      <point x="1544.0" y="792.0" type="line"/>
-      <point x="1456.0" y="684.0"/>
-      <point x="1336.0" y="620.0"/>
-      <point x="1220.0" y="620.0" type="curve" smooth="yes"/>
-      <point x="1084.0" y="620.0"/>
-      <point x="1032.0" y="660.0"/>
-      <point x="924.0" y="716.0" type="curve" smooth="yes"/>
-      <point x="808.0" y="772.0"/>
-      <point x="748.0" y="820.0"/>
-      <point x="600.0" y="816.0" type="curve"/>
-      <point x="480.0" y="816.0"/>
-      <point x="348.0" y="760.0"/>
-      <point x="264.0" y="672.0" type="curve"/>
+      <point x="208.0" y="296.0" type="curve"/>
+      <point x="424.0" y="296.0" type="line"/>
+      <point x="420.0" y="472.0"/>
+      <point x="500.0" y="540.0"/>
+      <point x="608.0" y="540.0" type="curve" smooth="yes"/>
+      <point x="680.0" y="540.0"/>
+      <point x="728.0" y="508.0"/>
+      <point x="824.0" y="424.0" type="curve" smooth="yes"/>
+      <point x="972.0" y="296.0"/>
+      <point x="1068.0" y="240.0"/>
+      <point x="1204.0" y="240.0" type="curve" smooth="yes"/>
+      <point x="1408.0" y="240.0"/>
+      <point x="1608.0" y="368.0"/>
+      <point x="1600.0" y="700.0" type="curve"/>
+      <point x="1384.0" y="700.0" type="line"/>
+      <point x="1388.0" y="540.0"/>
+      <point x="1316.0" y="456.0"/>
+      <point x="1200.0" y="456.0" type="curve" smooth="yes"/>
+      <point x="1128.0" y="456.0"/>
+      <point x="1084.0" y="488.0"/>
+      <point x="984.0" y="572.0" type="curve" smooth="yes"/>
+      <point x="840.0" y="700.0"/>
+      <point x="740.0" y="756.0"/>
+      <point x="604.0" y="756.0" type="curve" smooth="yes"/>
+      <point x="400.0" y="756.0"/>
+      <point x="204.0" y="628.0"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -69,18 +72,28 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>8.0</real>
+            <real>288.0</real>
+            <real>248.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>15.0</real>
+            <real>868.0</real>
+            <real>248.0</real>
           </array>
+          <key>stem</key>
+          <integer>-2</integer>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -89,18 +102,103 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>8.0</real>
+            <real>1060.0</real>
+            <real>248.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>15.0</real>
+            <real>484.0</real>
+            <real>248.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>place</key>
+          <array>
+            <real>288.0</real>
+            <real>248.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>TTStem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>place</key>
+          <array>
+            <real>868.0</real>
+            <real>248.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>TTStem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>place</key>
+          <array>
+            <real>1060.0</real>
+            <real>248.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>TTStem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>place</key>
+          <array>
+            <real>484.0</real>
+            <real>248.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>TTStem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>place</key>
+          <array>
+            <real>44.0</real>
+            <real>220.0</real>
           </array>
+          <key>stem</key>
+          <integer>-2</integer>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -109,37 +207,52 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
+          <key>place</key>
+          <array>
+            <real>344.0</real>
+            <real>220.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <false/>
+          <key>options</key>
+          <integer>0</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>2.0</real>
+            <real>25.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>21.0</real>
+            <real>0.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
         <dict>
           <key>horizontal</key>
-          <true/>
+          <false/>
           <key>options</key>
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
+            <real>13.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
-            <real>21.0</real>
+            <real>0.0</real>
+            <real>12.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -149,18 +262,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>8.0</real>
+            <real>44.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>15.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -169,59 +277,114 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>8.0</real>
+            <real>344.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
+          <key>type</key>
+          <string>TTStem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>15.0</real>
+            <real>-560.0</real>
+            <real>220.0</real>
           </array>
+          <key>stem</key>
+          <integer>-2</integer>
           <key>type</key>
-          <string>TTStem</string>
+          <string>Stem</string>
         </dict>
         <dict>
           <key>horizontal</key>
           <true/>
           <key>options</key>
-          <integer>4</integer>
+          <integer>0</integer>
+          <key>place</key>
+          <array>
+            <real>-260.0</real>
+            <real>220.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <false/>
+          <key>options</key>
+          <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
-            <real>2.0</real>
+            <real>1.0</real>
+            <real>25.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
+            <real>1.0</real>
             <real>0.0</real>
-            <real>21.0</real>
           </array>
           <key>type</key>
-          <string>TTStem</string>
+          <string>Stem</string>
         </dict>
         <dict>
           <key>horizontal</key>
-          <true/>
+          <false/>
           <key>options</key>
-          <integer>4</integer>
+          <integer>0</integer>
           <key>origin</key>
           <array>
             <real>1.0</real>
-            <real>2.0</real>
+            <real>13.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
             <real>1.0</real>
-            <real>21.0</real>
+            <real>12.0</real>
           </array>
           <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>place</key>
+          <array>
+            <real>-560.0</real>
+            <real>220.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>TTStem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>place</key>
+          <array>
+            <real>-260.0</real>
+            <real>220.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
           <string>TTStem</string>
         </dict>
       </array>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/asciitilde.case.glif b/src/Inter-UI-Regular.ufo/glyphs/asciitilde.case.glif
new file mode 100644
index 000000000..236d271e4
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/asciitilde.case.glif
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="asciitilde.case" format="2">
+  <advance width="1808.0"/>
+  <outline>
+    <component base="asciitilde" yOffset="212.0"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
+      <key>public.markColor</key>
+      <string>0.67,0.95,0.38,1</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/asciitilde.glif b/src/Inter-UI-Regular.ufo/glyphs/asciitilde.glif
index 1e2d6878e..d9e8cda90 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/asciitilde.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/asciitilde.glif
@@ -1,41 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="asciitilde" format="2">
-  <advance width="1680.0"/>
+  <advance width="1808.0"/>
   <unicode hex="007E"/>
-  <guideline x="784.0" y="880.0" angle="315.3603"/>
-  <guideline x="904.0" y="1068.0" angle="315.5305"/>
+  <guideline x="904.0" y="812.0" angle="320.0"/>
   <outline>
     <contour>
-      <point x="1320.0" y="1172.0" type="line"/>
-      <point x="1320.0" y="996.0"/>
-      <point x="1236.0" y="928.0"/>
-      <point x="1132.0" y="928.0" type="curve" smooth="yes"/>
-      <point x="1044.0" y="928.0"/>
-      <point x="988.0" y="976.0"/>
-      <point x="900.0" y="1064.0" type="curve" smooth="yes"/>
-      <point x="780.0" y="1184.0"/>
-      <point x="668.0" y="1236.0"/>
-      <point x="544.0" y="1236.0" type="curve" smooth="yes"/>
-      <point x="316.0" y="1236.0"/>
-      <point x="144.0" y="1060.0"/>
-      <point x="140.0" y="768.0" type="curve"/>
-      <point x="360.0" y="768.0" type="line"/>
-      <point x="372.0" y="936.0"/>
-      <point x="448.0" y="1008.0"/>
-      <point x="556.0" y="1008.0" type="curve" smooth="yes"/>
-      <point x="636.0" y="1008.0"/>
-      <point x="700.0" y="968.0"/>
-      <point x="780.0" y="876.0" type="curve" smooth="yes"/>
-      <point x="884.0" y="760.0"/>
-      <point x="1004.0" y="700.0"/>
-      <point x="1140.0" y="700.0" type="curve" smooth="yes"/>
-      <point x="1372.0" y="700.0"/>
-      <point x="1544.0" y="880.0"/>
-      <point x="1540.0" y="1172.0" type="curve"/>
+      <point x="208.0" y="608.0" type="curve"/>
+      <point x="424.0" y="608.0" type="line"/>
+      <point x="421.0" y="782.0"/>
+      <point x="500.0" y="852.0"/>
+      <point x="608.0" y="852.0" type="curve" smooth="yes"/>
+      <point x="679.0" y="852.0"/>
+      <point x="726.0" y="821.0"/>
+      <point x="824.0" y="736.0" type="curve" smooth="yes"/>
+      <point x="970.0" y="609.0"/>
+      <point x="1068.0" y="552.0"/>
+      <point x="1204.0" y="552.0" type="curve" smooth="yes"/>
+      <point x="1408.0" y="552.0"/>
+      <point x="1606.0" y="680.0"/>
+      <point x="1600.0" y="1012.0" type="curve"/>
+      <point x="1384.0" y="1012.0" type="line"/>
+      <point x="1387.0" y="853.0"/>
+      <point x="1314.0" y="768.0"/>
+      <point x="1200.0" y="768.0" type="curve" smooth="yes"/>
+      <point x="1129.0" y="768.0"/>
+      <point x="1082.0" y="799.0"/>
+      <point x="984.0" y="884.0" type="curve" smooth="yes"/>
+      <point x="838.0" y="1011.0"/>
+      <point x="740.0" y="1068.0"/>
+      <point x="604.0" y="1068.0" type="curve" smooth="yes"/>
+      <point x="400.0" y="1068.0"/>
+      <point x="202.0" y="940.0"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -43,18 +44,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>21.0</real>
+            <real>-248.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -63,18 +59,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>15.0</real>
+            <real>52.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>8.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -86,14 +77,14 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>11.0</real>
+            <real>25.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>12.0</real>
+            <real>0.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -106,14 +97,14 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>25.0</real>
+            <real>13.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>24.0</real>
+            <real>12.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -123,18 +114,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>21.0</real>
+            <real>-248.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -143,18 +129,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>15.0</real>
+            <real>52.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>8.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/bullet.case.glif b/src/Inter-UI-Regular.ufo/glyphs/bullet.case.glif
index 04155442b..5928b4d7a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/bullet.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/bullet.case.glif
@@ -7,6 +7,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>bullet</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/contents.plist b/src/Inter-UI-Regular.ufo/glyphs/contents.plist
index e76f0bab8..bd269681b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/contents.plist
+++ b/src/Inter-UI-Regular.ufo/glyphs/contents.plist
@@ -1130,6 +1130,8 @@
     <string>apostrophemod.glif</string>
     <key>approxequal</key>
     <string>approxequal.glif</string>
+    <key>approxequal.case</key>
+    <string>approxequal.case.glif</string>
     <key>archdblsubnosp</key>
     <string>archdblsubnosp.glif</string>
     <key>arighthalfring</key>
@@ -1152,6 +1154,8 @@
     <string>asciicircum.glif</string>
     <key>asciitilde</key>
     <string>asciitilde.glif</string>
+    <key>asciitilde.case</key>
+    <string>asciitilde.case.glif</string>
     <key>ascript</key>
     <string>ascript.glif</string>
     <key>ascript_uni02DE</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/divide.case.glif b/src/Inter-UI-Regular.ufo/glyphs/divide.case.glif
index 59b4c22e2..970f0cc66 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/divide.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/divide.case.glif
@@ -2,10 +2,12 @@
 <glyph name="divide.case" format="2">
   <advance width="1808.0"/>
   <outline>
-    <component base="divide" yOffset="136.0"/>
+    <component base="divide" yOffset="224.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/divide.glif b/src/Inter-UI-Regular.ufo/glyphs/divide.glif
index 077529760..49016e390 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/divide.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/divide.glif
@@ -2,44 +2,47 @@
 <glyph name="divide" format="2">
   <advance width="1808.0"/>
   <unicode hex="00F7"/>
+  <guideline x="268.0" y="800.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1544.0" y="1008.0" type="line"/>
-      <point x="264.0" y="1008.0" type="line"/>
-      <point x="264.0" y="788.0" type="line"/>
-      <point x="1544.0" y="788.0" type="line"/>
+      <point x="1544.0" y="912.0" type="line"/>
+      <point x="264.0" y="912.0" type="line"/>
+      <point x="264.0" y="688.0" type="line"/>
+      <point x="1544.0" y="688.0" type="line"/>
     </contour>
     <contour>
-      <point x="736.0" y="1408.0" type="curve" smooth="yes"/>
-      <point x="736.0" y="1320.0"/>
-      <point x="792.0" y="1252.0"/>
-      <point x="904.0" y="1252.0" type="curve" smooth="yes"/>
-      <point x="1012.0" y="1252.0"/>
-      <point x="1072.0" y="1320.0"/>
-      <point x="1072.0" y="1408.0" type="curve" smooth="yes"/>
-      <point x="1072.0" y="1500.0"/>
-      <point x="1012.0" y="1568.0"/>
-      <point x="904.0" y="1568.0" type="curve" smooth="yes"/>
-      <point x="792.0" y="1568.0"/>
-      <point x="736.0" y="1500.0"/>
+      <point x="904.0" y="104.0" type="curve" smooth="yes"/>
+      <point x="1000.0" y="104.0"/>
+      <point x="1080.0" y="184.0"/>
+      <point x="1080.0" y="284.0" type="curve" smooth="yes"/>
+      <point x="1080.0" y="380.0"/>
+      <point x="1000.0" y="460.0"/>
+      <point x="904.0" y="460.0" type="curve" smooth="yes"/>
+      <point x="804.0" y="460.0"/>
+      <point x="724.0" y="380.0"/>
+      <point x="724.0" y="284.0" type="curve" smooth="yes"/>
+      <point x="724.0" y="184.0"/>
+      <point x="804.0" y="104.0"/>
     </contour>
     <contour>
-      <point x="736.0" y="380.0" type="curve" smooth="yes"/>
-      <point x="736.0" y="292.0"/>
-      <point x="792.0" y="224.0"/>
-      <point x="904.0" y="224.0" type="curve" smooth="yes"/>
-      <point x="1012.0" y="224.0"/>
-      <point x="1072.0" y="292.0"/>
-      <point x="1072.0" y="380.0" type="curve" smooth="yes"/>
-      <point x="1072.0" y="472.0"/>
-      <point x="1012.0" y="544.0"/>
-      <point x="904.0" y="544.0" type="curve" smooth="yes"/>
-      <point x="792.0" y="544.0"/>
-      <point x="736.0" y="472.0"/>
+      <point x="904.0" y="1140.0" type="curve" smooth="yes"/>
+      <point x="1000.0" y="1140.0"/>
+      <point x="1080.0" y="1220.0"/>
+      <point x="1080.0" y="1320.0" type="curve" smooth="yes"/>
+      <point x="1080.0" y="1416.0"/>
+      <point x="1000.0" y="1496.0"/>
+      <point x="904.0" y="1496.0" type="curve" smooth="yes"/>
+      <point x="804.0" y="1496.0"/>
+      <point x="724.0" y="1416.0"/>
+      <point x="724.0" y="1320.0" type="curve" smooth="yes"/>
+      <point x="724.0" y="1220.0"/>
+      <point x="804.0" y="1140.0"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -67,10 +70,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>8.0</real>
+            <real>1472.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -111,8 +114,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>8.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/emdash.case.glif b/src/Inter-UI-Regular.ufo/glyphs/emdash.case.glif
index a4e125298..fbec161ec 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/emdash.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/emdash.case.glif
@@ -6,9 +6,7 @@
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>emdash</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
       <string>emdash</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/endash.case.glif b/src/Inter-UI-Regular.ufo/glyphs/endash.case.glif
index 8c5247a9b..8dafe4dd4 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/endash.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/endash.case.glif
@@ -6,9 +6,7 @@
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>endash</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
       <string>endash</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/equal.case.glif b/src/Inter-UI-Regular.ufo/glyphs/equal.case.glif
index 10d5396bd..958ffe481 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/equal.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/equal.case.glif
@@ -2,10 +2,12 @@
 <glyph name="equal.case" format="2">
   <advance width="1808.0"/>
   <outline>
-    <component base="equal" yOffset="128.0"/>
+    <component base="equal" yOffset="224.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/equal.glif b/src/Inter-UI-Regular.ufo/glyphs/equal.glif
index 63bce42d8..9dbdc34e9 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/equal.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/equal.glif
@@ -2,23 +2,25 @@
 <glyph name="equal" format="2">
   <advance width="1808.0"/>
   <unicode hex="003D"/>
-  <guideline x="256.0" y="896.0" angle="0.0"/>
+  <guideline x="268.0" y="800.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="328.0" y="732.0" type="line"/>
-      <point x="328.0" y="512.0" type="line"/>
-      <point x="1480.0" y="512.0" type="line"/>
-      <point x="1480.0" y="732.0" type="line"/>
+      <point x="328.0" y="988.0" type="line"/>
+      <point x="1480.0" y="988.0" type="line"/>
+      <point x="1480.0" y="1204.0" type="line"/>
+      <point x="328.0" y="1204.0" type="line"/>
     </contour>
     <contour>
-      <point x="328.0" y="1280.0" type="line"/>
-      <point x="328.0" y="1060.0" type="line"/>
-      <point x="1480.0" y="1060.0" type="line"/>
-      <point x="1480.0" y="1280.0" type="line"/>
+      <point x="328.0" y="396.0" type="line"/>
+      <point x="1480.0" y="396.0" type="line"/>
+      <point x="1480.0" y="612.0" type="line"/>
+      <point x="328.0" y="612.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -26,18 +28,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>396.0</real>
+            <real>216.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>3.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -48,15 +45,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
-            <real>3.0</real>
+            <real>0.0</real>
+            <real>2.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -66,18 +63,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>396.0</real>
+            <real>216.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>3.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -88,15 +80,15 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
-            <real>3.0</real>
+            <real>0.0</real>
+            <real>2.0</real>
           </array>
           <key>type</key>
           <string>TTStem</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/figuredash.case.glif b/src/Inter-UI-Regular.ufo/glyphs/figuredash.case.glif
index b22aaa41a..f1d591069 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/figuredash.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/figuredash.case.glif
@@ -6,9 +6,7 @@
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>figuredash</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
       <string>figuredash</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/hyphen.case.glif b/src/Inter-UI-Regular.ufo/glyphs/hyphen.case.glif
index 07c5603b0..586b3f95d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/hyphen.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/hyphen.case.glif
@@ -6,9 +6,7 @@
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>hyphen</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
       <string>hyphen</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/leftA_rrow.case.glif b/src/Inter-UI-Regular.ufo/glyphs/leftA_rrow.case.glif
index cfe06b08a..b873e87f3 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/leftA_rrow.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/leftA_rrow.case.glif
@@ -6,9 +6,7 @@
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>leftArrow</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
       <string>leftArrow</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/leftL_ongA_rrow.case.glif b/src/Inter-UI-Regular.ufo/glyphs/leftL_ongA_rrow.case.glif
index c858718d0..ff9795e82 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/leftL_ongA_rrow.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/leftL_ongA_rrow.case.glif
@@ -8,10 +8,8 @@
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>leftArrow</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>leftArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>leftLongArrow</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/leftL_ongA_rrow.glif b/src/Inter-UI-Regular.ufo/glyphs/leftL_ongA_rrow.glif
index 0ee965a82..b7fd3bb34 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/leftL_ongA_rrow.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/leftL_ongA_rrow.glif
@@ -3,7 +3,6 @@
   <advance width="3856.0"/>
   <unicode hex="27F5"/>
   <guideline x="272.0" y="896.0" angle="0.0"/>
-  <guideline x="668.0" y="1008.0" angle="90.0"/>
   <outline>
     <contour>
       <point x="3464.0" y="784.0" type="line"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/leftR_ightA_rrow.case.glif b/src/Inter-UI-Regular.ufo/glyphs/leftR_ightA_rrow.case.glif
index cae3ed15f..a62c7bf7c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/leftR_ightA_rrow.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/leftR_ightA_rrow.case.glif
@@ -6,10 +6,8 @@
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>leftArrow</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>rightArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>leftRightArrow</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/leftR_ightL_ongA_rrow.case.glif b/src/Inter-UI-Regular.ufo/glyphs/leftR_ightL_ongA_rrow.case.glif
index 17d75a9b7..176f251db 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/leftR_ightL_ongA_rrow.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/leftR_ightL_ongA_rrow.case.glif
@@ -6,10 +6,8 @@
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>leftArrow</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>rightArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>leftRightLongArrow</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/minus.case.glif b/src/Inter-UI-Regular.ufo/glyphs/minus.case.glif
index 28091f41b..1670c26b6 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/minus.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/minus.case.glif
@@ -2,14 +2,12 @@
 <glyph name="minus.case" format="2">
   <advance width="1808.0"/>
   <outline>
-    <component base="minus" yOffset="128.0"/>
+    <component base="minus" yOffset="224.0"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>minus</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>minus</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/minus.glif b/src/Inter-UI-Regular.ufo/glyphs/minus.glif
index 9e4b42bef..4a11bce32 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/minus.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/minus.glif
@@ -2,16 +2,19 @@
 <glyph name="minus" format="2">
   <advance width="1808.0"/>
   <unicode hex="2212"/>
+  <guideline x="268.0" y="800.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1544.0" y="1008.0" type="line"/>
-      <point x="264.0" y="1008.0" type="line"/>
-      <point x="264.0" y="784.0" type="line"/>
-      <point x="1544.0" y="784.0" type="line"/>
+      <point x="1544.0" y="912.0" type="line"/>
+      <point x="264.0" y="912.0" type="line"/>
+      <point x="264.0" y="688.0" type="line"/>
+      <point x="1544.0" y="688.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/multiply.case.glif b/src/Inter-UI-Regular.ufo/glyphs/multiply.case.glif
index 46d22f592..2e6ac2a78 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/multiply.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/multiply.case.glif
@@ -2,10 +2,12 @@
 <glyph name="multiply.case" format="2">
   <advance width="1808.0"/>
   <outline>
-    <component base="multiply" yOffset="128.0"/>
+    <component base="multiply" yOffset="224.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/multiply.glif b/src/Inter-UI-Regular.ufo/glyphs/multiply.glif
index 37218f445..232bc6a0f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/multiply.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/multiply.glif
@@ -2,22 +2,25 @@
 <glyph name="multiply" format="2">
   <advance width="1808.0"/>
   <unicode hex="00D7"/>
+  <guideline x="268.0" y="800.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="452.0" y="280.0" type="line"/>
-      <point x="1524.0" y="1372.0" type="line"/>
-      <point x="1372.0" y="1528.0" type="line"/>
-      <point x="300.0" y="436.0" type="line"/>
+      <point x="1392.0" y="160.0" type="line"/>
+      <point x="1544.0" y="312.0" type="line"/>
+      <point x="416.0" y="1440.0" type="line"/>
+      <point x="264.0" y="1288.0" type="line"/>
     </contour>
     <contour>
-      <point x="1356.0" y="280.0" type="line"/>
-      <point x="1508.0" y="436.0" type="line"/>
-      <point x="436.0" y="1528.0" type="line"/>
-      <point x="284.0" y="1372.0" type="line"/>
+      <point x="416.0" y="160.0" type="line"/>
+      <point x="1544.0" y="1288.0" type="line"/>
+      <point x="1392.0" y="1440.0" type="line"/>
+      <point x="264.0" y="312.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>public.markColor</key>
       <string>0.8,0.941,0.949,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/notequal.case.glif b/src/Inter-UI-Regular.ufo/glyphs/notequal.case.glif
index 5a7fade1b..cfd9c22cb 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/notequal.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/notequal.case.glif
@@ -2,10 +2,12 @@
 <glyph name="notequal.case" format="2">
   <advance width="1808.0"/>
   <outline>
-    <component base="notequal" yOffset="128.0"/>
+    <component base="notequal" yOffset="224.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/notequal.glif b/src/Inter-UI-Regular.ufo/glyphs/notequal.glif
index 39c95716b..d160cb083 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/notequal.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/notequal.glif
@@ -2,28 +2,20 @@
 <glyph name="notequal" format="2">
   <advance width="1808.0"/>
   <unicode hex="2260"/>
+  <guideline x="268.0" y="800.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1388.0" y="1544.0" type="line"/>
-      <point x="1252.0" y="1628.0" type="line"/>
-      <point x="424.0" y="220.0" type="line"/>
-      <point x="564.0" y="136.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="328.0" y="732.0" type="line"/>
-      <point x="328.0" y="512.0" type="line"/>
-      <point x="1480.0" y="512.0" type="line"/>
-      <point x="1480.0" y="732.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="328.0" y="1280.0" type="line"/>
-      <point x="328.0" y="1060.0" type="line"/>
-      <point x="1480.0" y="1060.0" type="line"/>
-      <point x="1480.0" y="1280.0" type="line"/>
+      <point x="1096.0" y="1536.0" type="line"/>
+      <point x="504.0" y="64.0" type="line"/>
+      <point x="728.0" y="64.0" type="line"/>
+      <point x="1320.0" y="1536.0" type="line"/>
     </contour>
+    <component base="equal"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -31,18 +23,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>512.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>3.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -51,18 +38,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>0.0</real>
+            <real>1060.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>3.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -71,10 +53,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>3.0</real>
+            <real>1544.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -93,18 +75,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>512.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>3.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -113,18 +90,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>0.0</real>
+            <real>1060.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>3.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -136,7 +108,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>3.0</real>
+            <real>2.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/plus.case.glif b/src/Inter-UI-Regular.ufo/glyphs/plus.case.glif
index bbc27d58e..b10e29a8d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/plus.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/plus.case.glif
@@ -2,10 +2,12 @@
 <glyph name="plus.case" format="2">
   <advance width="1808.0"/>
   <outline>
-    <component base="plus" yOffset="128.0"/>
+    <component base="plus" yOffset="220.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/plus.glif b/src/Inter-UI-Regular.ufo/glyphs/plus.glif
index 3f507e9c6..4d72e83f2 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/plus.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/plus.glif
@@ -2,19 +2,19 @@
 <glyph name="plus" format="2">
   <advance width="1808.0"/>
   <unicode hex="002B"/>
-  <guideline x="268.0" y="896.0" angle="0.0"/>
+  <guideline x="268.0" y="800.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1544.0" y="1008.0" type="line"/>
-      <point x="264.0" y="1008.0" type="line"/>
-      <point x="264.0" y="784.0" type="line"/>
-      <point x="1544.0" y="784.0" type="line"/>
+      <point x="792.0" y="164.0" type="line"/>
+      <point x="1016.0" y="164.0" type="line"/>
+      <point x="1016.0" y="1444.0" type="line"/>
+      <point x="792.0" y="1444.0" type="line"/>
     </contour>
     <contour>
-      <point x="1016.0" y="1536.0" type="line"/>
-      <point x="792.0" y="1536.0" type="line"/>
-      <point x="792.0" y="256.0" type="line"/>
-      <point x="1016.0" y="256.0" type="line"/>
+      <point x="264.0" y="692.0" type="line"/>
+      <point x="1544.0" y="692.0" type="line"/>
+      <point x="1544.0" y="916.0" type="line"/>
+      <point x="264.0" y="916.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -28,15 +28,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
             <real>1.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>1.0</real>
+            <real>2.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -48,8 +48,8 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>2.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -70,15 +70,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -90,15 +90,15 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>0.0</real>
             <real>1.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>1.0</real>
+            <real>2.0</real>
           </array>
           <key>type</key>
           <string>TTStem</string>
@@ -110,8 +110,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>2.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/plusminus.case.glif b/src/Inter-UI-Regular.ufo/glyphs/plusminus.case.glif
index 2e7c60be4..5128e9720 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/plusminus.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/plusminus.case.glif
@@ -2,10 +2,12 @@
 <glyph name="plusminus.case" format="2">
   <advance width="1808.0"/>
   <outline>
-    <component base="plusminus" yOffset="296.0"/>
+    <component base="plusminus" yOffset="256.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/plusminus.glif b/src/Inter-UI-Regular.ufo/glyphs/plusminus.glif
index 900a0d7c4..3072a6779 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/plusminus.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/plusminus.glif
@@ -2,30 +2,31 @@
 <glyph name="plusminus" format="2">
   <advance width="1808.0"/>
   <unicode hex="00B1"/>
+  <guideline x="268.0" y="800.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1544.0" y="220.0" type="line"/>
-      <point x="264.0" y="220.0" type="line"/>
       <point x="264.0" y="0.0" type="line"/>
       <point x="1544.0" y="0.0" type="line"/>
+      <point x="1544.0" y="224.0" type="line"/>
+      <point x="264.0" y="224.0" type="line"/>
     </contour>
     <contour>
-      <point x="1544.0" y="1096.0" type="line"/>
-      <point x="1020.0" y="1096.0" type="line"/>
-      <point x="1020.0" y="1536.0" type="line"/>
-      <point x="788.0" y="1536.0" type="line"/>
-      <point x="788.0" y="1096.0" type="line"/>
-      <point x="264.0" y="1096.0" type="line"/>
-      <point x="264.0" y="872.0" type="line"/>
-      <point x="788.0" y="872.0" type="line"/>
-      <point x="788.0" y="432.0" type="line"/>
-      <point x="1020.0" y="432.0" type="line"/>
-      <point x="1020.0" y="872.0" type="line"/>
-      <point x="1544.0" y="872.0" type="line"/>
+      <point x="264.0" y="864.0" type="line"/>
+      <point x="1544.0" y="864.0" type="line"/>
+      <point x="1544.0" y="1088.0" type="line"/>
+      <point x="264.0" y="1088.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="792.0" y="416.0" type="line"/>
+      <point x="1016.0" y="416.0" type="line"/>
+      <point x="1016.0" y="1536.0" type="line"/>
+      <point x="792.0" y="1536.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>plus</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -36,14 +37,14 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>1.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>0.0</real>
+            <real>2.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -53,18 +54,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>5.0</real>
+            <real>872.0</real>
+            <real>224.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>4.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -73,10 +69,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>1536.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -95,18 +91,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>7.0</real>
+            <real>788.0</real>
+            <real>232.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>8.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -118,14 +109,14 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>1.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>0.0</real>
+            <real>2.0</real>
           </array>
           <key>type</key>
           <string>TTStem</string>
@@ -135,18 +126,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>5.0</real>
+            <real>872.0</real>
+            <real>224.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>4.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -157,7 +143,7 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
+            <real>0.0</real>
             <real>2.0</real>
           </array>
           <key>stem</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rightA_rrow.case.glif b/src/Inter-UI-Regular.ufo/glyphs/rightA_rrow.case.glif
index e53f195c2..54ffb610a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rightA_rrow.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rightA_rrow.case.glif
@@ -6,9 +6,7 @@
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>rightArrow</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
       <string>rightArrow</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rightL_ongA_rrow.case.glif b/src/Inter-UI-Regular.ufo/glyphs/rightL_ongA_rrow.case.glif
index babe0484d..a3f8e0e07 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rightL_ongA_rrow.case.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rightL_ongA_rrow.case.glif
@@ -8,10 +8,8 @@
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>rightArrow</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>rightArrow</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>rightLongArrow</string>
       <key>public.markColor</key>
       <string>0.67,0.95,0.38,1</string>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/zero.glif b/src/Inter-UI-Regular.ufo/glyphs/zero.glif
index b552af535..7e2e3c324 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/zero.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/zero.glif
@@ -1,40 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zero" format="2">
-  <advance width="1776.0"/>
+  <advance width="1760.0"/>
   <unicode hex="0030"/>
-  <guideline x="832.0" y="792.0" angle="90.0"/>
+  <guideline x="824.0" y="792.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="888.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1320.0" y="-28.0"/>
-      <point x="1592.0" y="376.0"/>
+      <point x="880.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1332.0" y="-28.0"/>
+      <point x="1592.0" y="355.0"/>
       <point x="1592.0" y="1024.0" type="curve" smooth="yes"/>
-      <point x="1592.0" y="1668.0"/>
-      <point x="1320.0" y="2076.0"/>
-      <point x="888.0" y="2076.0" type="curve" smooth="yes"/>
-      <point x="456.0" y="2076.0"/>
-      <point x="184.0" y="1668.0"/>
-      <point x="184.0" y="1024.0" type="curve" smooth="yes"/>
-      <point x="184.0" y="376.0"/>
-      <point x="456.0" y="-28.0"/>
+      <point x="1592.0" y="1688.0"/>
+      <point x="1328.0" y="2076.0"/>
+      <point x="880.0" y="2076.0" type="curve" smooth="yes"/>
+      <point x="432.0" y="2076.0"/>
+      <point x="168.0" y="1688.0"/>
+      <point x="168.0" y="1024.0" type="curve" smooth="yes"/>
+      <point x="168.0" y="355.0"/>
+      <point x="428.0" y="-28.0"/>
     </contour>
     <contour>
-      <point x="888.0" y="192.0" type="curve" smooth="yes"/>
-      <point x="610.0" y="192.0"/>
-      <point x="428.0" y="512.0"/>
-      <point x="428.0" y="1024.0" type="curve" smooth="yes"/>
-      <point x="428.0" y="1536.0"/>
-      <point x="608.0" y="1860.0"/>
-      <point x="888.0" y="1860.0" type="curve" smooth="yes"/>
-      <point x="1168.0" y="1860.0"/>
-      <point x="1348.0" y="1536.0"/>
+      <point x="880.0" y="192.0" type="curve" smooth="yes"/>
+      <point x="582.0" y="192.0"/>
+      <point x="412.0" y="491.0"/>
+      <point x="412.0" y="1024.0" type="curve" smooth="yes"/>
+      <point x="412.0" y="1556.0"/>
+      <point x="584.0" y="1860.0"/>
+      <point x="880.0" y="1860.0" type="curve" smooth="yes"/>
+      <point x="1176.0" y="1860.0"/>
+      <point x="1348.0" y="1556.0"/>
       <point x="1348.0" y="1024.0" type="curve" smooth="yes"/>
-      <point x="1348.0" y="512.0"/>
-      <point x="1166.0" y="192.0"/>
+      <point x="1348.0" y="491.0"/>
+      <point x="1178.0" y="192.0"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>O</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/zero.slash.glif b/src/Inter-UI-Regular.ufo/glyphs/zero.slash.glif
index e6c699ebb..8b8e3e5a1 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/zero.slash.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/zero.slash.glif
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zero.slash" format="2">
-  <advance width="1776.0"/>
+  <advance width="1760.0"/>
   <outline>
     <contour>
-      <point x="1196.0" y="1836.0" type="line"/>
-      <point x="452.0" y="324.0" type="line"/>
-      <point x="572.0" y="212.0" type="line"/>
-      <point x="1324.0" y="1732.0" type="line"/>
+      <point x="1188.0" y="1836.0" type="line"/>
+      <point x="444.0" y="324.0" type="line"/>
+      <point x="564.0" y="208.0" type="line"/>
+      <point x="1316.0" y="1732.0" type="line"/>
     </contour>
     <component base="zero"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>zero</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>zero</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>1</integer>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/zero.tf.glif b/src/Inter-UI-Regular.ufo/glyphs/zero.tf.glif
index 98b83aba9..e998c446b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/zero.tf.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/zero.tf.glif
@@ -2,7 +2,7 @@
 <glyph name="zero.tf" format="2">
   <advance width="1680.0"/>
   <outline>
-    <component base="zero" xOffset="-48.0"/>
+    <component base="zero" xOffset="-40.0"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/zero.tf.slash.glif b/src/Inter-UI-Regular.ufo/glyphs/zero.tf.slash.glif
index 803dbe24d..c0632c09c 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/zero.tf.slash.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/zero.tf.slash.glif
@@ -2,7 +2,7 @@
 <glyph name="zero.tf.slash" format="2">
   <advance width="1680.0"/>
   <outline>
-    <component base="zero.slash" xOffset="-48.0"/>
+    <component base="zero.slash" xOffset="-40.0"/>
   </outline>
   <lib>
     <dict>