diff --git a/twenty-frontend/src/css/_layout.scss b/twenty-frontend/src/css/_layout.scss
index 4a1927f..a0c4dc4 100644
--- a/twenty-frontend/src/css/_layout.scss
+++ b/twenty-frontend/src/css/_layout.scss
@@ -4,6 +4,8 @@
 @import "layout/padding";
 @import "layout/borders";
 @import "layout/text";
+@import "layout/font";
+@import "layout/cursor";
 
 .m-0-auto { margin: 0 auto; }
 .maxw-1024 { max-width: 1024px; }
diff --git a/twenty-frontend/src/css/layout/_cursor.scss b/twenty-frontend/src/css/layout/_cursor.scss
new file mode 100644
index 0000000..1776dd8
--- /dev/null
+++ b/twenty-frontend/src/css/layout/_cursor.scss
@@ -0,0 +1,35 @@
+.cursor-auto { cursor: auto; }
+.cursor-default { cursor: default; }
+.cursor-pointer { cursor: pointer; }
+.cursor-wait { cursor: wait; }
+.cursor-text { cursor: text; }
+.cursor-move { cursor: move; }
+.cursor-help { cursor: help; }
+.cursor-not-allowed { cursor: not-allowed; }
+.cursor-none { cursor: none; }
+.cursor-context-menu { cursor: context-menu; }
+.cursor-progress { cursor: progress; }
+.cursor-cell { cursor: cell; }
+.cursor-crosshair { cursor: crosshair; }
+.cursor-vertical-text { cursor: vertical-text; }
+.cursor-alias { cursor: alias; }
+.cursor-copy { cursor: copy; }
+.cursor-no-drop { cursor: no-drop; }
+.cursor-grab { cursor: grab; }
+.cursor-grabbing { cursor: grabbing; }
+.cursor-all-scroll { cursor: all-scroll; }
+.cursor-col-resize { cursor: col-resize; }
+.cursor-row-resize { cursor: row-resize; }
+.cursor-n-resize { cursor: n-resize; }
+.cursor-e-resize { cursor: e-resize; }
+.cursor-s-resize { cursor: s-resize; }
+.cursor-w-resize { cursor: w-resize; }
+.cursor-ne-resize { cursor: ne-resize; }
+.cursor-nw-resize { cursor: nw-resize; }
+.cursor-se-resize { cursor: se-resize; }
+.cursor-sw-resize { cursor: sw-resize; }
+.cursor-ew-resize { cursor: ew-resize; }
+.cursor-ns-resize { cursor: ns-resize; }
+.cursor-nesw-resize { cursor: nesw-resize; }
+.cursor-nwse-resize { cursor: nwse-resize; }
+.cursor-zoom-in { cursor: zoom-in; }
diff --git a/twenty-frontend/src/css/layout/_fonts.scss b/twenty-frontend/src/css/layout/_fonts.scss
deleted file mode 100644
index 845263d..0000000
--- a/twenty-frontend/src/css/layout/_fonts.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-.font-sans { font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; }
-.font-serif { font-family: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif; }
-.font-mono { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; }
-
-.font-thin { font-weight: 100; }
-.font-extralight { font-weight: 200; }
-.font-light { font-weight: 300; }
-.font-normal { font-weight: 400; }
-.font-medium { font-weight: 500; }
-.font-semibold { font-weight: 600; }
-.font-bold { font-weight: 700; }
-.font-extrabold { font-weight: 800; }
-.font-black { font-weight: 900; }