diff --git a/frontend/src/uxbox/main/data/icons.cljs b/frontend/src/uxbox/main/data/icons.cljs
index f1d5fb62f6..eef0195d00 100644
--- a/frontend/src/uxbox/main/data/icons.cljs
+++ b/frontend/src/uxbox/main/data/icons.cljs
@@ -234,6 +234,7 @@
             (prepare [[content metadata]]
               {:collection id
                :content content
+               :id (uuid/random)
                ;; TODO Keep the name of the original icon
                :name (str "Icon " (gensym "i"))
                :metadata metadata})]
diff --git a/frontend/src/uxbox/main/ui/dashboard/icons.cljs b/frontend/src/uxbox/main/ui/dashboard/icons.cljs
index 6cc9bc771c..4305f91bde 100644
--- a/frontend/src/uxbox/main/ui/dashboard/icons.cljs
+++ b/frontend/src/uxbox/main/ui/dashboard/icons.cljs
@@ -285,7 +285,8 @@
                 (st/emit! (di/update-opts :edition selected))))]
       ;; MULTISELECT OPTIONS BAR
       [:div.multiselect-bar {}
-       (if editable?
+       (if (or (= type :own) (nil? coll))
+         ;; if editable
          [:div.multiselect-nav {}
           [:span.move-item.tooltip.tooltip-top
            {:alt (tr "ds.multiselect-bar.copy")