diff --git a/CHANGES.md b/CHANGES.md
index 05ccca284..108078dca 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,9 @@
 - Redesign of workspace toolbars [Taiga #2319](https://tree.taiga.io/project/penpot/us/2319)
 
 ### :bug: Bugs fixed
+
+- Fixed handoff shadow type text [Taiga #2717](https://tree.taiga.io/project/penpot/issue/2717)
+
 ### :arrow_up: Deps updates
 ### :heart: Community contributions by (Thank you!)
 
diff --git a/frontend/resources/styles/main/partials/handoff.scss b/frontend/resources/styles/main/partials/handoff.scss
index c666f03cd..3ebfd2374 100644
--- a/frontend/resources/styles/main/partials/handoff.scss
+++ b/frontend/resources/styles/main/partials/handoff.scss
@@ -233,10 +233,7 @@
 
     .attributes-shadow {
       display: flex;
-
-      .attributes-label {
-        margin-right: 2px;
-      }
+      margin-left: 4px;
     }
   }
 
diff --git a/frontend/src/app/main/ui/viewer/handoff/attributes/shadow.cljs b/frontend/src/app/main/ui/viewer/handoff/attributes/shadow.cljs
index 511f4ad78..94146d519 100644
--- a/frontend/src/app/main/ui/viewer/handoff/attributes/shadow.cljs
+++ b/frontend/src/app/main/ui/viewer/handoff/attributes/shadow.cljs
@@ -35,22 +35,18 @@
   (let [color-format (mf/use-state :hex)]
     [:div.attributes-shadow-block
      [:div.attributes-shadow-row
-      [:div.attributes-label (->> shadow :style d/name (str "handoff.attributes.shadow.style.") (tr))]
-      [:div.attributes-shadow
-       [:div.attributes-label (tr "handoff.attributes.shadow.shorthand.offset-x")]
-       [:div.attributes-value (str (:offset-x shadow))]]
+      [:div.attributes-label (->> shadow :style d/name (str "workspace.options.shadow-options.") (tr))]
+      [:div.attributes-shadow {:title  (tr "workspace.options.shadow-options.offsetx")}
+       [:div.attributes-value (str (:offset-x shadow) "px")]]
 
-      [:div.attributes-shadow
-       [:div.attributes-label (tr "handoff.attributes.shadow.shorthand.offset-y")]
-       [:div.attributes-value (str (:offset-y shadow))]]
+      [:div.attributes-shadow {:title  (tr "workspace.options.shadow-options.offsety")}
+       [:div.attributes-value (str (:offset-y shadow) "px")]]
 
-      [:div.attributes-shadow
-       [:div.attributes-label (tr "handoff.attributes.shadow.shorthand.blur")]
-       [:div.attributes-value (str (:blur shadow))]]
+      [:div.attributes-shadow {:title  (tr "workspace.options.shadow-options.blur")}
+       [:div.attributes-value (str (:blur shadow) "px")]]
 
-      [:div.attributes-shadow
-       [:div.attributes-label (tr "handoff.attributes.shadow.shorthand.spread")]
-       [:div.attributes-value (str (:spread shadow))]]
+      [:div.attributes-shadow {:title  (tr "workspace.options.shadow-options.spread")}
+       [:div.attributes-value (str (:spread shadow) "px")]]
 
       [:& copy-button {:data (shadow-copy-data shadow)}]]
 
@@ -63,9 +59,7 @@
     (when (and (seq shapes) (> (count shapes) 0))
       [:div.attributes-block
        [:div.attributes-block-title
-        [:div.attributes-block-title-text (tr "handoff.attributes.shadow")]
-        (when (= (count shapes) 1)
-          [:& copy-button {:data (shape-copy-data (first shapes))}])]
+        [:div.attributes-block-title-text (tr "handoff.attributes.shadow")]]
 
        [:div.attributes-shadow-blocks
         (for [shape shapes]