diff --git a/CHANGES.md b/CHANGES.md
index 01dfd5b7c..100296f4d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -28,6 +28,8 @@
 ### :boom: Breaking changes & Deprecations
 
 - New strokes default to inside border [Taiga #6847](https://tree.taiga.io/project/penpot/issue/6847)
+- Change default z ordering on layers in flex layout. The previous behavior was inconsistent with how HTML works and we changed it to be more consistent. Previous layers that overlapped could be hidden, the fastest way to fix this is changing the z-index property but a better way is to change the order of your layers.
+
 
 ### :heart: Community contributions (Thank you!)
 - New Hausa, Yoruba and Igbo translations and  update translation files (by All For Tech Empowerment Foundation) [Taiga #6950](https://tree.taiga.io/project/penpot/us/6950), [Taiga #6534](https://tree.taiga.io/project/penpot/us/6534)
diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj
index 6d5fc3d5f..97171825c 100644
--- a/backend/src/app/main.clj
+++ b/backend/src/app/main.clj
@@ -349,6 +349,8 @@
      :audit-log-archive  (ig/ref :app.loggers.audit.archive-task/handler)
      :audit-log-gc       (ig/ref :app.loggers.audit.gc-task/handler)
 
+     :object-update
+     (ig/ref :app.tasks.object-update/handler)
      :process-webhook-event
      (ig/ref ::webhooks/process-event-handler)
      :run-webhook
@@ -376,7 +378,10 @@
     ::sto/storage (ig/ref ::sto/storage)}
 
    :app.tasks.orphan-teams-gc/handler
-   {::db/pool     (ig/ref ::db/pool)}
+   {::db/pool (ig/ref ::db/pool)}
+
+   :app.tasks.object-update/handler
+   {::db/pool (ig/ref ::db/pool)}
 
    :app.tasks.file-gc/handler
    {::db/pool     (ig/ref ::db/pool)
diff --git a/backend/src/app/rpc/commands/files_thumbnails.clj b/backend/src/app/rpc/commands/files_thumbnails.clj
index d766acd3c..bd982ce17 100644
--- a/backend/src/app/rpc/commands/files_thumbnails.clj
+++ b/backend/src/app/rpc/commands/files_thumbnails.clj
@@ -271,7 +271,7 @@
     (when (and (some? th1)
                (not= (:media-id th1)
                      (:media-id th2)))
-      (sto/touch-object! storage (:media-id th1)))
+      (sto/touch-object! storage (:media-id th1) :async true))
 
     th2))
 
diff --git a/backend/src/app/rpc/commands/profile.clj b/backend/src/app/rpc/commands/profile.clj
index 89a50b6ad..fe33da10d 100644
--- a/backend/src/app/rpc/commands/profile.clj
+++ b/backend/src/app/rpc/commands/profile.clj
@@ -46,6 +46,10 @@
   (let [email (str/lower email)
         email (if (str/starts-with? email "mailto:")
                 (subs email 7)
+                email)
+        email (if (or (str/starts-with? email "<")
+                      (str/ends-with? email ">"))
+                (str/trim email "<>")
                 email)]
     email))
 
diff --git a/backend/src/app/rpc/commands/viewer.clj b/backend/src/app/rpc/commands/viewer.clj
index c2887ef96..70d5193c1 100644
--- a/backend/src/app/rpc/commands/viewer.clj
+++ b/backend/src/app/rpc/commands/viewer.clj
@@ -38,6 +38,11 @@
         team    (-> (db/get conn :team {:id (:team-id project)})
                     (teams/decode-row))
 
+        members (into #{} (->> (teams/get-team-members conn (:team-id project))
+                               (map :id)))
+
+        perms   (assoc perms :in-team (contains? members profile-id))
+
         _       (-> (cfeat/get-team-enabled-features cf/flags team)
                     (cfeat/check-client-features! (:features params))
                     (cfeat/check-file-features! (:features file)))
diff --git a/backend/src/app/storage.clj b/backend/src/app/storage.clj
index f6924aedb..070c53f3f 100644
--- a/backend/src/app/storage.clj
+++ b/backend/src/app/storage.clj
@@ -16,6 +16,7 @@
    [app.storage.impl :as impl]
    [app.storage.s3 :as ss3]
    [app.util.time :as dt]
+   [app.worker :as wrk]
    [clojure.spec.alpha :as s]
    [datoteka.fs :as fs]
    [integrant.core :as ig]
@@ -170,15 +171,28 @@
           (impl/put-object object content))
       object)))
 
+(def ^:private default-touch-delay
+  "A default delay for the asynchronous touch operation"
+  (dt/duration "5m"))
+
 (defn touch-object!
   "Mark object as touched."
-  [{:keys [::db/pool-or-conn] :as storage} object-or-id]
+  [{:keys [::db/pool-or-conn] :as storage} object-or-id & {:keys [async]}]
   (us/assert! ::storage storage)
-  (let [id (if (impl/object? object-or-id) (:id object-or-id) object-or-id)
-        rs (db/update! pool-or-conn :storage-object
-                       {:touched-at (dt/now)}
-                       {:id id})]
-    (pos? (db/get-update-count rs))))
+  (let [id (if (impl/object? object-or-id) (:id object-or-id) object-or-id)]
+    (if async
+      (wrk/submit! ::wrk/conn pool-or-conn
+                   ::wrk/task :object-update
+                   ::wrk/delay default-touch-delay
+                   :object :storage-object
+                   :id id
+                   :key :touched-at
+                   :val (dt/now))
+      (-> (db/update! pool-or-conn :storage-object
+                      {:touched-at (dt/now)}
+                      {:id id})
+          (db/get-update-count)
+          (pos?)))))
 
 (defn get-object-data
   "Return an input stream instance of the object content."
diff --git a/backend/src/app/tasks/object_update.clj b/backend/src/app/tasks/object_update.clj
new file mode 100644
index 000000000..cfe5fda44
--- /dev/null
+++ b/backend/src/app/tasks/object_update.clj
@@ -0,0 +1,32 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.tasks.object-update
+  "A task used for perform simple object properties update
+  in an asynchronous flow."
+  (:require
+   [app.common.data :as d]
+   [app.common.logging :as l]
+   [app.db :as db]
+   [clojure.spec.alpha :as s]
+   [integrant.core :as ig]))
+
+(defn- update-object
+  [{:keys [::db/conn] :as cfg} {:keys [id object key val] :as props}]
+  (l/trc :hint "update object prop"
+         :id (str id)
+         :object (d/name object)
+         :key (d/name key)
+         :val val)
+  (db/update! conn object {key val} {:id id} {::db/return-keys false}))
+
+(defmethod ig/pre-init-spec ::handler [_]
+  (s/keys :req [::db/pool]))
+
+(defmethod ig/init-key ::handler
+  [_ cfg]
+  (fn [{:keys [props] :as params}]
+    (db/tx-run! cfg update-object props)))
diff --git a/backend/src/app/worker.clj b/backend/src/app/worker.clj
index a648080f3..1da2e8de0 100644
--- a/backend/src/app/worker.clj
+++ b/backend/src/app/worker.clj
@@ -119,11 +119,13 @@
                         :next.jdbc/update-count))]
     (l/trc :hint "submit task"
            :name task
+           :task-id (str id)
            :queue queue
            :label label
            :dedupe (boolean dedupe)
-           :deleted (or deleted 0)
-           :in (dt/format-duration duration))
+           :delay (dt/format-duration duration)
+           :replace (or deleted 0))
+
 
     (db/exec-one! conn [sql:insert-new-task id task props queue
                         label priority max-retries interval])
diff --git a/backend/src/app/worker/cron.clj b/backend/src/app/worker/cron.clj
index 72a66a22b..cb5a69d88 100644
--- a/backend/src/app/worker/cron.clj
+++ b/backend/src/app/worker/cron.clj
@@ -92,7 +92,7 @@
   (let [ts (ms-until-valid cron)
         ft (px/schedule! ts (partial execute-cron-task cfg task))]
 
-    (l/dbg :hint "schedule task" :id id
+    (l/dbg :hint "schedule" :id id
            :ts (dt/format-duration ts)
            :at (dt/format-instant (dt/in-future ts)))
 
diff --git a/backend/src/app/worker/runner.clj b/backend/src/app/worker/runner.clj
index 11ca3d972..be3663365 100644
--- a/backend/src/app/worker/runner.clj
+++ b/backend/src/app/worker/runner.clj
@@ -139,7 +139,7 @@
 
                 :else
                 (try
-                  (l/trc :hint "start task"
+                  (l/dbg :hint "start"
                          :name (:name task)
                          :task-id (str task-id)
                          :queue queue
@@ -149,7 +149,7 @@
                         result  (handle-task task)
                         elapsed (dt/format-duration (tpoint))]
 
-                    (l/trc :hint "end task"
+                    (l/dbg :hint "end"
                            :name (:name task)
                            :task-id (str task-id)
                            :queue queue
@@ -228,9 +228,9 @@
             (recur))))
 
       (catch InterruptedException _
-        (l/debug :hint "interrupted"
-                 :id id
-                 :queue queue))
+        (l/dbg :hint "interrupted"
+               :id id
+               :queue queue))
       (catch Throwable cause
         (l/err :hint "unexpected exception"
                :id id
diff --git a/backend/test/backend_tests/rpc_file_thumbnails_test.clj b/backend/test/backend_tests/rpc_file_thumbnails_test.clj
index f0cfc9637..11ed4f352 100644
--- a/backend/test/backend_tests/rpc_file_thumbnails_test.clj
+++ b/backend/test/backend_tests/rpc_file_thumbnails_test.clj
@@ -277,8 +277,6 @@
       (t/is (thrown? org.postgresql.util.PSQLException
                      (th/db-delete! :storage-object {:id (:media-id row1)}))))))
 
-
-
 (t/deftest get-file-object-thumbnail
   (let [storage (::sto/storage th/*system*)
         profile (th/create-profile* 1)
@@ -317,3 +315,44 @@
 
       (let [result (:result out)]
         (t/is (contains? result "test-key-2"))))))
+
+(t/deftest create-file-object-thumbnail
+  (th/db-delete! :task {:name "object-update"})
+  (let [storage (::sto/storage th/*system*)
+        profile (th/create-profile* 1)
+        file    (th/create-file* 1 {:profile-id (:id profile)
+                                    :project-id (:default-project-id profile)
+                                    :is-shared false})
+        data    {::th/type :create-file-object-thumbnail
+                 ::rpc/profile-id (:id profile)
+                 :file-id (:id file)
+                 :object-id "test-key-2"
+                 :media {:filename "sample.jpg"
+                         :mtype "image/jpeg"}}]
+
+    (let [data (update data :media
+                       (fn [media]
+                         (-> media
+                             (assoc :path (th/tempfile "backend_tests/test_files/sample2.jpg"))
+                             (assoc :size 7923))))
+          out  (th/command! data)]
+      (t/is (nil? (:error out)))
+      (t/is (map? (:result out))))
+
+    (let [data (update data :media
+                       (fn [media]
+                         (-> media
+                             (assoc :path (th/tempfile "backend_tests/test_files/sample.jpg"))
+                             (assoc :size 312043))))
+          out  (th/command! data)]
+      (t/is (nil? (:error out)))
+      (t/is (map? (:result out))))
+
+    (let [[row1 :as rows]
+          (->> (th/db-query :task {:name "object-update"})
+               (map #(update % :props db/decode-transit-pgobject)))]
+
+      ;; (app.common.pprint/pprint rows)
+      (t/is (= 1 (count rows)))
+      (t/is (> (inst-ms (dt/diff (:created-at row1) (:scheduled-at row1)))
+               (inst-ms (dt/duration "4m")))))))
diff --git a/backend/test/backend_tests/rpc_profile_test.clj b/backend/test/backend_tests/rpc_profile_test.clj
index cbaff6038..00d2f2ac0 100644
--- a/backend/test/backend_tests/rpc_profile_test.clj
+++ b/backend/test/backend_tests/rpc_profile_test.clj
@@ -27,6 +27,14 @@
 (t/use-fixtures :once th/state-init)
 (t/use-fixtures :each th/database-reset)
 
+
+(t/deftest clean-email
+  (t/is "foo@example.com" (profile/clean-email "mailto:foo@example.com"))
+  (t/is "foo@example.com" (profile/clean-email "mailto:<foo@example.com>"))
+  (t/is "foo@example.com" (profile/clean-email "<foo@example.com>"))
+  (t/is "foo@example.com" (profile/clean-email "foo@example.com>"))
+  (t/is "foo@example.com" (profile/clean-email "<foo@example.com")))
+
 ;; Test with wrong credentials
 (t/deftest profile-login-failed-1
   (let [profile (th/create-profile* 1)
diff --git a/frontend/resources/images/icons/penpot-logo.svg b/frontend/resources/images/icons/penpot-logo.svg
index 4493b6d91..6439292bd 100644
--- a/frontend/resources/images/icons/penpot-logo.svg
+++ b/frontend/resources/images/icons/penpot-logo.svg
@@ -1 +1,3 @@
-<svg height="500" viewBox="0 0 1512.0058 499.99999" width="1512.0059" xmlns="http://www.w3.org/2000/svg"><path d="M92.418 16.013l-49.21 69.31v39.179L.386 144.87 0 144.69v255.605l166.955 78.877 10.203 4.815 10.202-4.815 166.955-78.877V144.689l-.314.149-42.835-20.376V85.324l-1.498-2.108-47.714-67.203-49.212 69.31v.07l-35.81-50.433-35.53 50.044-1.27-1.788zm8.707 40.26l19.033 26.807h-55.48l18.813-26.492zm169.533 0l19.036 26.807h-55.48l18.808-26.492zm-85.02 18.95l19.034 26.803h-55.474l18.807-26.491zM59.419 96.589H85.73v88.601l-26.313-12.432zm39.822 0h26.181v107.35L99.24 191.57zm129.716 0h26.31v94.89l-26.31 12.43zm39.817 0h26.18v76.14l-26.18 12.367zm-124.839 18.946h26.313v109.579l-26.313-12.432zm39.822 0h26.18v97.36l-26.18 12.37zm1250.79 9.673l-.13 49.326-26.45-.18v20.098h26.528v105.964c0 7.718.601 14.876 1.823 21.473l.012.057.013.06c1.498 6.739 4.03 12.614 7.641 17.517 3.643 4.943 8.518 8.743 14.402 11.31 6.002 2.854 13.305 4.188 21.874 4.188 3.906 0 8.377-.638 13.502-1.858a122.683 122.683 0 0015.265-4.723l2.98-1.137-6.428-19.274-3.37 1.556c-6.548 2.838-12.965 4.96-19.827 4.998-5.528 0-9.873-.794-13.056-2.164-3.037-1.644-5.384-3.704-7.166-6.262-1.86-2.908-3.227-6.253-4.091-10.096-.666-4.251-1.014-8.99-1.014-14.228V194.452h49.163V174.37h-49.163v-49.163zM311.162 144.655l23.167 9.471-23.167 10.944zm-267.954.034v20.413l-23.162-10.943zm1085.59 25.431l.003.003v.002c-11.151 0-21.974 2.746-32.31 8.16l-.014.01-.015.007c-8.35 4.48-15.318 9.158-22.644 14.686l-.132-18.617h-21.77v253.156h22.204v-90.49c7.276 4.963 14.464 9.266 21.502 12.394l.035.015.037.017c8.831 3.68 17.53 5.558 26.036 5.558 10.35 0 20.273-2.106 29.649-6.301l.017-.008.02-.01c9.613-4.436 18.024-10.749 25.151-18.86l-.007.003c7.38-8.365 13.133-18.423 17.264-30.088 4.156-11.735 6.202-24.97 6.202-39.66 0-26.873-5.764-48.61-17.599-64.892l-.005-.008c-11.928-16.645-30.22-25.077-53.623-25.077zm-537.717.003v.002c-11.152 0-21.974 2.746-32.31 8.16l-.014.01-.015.007c-8.35 4.48-15.318 9.16-22.645 14.689l-.13-18.62h-21.77V427.53H536.4v-90.491c7.276 4.963 14.463 9.264 21.502 12.392l.035.017.037.018c8.831 3.68 17.53 5.558 26.036 5.558 10.35 0 20.273-2.107 29.649-6.301l.017-.01.02-.008c9.612-4.437 18.024-10.75 25.151-18.86l-.007.003c7.38-8.365 13.133-18.423 17.264-30.088 4.156-11.735 6.202-24.97 6.202-39.661 0-26.873-5.764-48.61-17.599-64.892l-.005-.007c-11.928-16.645-30.218-25.077-53.621-25.077zm361.519 0v.002c-12.33 0-23.506 3.12-33.236 9.348-7.945 4.891-15.644 11.122-23.19 18.189l.156-23.291h-21.326v176.407h22.208V222.78c9.853-9.975 18.726-19.422 26.387-24.238l.027-.02.028-.017c7.73-5.08 16.216-7.59 25.763-7.59 13.216 0 21.738 3.903 26.954 11.623l.03.042.032.044c5.472 7.577 8.565 20.24 8.565 38.022v110.13h22.206V238.523c0-22.576-4.137-39.704-13.078-51.2-8.959-11.517-23.178-17.2-41.526-17.2zm-182.585.002c-9.918 0-19.62 2.244-28.976 6.67-.005.003-.009.006-.015.008-9.149 4.207-17.416 10.392-24.752 18.461l-.002.003c-7.152 7.891-12.895 17.58-17.262 28.983l-.013.03-.01.03c-4.16 11.5-6.212 24.387-6.212 38.618 0 14.23 2.052 27.12 6.212 38.62l.012.04.018.04c4.374 11.178 10.243 20.86 17.611 28.965l.02.018.015.02c7.376 7.868 16.035 13.931 25.881 18.116l.013.005.015.005c10.073 4.177 20.787 6.264 32.042 6.264 12.795 0 23.485-1.786 32.08-5.57l.017-.01c8.357-3.583 16.02-7.414 22.988-11.499l2.747-1.607-9.665-18.253-3.106 2.301c-6.11 4.526-12.137 7.34-19.392 10.064-6.888 2.44-15.384 3.69-24.255 3.69-9.242 0-17.45-.877-24.747-4.185-7.372-3.58-13.694-8.354-19.05-14.367-5.13-6.257-9.176-13.645-12.12-22.248-.001-.003-.001-.006-.003-.008-2.61-7.84-3.984-16.33-4.463-25.307h122.424c0-3.46.332-6.785.344-9.69v-6.365c0-25.505-5.917-45.711-18.114-60.149-12.172-14.407-29.258-21.69-50.282-21.69zm538.136 0c-10.576 0-20.72 2.103-30.326 6.29-9.609 4.188-18.136 10.248-25.5 18.103l-.017.02-.023.02c-7.163 7.904-12.907 17.72-17.272 29.36l-.007.017-.008.02c-4.162 11.507-6.21 24.512-6.21 38.972 0 14.461 2.048 27.468 6.21 38.975l.015.04.017.04c4.37 11.166 10.113 20.73 17.253 28.609l.02.017.02.022c7.363 7.855 15.888 13.913 25.497 18.102 9.606 4.187 19.754 6.289 30.33 6.289 10.577 0 20.723-2.102 30.328-6.29 9.836-4.184 18.377-10.247 25.518-18.12 7.392-7.89 13.153-17.481 17.292-28.674 4.407-11.517 6.579-24.54 6.579-39.01 0-14.464-2.17-27.48-6.574-38.995-4.133-11.652-9.89-21.487-17.3-29.396-7.14-7.872-15.68-13.938-25.515-18.122-9.604-4.187-19.75-6.289-30.325-6.289zm-1287.748 6.77l146.552 69.231v210.475l-146.552-69.23zm313.507 0V387.37l-146.55 69.231V246.126zm436.454 13.313h.003c14.542 0 25.502 4.934 33.87 15.063l.007.015.01.015c7.776 9.208 12.013 23.687 12.474 43.342H715.896c1.054-8.32 2.805-15.96 5.546-22.623 3.402-7.696 7.557-14.188 12.45-19.53 5.14-5.358 10.76-9.311 16.917-11.95l.044-.022.045-.02c6.177-2.867 12.622-4.29 19.467-4.29zm-181.757.352v.003c9.235 0 16.894 1.793 23.152 5.246l.04.02.039.022c6.338 3.278 11.401 7.906 15.352 14.052l.018.025.014.022c3.972 5.957 6.894 13.206 8.71 21.83l.007.042.013.04c2.056 8.68 3.094 18.089 3.094 28.237 0 11.26-1.494 21.522-4.444 30.825l-.01.025-.008.025c-2.732 9.108-6.57 16.867-11.488 23.35-4.911 6.474-10.757 11.427-17.624 14.971-6.843 3.532-14.175 5.288-22.171 5.288-6.048 0-13.214-1.53-21.43-4.726-7.694-2.992-16.247-10.344-25.469-17.66V218.23c9.78-8.334 18.904-16.242 27.227-20.623l.013-.005.014-.01c8.82-4.75 17.109-7.032 24.95-7.032zm537.717 0l.003.003c9.235 0 16.894 1.793 23.152 5.246l.04.02.04.022c6.337 3.278 11.4 7.906 15.351 14.052l.018.025.015.022c3.97 5.957 6.893 13.206 8.709 21.83l.007.042.013.04c2.056 8.68 3.094 18.089 3.094 28.237 0 11.26-1.494 21.522-4.444 30.825l-.013.025-.007.025c-2.733 9.108-6.57 16.867-11.489 23.35-4.91 6.474-10.756 11.427-17.623 14.971-6.844 3.532-14.176 5.288-22.172 5.288-6.048 0-13.213-1.53-21.43-4.726-7.694-2.992-16.247-10.344-25.468-17.66V218.23c9.78-8.334 18.903-16.242 27.226-20.623l.013-.008.015-.007c8.82-4.75 17.108-7.032 24.95-7.032zm181.83 0v.003c7.995 0 15.327 1.758 22.17 5.29l.06.028.055.027c7.065 3.312 12.979 8.123 17.864 14.562l.037.052.039.047c5.138 6.255 9.195 13.775 12.15 22.64 2.935 8.807 4.426 18.7 4.426 29.718 0 10.776-1.488 20.55-4.427 29.365-2.954 8.864-7.011 16.382-12.15 22.637l-.022.03-.02.03c-4.89 6.221-10.838 11.067-17.953 14.628-6.85 3.312-14.211 4.966-22.231 4.966-8.01 0-15.365-1.652-22.209-4.956-6.88-3.558-12.855-8.422-17.997-14.676-4.909-6.256-8.858-13.787-11.815-22.66-2.939-8.815-4.43-18.588-4.43-29.364 0-11.017 1.494-20.91 4.43-29.718 2.96-8.883 6.914-16.422 11.83-22.682l.005-.005.005-.01c5.142-6.48 11.092-11.315 17.93-14.624l.04-.02.037-.017c6.843-3.533 14.177-5.291 22.173-5.291z"/></svg>
\ No newline at end of file
+<svg title="Penpot logo" alt="Penpot logo" height="500" viewBox="0 0 1512.0058 499.99999" width="1512.0059" xmlns="http://www.w3.org/2000/svg">
+    <path d="M92.418 16.013l-49.21 69.31v39.179L.386 144.87 0 144.69v255.605l166.955 78.877 10.203 4.815 10.202-4.815 166.955-78.877V144.689l-.314.149-42.835-20.376V85.324l-1.498-2.108-47.714-67.203-49.212 69.31v.07l-35.81-50.433-35.53 50.044-1.27-1.788zm8.707 40.26l19.033 26.807h-55.48l18.813-26.492zm169.533 0l19.036 26.807h-55.48l18.808-26.492zm-85.02 18.95l19.034 26.803h-55.474l18.807-26.491zM59.419 96.589H85.73v88.601l-26.313-12.432zm39.822 0h26.181v107.35L99.24 191.57zm129.716 0h26.31v94.89l-26.31 12.43zm39.817 0h26.18v76.14l-26.18 12.367zm-124.839 18.946h26.313v109.579l-26.313-12.432zm39.822 0h26.18v97.36l-26.18 12.37zm1250.79 9.673l-.13 49.326-26.45-.18v20.098h26.528v105.964c0 7.718.601 14.876 1.823 21.473l.012.057.013.06c1.498 6.739 4.03 12.614 7.641 17.517 3.643 4.943 8.518 8.743 14.402 11.31 6.002 2.854 13.305 4.188 21.874 4.188 3.906 0 8.377-.638 13.502-1.858a122.683 122.683 0 0015.265-4.723l2.98-1.137-6.428-19.274-3.37 1.556c-6.548 2.838-12.965 4.96-19.827 4.998-5.528 0-9.873-.794-13.056-2.164-3.037-1.644-5.384-3.704-7.166-6.262-1.86-2.908-3.227-6.253-4.091-10.096-.666-4.251-1.014-8.99-1.014-14.228V194.452h49.163V174.37h-49.163v-49.163zM311.162 144.655l23.167 9.471-23.167 10.944zm-267.954.034v20.413l-23.162-10.943zm1085.59 25.431l.003.003v.002c-11.151 0-21.974 2.746-32.31 8.16l-.014.01-.015.007c-8.35 4.48-15.318 9.158-22.644 14.686l-.132-18.617h-21.77v253.156h22.204v-90.49c7.276 4.963 14.464 9.266 21.502 12.394l.035.015.037.017c8.831 3.68 17.53 5.558 26.036 5.558 10.35 0 20.273-2.106 29.649-6.301l.017-.008.02-.01c9.613-4.436 18.024-10.749 25.151-18.86l-.007.003c7.38-8.365 13.133-18.423 17.264-30.088 4.156-11.735 6.202-24.97 6.202-39.66 0-26.873-5.764-48.61-17.599-64.892l-.005-.008c-11.928-16.645-30.22-25.077-53.623-25.077zm-537.717.003v.002c-11.152 0-21.974 2.746-32.31 8.16l-.014.01-.015.007c-8.35 4.48-15.318 9.16-22.645 14.689l-.13-18.62h-21.77V427.53H536.4v-90.491c7.276 4.963 14.463 9.264 21.502 12.392l.035.017.037.018c8.831 3.68 17.53 5.558 26.036 5.558 10.35 0 20.273-2.107 29.649-6.301l.017-.01.02-.008c9.612-4.437 18.024-10.75 25.151-18.86l-.007.003c7.38-8.365 13.133-18.423 17.264-30.088 4.156-11.735 6.202-24.97 6.202-39.661 0-26.873-5.764-48.61-17.599-64.892l-.005-.007c-11.928-16.645-30.218-25.077-53.621-25.077zm361.519 0v.002c-12.33 0-23.506 3.12-33.236 9.348-7.945 4.891-15.644 11.122-23.19 18.189l.156-23.291h-21.326v176.407h22.208V222.78c9.853-9.975 18.726-19.422 26.387-24.238l.027-.02.028-.017c7.73-5.08 16.216-7.59 25.763-7.59 13.216 0 21.738 3.903 26.954 11.623l.03.042.032.044c5.472 7.577 8.565 20.24 8.565 38.022v110.13h22.206V238.523c0-22.576-4.137-39.704-13.078-51.2-8.959-11.517-23.178-17.2-41.526-17.2zm-182.585.002c-9.918 0-19.62 2.244-28.976 6.67-.005.003-.009.006-.015.008-9.149 4.207-17.416 10.392-24.752 18.461l-.002.003c-7.152 7.891-12.895 17.58-17.262 28.983l-.013.03-.01.03c-4.16 11.5-6.212 24.387-6.212 38.618 0 14.23 2.052 27.12 6.212 38.62l.012.04.018.04c4.374 11.178 10.243 20.86 17.611 28.965l.02.018.015.02c7.376 7.868 16.035 13.931 25.881 18.116l.013.005.015.005c10.073 4.177 20.787 6.264 32.042 6.264 12.795 0 23.485-1.786 32.08-5.57l.017-.01c8.357-3.583 16.02-7.414 22.988-11.499l2.747-1.607-9.665-18.253-3.106 2.301c-6.11 4.526-12.137 7.34-19.392 10.064-6.888 2.44-15.384 3.69-24.255 3.69-9.242 0-17.45-.877-24.747-4.185-7.372-3.58-13.694-8.354-19.05-14.367-5.13-6.257-9.176-13.645-12.12-22.248-.001-.003-.001-.006-.003-.008-2.61-7.84-3.984-16.33-4.463-25.307h122.424c0-3.46.332-6.785.344-9.69v-6.365c0-25.505-5.917-45.711-18.114-60.149-12.172-14.407-29.258-21.69-50.282-21.69zm538.136 0c-10.576 0-20.72 2.103-30.326 6.29-9.609 4.188-18.136 10.248-25.5 18.103l-.017.02-.023.02c-7.163 7.904-12.907 17.72-17.272 29.36l-.007.017-.008.02c-4.162 11.507-6.21 24.512-6.21 38.972 0 14.461 2.048 27.468 6.21 38.975l.015.04.017.04c4.37 11.166 10.113 20.73 17.253 28.609l.02.017.02.022c7.363 7.855 15.888 13.913 25.497 18.102 9.606 4.187 19.754 6.289 30.33 6.289 10.577 0 20.723-2.102 30.328-6.29 9.836-4.184 18.377-10.247 25.518-18.12 7.392-7.89 13.153-17.481 17.292-28.674 4.407-11.517 6.579-24.54 6.579-39.01 0-14.464-2.17-27.48-6.574-38.995-4.133-11.652-9.89-21.487-17.3-29.396-7.14-7.872-15.68-13.938-25.515-18.122-9.604-4.187-19.75-6.289-30.325-6.289zm-1287.748 6.77l146.552 69.231v210.475l-146.552-69.23zm313.507 0V387.37l-146.55 69.231V246.126zm436.454 13.313h.003c14.542 0 25.502 4.934 33.87 15.063l.007.015.01.015c7.776 9.208 12.013 23.687 12.474 43.342H715.896c1.054-8.32 2.805-15.96 5.546-22.623 3.402-7.696 7.557-14.188 12.45-19.53 5.14-5.358 10.76-9.311 16.917-11.95l.044-.022.045-.02c6.177-2.867 12.622-4.29 19.467-4.29zm-181.757.352v.003c9.235 0 16.894 1.793 23.152 5.246l.04.02.039.022c6.338 3.278 11.401 7.906 15.352 14.052l.018.025.014.022c3.972 5.957 6.894 13.206 8.71 21.83l.007.042.013.04c2.056 8.68 3.094 18.089 3.094 28.237 0 11.26-1.494 21.522-4.444 30.825l-.01.025-.008.025c-2.732 9.108-6.57 16.867-11.488 23.35-4.911 6.474-10.757 11.427-17.624 14.971-6.843 3.532-14.175 5.288-22.171 5.288-6.048 0-13.214-1.53-21.43-4.726-7.694-2.992-16.247-10.344-25.469-17.66V218.23c9.78-8.334 18.904-16.242 27.227-20.623l.013-.005.014-.01c8.82-4.75 17.109-7.032 24.95-7.032zm537.717 0l.003.003c9.235 0 16.894 1.793 23.152 5.246l.04.02.04.022c6.337 3.278 11.4 7.906 15.351 14.052l.018.025.015.022c3.97 5.957 6.893 13.206 8.709 21.83l.007.042.013.04c2.056 8.68 3.094 18.089 3.094 28.237 0 11.26-1.494 21.522-4.444 30.825l-.013.025-.007.025c-2.733 9.108-6.57 16.867-11.489 23.35-4.91 6.474-10.756 11.427-17.623 14.971-6.844 3.532-14.176 5.288-22.172 5.288-6.048 0-13.213-1.53-21.43-4.726-7.694-2.992-16.247-10.344-25.468-17.66V218.23c9.78-8.334 18.903-16.242 27.226-20.623l.013-.008.015-.007c8.82-4.75 17.108-7.032 24.95-7.032zm181.83 0v.003c7.995 0 15.327 1.758 22.17 5.29l.06.028.055.027c7.065 3.312 12.979 8.123 17.864 14.562l.037.052.039.047c5.138 6.255 9.195 13.775 12.15 22.64 2.935 8.807 4.426 18.7 4.426 29.718 0 10.776-1.488 20.55-4.427 29.365-2.954 8.864-7.011 16.382-12.15 22.637l-.022.03-.02.03c-4.89 6.221-10.838 11.067-17.953 14.628-6.85 3.312-14.211 4.966-22.231 4.966-8.01 0-15.365-1.652-22.209-4.956-6.88-3.558-12.855-8.422-17.997-14.676-4.909-6.256-8.858-13.787-11.815-22.66-2.939-8.815-4.43-18.588-4.43-29.364 0-11.017 1.494-20.91 4.43-29.718 2.96-8.883 6.914-16.422 11.83-22.682l.005-.005.005-.01c5.142-6.48 11.092-11.315 17.93-14.624l.04-.02.037-.017c6.843-3.533 14.177-5.291 22.173-5.291z"/>
+</svg>
\ No newline at end of file
diff --git a/frontend/resources/templates/index.mustache b/frontend/resources/templates/index.mustache
index 9090976a3..239893399 100644
--- a/frontend/resources/templates/index.mustache
+++ b/frontend/resources/templates/index.mustache
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
     <meta charset="utf-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge" />
diff --git a/frontend/src/app/main/ui/auth.cljs b/frontend/src/app/main/ui/auth.cljs
index 218fc21ce..e5f28bd70 100644
--- a/frontend/src/app/main/ui/auth.cljs
+++ b/frontend/src/app/main/ui/auth.cljs
@@ -48,7 +48,8 @@
       (dom/set-html-title (tr "title.default")))
 
     [:main {:class (stl/css :auth-section)}
-     [:a {:href "#/" :class (stl/css :logo-btn)} i/logo]
+     [:h1 {:class (stl/css :logo-container)}
+      [:a {:href "#/" :title "Penpot" :class (stl/css :logo-btn)} i/logo]]
      [:div {:class (stl/css :login-illustration)}
       i/login-illustration]
 
diff --git a/frontend/src/app/main/ui/auth.scss b/frontend/src/app/main/ui/auth.scss
index 81e418e9c..f2d41c34d 100644
--- a/frontend/src/app/main/ui/auth.scss
+++ b/frontend/src/app/main/ui/auth.scss
@@ -24,6 +24,16 @@
   }
 }
 
+.logo-container {
+  position: absolute;
+  top: $s-20;
+  left: $s-20;
+  display: flex;
+  justify-content: flex-start;
+  width: $s-120;
+  margin-block-end: $s-52;
+}
+
 .login-illustration {
   display: flex;
   justify-content: center;
@@ -55,14 +65,6 @@
 }
 
 .logo-btn {
-  position: absolute;
-  top: $s-20;
-  left: $s-20;
-  display: flex;
-  justify-content: flex-start;
-  width: $s-120;
-  margin-block-end: $s-52;
-
   svg {
     width: $s-120;
     height: $s-40;
diff --git a/frontend/src/app/main/ui/components/tab_container.cljs b/frontend/src/app/main/ui/components/tab_container.cljs
index bd3ff6727..20c79a417 100644
--- a/frontend/src/app/main/ui/components/tab_container.cljs
+++ b/frontend/src/app/main/ui/components/tab_container.cljs
@@ -54,9 +54,10 @@
          (let [props (.-props tab)
                id    (.-id props)
                title (.-title props)
-               sid   (d/name id)]
+               sid   (d/name id)
+               tooltip (if (string? title) title nil)]
            [:div {:key (str/concat "tab-" sid)
-                  :title title
+                  :title tooltip
                   :data-id sid
                   :on-click on-click
                   :class  (stl/css-case
diff --git a/frontend/src/app/main/ui/viewer/header.cljs b/frontend/src/app/main/ui/viewer/header.cljs
index 6e3051cf7..77460f0b6 100644
--- a/frontend/src/app/main/ui/viewer/header.cljs
+++ b/frontend/src/app/main/ui/viewer/header.cljs
@@ -180,7 +180,7 @@
        :on-zoom-fit  handle-zoom-fit
        :on-fullscreen toggle-fullscreen}]
 
-     (when (:can-edit permissions)
+     (when (:in-team permissions)
        [:span {:on-click go-to-workspace
                :class (stl/css :edit-btn)}
         i/curve])
@@ -191,7 +191,9 @@
              :on-click toggle-fullscreen}
       i/expand]
 
-     (when (:is-admin permissions)
+     (when (and
+            (:in-team permissions)
+            (:is-admin permissions))
        [:button {:on-click open-share-dialog
                  :class (stl/css :share-btn)}
         (tr "labels.share")])
@@ -301,8 +303,8 @@
       ;; If the user doesn't have permission we disable the link
       [:a {:class (stl/css :home-link)
            :on-click go-to-dashboard
-           :style {:cursor (when-not (:can-edit permissions) "auto")
-                   :pointer-events (when-not (:can-edit permissions) "none")}}
+           :style {:cursor (when-not (:in-team permissions) "auto")
+                   :pointer-events (when-not (:in-team permissions) "none")}}
        [:span {:class (stl/css :logo-icon)}
         i/logo-icon]]
 
@@ -321,7 +323,7 @@
                 :title (tr "viewer.header.interactions-section" (sc/get-tooltip :open-interactions))}
        i/play]
 
-      (when (or (:can-edit permissions)
+      (when (or (:in-team permissions)
                 (= (:who-comment permissions) "all"))
         [:button {:on-click navigate
                   :data-value "comments"