diff --git a/common/src/app/common/types/file.cljc b/common/src/app/common/types/file.cljc
index 12775f322f..0c5fbf5726 100644
--- a/common/src/app/common/types/file.cljc
+++ b/common/src/app/common/types/file.cljc
@@ -219,11 +219,11 @@
 (defn advance-shape-ref
   "Get the shape-ref of the near main of the shape, recursively repeated as many times
    as the given levels."
-  [file container libraries shape levels & options]
-  (let [ref-shape (find-ref-shape file container libraries shape options)]
+  [file container libraries shape levels & {:keys [include-deleted?] :or {include-deleted? false}}]
+  (let [ref-shape (find-ref-shape file container libraries shape :include-deleted? include-deleted? :with-context? true)]
     (if (or (nil? (:shape-ref ref-shape)) (not (pos? levels)))
       (:id ref-shape)
-      (advance-shape-ref file container libraries ref-shape (dec levels) options))))
+      (advance-shape-ref file (:container (meta ref-shape)) libraries ref-shape (dec levels) :include-deleted? include-deleted?))))
 
 (defn find-ref-component
   "Locate the nearest component in the local file or libraries that is referenced by the
diff --git a/frontend/src/app/main/ui/dashboard/projects.cljs b/frontend/src/app/main/ui/dashboard/projects.cljs
index fc0a51f97c..cdd9304e97 100644
--- a/frontend/src/app/main/ui/dashboard/projects.cljs
+++ b/frontend/src/app/main/ui/dashboard/projects.cljs
@@ -312,11 +312,13 @@
           :on-menu-close on-menu-close
           :on-import on-import}]
 
-        [:span {:class (stl/css :info)} (str (tr "labels.num-of-files" (i18n/c file-count)))]
+        ;; We group these two spans under a div to avoid having extra space between them.
+        [:div
+         [:span {:class (stl/css :info)} (str (tr "labels.num-of-files" (i18n/c file-count)))]
 
-        (let [time (-> (:modified-at project)
-                       (dt/timeago {:locale locale}))]
-          [:span {:class (stl/css :recent-files-row-title-info)} (str ", " time)])
+         (let [time (-> (:modified-at project)
+                        (dt/timeago {:locale locale}))]
+           [:span {:class (stl/css :recent-files-row-title-info)} (str ", " time)])]
 
         [:div {:class (stl/css-case :project-actions true
                                     :pinned-project (:is-pinned project))}
diff --git a/frontend/src/app/main/ui/shapes/custom_stroke.cljs b/frontend/src/app/main/ui/shapes/custom_stroke.cljs
index 35d2bd7f0d..ed317cdbdc 100644
--- a/frontend/src/app/main/ui/shapes/custom_stroke.cljs
+++ b/frontend/src/app/main/ui/shapes/custom_stroke.cljs
@@ -91,7 +91,7 @@
 
         color     (cond
                     (some? gradient)
-                    (str/ffmt "url(#stroke-color-gradient-%s-%s)" render-id index)
+                    (str/ffmt "url(#stroke-color-gradient-%-%)" render-id index)
 
                     (some? image)
                     (str/ffmt "url(#stroke-fill-%-%)" render-id index)
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
index 8921cc25de..fef5e2beec 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
@@ -184,7 +184,7 @@
                      :class (stl/css-case
                              :icon true
                              :icon-tick true
-                             :hidden invalid-text?)}
+                             :invalid invalid-text?)}
                i/tick]
               [:div {:class (stl/css :icon :icon-cross)
                      :title (tr "labels.discard")
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss
index 3587d0fbe5..e6234ffe4a 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss
@@ -559,6 +559,13 @@
         }
       }
 
+      &.icon-tick.invalid:hover {
+        cursor: default;
+        svg {
+          stroke: var(--icon-foreground);
+        }
+      }
+
       &.icon-cross:hover,
       &.icon-trash:hover {
         svg {