diff --git a/common/src/app/common/types/token.cljc b/common/src/app/common/types/token.cljc
index 29b4789300..52666fe325 100644
--- a/common/src/app/common/types/token.cljc
+++ b/common/src/app/common/types/token.cljc
@@ -37,7 +37,7 @@
     :border-radius
     :stroke-width
     :box-shadow
-    :dimension
+    :dimensions
     :numeric
     :opacity
     :other
@@ -98,8 +98,8 @@
    [:p2 {:optional true} ::sm/uuid]
    [:p3 {:optional true} ::sm/uuid]
    [:p4 {:optional true} ::sm/uuid]
-   [:position-x {:optional true} ::sm/uuid]
-   [:position-y {:optional true} ::sm/uuid]])
+   [:x {:optional true} ::sm/uuid]
+   [:y {:optional true} ::sm/uuid]])
 
 (def spacing-keys (schema-keys ::spacing))
 
diff --git a/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs b/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
index a1cde4010a..f3a54d0dfb 100644
--- a/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
@@ -8,18 +8,22 @@
   (:require-macros [app.main.style :as stl])
   (:require
    [app.common.data :as d]
+   [app.common.data.macros :as dm]
    [app.common.types.shape.radius :as ctsr]
    [app.main.data.modal :as modal]
+   [app.main.data.shortcuts :as scd]
    [app.main.data.tokens :as dt]
+   [app.main.data.workspace :as dw]
    [app.main.data.workspace.changes :as dch]
    [app.main.data.workspace.shape-layout :as dwsl]
    [app.main.data.workspace.transforms :as dwt]
    [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.ui.components.dropdown :refer [dropdown]]
-   [app.main.ui.workspace.context-menu :refer [menu-entry prevent-default]]
+   [app.main.ui.icons :as i]
    [app.main.ui.workspace.tokens.core :as wtc]
    [app.util.dom :as dom]
+   [app.util.timers :as timers]
    [clojure.set :as set]
    [okulary.core :as l]
    [rumext.v2 :as mf]))
@@ -27,6 +31,92 @@
 (def tokens-menu-ref
   (l/derived :token-context-menu refs/workspace-local))
 
+(defn- prevent-default
+  [event]
+  (dom/prevent-default event)
+  (dom/stop-propagation event))
+
+(mf/defc menu-entry
+  {::mf/props :obj}
+  [{:keys [title shortcut on-click on-pointer-enter on-pointer-leave
+           on-unmount children selected? icon disabled value]}]
+  (let [submenu-ref (mf/use-ref nil)
+        hovering?   (mf/use-ref false)
+        on-pointer-enter
+        (mf/use-callback
+         (fn []
+           (mf/set-ref-val! hovering? true)
+           (let [submenu-node (mf/ref-val submenu-ref)]
+             (when (some? submenu-node)
+               (dom/set-css-property! submenu-node "display" "block")))
+           (when on-pointer-enter (on-pointer-enter))))
+
+        on-pointer-leave
+        (mf/use-callback
+         (fn []
+           (mf/set-ref-val! hovering? false)
+           (let [submenu-node (mf/ref-val submenu-ref)]
+             (when (some? submenu-node)
+               (timers/schedule
+                50
+                #(when-not (mf/ref-val hovering?)
+                   (dom/set-css-property! submenu-node "display" "none")))))
+           (when on-pointer-leave (on-pointer-leave))))
+
+        set-dom-node
+        (mf/use-callback
+         (fn [dom]
+           (let [submenu-node (mf/ref-val submenu-ref)]
+             (when (and (some? dom) (some? submenu-node))
+               (dom/set-css-property! submenu-node "top" (str (.-offsetTop dom) "px"))))))]
+
+    (mf/use-effect
+     (mf/deps on-unmount)
+     (constantly on-unmount))
+
+    (if icon
+      [:li {:class (stl/css :icon-menu-item)
+            :disabled disabled
+            :data-value value
+            :ref set-dom-node
+            :on-click on-click
+            :on-pointer-enter on-pointer-enter
+            :on-pointer-leave on-pointer-leave}
+       [:span
+        {:class (stl/css :icon-wrapper)}
+        (if selected? [:span {:class (stl/css :selected-icon)}
+                       i/tick]
+            [:span {:class (stl/css :selected-icon)}])
+        [:span {:class (stl/css :shape-icon)} icon]]
+       [:span {:class (stl/css :title)} title]]
+      [:li {:class (stl/css :context-menu-item)
+            :disabled disabled
+            :ref set-dom-node
+            :data-value value
+            :on-click on-click
+            :on-pointer-enter on-pointer-enter
+            :on-pointer-leave on-pointer-leave}
+       [:span {:class (stl/css :title)} title]
+       (when shortcut
+         [:span   {:class (stl/css :shortcut)}
+          (for [[idx sc] (d/enumerate (scd/split-sc shortcut))]
+            [:span {:key (dm/str shortcut "-" idx)
+                    :class (stl/css :shortcut-key)} sc])])
+
+       (when (> (count children) 1)
+         [:span {:class (stl/css :submenu-icon)} i/arrow])
+
+       (when (> (count children) 1)
+         [:ul {:class (stl/css :token-context-submenu)
+               :ref submenu-ref
+               :style {:display "none" :left 235}
+               :on-context-menu prevent-default}
+          children])])))
+
+(mf/defc menu-separator
+  []
+  [:li {:class (stl/css :separator)}])
+
 (defn update-shape-radius-single-corner [value shape-ids attribute]
   (st/emit!
    (dch/update-shapes shape-ids
@@ -65,6 +155,22 @@
                          :token-type-props updated-token-type-props
                          :selected-shapes selected-shapes})))
 
+(defn update-shape-position [value shape-ids attributes]
+  (doseq [shape-id shape-ids]
+    (st/emit! (dw/update-position shape-id {(first attributes) value}))))
+
+(defn apply-dimensions-token [{:keys [token-id token-type-props selected-shapes]} attributes]
+  (let [token (dt/get-token-data-from-token-id token-id)
+        attributes (set attributes)
+        updated-token-type-props (if (set/superset? #{:x :y} attributes)
+                                   (assoc token-type-props
+                                          :on-update-shape update-shape-position
+                                          :attributes attributes)
+                                   token-type-props)]
+    (wtc/on-apply-token {:token token
+                         :token-type-props updated-token-type-props
+                         :selected-shapes selected-shapes})))
+
 (defn update-shape-dimensions [value shape-ids attributes]
   (st/emit! (dwt/update-dimensions shape-ids (first attributes) value)))
 
@@ -125,6 +231,16 @@
                       {:title "Min height" :attributes #{:layout-item-min-h}}
                       {:title "Max height" :attributes #{:layout-item-max-h}}])
 
+      :dimensions    (attributes->actions
+                      apply-dimensions-token
+                      [{:title "Spacing" :submenu :spacing}
+                       {:title "Sizing" :submenu :sizing}
+                       {:title "Border Radius" :submenu :border-radius}
+                      ;; TODO: BORDER_WIDTH {:title "Border Width" :attributes #{:width} :children true}
+                       {:title "x" :attributes #{:x}}
+                       {:title "y" :attributes #{:y}}])
+                      ;;TODO: Background blur {:title "Background blur" :attributes #{:width}}])
+
       [])))
 
 (defn generate-menu-entries [{:keys [token-id token-type-props token-type selected-shapes] :as context-data}]
@@ -148,14 +264,23 @@
 (mf/defc token-pill-context-menu
   [context-data]
   (let [menu-entries (generate-menu-entries context-data)]
-    (for [[index {:keys [title action selected?]}] (d/enumerate menu-entries)]
-      [:& menu-entry {:key index
-                      :title title
-                      :on-click action
+    (for [[index {:keys [title action selected? children submenu]}] (d/enumerate menu-entries)]
+      [:& menu-entry (cond-> {:key index
+                              :title title}
+                       (not submenu) (assoc :on-click action
                       ;; TODO: Allow selected items wihtout an icon for the context menu
-                      :icon (mf/html [:div {:class (stl/css-case :empty-icon true
-                                                                 :hidden-icon (not selected?))}])
-                      :selected? selected?}])))
+                                            :icon (mf/html [:div {:class (stl/css-case :empty-icon true
+                                                                                       :hidden-icon (not selected?))}])
+                                            :selected? selected?))
+       (when submenu
+         (let [submenu-entries (additional-actions (assoc context-data :token-type submenu))]
+           (for [[index {:keys [title action selected?]}] (d/enumerate submenu-entries)]
+             [:& menu-entry {:key index
+                             :title title
+                             :on-click action
+                             :icon  (mf/html [:div {:class (stl/css-case :empty-icon true
+                                                                         :hidden-icon (not selected?))}])
+                             :selected? selected?}])))])))
 
 (mf/defc token-context-menu
   []
@@ -179,7 +304,6 @@
                                "left: " (- left delta-x) "px;")]
             (when (or (> delta-x 0) (> delta-y 0))
               (.setAttribute ^js dropdown "style" new-style))))))
-
     [:& dropdown {:show (boolean mdata)
                   :on-close #(st/emit! dt/hide-token-context-menu)}
      [:div {:class (stl/css :token-context-menu)
diff --git a/frontend/src/app/main/ui/workspace/tokens/context_menu.scss b/frontend/src/app/main/ui/workspace/tokens/context_menu.scss
index 25505f4e91..3062483bc8 100644
--- a/frontend/src/app/main/ui/workspace/tokens/context_menu.scss
+++ b/frontend/src/app/main/ui/workspace/tokens/context_menu.scss
@@ -25,13 +25,114 @@
   max-height: 100vh;
   overflow-y: auto;
 
-  // TODO: Fixes missing styles from parent context menu
   li {
     @include bodySmallTypography;
     color: var(--menu-foreground-color);
   }
 }
 
+.token-context-submenu {
+  position: absolute;
+  padding: $s-4;
+  margin-left: $s-6;
+}
+
+.separator {
+  height: $s-12;
+}
+
+.context-menu-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: $s-28;
+  width: 100%;
+  padding: $s-6;
+  border-radius: $br-8;
+  cursor: pointer;
+
+  .title {
+    @include bodySmallTypography;
+    color: var(--menu-foreground-color);
+    margin-left: calc(($s-32 + $s-28) / 2);
+  }
+  .shortcut {
+    @include flexCenter;
+    gap: $s-2;
+    color: var(--menu-shortcut-foreground-color);
+    .shortcut-key {
+      @include bodySmallTypography;
+      @include flexCenter;
+      height: $s-20;
+      padding: $s-2 $s-6;
+      border-radius: $br-6;
+      background-color: var(--menu-shortcut-background-color);
+    }
+  }
+
+  .submenu-icon svg {
+    @extend .button-icon-small;
+    stroke: var(--menu-foreground-color);
+  }
+
+  &:hover {
+    background-color: var(--menu-background-color-hover);
+    .title {
+      color: var(--menu-foreground-color-hover);
+    }
+    .shortcut {
+      color: var(--menu-shortcut-foreground-color-hover);
+    }
+  }
+  &:focus {
+    border: 1px solid var(--menu-border-color-focus);
+    background-color: var(--menu-background-color-focus);
+  }
+}
+
+.icon-menu-item {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  height: $s-28;
+  padding: $s-6;
+  border-radius: $br-8;
+  &:hover {
+    background-color: var(--menu-background-color-hover);
+  }
+
+  span.title {
+    margin-left: $s-6;
+  }
+
+  .selected-icon {
+    svg {
+      @extend .button-icon-small;
+      stroke: var(--menu-foreground-color);
+    }
+  }
+
+  .shape-icon {
+    margin-left: $s-2;
+    svg {
+      @extend .button-icon-small;
+      stroke: var(--menu-foreground-color);
+    }
+  }
+
+  .icon-wrapper {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    margin: 0;
+  }
+}
+
+.icon-menu-item[disabled],
+.context-menu-item[disabled] {
+  pointer-events: none;
+  opacity: 0.6;
+}
+
 // TODO: Allow selected items wihtout an icon for the context menu
 .empty-icon {
   width: 0;
diff --git a/frontend/src/app/main/ui/workspace/tokens/core.cljs b/frontend/src/app/main/ui/workspace/tokens/core.cljs
index aa8d62a67c..a4c871b202 100644
--- a/frontend/src/app/main/ui/workspace/tokens/core.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/core.cljs
@@ -159,7 +159,7 @@
      :modal {:key :tokens/sizing
              :fields [{:label "Sizing"
                        :key :sizing}]}}]
-   [:dimension
+   [:dimensions
     {:title "Dimensions"
      :attributes ctt/dimensions-keys
      :on-update-shape update-shape-dimensions
diff --git a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
index f0246b4a44..c740fc8e04 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
@@ -51,7 +51,7 @@
     :stroke-width i/stroke-size
     :typography i/text
     ;; TODO: Add diagonal icon here when it's available
-    :dimension [:div {:style {:rotate "45deg"}} i/constraint-horizontal]
+    :dimensions [:div {:style {:rotate "45deg"}} i/constraint-horizontal]
     :sizing [:div {:style {:rotate "45deg"}} i/constraint-horizontal]
     i/add))