diff --git a/.github/workflows/saas-update-backend.yml b/.github/workflows/saas-update-backend.yml
index 14bd269ef9..d27291cf67 100644
--- a/.github/workflows/saas-update-backend.yml
+++ b/.github/workflows/saas-update-backend.yml
@@ -13,7 +13,7 @@ jobs:
   deploy-php:
     runs-on: ubuntu-20.04
     steps:
-      - run: 'echo "DOCKERTAGVERSION=2021.Q1.434" >> $GITHUB_ENV'
+      - run: 'echo "DOCKERTAGVERSION=2021.Q2.481" >> $GITHUB_ENV'
       - name: Set env to develop
         if: endsWith(github.ref, '/develop')
         run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=${{ env.DOCKERTAGVERSION }}-develop" >> $GITHUB_ENV'
@@ -34,7 +34,7 @@ jobs:
   deploy-node:
     runs-on: ubuntu-20.04
     steps:
-      - run: 'echo "DOCKERTAGVERSION=2021.Q1.434" >> $GITHUB_ENV'
+      - run: 'echo "DOCKERTAGVERSION=2021.Q2.481" >> $GITHUB_ENV'
       - name: Set env to develop
         if: endsWith(github.ref, '/develop')
         run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=${{ env.DOCKERTAGVERSION }}-develop" >> $GITHUB_ENV'
diff --git a/.github/workflows/saas-update-front.yml b/.github/workflows/saas-update-front.yml
index ebf900d681..53511211e9 100644
--- a/.github/workflows/saas-update-front.yml
+++ b/.github/workflows/saas-update-front.yml
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-20.04
     if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop'
     steps:
-      - run: 'echo "DOCKERTAGVERSION=2021.Q1.434" >> $GITHUB_ENV'
+      - run: 'echo "DOCKERTAGVERSION=2021.Q2.481" >> $GITHUB_ENV'
       - name: Set env to develop
         if: endsWith(github.ref, '/develop')
         run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=${{ env.DOCKERTAGVERSION }}-develop" >> $GITHUB_ENV'
diff --git a/changelog.md b/changelog.md
index dd612a6be5..47c6c88953 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,64 @@
+# Twake 2021.Q2.481
+
+### Messages
+
+- Fix a bug making too many desktop notifications at the same time.
+- Fix a bug when sending a message using the send button, message now disapear as expected.
+- Fix the "hidden notification" button that can be stuck on top or bottom of the channel list.
+
+### Console
+
+- Now if you change your language on Console it will affect Twake accordingly.
+- Better onboarding of new users: automatic channel selection, add collaborators button, invite collaborators from Twake using console management app and more.
+- Polishing console migration script, previous Twake users will soon uses the Console.
+
+# Twake 2021.Q1.434
+
+### Messages
+
+- Default channels now available 🌟 You can set a channel as default, new users invited in workspace will be automatically added to this channel.
+
+### General
+
+- Console onboarding update (soon open source!)
+- Multiple bug fixes
+
+# Twake 2021.Q1.401
+
+### General
+
+- First elements of Twake new design, welcome to blue #3840f7
+- Cmd+K / Ctrl+K now working on all channels types (direct and workspace channels)
+- Multiple bug fixes
+
+# Twake 2021.Q1.385
+
+### General
+
+- Twake is on OVH! OVH is a french infrastructure provider, it is a big step for us. Good bye Amazon 👋
+- Started migration to NodeJS from PHP (30%) for faster and lighter server, compatibility with MongoDB and more!
+- Move to socket.io from socketcluster for more robust websockets.
+- We are now compatible with the Twake Console. Twake account and group management will be soon fully replaced by the Console.
+- Big performances upgrades, we fixed a lot of memory leaks in the last weeks.
+
+### Channels
+
+- Ability to join and leave channels.
+- Channel activity messages.
+- Access and rights for channel creation updated (now everyone can create channels).
+- Favorite direct channels, now you can put your direct channels in favorites too.
+- Channel groups are back! Yes, you can again create groups of channels to organize your workspace.
+- Channel members list: see who is in a channel and manage members
+
+### Notifications
+
+- Now you only receive badge notification for threads you follow and when you are mentionned.
+- Other messages in channel will update the channel text to bold.
+
+### Drive
+
+- Ability to preview coding files and markdown files
+
 # Twake 2020.Q4.137
 
 ### General
diff --git a/twake/backend/core/src/BuiltInConnectors/Common/Services/MainConnectorService.php b/twake/backend/core/src/BuiltInConnectors/Common/Services/MainConnectorService.php
index a9d4e99e39..b854ea0523 100755
--- a/twake/backend/core/src/BuiltInConnectors/Common/Services/MainConnectorService.php
+++ b/twake/backend/core/src/BuiltInConnectors/Common/Services/MainConnectorService.php
@@ -139,12 +139,21 @@ public function saveDocument($id, $content){
         return false;
       }
       $document = new BuiltInConnectorsEntity($cred["api_id"], $id);
-      $document->setValue($content);
-      $this->doctrine->persist($document);
+      if($content === null){
+        $this->doctrine->remove($document);
+      }else{
+        $document->setValue($content);
+        $this->doctrine->persist($document);
+      }
       $this->doctrine->flush();
       return true;
     }
 
+    /** Remove connector document from db */
+    public function removeDocument($id){
+      return $this->saveDocument($id, null);
+    }
+
     /** Get connector document from db */
     public function getDocument($id){
       $cred = $this->getConnectorKeys();
diff --git a/twake/backend/core/src/Twake/Calendar/Controller/Calendar.php b/twake/backend/core/src/Twake/Calendar/Controller/Calendar.php
index ac1217927e..0e1f969b0b 100755
--- a/twake/backend/core/src/Twake/Calendar/Controller/Calendar.php
+++ b/twake/backend/core/src/Twake/Calendar/Controller/Calendar.php
@@ -31,7 +31,7 @@ public function save(Request $request)
         }else{
             if($GLOBALS["segment_enabled"]) \Segment::track([
                 "event" => "calendar:".($object["id"] ? "edit" : "create"),
-                "userId" => $this->getUser()->getId()
+                "userId" => $this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()
             ]);
         }
         return new Response(Array("data" => Array("object" => $res)));
@@ -46,7 +46,7 @@ public function getAction(Request $request)
         }else{
             if($GLOBALS["segment_enabled"]) \Segment::track([
                 "event" => "calendar:open",
-                "userId" => $this->getUser()->getId()
+                "userId" => $this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()
             ]);
         }
 
diff --git a/twake/backend/core/src/Twake/Calendar/Controller/Event.php b/twake/backend/core/src/Twake/Calendar/Controller/Event.php
index 269df60dfa..ab207fcc9f 100755
--- a/twake/backend/core/src/Twake/Calendar/Controller/Event.php
+++ b/twake/backend/core/src/Twake/Calendar/Controller/Event.php
@@ -20,7 +20,7 @@ public function remove(Request $request)
         }
         if($GLOBALS["segment_enabled"]) \Segment::track([
             "event" => "calendar:event:remove",
-            "userId" => $this->getUser()->getId()
+            "userId" => $this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()
         ]);
         return new Response(Array("data" => Array("object" => $res)));
     }
@@ -38,7 +38,7 @@ public function save(Request $request)
             }
             if($GLOBALS["segment_enabled"]) \Segment::track([
                 "event" => "calendar:event:".($object["id"] ? "edit" : "create"),
-                "userId" => $this->getUser()->getId()
+                "userId" => $this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()
             ]);
         }
         return new Response(Array("data" => Array("object" => $res)));
diff --git a/twake/backend/core/src/Twake/Core/Controller/Version.php b/twake/backend/core/src/Twake/Core/Controller/Version.php
index f708732f4c..9e6c739437 100755
--- a/twake/backend/core/src/Twake/Core/Controller/Version.php
+++ b/twake/backend/core/src/Twake/Core/Controller/Version.php
@@ -48,9 +48,9 @@ function getVersion(Request $request)
             "auth_mode" => array_keys($auth),
             "auth" => $auth,
             "version" => [
-                "current" => /* @VERSION_DETAIL */ "2021.Q1.434",
+                "current" => /* @VERSION_DETAIL */ "2021.Q2.481",
                 "minimal" => [
-                    "web" => /* @MIN_VERSION_WEB */ "2021.Q1.385",
+                    "web" => /* @MIN_VERSION_WEB */ "2021.Q1.481",
                     "mobile" => /* @MIN_VERSION_MOBILE */ "2021.Q1.385",
                 ]
             ],
diff --git a/twake/backend/core/src/Twake/Discussion/Controller/Discussion.php b/twake/backend/core/src/Twake/Discussion/Controller/Discussion.php
index ec75b93323..bb0bd16a2e 100755
--- a/twake/backend/core/src/Twake/Discussion/Controller/Discussion.php
+++ b/twake/backend/core/src/Twake/Discussion/Controller/Discussion.php
@@ -39,7 +39,7 @@ public function save(Request $request)
                 $this->get("administration.counter")->incrementCounter("total_messages", 1);
                 if($GLOBALS["segment_enabled"]) \Segment::track([
                     "event" => "message:send",
-                    "userId" => $this->getUser()->getId()
+                    "userId" => $this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()
                 ]);
             }
         }
diff --git a/twake/backend/core/src/Twake/Discussion/Services/MessageSystem.php b/twake/backend/core/src/Twake/Discussion/Services/MessageSystem.php
index 4e65786b5e..ed90e20599 100755
--- a/twake/backend/core/src/Twake/Discussion/Services/MessageSystem.php
+++ b/twake/backend/core/src/Twake/Discussion/Services/MessageSystem.php
@@ -580,6 +580,7 @@ public function sendToNode($channel, $message, $did_create){
 
         $title = "";
         $text = $this->buildShortText($message);
+        $body = $text; // we need original body just in case text gets updated further on
         if ($channel->getData()["is_direct"]) {
             $title = $senderName . " in " . $channel->getData()["company_name"];
         }else{
@@ -622,8 +623,10 @@ public function sendToNode($channel, $message, $did_create){
                 "channel_id" => $messageArray["channel_id"],
                 "date" => $messageArray["creation_date"] * 1000,
                 "sender" => $messageArray["sender"],
-                "title" => $title,
-                "text" => $text
+                "sender_name" => $senderName, // username, because it's not convenient to make request to find out username by id
+                "title" => $title, 
+                "text" => $text,
+                "body" => $body // original body of the message without sender
             ];
 
             if($messageArray["message_type"] != 2){ //Ignore system messages
diff --git a/twake/backend/core/src/Twake/Drive/Controller/Download.php b/twake/backend/core/src/Twake/Drive/Controller/Download.php
index 62ae59db95..53e73b3e28 100755
--- a/twake/backend/core/src/Twake/Drive/Controller/Download.php
+++ b/twake/backend/core/src/Twake/Drive/Controller/Download.php
@@ -39,7 +39,7 @@ public function downloadfile(Request $request)
 
         if($GLOBALS["segment_enabled"]) \Segment::track([
             "event" => "drive:download",
-            "userId" => $this->isConnected() ? $this->getUser()->getId() : "anonymous"
+            "userId" => $this->isConnected() ? ($this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()) : "anonymous"
         ]);
 
         @$response = $this->get('driveupload.download')->download($workspace_id, $files_ids, $download, $versionId);
diff --git a/twake/backend/core/src/Twake/Drive/Controller/DriveFile.php b/twake/backend/core/src/Twake/Drive/Controller/DriveFile.php
index cefdd57078..cfcba1903d 100755
--- a/twake/backend/core/src/Twake/Drive/Controller/DriveFile.php
+++ b/twake/backend/core/src/Twake/Drive/Controller/DriveFile.php
@@ -48,7 +48,7 @@ public function save(Request $request)
 
         if($GLOBALS["segment_enabled"]) \Segment::track([
             "event" => "drive:".($object["is_directory"] ? "directory" : "file") . ":" . ($object["id"] ? "edit" : "create"),
-            "userId" => $this->getUser()->getId()
+            "userId" => $this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()
         ]);
 
         if (!empty($object["_once_set_access"]) && !empty($object["id"])) {
diff --git a/twake/backend/core/src/Twake/Drive/Controller/Upload.php b/twake/backend/core/src/Twake/Drive/Controller/Upload.php
index cd0d3dd78e..15c3028956 100755
--- a/twake/backend/core/src/Twake/Drive/Controller/Upload.php
+++ b/twake/backend/core/src/Twake/Drive/Controller/Upload.php
@@ -17,7 +17,7 @@ public function Preprocess(Request $request)
 
         if($GLOBALS["segment_enabled"]) \Segment::track([
             "event" => "drive:file:create",
-            "userId" => $this->getUser()->getId()
+            "userId" => $this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()
         ]);
 
         return new Response(Array("identifier" => $identifier));
@@ -41,7 +41,7 @@ public function Preview(Request $request)
 
         if($GLOBALS["segment_enabled"]) \Segment::track([
             "event" => "drive:preview",
-            "userId" => $this->isConnected() ? $this->getUser()->getId() : "anonymous"
+            "userId" => $this->isConnected() ? ($this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()) : "anonymous"
         ]);
 
         $this->get('driveupload.previewmanager')->generatePreviewFromFolder($request);
diff --git a/twake/backend/core/src/Twake/Tasks/Controller/Board.php b/twake/backend/core/src/Twake/Tasks/Controller/Board.php
index 30dffe5c87..58fe102711 100755
--- a/twake/backend/core/src/Twake/Tasks/Controller/Board.php
+++ b/twake/backend/core/src/Twake/Tasks/Controller/Board.php
@@ -20,7 +20,7 @@ public function remove(Request $request)
         }
         if($GLOBALS["segment_enabled"]) \Segment::track([
             "event" => "tasks:board:remove",
-            "userId" => $this->getUser()->getId()
+            "userId" => $this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()
         ]);
         return new Response(Array("data" => Array("object" => $res)));
     }
@@ -35,7 +35,7 @@ public function save(Request $request)
         }
         if($GLOBALS["segment_enabled"]) \Segment::track([
             "event" => "tasks:board:".($object["id"] ? "edit" : "create"),
-            "userId" => $this->getUser()->getId()
+            "userId" => $this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()
         ]);
         return new Response(Array("data" => Array("object" => $res)));
     }
diff --git a/twake/backend/core/src/Twake/Tasks/Controller/Task.php b/twake/backend/core/src/Twake/Tasks/Controller/Task.php
index cb14484bd0..fa5f505fa5 100755
--- a/twake/backend/core/src/Twake/Tasks/Controller/Task.php
+++ b/twake/backend/core/src/Twake/Tasks/Controller/Task.php
@@ -20,7 +20,7 @@ public function remove(Request $request)
         }else{
             if($GLOBALS["segment_enabled"]) \Segment::track([
                 "event" => "tasks:task:remove",
-                "userId" => $this->getUser()->getId()
+                "userId" => $this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()
             ]);
         }
         return new Response(Array("data" => Array("object" => $res)));
@@ -37,7 +37,7 @@ public function save(Request $request)
         }
         if($GLOBALS["segment_enabled"]) \Segment::track([
             "event" => "tasks:task:".($object["id"] ? "edit" : "create"),
-            "userId" => $this->getUser()->getId()
+            "userId" => $this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()
         ]);
 
         if (!$res) {
@@ -55,7 +55,7 @@ public function getAction(Request $request)
         }else{
             if($GLOBALS["segment_enabled"]) \Segment::track([
                 "event" => "tasks:task:get",
-                "userId" => $this->getUser()->getId()
+                "userId" => $this->getuser()->getIdentityProviderId() ?: $this->getUser()->getId()
             ]);
         }
         return new Response(Array("data" => $objects));
diff --git a/twake/backend/core/src/Twake/Users/Controller/Adapters/Console.php b/twake/backend/core/src/Twake/Users/Controller/Adapters/Console.php
index bc5e10782f..1094cbbb43 100755
--- a/twake/backend/core/src/Twake/Users/Controller/Adapters/Console.php
+++ b/twake/backend/core/src/Twake/Users/Controller/Adapters/Console.php
@@ -34,10 +34,10 @@ function logoutSuccess(Request $request)
         try{
           $message = json_decode(urldecode($request->query->get("error_code")));
         }catch(\Exception $err){
-          $message = "success";
+          $message = false;
         }
 
-        return $this->redirect(rtrim($this->getParameter("env.frontend_server_name", $this->getParameter("env.server_name")), "/") . "/login" . "?error_code=".str_replace('+', '%20', urlencode(json_encode($message))));
+        return $this->redirect(rtrim($this->getParameter("env.frontend_server_name", $this->getParameter("env.server_name")), "/") . "/login" . ($message ? ("?error_code=".str_replace('+', '%20', urlencode(json_encode($message)))) : "?auto"));
     }
 
     function logout(Request $request, $message = null)
diff --git a/twake/backend/core/src/Twake/Users/Controller/Adapters/Console/ApplyUpdates.php b/twake/backend/core/src/Twake/Users/Controller/Adapters/Console/ApplyUpdates.php
index 98fad748fb..9b36b7b274 100755
--- a/twake/backend/core/src/Twake/Users/Controller/Adapters/Console/ApplyUpdates.php
+++ b/twake/backend/core/src/Twake/Users/Controller/Adapters/Console/ApplyUpdates.php
@@ -17,10 +17,14 @@ class ApplyUpdates
     /** @var App */
     protected $app = null;
 
+    /** @var String */
+    protected $endpoint = null;
+
     public function __construct(App $app)
     {
         $this->app = $app;
         $this->em = $app->getServices()->get("app.twake_doctrine");
+        $this->endpoint = $app->getContainer()->getParameter("defaults.auth.console.provider");
         $this->string_cleaner = $app->getServices()->get("app.string_cleaner");
         $this->user_service = $app->getServices()->get("app.user");
     }
@@ -55,6 +59,13 @@ function updateCompany($companyDTO){
         $company->setIdentityProvider("console");
         $company->setIdentityProviderId($companyConsoleCode);
 
+        $avatar = $userDTO["company"]["details"]["avatar"];
+        $picture = $companyDTO["value"] ?: "";
+        if($avatar["type"] && $avatar["type"] !== "url"){
+            $picture = rtrim($this->endpoint, "/") . "/avatars/" . $avatar["value"];
+        }
+        $company->setLogo($picture);
+
         // Format is {name: "string", limits: {}}
         $company->setPlan($companyDTO["company"]["plan"]);
 
@@ -71,8 +82,6 @@ function updateCompany($companyDTO){
 
         $this->app->getServices()->get("app.groups")->init($company);
 
-        //TODO: realtime update
-
         return $company;
 
     }
@@ -163,34 +172,26 @@ function updateUser($userDTO){
         // Update user names
         $user->setEmail($email);
         $user->setPhone("");
-        $user->setFirstName($userDTO["firstName"] ?: ($userDTO["fullName"] ?: ""));
+        $user->setFirstName($userDTO["firstName"] ?: ($userDTO["name"] ?: ""));
         $user->setLastName($userDTO["lastName"] ?: "");
         $user->setMailVerified(!!$userDTO["isVerified"]);
+        $user->setIdentityProvider("console");
+        $user->setIdentityProviderId($userConsoleId);
 
-        $user->setLanguage(@$userDTO["preferences"]["locale"] ?: "en");
-        $user->setTimezone(@$userDTO["preferences"]["timezone"] ?: "");
+        $user->setLanguage(@$userDTO["preference"]["locale"] ?: "en");
+        $user->setTimezone(@$userDTO["preference"]["timeZone"] ?: "");
 
         // Update user picture
-        $picture = $userDTO["picture"];
-        if (($picture && (!$user->getThumbnail() || $user->getThumbnail()->getPublicLink() != $picture)) || ($user->getThumbnail() && !$picture)) {
-            if ($user->getThumbnail()) {
-                $this->em->remove($user->getThumbnail());
-            }
-            if($picture){
-              $thumbnail = new File();
-              $thumbnail->setPublicLink($picture);
-              $user->setThumbnail($thumbnail);
-              $this->em->persist($thumbnail);
-            }else{
-              $user->setThumbnail(null);
-            }
+        $avatar = $userDTO["avatar"];
+        $picture = $avatar["value"] ?: "";
+        if($avatar["type"] && $avatar["type"] !== "url"){
+            $picture = rtrim($this->endpoint, "/") . "/avatars/" . $avatar["value"];
         }
+        $user->setPicture($picture);
 
         $this->em->persist($user);
         $this->em->flush();
 
-        //TODO websocket update
-
         foreach($roles as $role){
             $companyConsoleCode = $role["targetCode"];
             $level = $role["roleCode"];
diff --git a/twake/backend/core/src/Twake/Users/Controller/UsersConnections.php b/twake/backend/core/src/Twake/Users/Controller/UsersConnections.php
index d7c463c774..7be29712cb 100755
--- a/twake/backend/core/src/Twake/Users/Controller/UsersConnections.php
+++ b/twake/backend/core/src/Twake/Users/Controller/UsersConnections.php
@@ -49,7 +49,7 @@ public function login(Request $request)
 
         $response = new Response();
         $logged = $this->getUser() && !is_string($this->getUser());
-        if(!$logged){
+        if(!$logged || ($usernameOrMail && $password)){
             $loginResult = $this->get("app.user")->login($usernameOrMail, $password, $rememberMe, $request, $response);
         }
 
diff --git a/twake/backend/core/src/Twake/Users/Entity/User.php b/twake/backend/core/src/Twake/Users/Entity/User.php
index e7cfc9c0b9..186d6b1968 100755
--- a/twake/backend/core/src/Twake/Users/Entity/User.php
+++ b/twake/backend/core/src/Twake/Users/Entity/User.php
@@ -56,7 +56,12 @@ class User extends SearchableObject
     /**
      * @ORM\ManyToOne(targetEntity="Twake\Upload\Entity\File")
      */
-    protected $thumbnail;
+    protected $thumbnail; //Old format depreciated (now with console)
+
+    /**
+     * @ORM\Column(name="picture", type="twake_text")
+     */
+    protected $picture;
 
     /**
      * @ORM\Column(name="workspaces", type="twake_text")
@@ -344,6 +349,25 @@ public function setThumbnail($thumbnail)
         $this->thumbnail = $thumbnail;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getPicture()
+    {
+        if(!$this->picture){
+            $this->setPicture($this->getThumbnail() ? $this->getThumbnail()->getPublicURL(2) : "");
+        }
+        return $this->picture ?: "";
+    }
+
+    /**
+     * @param mixed $logo
+     */
+    public function setPicture($picture)
+    {
+        $this->picture = $picture;
+    }
+
     public function isActive()
     {
         $this->lastactivity = date("U");
@@ -534,7 +558,7 @@ public function getAsArray()
             "username" => $this->getUsername(),
             "firstname" => $this->getFirstName(),
             "lastname" => $this->getLastName(),
-            "thumbnail" => (($this->getThumbnail() == null) ? null : $this->getThumbnail()->getPublicURL(2)) . "",
+            "thumbnail" => $this->getPicture(),
             "identity_provider" => $this->getIdentityProvider(),
             "connected" => $this->isConnected(),
             "language" => $this->getLanguage(),
@@ -558,12 +582,12 @@ public function getAsArray()
 
         $return["email"] = $return["email"];
         $return["is_verified"] = $this->getMailVerified();
-        $return["picture"] = $return["thumbnail"];
+        $return["picture"] = $this->getPicture();
         $return["first_name"] = $return["firstname"];
         $return["last_name"] = $return["lastname"];
         $return["created_at"] = ($this->getCreationDate() ? ($this->getCreationDate()->format('U') * 1000) : null);
 
-        $return["preferences"] = [
+        $return["preference"] = [
             "locale" => $this->getLanguage(),
             "timezone" => $this->timezone,
         ];
diff --git a/twake/backend/core/src/Twake/Users/Services/User.php b/twake/backend/core/src/Twake/Users/Services/User.php
index baa4cfc426..39825b65dd 100755
--- a/twake/backend/core/src/Twake/Users/Services/User.php
+++ b/twake/backend/core/src/Twake/Users/Services/User.php
@@ -176,9 +176,11 @@ public function loginFromServiceWithToken($service_id, $external_id, $email, $us
               $thumbnail = new File();
               $thumbnail->setPublicLink($picture);
               $user->setThumbnail($thumbnail);
+              $user->setPicture($thumbnail->getPublicURL(2));
               $this->em->persist($thumbnail);
             }else{
               $user->setThumbnail(null);
+              $user->setPicture("");
             }
         }
 
@@ -1023,6 +1025,7 @@ public function updateUserBasicData($userId, $firstName, $lastName, $thumbnail =
             $user->setLastName($lastName);
             if ($thumbnail == 'false' || $thumbnail == 'null') {
                 $user->setThumbnail(null);
+                $user->setPicture("");
             } else if ($thumbnail != null && !is_string($thumbnail)) {
                 if ($user->getThumbnail()) {
                     if ($uploader) {
@@ -1033,6 +1036,7 @@ public function updateUserBasicData($userId, $firstName, $lastName, $thumbnail =
                     $this->em->remove($user->getThumbnail());
                 }
                 $user->setThumbnail($thumbnail);
+                $user->setPicture($thumbnail->getPublicURL(2));
             }
             $this->em->persist($user);
             $this->em->flush();
diff --git a/twake/backend/core/src/Twake/Users/Services/Users.php b/twake/backend/core/src/Twake/Users/Services/Users.php
index 570bbc8172..0259b944db 100755
--- a/twake/backend/core/src/Twake/Users/Services/Users.php
+++ b/twake/backend/core/src/Twake/Users/Services/Users.php
@@ -33,7 +33,8 @@ public function searchWithDB($options = Array(), $entity = false)
         $name = $options["name"];
 
         $scope = $options["scope"] ?: "all";
-     
+        if($scope !== "group" || $scope !== "workspace") $scope = "group";
+
         $usersArray = [];
         $usersEntities = [];
 
@@ -72,10 +73,21 @@ public function searchWithDB($options = Array(), $entity = false)
             foreach($users as $user){
                 if($user){
 
-                    //TODO execute search filter
-                    
-                    $usersArray[] = [$user->getAsArray(), 0];
-                    $usersEntities[] = [$user, 0];
+                    $match = false;
+                    foreach($user->getAsArray() as $key => $value){
+                        if(in_array($key, ["username", "firstname", "lastname", "email"])){
+                            foreach(explode(" ", $name) as $word){
+                                if(strpos(strtolower($value), strtolower($word)) !== false){
+                                    $match = true;
+                                }
+                            }
+                        }
+                    }
+
+                    if($match){
+                        $usersArray[] = [$user->getAsArray(), 0];
+                        $usersEntities[] = [$user, 0];
+                    }
                 }
             }
 
@@ -95,6 +107,7 @@ public function searchWithES($options = Array(), $entity = false)
         $name = $options["name"];
 
         $scope = $options["scope"] ?: "all";
+        if($scope !== "group" || $scope !== "workspace") $scope = "group";
         $workspace_id = $options["workspace_id"];
         $group_id = $options["group_id"];
         
diff --git a/twake/backend/core/src/Twake/Workspaces/Entity/Group.php b/twake/backend/core/src/Twake/Workspaces/Entity/Group.php
index 3fc62c3d83..386b475287 100755
--- a/twake/backend/core/src/Twake/Workspaces/Entity/Group.php
+++ b/twake/backend/core/src/Twake/Workspaces/Entity/Group.php
@@ -238,7 +238,7 @@ public function getLogoFile()
     public function getLogo()
     {
         if(!$this->logo){
-            return $this->getLogoFile() ? $this->getLogoFile()->getPublicURL(2) : "";
+            $this->setLogo($this->getLogoFile() ? $this->getLogoFile()->getPublicURL(2) : "");
         }
         return $this->logo ?: "";
     }
@@ -399,6 +399,8 @@ public function getAsArray()
             "logo" => $this->getLogo(),
             "plan" => $this->getPlan(),
             "stats" => $this->getStats(),
+            "identity_provider" => $this->getIdentityProvider(),
+            "identity_provider_id" => $this->getIdentityProviderId(),
         );
     }
 
diff --git a/twake/backend/core/src/Twake/Workspaces/Entity/Workspace.php b/twake/backend/core/src/Twake/Workspaces/Entity/Workspace.php
index 1c82ed3da2..9882cfb381 100755
--- a/twake/backend/core/src/Twake/Workspaces/Entity/Workspace.php
+++ b/twake/backend/core/src/Twake/Workspaces/Entity/Workspace.php
@@ -10,7 +10,7 @@
 /**
  * Workspace
  *
- * @ORM\Table(name="workspace",options={"engine":"MyISAM", "scylladb_keys": {{"id":"ASC"}, {"group_id":"ASC", "id":"ASC"}}})
+ * @ORM\Table(name="workspace",options={"engine":"MyISAM", "scylladb_keys": {{"id":"ASC"}, {"group_id":"ASC", "id":"ASC"}, {"group_id":"ASC"}}})
  * @ORM\Entity()
  */
 class Workspace extends SearchableObject
@@ -206,7 +206,7 @@ public function getLogoFile()
     public function getLogo()
     {
         if(!$this->logo){
-            return $this->getLogoFile() ? $this->getLogoFile()->getPublicURL(2) : "";
+            $this->setLogo($this->getLogoFile() ? $this->getLogoFile()->getPublicURL(2) : "");
         }
         return $this->logo ?: "";
     }
diff --git a/twake/backend/core/src/Twake/Workspaces/Services/WorkspaceMembers.php b/twake/backend/core/src/Twake/Workspaces/Services/WorkspaceMembers.php
index f9f69405e7..148aa9077b 100755
--- a/twake/backend/core/src/Twake/Workspaces/Services/WorkspaceMembers.php
+++ b/twake/backend/core/src/Twake/Workspaces/Services/WorkspaceMembers.php
@@ -318,21 +318,6 @@ public function addMemberByMail($workspaceId, $mail, $asExterne, $currentUserId
                 $this->doctrine->flush();
                 $retour = "mail";
             }
-
-            if($sendEmail){
-
-                //Send mail
-                $this->twake_mailer->send($mail, "inviteToWorkspaceMail", Array(
-                    "_language" => $currentUser ? $currentUser->getLanguage() : "en",
-                    "mail" => $mail,
-                    "sender_user" => $currentUser ? $currentUser->getUsername() : "TwakeBot",
-                    "sender_user_mail" => $currentUser ? $currentUser->getEmail() : "noreply@twakeapp.com",
-                    "workspace" => $workspace->getName(),
-                    "group" => $workspace->getGroup()->getDisplayName()
-                ));
-
-            }
-
             return $retour;
         }
 
diff --git a/twake/backend/core/src/Twake/Workspaces/Services/Workspaces.php b/twake/backend/core/src/Twake/Workspaces/Services/Workspaces.php
index d96d806daa..eef3b5c3a1 100755
--- a/twake/backend/core/src/Twake/Workspaces/Services/Workspaces.php
+++ b/twake/backend/core/src/Twake/Workspaces/Services/Workspaces.php
@@ -141,7 +141,7 @@ public function create($name, $groupId = null, $userId = null, $default = false)
                 "name" => "General",
                 "description" => "",
                 "visibility" => "public",
-                "default" => true
+                "is_default" => true
             ],
             "options" => [],
             "user_id" => $userId
diff --git a/twake/backend/node/src/cli/cmds/generate_cmds/users-and-companies.ts b/twake/backend/node/src/cli/cmds/generate_cmds/users-and-companies.ts
index 2da1730c91..e10ce7b82c 100644
--- a/twake/backend/node/src/cli/cmds/generate_cmds/users-and-companies.ts
+++ b/twake/backend/node/src/cli/cmds/generate_cmds/users-and-companies.ts
@@ -117,10 +117,10 @@ const getUsers = (company: Company, size: number = 100): User[] => {
 const getUser = (company: Company, id: number): User => {
   return getUserInstance({
     id: uuid(),
-    firstname: "John",
-    lastname: `Doe${id}`,
-    emailcanonical: `user${id}@${company.name}`,
-    creationdate: Date.now(),
+    first_name: "John",
+    last_name: `Doe${id}`,
+    email_canonical: `user${id}@${company.name}`,
+    creation_date: Date.now(),
     password: passwordGenerator.generate({
       length: 10,
       numbers: true,
diff --git a/twake/backend/node/src/core/platform/services/auth/web/jwt.ts b/twake/backend/node/src/core/platform/services/auth/web/jwt.ts
index 98a71382e4..f4f42978ae 100644
--- a/twake/backend/node/src/core/platform/services/auth/web/jwt.ts
+++ b/twake/backend/node/src/core/platform/services/auth/web/jwt.ts
@@ -12,7 +12,12 @@ const jwtPlugin: FastifyPluginCallback = (fastify, _opts, next) => {
   fastify.decorate("authenticate", async (request: FastifyRequest) => {
     try {
       const jwt: JwtType = await request.jwtVerify();
-      request.currentUser = { ...{ org: jwt.org }, ...{ email: jwt.email }, ...{ id: jwt.sub } };
+      request.currentUser = {
+        ...{ org: jwt.org },
+        ...{ email: jwt.email },
+        ...{ id: jwt.sub },
+        ...{ identity_provider_id: jwt.provider_id },
+      };
       request.log.debug(`Authenticated as user ${request.currentUser.id}`);
     } catch (err) {
       throw fastify.httpErrors.unauthorized("Bad credentials");
diff --git a/twake/backend/node/src/core/platform/services/tracker/index.ts b/twake/backend/node/src/core/platform/services/tracker/index.ts
index 007275f7a6..f9a3c278c3 100644
--- a/twake/backend/node/src/core/platform/services/tracker/index.ts
+++ b/twake/backend/node/src/core/platform/services/tracker/index.ts
@@ -16,7 +16,7 @@ export default class Tracker extends TwakeService<TrackerAPI> implements Tracker
     localEventBus.subscribe<ResourceEventsPayload>(channelListEvent, data => {
       logger.debug(`Tracker - New ${channelListEvent} event`);
       this.identify({
-        userId: data.user.id,
+        userId: data.user.identity_provider_id || data.user.id,
         traits: {
           email: data.user.email || "",
           company: {
diff --git a/twake/backend/node/src/core/platform/services/types/index.ts b/twake/backend/node/src/core/platform/services/types/index.ts
index c44775d76f..47a25ff6af 100644
--- a/twake/backend/node/src/core/platform/services/types/index.ts
+++ b/twake/backend/node/src/core/platform/services/types/index.ts
@@ -1,5 +1,6 @@
 export type JwtType = {
   sub: string;
+  provider_id: string; //Console sub
   email: string;
   nbf: number;
   refresh_nbf: number;
diff --git a/twake/backend/node/src/core/platform/services/websocket/services/index.ts b/twake/backend/node/src/core/platform/services/websocket/services/index.ts
index 5544961401..48d7b43afd 100644
--- a/twake/backend/node/src/core/platform/services/websocket/services/index.ts
+++ b/twake/backend/node/src/core/platform/services/websocket/services/index.ts
@@ -61,6 +61,7 @@ export class WebSocketService extends EventEmitter implements WebSocketAPI {
   getUser(socket: WebSocket): WebSocketUser {
     return {
       id: socket.decoded_token.sub,
+      identity_provider_id: socket.decoded_token.provider_id,
       email: socket.decoded_token.email,
       org: socket.decoded_token.org,
       token: socket.decoded_token,
diff --git a/twake/backend/node/src/services/channels/entities/channel-activity.ts b/twake/backend/node/src/services/channels/entities/channel-activity.ts
index 6e93743e40..b3452322a2 100644
--- a/twake/backend/node/src/services/channels/entities/channel-activity.ts
+++ b/twake/backend/node/src/services/channels/entities/channel-activity.ts
@@ -27,9 +27,10 @@ export class ChannelActivity {
   last_activity: number;
 
   @Column("last_message", "encoded_json")
-  last_message: {
+  last_message: null | {
     date: number;
     sender: string;
+    sender_name: string;
     title: string;
     text: string;
   };
diff --git a/twake/backend/node/src/services/channels/provider.ts b/twake/backend/node/src/services/channels/provider.ts
index 93cc927f25..8dedbdacc0 100644
--- a/twake/backend/node/src/services/channels/provider.ts
+++ b/twake/backend/node/src/services/channels/provider.ts
@@ -30,6 +30,7 @@ export type ChannelPrimaryKey = {
 export type ChannelActivityMessage = {
   date: number;
   sender: string;
+  sender_name: string;
   title: string;
   text: string;
 };
@@ -97,6 +98,7 @@ export interface ChannelService
    */
   updateLastActivity(
     payload: {
+      date: number;
       channel: ChannelPrimaryKey;
       message: ChannelActivityMessage;
     },
diff --git a/twake/backend/node/src/services/channels/services/channel/service.ts b/twake/backend/node/src/services/channels/services/channel/service.ts
index a98c6cb735..56cca565d4 100644
--- a/twake/backend/node/src/services/channels/services/channel/service.ts
+++ b/twake/backend/node/src/services/channels/services/channel/service.ts
@@ -316,8 +316,9 @@ export class Service implements ChannelService {
   })
   async updateLastActivity(
     payload: {
+      date: number;
       channel: ChannelPrimaryKey;
-      message: ChannelActivityMessage;
+      message: ChannelActivityMessage | null;
     },
     context: WorkspaceExecutionContext,
   ): Promise<UpdateResult<ChannelActivity>> {
@@ -328,13 +329,16 @@ export class Service implements ChannelService {
     entity.channel_id = channelPK.id;
     entity.company_id = channelPK.company_id;
     entity.workspace_id = channelPK.workspace_id;
-    entity.last_activity = channelActivityMessage.date;
-    entity.last_message = {
-      date: channelActivityMessage.date,
-      sender: channelActivityMessage.sender,
-      title: channelActivityMessage.title,
-      text: channelActivityMessage.text,
-    };
+    entity.last_activity = payload.date;
+    entity.last_message = channelActivityMessage
+      ? {
+          date: channelActivityMessage.date,
+          sender: channelActivityMessage.sender,
+          sender_name: channelActivityMessage.sender_name,
+          title: channelActivityMessage.title,
+          text: channelActivityMessage.text,
+        }
+      : null;
 
     entity.channel = channel;
 
@@ -607,6 +611,15 @@ export class Service implements ChannelService {
         }
       }
 
+      this.updateLastActivity(
+        {
+          date: new Date().getTime(),
+          channel: channel,
+          message: null,
+        },
+        context,
+      );
+
       localEventBus.publish<ResourceEventsPayload>("channel:created", { channel });
     }
   }
diff --git a/twake/backend/node/src/services/channels/services/pubsub/new-channel-activity/index.ts b/twake/backend/node/src/services/channels/services/pubsub/new-channel-activity/index.ts
index e3459128a7..ea125fccec 100644
--- a/twake/backend/node/src/services/channels/services/pubsub/new-channel-activity/index.ts
+++ b/twake/backend/node/src/services/channels/services/pubsub/new-channel-activity/index.ts
@@ -29,6 +29,7 @@ export class NewChannelActivityProcessor
     try {
       this.service.updateLastActivity(
         {
+          date: message.date,
           channel: {
             id: message.channel_id,
             workspace_id: message.workspace_id,
@@ -37,8 +38,9 @@ export class NewChannelActivityProcessor
           message: {
             date: message.date,
             sender: message.sender,
+            sender_name: message.sender_name,
             title: message.title,
-            text: message.text,
+            text: message.body,
           },
         },
         {
diff --git a/twake/backend/node/src/services/channels/types.ts b/twake/backend/node/src/services/channels/types.ts
index 7bf61481d4..0e872a0ac0 100644
--- a/twake/backend/node/src/services/channels/types.ts
+++ b/twake/backend/node/src/services/channels/types.ts
@@ -50,4 +50,6 @@ export type ChannelActivityNotification = {
   sender: string;
   title: string;
   text: string;
+  sender_name: string;
+  body: string;
 };
diff --git a/twake/backend/node/src/services/console/index.ts b/twake/backend/node/src/services/console/index.ts
index 6ee2b16b03..7b92885d78 100644
--- a/twake/backend/node/src/services/console/index.ts
+++ b/twake/backend/node/src/services/console/index.ts
@@ -1,16 +1,20 @@
+import { DatabaseServiceAPI } from "../../core/platform/services/database/api";
 import { TwakeService, Consumes } from "../../core/platform/framework";
 import UserServiceAPI from "../user/api";
 import { ConsoleServiceAPI } from "./api";
 import { getService } from "./service";
 
-@Consumes(["user"])
+@Consumes(["user", "database"])
 export default class ConsoleService extends TwakeService<ConsoleServiceAPI> {
   version = "1";
   name = "console";
   private service: ConsoleServiceAPI;
 
   async doInit(): Promise<this> {
-    this.service = getService(this.context.getProvider<UserServiceAPI>("user"));
+    this.service = getService(
+      this.context.getProvider<DatabaseServiceAPI>("database"),
+      this.context.getProvider<UserServiceAPI>("user"),
+    );
 
     return this;
   }
diff --git a/twake/backend/node/src/services/console/processing/merge.ts b/twake/backend/node/src/services/console/processing/merge.ts
index 7319bc80f3..50fe92ac6c 100644
--- a/twake/backend/node/src/services/console/processing/merge.ts
+++ b/twake/backend/node/src/services/console/processing/merge.ts
@@ -33,6 +33,7 @@ import { getInstance as getExternalGroupInstance } from "../../user/entities/ext
 import CompanyUser from "../../user/entities/company_user";
 import { ConsoleHTTPClient } from "../client";
 import { ConsoleServiceClient } from "../api";
+import { DatabaseServiceAPI } from "../../../core/platform/services/database/api";
 
 const logger = getLogger("console.process.merge");
 
@@ -40,6 +41,7 @@ export class MergeProcess {
   private client: ConsoleServiceClient;
 
   constructor(
+    private database: DatabaseServiceAPI,
     private userService: UserServiceAPI,
     private dryRun: boolean,
     private consoleId: string = "console",
@@ -240,6 +242,10 @@ export class MergeProcess {
       createdCompany = await this.client.createCompany({
         code: company.id,
         displayName: company.displayName,
+        avatar: {
+          type: "url",
+          value: company.logo,
+        },
         status: "active",
       });
 
@@ -275,24 +281,56 @@ export class MergeProcess {
         throw new Error(`User ${companyUser.user_id} not found`);
       }
 
+      const firstName =
+        user.first_name && user.first_name.trim().length ? user.first_name : user.email_canonical;
+      const lastName =
+        user.last_name && user.last_name.trim().length ? user.last_name : user.email_canonical;
+      const name = (firstName + " " + lastName).trim();
+
+      let role: "admin" | "guest" | "member" =
+        companyUser.level.valueOf() === 3 ? "admin" : "member";
+      if (role != "admin") {
+        if (companyUser.isExterne) {
+          role = "guest";
+        }
+        const workspacesUsers = await this.userService.workspaces.getAllForUser({
+          userId: companyUser.user_id,
+        });
+        workspacesUsers.getEntities().forEach(e => {
+          if (e.isExternal) {
+            role = "guest";
+          }
+        });
+      }
+
       result = await this.client.addUser(
         { code: company.id },
         {
-          email: user.emailcanonical,
+          email: user.email_canonical,
           // console requires that firstname/lastname are defined and at least 1 chat long
-          firstName:
-            user.firstname && user.firstname.trim().length ? user.firstname : user.emailcanonical,
-          lastName:
-            user.lastname && user.lastname.trim().length ? user.lastname : user.emailcanonical,
+          firstName,
+          lastName,
+          name,
+          avatar: {
+            type: "url",
+            value: user.picture,
+          },
           password: passwordGenerator.generate({
             length: 10,
             numbers: true,
           }),
           skipInvite: true,
-          role: companyUser.level.valueOf() === 3 ? "admin" : "member",
+          role,
         },
       );
 
+      const companyUserRepository = await this.database.getRepository<CompanyUser>(
+        "group_user",
+        CompanyUser,
+      );
+      companyUser.role = role;
+      companyUserRepository.save(companyUser);
+
       if (this.linkExternal) {
         await this.createUserLink(user, result, this.consoleId);
       }
diff --git a/twake/backend/node/src/services/console/service.ts b/twake/backend/node/src/services/console/service.ts
index 72482836bc..77ccb51434 100644
--- a/twake/backend/node/src/services/console/service.ts
+++ b/twake/backend/node/src/services/console/service.ts
@@ -1,3 +1,4 @@
+import { DatabaseServiceAPI } from "../../core/platform/services/database/api";
 import UserServiceAPI from "../user/api";
 import { ConsoleServiceAPI } from "./api";
 import { MergeProcess } from "./processing/merge";
@@ -6,7 +7,7 @@ import { MergeProgress } from "./types";
 class ConsoleService implements ConsoleServiceAPI {
   version: "1";
 
-  constructor(private userService: UserServiceAPI) {}
+  constructor(private database: DatabaseServiceAPI, private userService: UserServiceAPI) {}
 
   merge(
     baseUrl: string,
@@ -17,7 +18,7 @@ class ConsoleService implements ConsoleServiceAPI {
     client: string,
     secret: string,
   ): MergeProgress {
-    return new MergeProcess(this.userService, dryRun, console, link, {
+    return new MergeProcess(this.database, this.userService, dryRun, console, link, {
       client,
       secret,
       url: baseUrl,
@@ -25,6 +26,9 @@ class ConsoleService implements ConsoleServiceAPI {
   }
 }
 
-export function getService(userService: UserServiceAPI): ConsoleServiceAPI {
-  return new ConsoleService(userService);
+export function getService(
+  database: DatabaseServiceAPI,
+  userService: UserServiceAPI,
+): ConsoleServiceAPI {
+  return new ConsoleService(database, userService);
 }
diff --git a/twake/backend/node/src/services/console/types.ts b/twake/backend/node/src/services/console/types.ts
index c486d7e2ca..5114f6bdc3 100644
--- a/twake/backend/node/src/services/console/types.ts
+++ b/twake/backend/node/src/services/console/types.ts
@@ -5,6 +5,10 @@ import CompanyUser from "../user/entities/company_user";
 export interface CreateConsoleCompany {
   code: string;
   displayName: string;
+  avatar: {
+    type: "url";
+    value: string;
+  };
   country?: string;
   address?: string;
   logo?: string;
@@ -25,6 +29,11 @@ export interface CreateConsoleUser {
   email: string;
   firstName: string;
   lastName: string;
+  name: string;
+  avatar: {
+    type: "url";
+    value: string;
+  };
   password: string;
   role: string;
   skipInvite: boolean;
diff --git a/twake/backend/node/src/services/types/index.ts b/twake/backend/node/src/services/types/index.ts
index bd4e386946..18d719eb17 100644
--- a/twake/backend/node/src/services/types/index.ts
+++ b/twake/backend/node/src/services/types/index.ts
@@ -40,6 +40,8 @@ export const webSocketSchema = {
 export interface User {
   // unique user id
   id: uuid;
+  // unique console user id
+  identity_provider_id?: uuid;
   // user email
   email?: string;
   // Organisation properties
diff --git a/twake/backend/node/src/services/user/api.ts b/twake/backend/node/src/services/user/api.ts
index cc9339d6aa..2984d7f308 100644
--- a/twake/backend/node/src/services/user/api.ts
+++ b/twake/backend/node/src/services/user/api.ts
@@ -101,6 +101,15 @@ export interface WorkspaceServiceAPI
     pagination?: Paginable,
   ): Promise<ListResult<WorkspaceUser>>;
 
+  /**
+   * Get all the workspace for a user
+   *
+   * @param userId
+   */
+  getAllForUser(
+    userId: Pick<WorkspaceUserPrimaryKey, "userId">,
+  ): Promise<ListResult<WorkspaceUser>>;
+
   /**
    * Get all the users of a workspace as Observable
    *
diff --git a/twake/backend/node/src/services/user/entities/company.ts b/twake/backend/node/src/services/user/entities/company.ts
index d4c25c5a40..3e8599930b 100644
--- a/twake/backend/node/src/services/user/entities/company.ts
+++ b/twake/backend/node/src/services/user/entities/company.ts
@@ -25,6 +25,9 @@ export default class Company {
   stats: any;
 
   @Column("logo_id", "uuid")
+  logofile: string;
+
+  @Column("logo", "string")
   logo: string;
 
   @Column("workspaces_id", "encoded_json")
@@ -48,6 +51,12 @@ export default class Company {
 
   @Column("member_count", "number")
   memberCount: number;
+
+  @Column("identity_provider", "encoded_string")
+  identity_provider: string;
+
+  @Column("identity_provider_id", "encoded_string")
+  identity_provider_id: string;
 }
 
 export type CompanyPrimaryKey = Pick<Company, "id">;
diff --git a/twake/backend/node/src/services/user/entities/company_user.ts b/twake/backend/node/src/services/user/entities/company_user.ts
index 840a46b960..d270c65218 100644
--- a/twake/backend/node/src/services/user/entities/company_user.ts
+++ b/twake/backend/node/src/services/user/entities/company_user.ts
@@ -21,18 +21,8 @@ export default class CompanyUser {
   @Column("id", "timeuuid")
   id: string;
 
-  /**
-   * 0: member,
-   * 1, 2, 3: admin,
-   */
-  @Column("level", "number")
-  level: number;
-
-  @Column("did_connect_today", "boolean")
-  didConnectToday: boolean;
-
-  @Column("app_used_today", "json")
-  appUsedToday: Array<string>;
+  @Column("role", "string")
+  role: "guest" | "admin" | "member";
 
   @Column("nb_workspace", "number")
   nbWorkspaces: number;
@@ -44,10 +34,26 @@ export default class CompanyUser {
   lastUpdateDay: number;
 
   @Column("nb_connections_period", "number")
-  nbConnectionsPeriod: number;
+  nbConnectionsPeriod: number; //Depreciated
 
   @Column("app_used_period", "number")
-  appUsedPeriod: number;
+  appUsedPeriod: number; //Depreciated
+
+  /**
+   * 0: member,
+   * 1, 2, 3: admin,
+   */
+  @Column("level", "number")
+  level: number; //Depreciated
+
+  @Column("is_externe", "twake_boolean")
+  isExterne: boolean; //Depreciated
+
+  @Column("did_connect_today", "twake_boolean")
+  didConnectToday: boolean; //Depreciated
+
+  @Column("app_used_today", "json")
+  appUsedToday: Array<string>; //Depreciated
 }
 
 export type CompanyUserPrimaryKey = Partial<Pick<CompanyUser, "group_id" | "user_id">>;
diff --git a/twake/backend/node/src/services/user/entities/user.ts b/twake/backend/node/src/services/user/entities/user.ts
index 9a4e2688eb..35ade52791 100644
--- a/twake/backend/node/src/services/user/entities/user.ts
+++ b/twake/backend/node/src/services/user/entities/user.ts
@@ -11,72 +11,32 @@ export default class User {
   @Column("id", "timeuuid")
   id: string;
 
-  @Column("banned", "twake_boolean")
-  banned = false;
-
-  @Column("is_robot", "twake_boolean")
-  isrobot = false;
-
   @Column("first_name", "encoded_string")
-  firstname: string;
+  first_name: string;
 
   @Column("last_name", "encoded_string")
-  lastname: string;
-
-  /**
-   * FIXME: This is a thumbnail_id in current user table
-   */
-  @Column("thumbnail", "string")
-  thumbnail: string;
-
-  @Column("workspaces", "encoded_json")
-  workspaces: Array<string>;
+  last_name: string;
 
-  /**
-   * @ORM\Column(name="groups", type="twake_text")
-   * FIXME: Decode error, check the type, if JSON
-   */
-  @Column("groups", "encoded_json")
-  groups: Array<string>;
-
-  @Column("connections", "number")
-  connections: number;
-
-  @Column("connected", "twake_boolean")
-  connected: boolean;
+  @Column("picture", "string")
+  picture: string;
 
   // FIXME: Looks like this is an array stringified, need to check DB
   @Column("status_icon", "json")
   status_icon: string; // = '["", ""]';
 
   @Column("last_activity", "number")
-  lastactivity: number;
+  last_activity: number;
 
   @Column("creation_date", "number")
-  creationdate: number;
+  creation_date: number;
 
   @Column("language", "string")
-  language = "en";
+  language: string;
 
   @Column("notification_preference", "encoded_json")
   // FIXME= Which type to use with encoded json? This is an object at the end
   notification_preference: any;
 
-  @Column("notification_read_increment", "number")
-  notification_read_increment = 0;
-
-  @Column("notification_write_increment", "number")
-  notification_write_increment = 0;
-
-  @Column("workspaces_preference", "encoded_json")
-  workspaces_preference: any;
-
-  @Column("tutorial_status", "encoded_json")
-  tutorial_status: any;
-
-  @Column("phone", "encoded_string")
-  phone: string;
-
   @Column("identity_provider", "encoded_string")
   identity_provider: string;
 
@@ -86,55 +46,19 @@ export default class User {
   @Column("token_login", "encoded_string")
   token_login: string;
 
-  @Column("origin", "string")
-  origin: string;
-
-  @Column("is_new", "twake_boolean")
-  isnew = true;
-
-  @Column("mail_verified", "twake_boolean")
-  mail_verified = false;
-
-  @Column("mail_verification_override", "string")
-  mail_verification_override: string;
-
   // TODO: Index
   @Column("username_canonical", "string")
-  usernamecanonical: string;
+  username_canonical: string;
 
   // TODO: Index
   @Column("email_canonical", "string")
-  emailcanonical: string;
-
-  @Column("remember_me_secret", "encoded_string")
-  remember_me_secret: string;
-
-  @Column("enabled", "twake_boolean")
-  enabled: boolean;
-
-  @Column("salt", "string")
-  salt: string;
-
-  @Column("password", "string")
-  password: string;
+  email_canonical: string;
 
   @Column("timezone", "string")
   timezone: string;
 
-  // FIXME: This is a datetime
-  @Column("last_login", "number")
-  lastlogin: number;
-
-  @Column("confirmation_token", "string")
-  confirmationtoken: string;
-
-  // FIXME: This is a datetime
-  @Column("password_requested_at", "number")
-  passwordrequestedat: number;
-
-  // FIXME:  This is an array in PHP and looks like a:0:{} in the DB
-  @Column("roles", "json")
-  roles: Array<string>;
+  @Column("password", "string")
+  password: string;
 
   constructor(id?: string) {
     this.id = id;
diff --git a/twake/backend/node/src/services/user/entities/workspace.ts b/twake/backend/node/src/services/user/entities/workspace.ts
index 26535f5b7e..a2ce944f63 100644
--- a/twake/backend/node/src/services/user/entities/workspace.ts
+++ b/twake/backend/node/src/services/user/entities/workspace.ts
@@ -4,7 +4,7 @@ import { Column, Entity } from "../../../core/platform/services/database/service
 export const TYPE = "workspace";
 
 @Entity(TYPE, {
-  primaryKey: [["id"], "group_id", "id"],
+  primaryKey: [["group_id"], "id"],
   type: TYPE,
 })
 export default class Workspace {
@@ -14,33 +14,21 @@ export default class Workspace {
   @Column("name", "encoded_string")
   name: string;
 
-  @Column("logo", "uuid")
+  @Column("logo", "string")
   logo: string;
 
-  @Column("stats", "uuid")
+  @Column("stats", "encoded_string")
   stats: string;
 
-  @Column("isdeleted", "twake_boolean")
+  @Column("is_deleted", "boolean")
   isDeleted: boolean;
 
-  @Column("isarchived", "twake_boolean")
+  @Column("is_archived", "boolean")
   isArchived: boolean;
 
-  @Column("isdefault", "twake_boolean")
+  @Column("is_default", "boolean")
   isDefault: boolean;
 
-  @Column("uniquename", "encoded_string")
-  uniqueName: string;
-
-  @Column("member_count", "number")
-  memberCount: number;
-
-  @Column("guest_count", "number")
-  guestCount: number;
-
-  @Column("pending_count", "number")
-  pendingCount: number;
-
   @Column("date_added", "number")
   dateAdded: number;
 }
diff --git a/twake/backend/node/src/services/user/entities/workspace_user.ts b/twake/backend/node/src/services/user/entities/workspace_user.ts
index 1060fafa61..82981119c4 100644
--- a/twake/backend/node/src/services/user/entities/workspace_user.ts
+++ b/twake/backend/node/src/services/user/entities/workspace_user.ts
@@ -20,8 +20,8 @@ export default class WorkspaceUser {
   @Column("id", "timeuuid")
   id: string;
 
-  @Column("level_id", "number")
-  levelId: number;
+  @Column("role", "string")
+  role: "admin" | "member"; //Relative to workspace only (not relative to company)
 
   @Column("date_added", "number")
   dateAdded: number;
@@ -29,14 +29,8 @@ export default class WorkspaceUser {
   @Column("last_access", "number")
   lastAccess: number;
 
-  @Column("hasnotifications", "twake_boolean")
-  hasNotifications: boolean;
-
   @Column("is_externe", "twake_boolean")
-  isExternal: boolean;
-
-  @Column("is_auto_add_externe", "twake_boolean")
-  autoAddExternalExternal: boolean;
+  isExternal: boolean; //Depreciated
 }
 
 export type WorkspaceUserPrimaryKey = Partial<Pick<WorkspaceUser, "workspaceId" | "userId">>;
diff --git a/twake/backend/node/src/services/user/services/external_links/index.ts b/twake/backend/node/src/services/user/services/external_links/index.ts
index f94d8250e6..6a77124a60 100644
--- a/twake/backend/node/src/services/user/services/external_links/index.ts
+++ b/twake/backend/node/src/services/user/services/external_links/index.ts
@@ -3,11 +3,15 @@ import Repository from "../../../../core/platform/services/database/services/orm
 import ExternalUser from "../../entities/external_user";
 import ExternalGroup from "../../entities/external_company";
 import { UserExternalLinksServiceAPI } from "../../api";
+import Company from "../../entities/company";
+import User from "../../entities/user";
 
 export class UserExternalLinksService implements UserExternalLinksServiceAPI {
   version: "1";
   private externalUserRepository: Repository<ExternalUser>;
   private externalGroupRepository: Repository<ExternalGroup>;
+  private companyRepository: Repository<Company>;
+  private userRepository: Repository<User>;
 
   constructor(private database: DatabaseServiceAPI) {}
 
@@ -20,6 +24,8 @@ export class UserExternalLinksService implements UserExternalLinksServiceAPI {
       "external_group_repository",
       ExternalGroup,
     );
+    this.companyRepository = await this.database.getRepository<Company>("group_entity", Company);
+    this.userRepository = await this.database.getRepository<User>("user", User);
 
     return this;
   }
@@ -27,12 +33,28 @@ export class UserExternalLinksService implements UserExternalLinksServiceAPI {
   async createExternalUser(user: ExternalUser): Promise<ExternalUser> {
     await this.externalUserRepository.save(user);
 
+    //Save user provider and provider id here
+    const internalUser = await this.userRepository.findOne({ id: user.user_id });
+    if (internalUser) {
+      internalUser.identity_provider = user.service_id;
+      internalUser.identity_provider_id = user.external_id;
+      this.userRepository.save(internalUser);
+    }
+
     return user;
   }
 
   async createExternalGroup(group: ExternalGroup): Promise<ExternalGroup> {
     await this.externalGroupRepository.save(group);
 
+    //Save company provider and provider id here
+    const internalCompany = await this.companyRepository.findOne({ id: group.company_id });
+    if (internalCompany) {
+      internalCompany.identity_provider = group.service_id;
+      internalCompany.identity_provider_id = group.external_id;
+      this.companyRepository.save(internalCompany);
+    }
+
     return group;
   }
 }
diff --git a/twake/backend/node/src/services/user/services/workspace/index.ts b/twake/backend/node/src/services/user/services/workspace/index.ts
index c16a20117c..ba333bae85 100644
--- a/twake/backend/node/src/services/user/services/workspace/index.ts
+++ b/twake/backend/node/src/services/user/services/workspace/index.ts
@@ -88,6 +88,16 @@ export class WorkspaceService implements WorkspaceServiceAPI {
     );
   }
 
+  getAllForUser(
+    userId: Pick<WorkspaceUserPrimaryKey, "userId">,
+    pagination?: Paginable,
+  ): Promise<ListResult<WorkspaceUser>> {
+    return this.workspaceUserRepository.find(
+      { user_id: userId.userId },
+      { pagination: { limitStr: pagination?.limitStr, page_token: pagination?.page_token } },
+    );
+  }
+
   getAllUsers$(
     workspaceId: Pick<WorkspaceUserPrimaryKey, "workspaceId">,
     pagination?: Paginable,
diff --git a/twake/docker-compose.yml.dist b/twake/docker-compose.yml.dist.onpremise
similarity index 71%
rename from twake/docker-compose.yml.dist
rename to twake/docker-compose.yml.dist.onpremise
index 02c2aead31..12f6714739 100644
--- a/twake/docker-compose.yml.dist
+++ b/twake/docker-compose.yml.dist.onpremise
@@ -18,14 +18,10 @@ services:
       RABBITMQ_DEFAULT_PASS: admin
 
   node:
-    image: twaketech/twake-node
-    build:
-      context: ./backend/node
-      dockerfile: ../../docker/twake-node/Dockerfile.dev
+    image: twaketech/twake-node:latest
     environment:
       - NODE_ENV=production
     volumes:
-      - ./backend/node:/usr/src/app
       - ./configuration/backend-node/production.json:/usr/src/app/config/production.json
     depends_on:
       - scylladb
@@ -34,14 +30,12 @@ services:
       - scylladb
 
   php:
-    image: twaketech/twake-php
+    image: twaketech/twake-php:latest
     environment:
-      - DEV=dev
-    build:
-      context: .
-      dockerfile: docker/twake-php/Dockerfile
+      - DEV=production
     volumes:
-      - ./backend/core/:/twake-core:cached
+      - ./configuration/backend/Parameters.php:/configuration/Parameters.php
+      - ./connectors/:/twake-core/src/BuiltInConnectors/Connectors
       - ./docker-data/drive/:/twake-core/drive/
       - ./docker-data/fpm/:/etc/docker-data/fpm/
       - ./docker-data/drive-preview/:/twake-core/web/medias/
@@ -53,13 +47,9 @@ services:
       - scylladb
 
   nginx:
-    image: twaketech/twake-nginx
+    image: twaketech/twake-nginx:latest
     environment:
-      - DEV=dev
-      #- MOBILE_HOST=http://node:3000
-    build:
-      context: .
-      dockerfile: docker/twake-nginx/Dockerfile
+      - DEV=production
     ports:
       - 8000:80
     depends_on:
@@ -69,7 +59,6 @@ services:
       - php
       - node
     volumes:
-      - ./frontend/:/twake-react/
       - ./docker-data/logs/nginx/:/var/log/nginx
       - ./docker-data/letsencrypt/:/etc/letsencrypt/
       - ./docker-data/drive-preview/:/twake-core/web/medias/
diff --git a/twake/docker/twake-nginx/site.conf b/twake/docker/twake-nginx/site.conf
index c36da7b884..a6433ea10a 100644
--- a/twake/docker/twake-nginx/site.conf
+++ b/twake/docker/twake-nginx/site.conf
@@ -31,14 +31,17 @@ server {
     }
 
     location ~ ^/internal/mobile/.* {
+        proxy_set_header X-Forwarded-Host $host;
         proxy_pass ${MOBILE_HOST};
     }
 
     location ~ ^/(internal|plugins).* {
+        proxy_set_header X-Forwarded-Host $host;
         proxy_pass ${NODE_HOST};
     }
 
     location ~ ^/(api|administration)/v2/.* {
+        proxy_set_header X-Forwarded-Host $host;
         proxy_pass ${NODE_HOST};
     }
 
diff --git a/twake/frontend/public/index.html b/twake/frontend/public/index.html
index d85ec1b43d..0fadbc2703 100644
--- a/twake/frontend/public/index.html
+++ b/twake/frontend/public/index.html
@@ -41,9 +41,8 @@
       }
     </style>
     <link rel="manifest" href="/manifest.json" />
-    <link rel="stylesheet" href="/public/font/circular/stylesheet.css" />
-    <link rel="stylesheet" href="/public/font/helvetica/stylesheet.css" />
     <link rel="stylesheet" href="/public/font/tt_norms/stylesheet.css" />
+    <link rel="stylesheet" href="/public/font/helvetica/stylesheet.css" />
   </head>
   <body id="body" style="margin: 0; padding: 0;">
     <div id="fyfk-widget"></div>
@@ -80,13 +79,7 @@
       }
     </script>
     <script async src="https://cdn.headwayapp.co/widget.js"></script>
-    <script>
-      var ffWidgetId = '4a0f72e7-9db7-4d0f-aad2-da3ea3c6cb63';
-      var ffWidgetScript  = document.createElement('script');
-      ffWidgetScript.type = 'text/javascript';
-      ffWidgetScript.src = 'https://cdn.freddyfeedback.com/widget/freddyfeedback.js';
-      document.head.appendChild(ffWidgetScript);
-    </script>
+
     <script>
       if(location.origin.indexOf("twake.app") >= 0){
         !function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on","addSourceMiddleware","addIntegrationMiddleware","setAnonymousId","addDestinationMiddleware"];analytics.factory=function(e){return function(){var t=Array.prototype.slice.call(arguments);t.unshift(e);analytics.push(t);return analytics}};for(var e=0;e<analytics.methods.length;e++){var key=analytics.methods[e];analytics[key]=analytics.factory(key)}analytics.load=function(key,e){var t=document.createElement("script");t.type="text/javascript";t.async=!0;t.src="https://cdn.segment.com/analytics.js/v1/" + key + "/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(t,n);analytics._loadOptions=e};analytics.SNIPPET_VERSION="4.13.1";
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Black.eot b/twake/frontend/public/public/font/circular/CircularStd-Black.eot
deleted file mode 100644
index 846bd52a0d..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Black.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Black.ttf b/twake/frontend/public/public/font/circular/CircularStd-Black.ttf
deleted file mode 100644
index 7fc489216c..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Black.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Black.woff b/twake/frontend/public/public/font/circular/CircularStd-Black.woff
deleted file mode 100644
index 3c1aefebf6..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Black.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Black.woff2 b/twake/frontend/public/public/font/circular/CircularStd-Black.woff2
deleted file mode 100644
index d8d8e64ae7..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Black.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-BlackItalic.eot b/twake/frontend/public/public/font/circular/CircularStd-BlackItalic.eot
deleted file mode 100644
index b60c334c97..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-BlackItalic.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-BlackItalic.ttf b/twake/frontend/public/public/font/circular/CircularStd-BlackItalic.ttf
deleted file mode 100644
index 6f22e9d4fa..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-BlackItalic.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-BlackItalic.woff b/twake/frontend/public/public/font/circular/CircularStd-BlackItalic.woff
deleted file mode 100644
index 90ea21deb0..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-BlackItalic.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-BlackItalic.woff2 b/twake/frontend/public/public/font/circular/CircularStd-BlackItalic.woff2
deleted file mode 100644
index e04eb1df25..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-BlackItalic.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Bold.eot b/twake/frontend/public/public/font/circular/CircularStd-Bold.eot
deleted file mode 100644
index c02a7ab71e..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Bold.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Bold.ttf b/twake/frontend/public/public/font/circular/CircularStd-Bold.ttf
deleted file mode 100644
index 53caf09561..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Bold.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Bold.woff b/twake/frontend/public/public/font/circular/CircularStd-Bold.woff
deleted file mode 100644
index 5204e371fe..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Bold.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Bold.woff2 b/twake/frontend/public/public/font/circular/CircularStd-Bold.woff2
deleted file mode 100644
index 52a110af5a..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Bold.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-BoldItalic.eot b/twake/frontend/public/public/font/circular/CircularStd-BoldItalic.eot
deleted file mode 100644
index 8e672f1e9d..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-BoldItalic.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-BoldItalic.ttf b/twake/frontend/public/public/font/circular/CircularStd-BoldItalic.ttf
deleted file mode 100644
index abf44d3d6f..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-BoldItalic.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-BoldItalic.woff b/twake/frontend/public/public/font/circular/CircularStd-BoldItalic.woff
deleted file mode 100644
index 87d9dbff27..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-BoldItalic.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-BoldItalic.woff2 b/twake/frontend/public/public/font/circular/CircularStd-BoldItalic.woff2
deleted file mode 100644
index b52c05b558..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-BoldItalic.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Book.eot b/twake/frontend/public/public/font/circular/CircularStd-Book.eot
deleted file mode 100644
index 3c59ed9eeb..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Book.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Book.ttf b/twake/frontend/public/public/font/circular/CircularStd-Book.ttf
deleted file mode 100644
index e77c7f6b17..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Book.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Book.woff b/twake/frontend/public/public/font/circular/CircularStd-Book.woff
deleted file mode 100644
index a4be1de577..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Book.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Book.woff2 b/twake/frontend/public/public/font/circular/CircularStd-Book.woff2
deleted file mode 100644
index acaa8148dd..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Book.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-BookItalic.eot b/twake/frontend/public/public/font/circular/CircularStd-BookItalic.eot
deleted file mode 100644
index b6f87e4a6f..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-BookItalic.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-BookItalic.ttf b/twake/frontend/public/public/font/circular/CircularStd-BookItalic.ttf
deleted file mode 100644
index 481a721bf4..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-BookItalic.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-BookItalic.woff b/twake/frontend/public/public/font/circular/CircularStd-BookItalic.woff
deleted file mode 100644
index fdd5d41c04..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-BookItalic.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-BookItalic.woff2 b/twake/frontend/public/public/font/circular/CircularStd-BookItalic.woff2
deleted file mode 100644
index 526cb144ec..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-BookItalic.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Medium.eot b/twake/frontend/public/public/font/circular/CircularStd-Medium.eot
deleted file mode 100644
index ef0c1a4a9b..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Medium.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Medium.ttf b/twake/frontend/public/public/font/circular/CircularStd-Medium.ttf
deleted file mode 100644
index 5a5e6eddc7..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Medium.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Medium.woff b/twake/frontend/public/public/font/circular/CircularStd-Medium.woff
deleted file mode 100644
index 90d2a35b6d..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Medium.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-Medium.woff2 b/twake/frontend/public/public/font/circular/CircularStd-Medium.woff2
deleted file mode 100644
index 6b6797b39e..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-Medium.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-MediumItalic.eot b/twake/frontend/public/public/font/circular/CircularStd-MediumItalic.eot
deleted file mode 100644
index 0149ae206d..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-MediumItalic.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-MediumItalic.ttf b/twake/frontend/public/public/font/circular/CircularStd-MediumItalic.ttf
deleted file mode 100644
index 317a635ceb..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-MediumItalic.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-MediumItalic.woff b/twake/frontend/public/public/font/circular/CircularStd-MediumItalic.woff
deleted file mode 100644
index 64c0e3249c..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-MediumItalic.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/CircularStd-MediumItalic.woff2 b/twake/frontend/public/public/font/circular/CircularStd-MediumItalic.woff2
deleted file mode 100644
index b51d6ec7bc..0000000000
Binary files a/twake/frontend/public/public/font/circular/CircularStd-MediumItalic.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/circular/stylesheet.css b/twake/frontend/public/public/font/circular/stylesheet.css
deleted file mode 100644
index ef0c638da0..0000000000
--- a/twake/frontend/public/public/font/circular/stylesheet.css
+++ /dev/null
@@ -1,99 +0,0 @@
-@font-face {
-  font-family: 'Circular Std';
-  src: url('CircularStd-MediumItalic.eot');
-  src: local('Circular Std Medium Italic'), local('CircularStd-MediumItalic'),
-    url('CircularStd-MediumItalic.eot?#iefix') format('embedded-opentype'),
-    url('CircularStd-MediumItalic.woff2') format('woff2'),
-    url('CircularStd-MediumItalic.woff') format('woff'),
-    url('CircularStd-MediumItalic.ttf') format('truetype');
-  font-weight: 500;
-  font-style: italic;
-  unicode-range: U+0030-0039, U+0040-036F;
-}
-
-@font-face {
-  font-family: 'Circular Std';
-  src: url('CircularStd-Black.eot');
-  src: local('Circular Std Black'), local('CircularStd-Black'),
-    url('CircularStd-Black.eot?#iefix') format('embedded-opentype'),
-    url('CircularStd-Black.woff2') format('woff2'), url('CircularStd-Black.woff') format('woff'),
-    url('CircularStd-Black.ttf') format('truetype');
-  font-weight: 900;
-  font-style: normal;
-  unicode-range: U+0030-0039, U+0040-036F;
-}
-
-@font-face {
-  font-family: 'Circular Std';
-  src: url('CircularStd-Medium.eot');
-  src: local('Circular Std Medium'), local('CircularStd-Medium'),
-    url('CircularStd-Medium.eot?#iefix') format('embedded-opentype'),
-    url('CircularStd-Medium.woff2') format('woff2'), url('CircularStd-Medium.woff') format('woff'),
-    url('CircularStd-Medium.ttf') format('truetype');
-  font-weight: 500;
-  font-style: normal;
-  unicode-range: U+0030-0039, U+0040-036F;
-}
-
-@font-face {
-  font-family: 'Circular Std';
-  src: url('CircularStd-Bold.eot');
-  src: local('Circular Std Bold'), local('CircularStd-Bold'),
-    url('CircularStd-Bold.eot?#iefix') format('embedded-opentype'),
-    url('CircularStd-Bold.woff2') format('woff2'), url('CircularStd-Bold.woff') format('woff'),
-    url('CircularStd-Bold.ttf') format('truetype');
-  font-weight: bold;
-  font-style: normal;
-  unicode-range: U+0030-0039, U+0040-036F;
-}
-
-@font-face {
-  font-family: 'Circular Std';
-  src: url('CircularStd-BlackItalic.eot');
-  src: local('Circular Std Black Italic'), local('CircularStd-BlackItalic'),
-    url('CircularStd-BlackItalic.eot?#iefix') format('embedded-opentype'),
-    url('CircularStd-BlackItalic.woff2') format('woff2'),
-    url('CircularStd-BlackItalic.woff') format('woff'),
-    url('CircularStd-BlackItalic.ttf') format('truetype');
-  font-weight: 900;
-  font-style: italic;
-  unicode-range: U+0030-0039, U+0040-036F;
-}
-
-@font-face {
-  font-family: 'Circular Std';
-  src: url('CircularStd-BookItalic.eot');
-  src: local('Circular Std Book Italic'), local('CircularStd-BookItalic'),
-    url('CircularStd-BookItalic.eot?#iefix') format('embedded-opentype'),
-    url('CircularStd-BookItalic.woff2') format('woff2'),
-    url('CircularStd-BookItalic.woff') format('woff'),
-    url('CircularStd-BookItalic.ttf') format('truetype');
-  font-weight: normal;
-  font-style: italic;
-  unicode-range: U+0030-0039, U+0040-036F;
-}
-
-@font-face {
-  font-family: 'Circular Std';
-  src: url('CircularStd-BoldItalic.eot');
-  src: local('Circular Std Bold Italic'), local('CircularStd-BoldItalic'),
-    url('CircularStd-BoldItalic.eot?#iefix') format('embedded-opentype'),
-    url('CircularStd-BoldItalic.woff2') format('woff2'),
-    url('CircularStd-BoldItalic.woff') format('woff'),
-    url('CircularStd-BoldItalic.ttf') format('truetype');
-  font-weight: bold;
-  font-style: italic;
-  unicode-range: U+0030-0039, U+0040-036F;
-}
-
-@font-face {
-  font-family: 'Circular Std';
-  src: url('CircularStd-Book.eot');
-  src: local('Circular Std Book'), local('CircularStd-Book'),
-    url('CircularStd-Book.eot?#iefix') format('embedded-opentype'),
-    url('CircularStd-Book.woff2') format('woff2'), url('CircularStd-Book.woff') format('woff'),
-    url('CircularStd-Book.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-  unicode-range: U+0030-0039, U+0040-036F;
-}
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Black.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-Black.eot
deleted file mode 100644
index 44788bd182..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Black.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Black.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-Black.ttf
deleted file mode 100644
index 1400ce3d94..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Black.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Black.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-Black.woff
deleted file mode 100644
index 9ba6d1c7cf..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Black.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Black.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-Black.woff2
deleted file mode 100644
index 28b2f1b4c6..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Black.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-BlackItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-BlackItalic.eot
deleted file mode 100644
index 8745287622..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-BlackItalic.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-BlackItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-BlackItalic.ttf
deleted file mode 100644
index d69a1132c9..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-BlackItalic.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-BlackItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-BlackItalic.woff
deleted file mode 100644
index 8d7c7fa19a..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-BlackItalic.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-BlackItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-BlackItalic.woff2
deleted file mode 100644
index 8da8ad0e17..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-BlackItalic.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Bold.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-Bold.eot
deleted file mode 100644
index 1ed0ad5788..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Bold.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Bold.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-Bold.ttf
deleted file mode 100644
index 5c600f8b77..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Bold.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Bold.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-Bold.woff
deleted file mode 100644
index a9c1528896..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Bold.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Bold.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-Bold.woff2
deleted file mode 100644
index 42ab70c698..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Bold.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-BoldItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-BoldItalic.eot
deleted file mode 100644
index 2cddd37aa5..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-BoldItalic.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-BoldItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-BoldItalic.ttf
deleted file mode 100644
index 28d180ec70..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-BoldItalic.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-BoldItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-BoldItalic.woff
deleted file mode 100644
index c1c65c01e9..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-BoldItalic.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-BoldItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-BoldItalic.woff2
deleted file mode 100644
index 3879f50820..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-BoldItalic.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBold.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBold.eot
deleted file mode 100644
index c492b72718..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBold.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBold.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBold.ttf
deleted file mode 100644
index e9778e5cff..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBold.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBold.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBold.woff
deleted file mode 100644
index 1fc4a6328d..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBold.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBold.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBold.woff2
deleted file mode 100644
index 6cf833e221..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBold.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBoldItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBoldItalic.eot
deleted file mode 100644
index 2d11387463..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBoldItalic.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBoldItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBoldItalic.ttf
deleted file mode 100644
index bffdf6b6fa..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBoldItalic.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBoldItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBoldItalic.woff
deleted file mode 100644
index f3b5ae2682..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBoldItalic.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBoldItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBoldItalic.woff2
deleted file mode 100644
index 39ed74e5c7..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraBoldItalic.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLight.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLight.eot
deleted file mode 100644
index 9873529092..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLight.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLight.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLight.ttf
deleted file mode 100644
index 5bf5fd5e4f..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLight.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLight.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLight.woff
deleted file mode 100644
index 3971c36ea6..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLight.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLight.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLight.woff2
deleted file mode 100644
index 8fddd1a07a..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLight.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLightItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLightItalic.eot
deleted file mode 100644
index c32200508c..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLightItalic.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLightItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLightItalic.ttf
deleted file mode 100644
index 023179c175..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLightItalic.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLightItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLightItalic.woff
deleted file mode 100644
index 340caa7bd7..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLightItalic.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLightItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLightItalic.woff2
deleted file mode 100644
index bb6db104cf..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ExtraLightItalic.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Heavy.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-Heavy.eot
deleted file mode 100644
index a654d269dc..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Heavy.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Heavy.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-Heavy.ttf
deleted file mode 100644
index cfc81ae02e..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Heavy.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Heavy.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-Heavy.woff
deleted file mode 100644
index 8528abfe36..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Heavy.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Heavy.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-Heavy.woff2
deleted file mode 100644
index 0d88d920a7..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Heavy.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-HeavyItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-HeavyItalic.eot
deleted file mode 100644
index 1f621ff3b3..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-HeavyItalic.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-HeavyItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-HeavyItalic.ttf
deleted file mode 100644
index 2076fd3368..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-HeavyItalic.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-HeavyItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-HeavyItalic.woff
deleted file mode 100644
index 848def0803..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-HeavyItalic.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-HeavyItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-HeavyItalic.woff2
deleted file mode 100644
index ba000cf262..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-HeavyItalic.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Italic.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-Italic.eot
deleted file mode 100644
index afa08937e0..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Italic.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Italic.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-Italic.ttf
deleted file mode 100644
index b888b5ba59..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Italic.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Italic.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-Italic.woff
deleted file mode 100644
index 969ae72399..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Italic.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Italic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-Italic.woff2
deleted file mode 100644
index a789347225..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Italic.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Light.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-Light.eot
deleted file mode 100644
index d212bd00ad..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Light.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Light.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-Light.ttf
deleted file mode 100644
index 0561d28ff1..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Light.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Light.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-Light.woff
deleted file mode 100644
index 6cc092dc32..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Light.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Light.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-Light.woff2
deleted file mode 100644
index 35d17ebc5d..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Light.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-LightItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-LightItalic.eot
deleted file mode 100644
index 08c48d7c4b..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-LightItalic.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-LightItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-LightItalic.ttf
deleted file mode 100644
index 1ad6b42b73..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-LightItalic.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-LightItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-LightItalic.woff
deleted file mode 100644
index 161a15168d..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-LightItalic.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-LightItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-LightItalic.woff2
deleted file mode 100644
index ecda936f07..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-LightItalic.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Medium.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-Medium.eot
deleted file mode 100644
index 18581d7fe1..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Medium.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Medium.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-Medium.ttf
deleted file mode 100644
index a36153d711..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Medium.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Medium.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-Medium.woff
deleted file mode 100644
index f61ab41003..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Medium.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Medium.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-Medium.woff2
deleted file mode 100644
index b02e795fe9..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Medium.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-MediumItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-MediumItalic.eot
deleted file mode 100644
index e90bb30d3a..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-MediumItalic.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-MediumItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-MediumItalic.ttf
deleted file mode 100644
index 918b4a0e3a..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-MediumItalic.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-MediumItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-MediumItalic.woff
deleted file mode 100644
index 13c3fe4e2b..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-MediumItalic.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-MediumItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-MediumItalic.woff2
deleted file mode 100644
index 5832859d7d..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-MediumItalic.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Regular.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-Regular.eot
deleted file mode 100644
index f49e5649fe..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Regular.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Regular.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-Regular.ttf
deleted file mode 100644
index 5966123722..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Regular.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Regular.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-Regular.woff
deleted file mode 100644
index 4b5b79d811..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Regular.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Regular.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-Regular.woff2
deleted file mode 100644
index ce3282c14e..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Regular.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Thin.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-Thin.eot
deleted file mode 100644
index 31a97d236f..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Thin.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Thin.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-Thin.ttf
deleted file mode 100644
index 3a4e5a6c3c..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Thin.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Thin.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-Thin.woff
deleted file mode 100644
index 38595ea168..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Thin.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-Thin.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-Thin.woff2
deleted file mode 100644
index 7410a9e4a9..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-Thin.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ThinItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNorms-ThinItalic.eot
deleted file mode 100644
index 9f97b03df5..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ThinItalic.eot and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ThinItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNorms-ThinItalic.ttf
deleted file mode 100644
index 0c2f2180b0..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ThinItalic.ttf and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ThinItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNorms-ThinItalic.woff
deleted file mode 100644
index 8f79adab57..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ThinItalic.woff and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNorms-ThinItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNorms-ThinItalic.woff2
deleted file mode 100644
index 8cd9aa6db5..0000000000
Binary files a/twake/frontend/public/public/font/tt_norms/TTNorms-ThinItalic.woff2 and /dev/null differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Black.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Black.eot
new file mode 100644
index 0000000000..60ae189fbb
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Black.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Black.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Black.ttf
new file mode 100644
index 0000000000..ec41d1f052
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Black.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Black.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Black.woff
new file mode 100644
index 0000000000..b9394bc9cd
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Black.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Black.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Black.woff2
new file mode 100644
index 0000000000..e711095531
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Black.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-BlackItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BlackItalic.eot
new file mode 100644
index 0000000000..68952dd828
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BlackItalic.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-BlackItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BlackItalic.ttf
new file mode 100644
index 0000000000..3deb3f09a1
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BlackItalic.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-BlackItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BlackItalic.woff
new file mode 100644
index 0000000000..fee9046f4a
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BlackItalic.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-BlackItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BlackItalic.woff2
new file mode 100644
index 0000000000..2a884a43f9
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BlackItalic.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Bold.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Bold.eot
new file mode 100644
index 0000000000..02f659734c
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Bold.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Bold.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Bold.ttf
new file mode 100644
index 0000000000..1c0313ef40
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Bold.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Bold.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Bold.woff
new file mode 100644
index 0000000000..cbf38697c8
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Bold.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Bold.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Bold.woff2
new file mode 100644
index 0000000000..27fdde37b5
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Bold.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-BoldItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BoldItalic.eot
new file mode 100644
index 0000000000..1cf3277104
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BoldItalic.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-BoldItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BoldItalic.ttf
new file mode 100644
index 0000000000..4b48a835d7
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BoldItalic.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-BoldItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BoldItalic.woff
new file mode 100644
index 0000000000..5e19e0dfb0
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BoldItalic.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-BoldItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BoldItalic.woff2
new file mode 100644
index 0000000000..8e001ac549
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-BoldItalic.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlack.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlack.eot
new file mode 100644
index 0000000000..93789e4e0b
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlack.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlack.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlack.ttf
new file mode 100644
index 0000000000..976ff0b37f
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlack.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlack.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlack.woff
new file mode 100644
index 0000000000..9e35aaf758
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlack.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlack.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlack.woff2
new file mode 100644
index 0000000000..1bdb015ca8
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlack.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlackItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlackItalic.eot
new file mode 100644
index 0000000000..4629615776
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlackItalic.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlackItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlackItalic.ttf
new file mode 100644
index 0000000000..e79cddcfcd
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlackItalic.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlackItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlackItalic.woff
new file mode 100644
index 0000000000..c1d3992be9
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlackItalic.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlackItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlackItalic.woff2
new file mode 100644
index 0000000000..053051b3bf
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBlackItalic.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBold.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBold.eot
new file mode 100644
index 0000000000..5f5c876d3b
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBold.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBold.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBold.ttf
new file mode 100644
index 0000000000..cfa757e99e
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBold.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBold.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBold.woff
new file mode 100644
index 0000000000..bd3d751894
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBold.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBold.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBold.woff2
new file mode 100644
index 0000000000..e761c453e6
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBold.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBoldItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBoldItalic.eot
new file mode 100644
index 0000000000..1e45cc4cf2
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBoldItalic.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBoldItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBoldItalic.ttf
new file mode 100644
index 0000000000..8517b4be09
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBoldItalic.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBoldItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBoldItalic.woff
new file mode 100644
index 0000000000..64677f985c
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBoldItalic.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBoldItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBoldItalic.woff2
new file mode 100644
index 0000000000..a679f17aca
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraBoldItalic.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLight.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLight.eot
new file mode 100644
index 0000000000..8e1016f0a1
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLight.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLight.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLight.ttf
new file mode 100644
index 0000000000..2ba3166262
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLight.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLight.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLight.woff
new file mode 100644
index 0000000000..6f9c59d7ce
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLight.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLight.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLight.woff2
new file mode 100644
index 0000000000..21353f2aac
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLight.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLightItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLightItalic.eot
new file mode 100644
index 0000000000..ac95471e84
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLightItalic.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLightItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLightItalic.ttf
new file mode 100644
index 0000000000..1446c33fca
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLightItalic.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLightItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLightItalic.woff
new file mode 100644
index 0000000000..d6da6d41a8
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLightItalic.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLightItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLightItalic.woff2
new file mode 100644
index 0000000000..ac981cc241
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ExtraLightItalic.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Italic.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Italic.eot
new file mode 100644
index 0000000000..4d30d4bbd0
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Italic.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Italic.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Italic.ttf
new file mode 100644
index 0000000000..0c89334d94
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Italic.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Italic.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Italic.woff
new file mode 100644
index 0000000000..064d088088
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Italic.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Italic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Italic.woff2
new file mode 100644
index 0000000000..6cc6ee9cd6
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Italic.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Light.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Light.eot
new file mode 100644
index 0000000000..a4652042a2
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Light.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Light.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Light.ttf
new file mode 100644
index 0000000000..ef8aa69768
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Light.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Light.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Light.woff
new file mode 100644
index 0000000000..b4ee151bc2
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Light.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Light.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Light.woff2
new file mode 100644
index 0000000000..e50fca855f
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Light.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-LightItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-LightItalic.eot
new file mode 100644
index 0000000000..3a750f6f93
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-LightItalic.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-LightItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-LightItalic.ttf
new file mode 100644
index 0000000000..91898add25
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-LightItalic.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-LightItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-LightItalic.woff
new file mode 100644
index 0000000000..65544618d4
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-LightItalic.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-LightItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-LightItalic.woff2
new file mode 100644
index 0000000000..b13cd6d9a9
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-LightItalic.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Medium.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Medium.eot
new file mode 100644
index 0000000000..50622e6251
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Medium.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Medium.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Medium.ttf
new file mode 100644
index 0000000000..04159c49a0
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Medium.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Medium.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Medium.woff
new file mode 100644
index 0000000000..a472244c00
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Medium.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Medium.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Medium.woff2
new file mode 100644
index 0000000000..23a1570e85
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Medium.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-MediumItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-MediumItalic.eot
new file mode 100644
index 0000000000..e0e0f51239
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-MediumItalic.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-MediumItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-MediumItalic.ttf
new file mode 100644
index 0000000000..a1015fb05c
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-MediumItalic.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-MediumItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-MediumItalic.woff
new file mode 100644
index 0000000000..deb1b7d64f
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-MediumItalic.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-MediumItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-MediumItalic.woff2
new file mode 100644
index 0000000000..903976ce8d
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-MediumItalic.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Regular.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Regular.eot
new file mode 100644
index 0000000000..771257cf69
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Regular.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Regular.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Regular.ttf
new file mode 100644
index 0000000000..9163f52b98
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Regular.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Regular.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Regular.woff
new file mode 100644
index 0000000000..5e1c2a1a1f
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Regular.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Regular.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Regular.woff2
new file mode 100644
index 0000000000..e181f465c9
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Regular.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Thin.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Thin.eot
new file mode 100644
index 0000000000..f05069304d
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Thin.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Thin.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Thin.ttf
new file mode 100644
index 0000000000..434e4e9154
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Thin.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Thin.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Thin.woff
new file mode 100644
index 0000000000..726323d849
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Thin.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-Thin.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Thin.woff2
new file mode 100644
index 0000000000..1a259b003f
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-Thin.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ThinItalic.eot b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ThinItalic.eot
new file mode 100644
index 0000000000..559b471e68
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ThinItalic.eot differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ThinItalic.ttf b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ThinItalic.ttf
new file mode 100644
index 0000000000..77f7066953
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ThinItalic.ttf differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ThinItalic.woff b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ThinItalic.woff
new file mode 100644
index 0000000000..a08388fb33
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ThinItalic.woff differ
diff --git a/twake/frontend/public/public/font/tt_norms/TTNormsPro-ThinItalic.woff2 b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ThinItalic.woff2
new file mode 100644
index 0000000000..c98be2dc2d
Binary files /dev/null and b/twake/frontend/public/public/font/tt_norms/TTNormsPro-ThinItalic.woff2 differ
diff --git a/twake/frontend/public/public/font/tt_norms/stylesheet.css b/twake/frontend/public/public/font/tt_norms/stylesheet.css
index 27ce469077..1979b0e593 100644
--- a/twake/frontend/public/public/font/tt_norms/stylesheet.css
+++ b/twake/frontend/public/public/font/tt_norms/stylesheet.css
@@ -1,218 +1,208 @@
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-Bold.eot');
-  src: local('TT Norms Bold'), local('TTNorms-Bold'),
-    url('TTNorms-Bold.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-Bold.woff2') format('woff2'), url('TTNorms-Bold.woff') format('woff'),
-    url('TTNorms-Bold.ttf') format('truetype');
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-Bold.eot');
+  src: local('TT Norms Pro Bold'), local('TTNormsPro-Bold'),
+    url('TTNormsPro-Bold.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-Bold.woff2') format('woff2'), url('TTNormsPro-Bold.woff') format('woff'),
+    url('TTNormsPro-Bold.ttf') format('truetype');
   font-weight: bold;
   font-style: normal;
-  unicode-range: U+0370-052F;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-ThinItalic.eot');
-  src: local('TT Norms Thin Italic'), local('TTNorms-ThinItalic'),
-    url('TTNorms-ThinItalic.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-ThinItalic.woff2') format('woff2'), url('TTNorms-ThinItalic.woff') format('woff'),
-    url('TTNorms-ThinItalic.ttf') format('truetype');
-  font-weight: 100;
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-ExtraBoldItalic.eot');
+  src: local('TT Norms Pro ExtraBold Italic'), local('TTNormsPro-ExtraBoldItalic'),
+    url('TTNormsPro-ExtraBoldItalic.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-ExtraBoldItalic.woff2') format('woff2'),
+    url('TTNormsPro-ExtraBoldItalic.woff') format('woff'),
+    url('TTNormsPro-ExtraBoldItalic.ttf') format('truetype');
+  font-weight: 800;
   font-style: italic;
-  unicode-range: U+0370-052F;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-Thin.eot');
-  src: local('TT Norms Thin'), local('TTNorms-Thin'),
-    url('TTNorms-Thin.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-Thin.woff2') format('woff2'), url('TTNorms-Thin.woff') format('woff'),
-    url('TTNorms-Thin.ttf') format('truetype');
-  font-weight: 100;
-  font-style: normal;
-  unicode-range: U+0370-052F;
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-ExtraLightItalic.eot');
+  src: local('TT Norms Pro ExtraLight Italic'), local('TTNormsPro-ExtraLightItalic'),
+    url('TTNormsPro-ExtraLightItalic.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-ExtraLightItalic.woff2') format('woff2'),
+    url('TTNormsPro-ExtraLightItalic.woff') format('woff'),
+    url('TTNormsPro-ExtraLightItalic.ttf') format('truetype');
+  font-weight: 200;
+  font-style: italic;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-LightItalic.eot');
-  src: local('TT Norms Light Italic'), local('TTNorms-LightItalic'),
-    url('TTNorms-LightItalic.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-LightItalic.woff2') format('woff2'), url('TTNorms-LightItalic.woff') format('woff'),
-    url('TTNorms-LightItalic.ttf') format('truetype');
-  font-weight: 300;
-  font-style: italic;
-  unicode-range: U+0370-052F;
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-Thin.eot');
+  src: local('TT Norms Pro Thin'), local('TTNormsPro-Thin'),
+    url('TTNormsPro-Thin.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-Thin.woff2') format('woff2'), url('TTNormsPro-Thin.woff') format('woff'),
+    url('TTNormsPro-Thin.ttf') format('truetype');
+  font-weight: 100;
+  font-style: normal;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-ExtraBoldItalic.eot');
-  src: local('TT Norms ExtraBold Italic'), local('TTNorms-ExtraBoldItalic'),
-    url('TTNorms-ExtraBoldItalic.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-ExtraBoldItalic.woff2') format('woff2'),
-    url('TTNorms-ExtraBoldItalic.woff') format('woff'),
-    url('TTNorms-ExtraBoldItalic.ttf') format('truetype');
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-ExtraBold.eot');
+  src: local('TT Norms Pro ExtraBold'), local('TTNormsPro-ExtraBold'),
+    url('TTNormsPro-ExtraBold.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-ExtraBold.woff2') format('woff2'),
+    url('TTNormsPro-ExtraBold.woff') format('woff'),
+    url('TTNormsPro-ExtraBold.ttf') format('truetype');
   font-weight: 800;
-  font-style: italic;
-  unicode-range: U+0370-052F;
+  font-style: normal;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-Italic.eot');
-  src: local('TT Norms Italic'), local('TTNorms-Italic'),
-    url('TTNorms-Italic.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-Italic.woff2') format('woff2'), url('TTNorms-Italic.woff') format('woff'),
-    url('TTNorms-Italic.ttf') format('truetype');
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-Regular.eot');
+  src: local('TT Norms Pro Regular'), local('TTNormsPro-Regular'),
+    url('TTNormsPro-Regular.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-Regular.woff2') format('woff2'), url('TTNormsPro-Regular.woff') format('woff'),
+    url('TTNormsPro-Regular.ttf') format('truetype');
   font-weight: normal;
-  font-style: italic;
-  unicode-range: U+0370-052F;
+  font-style: normal;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-ExtraLight.eot');
-  src: local('TT Norms ExtraLight'), local('TTNorms-ExtraLight'),
-    url('TTNorms-ExtraLight.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-ExtraLight.woff2') format('woff2'), url('TTNorms-ExtraLight.woff') format('woff'),
-    url('TTNorms-ExtraLight.ttf') format('truetype');
-  font-weight: 200;
-  font-style: normal;
-  unicode-range: U+0370-052F;
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-ThinItalic.eot');
+  src: local('TT Norms Pro Thin Italic'), local('TTNormsPro-ThinItalic'),
+    url('TTNormsPro-ThinItalic.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-ThinItalic.woff2') format('woff2'),
+    url('TTNormsPro-ThinItalic.woff') format('woff'),
+    url('TTNormsPro-ThinItalic.ttf') format('truetype');
+  font-weight: 100;
+  font-style: italic;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-HeavyItalic.eot');
-  src: local('TT Norms Heavy Italic'), local('TTNorms-HeavyItalic'),
-    url('TTNorms-HeavyItalic.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-HeavyItalic.woff2') format('woff2'), url('TTNorms-HeavyItalic.woff') format('woff'),
-    url('TTNorms-HeavyItalic.ttf') format('truetype');
-  font-weight: 900;
-  font-style: italic;
-  unicode-range: U+0370-052F;
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-Light.eot');
+  src: local('TT Norms Pro Light'), local('TTNormsPro-Light'),
+    url('TTNormsPro-Light.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-Light.woff2') format('woff2'), url('TTNormsPro-Light.woff') format('woff'),
+    url('TTNormsPro-Light.ttf') format('truetype');
+  font-weight: 300;
+  font-style: normal;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-MediumItalic.eot');
-  src: local('TT Norms Medium Italic'), local('TTNorms-MediumItalic'),
-    url('TTNorms-MediumItalic.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-MediumItalic.woff2') format('woff2'),
-    url('TTNorms-MediumItalic.woff') format('woff'),
-    url('TTNorms-MediumItalic.ttf') format('truetype');
-  font-weight: 500;
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-MediumItalic.eot');
+  src: local('TT Norms Pro Medium Italic'), local('TTNormsPro-MediumItalic'),
+    url('TTNormsPro-MediumItalic.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-MediumItalic.woff2') format('woff2'),
+    url('TTNormsPro-MediumItalic.woff') format('woff'),
+    url('TTNormsPro-MediumItalic.ttf') format('truetype');
+  font-weight: 400;
   font-style: italic;
-  unicode-range: U+0370-052F;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-BoldItalic.eot');
-  src: local('TT Norms Bold Italic'), local('TTNorms-BoldItalic'),
-    url('TTNorms-BoldItalic.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-BoldItalic.woff2') format('woff2'), url('TTNorms-BoldItalic.woff') format('woff'),
-    url('TTNorms-BoldItalic.ttf') format('truetype');
-  font-weight: bold;
+  font-family: 'TT Norms Pro ExtraBlack';
+  src: url('TTNormsPro-ExtraBlackItalic.eot');
+  src: local('TT Norms Pro ExtraBlack Italic'), local('TTNormsPro-ExtraBlackItalic'),
+    url('TTNormsPro-ExtraBlackItalic.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-ExtraBlackItalic.woff2') format('woff2'),
+    url('TTNormsPro-ExtraBlackItalic.woff') format('woff'),
+    url('TTNormsPro-ExtraBlackItalic.ttf') format('truetype');
+  font-weight: 900;
   font-style: italic;
-  unicode-range: U+0370-052F;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-Heavy.eot');
-  src: local('TT Norms Heavy'), local('TTNorms-Heavy'),
-    url('TTNorms-Heavy.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-Heavy.woff2') format('woff2'), url('TTNorms-Heavy.woff') format('woff'),
-    url('TTNorms-Heavy.ttf') format('truetype');
-  font-weight: 900;
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-ExtraLight.eot');
+  src: local('TT Norms Pro ExtraLight'), local('TTNormsPro-ExtraLight'),
+    url('TTNormsPro-ExtraLight.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-ExtraLight.woff2') format('woff2'),
+    url('TTNormsPro-ExtraLight.woff') format('woff'),
+    url('TTNormsPro-ExtraLight.ttf') format('truetype');
+  font-weight: 200;
   font-style: normal;
-  unicode-range: U+0370-052F;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-Light.eot');
-  src: local('TT Norms Light'), local('TTNorms-Light'),
-    url('TTNorms-Light.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-Light.woff2') format('woff2'), url('TTNorms-Light.woff') format('woff'),
-    url('TTNorms-Light.ttf') format('truetype');
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-LightItalic.eot');
+  src: local('TT Norms Pro Light Italic'), local('TTNormsPro-LightItalic'),
+    url('TTNormsPro-LightItalic.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-LightItalic.woff2') format('woff2'),
+    url('TTNormsPro-LightItalic.woff') format('woff'),
+    url('TTNormsPro-LightItalic.ttf') format('truetype');
   font-weight: 300;
-  font-style: normal;
-  unicode-range: U+0370-052F;
+  font-style: italic;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-Medium.eot');
-  src: local('TT Norms Medium'), local('TTNorms-Medium'),
-    url('TTNorms-Medium.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-Medium.woff2') format('woff2'), url('TTNorms-Medium.woff') format('woff'),
-    url('TTNorms-Medium.ttf') format('truetype');
-  font-weight: 500;
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-Medium.eot');
+  src: local('TT Norms Pro Medium'), local('TTNormsPro-Medium'),
+    url('TTNormsPro-Medium.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-Medium.woff2') format('woff2'), url('TTNormsPro-Medium.woff') format('woff'),
+    url('TTNormsPro-Medium.ttf') format('truetype');
+  font-weight: 400;
   font-style: normal;
-  unicode-range: U+0370-052F;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-ExtraBold.eot');
-  src: local('TT Norms ExtraBold'), local('TTNorms-ExtraBold'),
-    url('TTNorms-ExtraBold.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-ExtraBold.woff2') format('woff2'), url('TTNorms-ExtraBold.woff') format('woff'),
-    url('TTNorms-ExtraBold.ttf') format('truetype');
-  font-weight: 800;
+  font-family: 'TT Norms Pro ExtraBlack';
+  src: url('TTNormsPro-ExtraBlack.eot');
+  src: local('TT Norms Pro ExtraBlack'), local('TTNormsPro-ExtraBlack'),
+    url('TTNormsPro-ExtraBlack.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-ExtraBlack.woff2') format('woff2'),
+    url('TTNormsPro-ExtraBlack.woff') format('woff'),
+    url('TTNormsPro-ExtraBlack.ttf') format('truetype');
+  font-weight: 900;
   font-style: normal;
-  unicode-range: U+0370-052F;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-ExtraLightItalic.eot');
-  src: local('TT Norms ExtraLight Italic'), local('TTNorms-ExtraLightItalic'),
-    url('TTNorms-ExtraLightItalic.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-ExtraLightItalic.woff2') format('woff2'),
-    url('TTNorms-ExtraLightItalic.woff') format('woff'),
-    url('TTNorms-ExtraLightItalic.ttf') format('truetype');
-  font-weight: 200;
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-BoldItalic.eot');
+  src: local('TT Norms Pro Bold Italic'), local('TTNormsPro-BoldItalic'),
+    url('TTNormsPro-BoldItalic.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-BoldItalic.woff2') format('woff2'),
+    url('TTNormsPro-BoldItalic.woff') format('woff'),
+    url('TTNormsPro-BoldItalic.ttf') format('truetype');
+  font-weight: bold;
   font-style: italic;
-  unicode-range: U+0370-052F;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-Regular.eot');
-  src: local('TT Norms Regular'), local('TTNorms-Regular'),
-    url('TTNorms-Regular.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-Regular.woff2') format('woff2'), url('TTNorms-Regular.woff') format('woff'),
-    url('TTNorms-Regular.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-  unicode-range: U+0370-052F;
-}
-
-@font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-BlackItalic.eot');
-  src: local('TT Norms Black Italic'), local('TTNorms-BlackItalic'),
-    url('TTNorms-BlackItalic.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-BlackItalic.woff2') format('woff2'), url('TTNorms-BlackItalic.woff') format('woff'),
-    url('TTNorms-BlackItalic.ttf') format('truetype');
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-BlackItalic.eot');
+  src: local('TT Norms Pro Black Italic'), local('TTNormsPro-BlackItalic'),
+    url('TTNormsPro-BlackItalic.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-BlackItalic.woff2') format('woff2'),
+    url('TTNormsPro-BlackItalic.woff') format('woff'),
+    url('TTNormsPro-BlackItalic.ttf') format('truetype');
   font-weight: 900;
   font-style: italic;
-  unicode-range: U+0370-052F;
 }
 
 @font-face {
-  font-family: 'TT Norms';
-  src: url('TTNorms-Black.eot');
-  src: local('TT Norms Black'), local('TTNorms-Black'),
-    url('TTNorms-Black.eot?#iefix') format('embedded-opentype'),
-    url('TTNorms-Black.woff2') format('woff2'), url('TTNorms-Black.woff') format('woff'),
-    url('TTNorms-Black.ttf') format('truetype');
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-Black.eot');
+  src: local('TT Norms Pro Black'), local('TTNormsPro-Black'),
+    url('TTNormsPro-Black.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-Black.woff2') format('woff2'), url('TTNormsPro-Black.woff') format('woff'),
+    url('TTNormsPro-Black.ttf') format('truetype');
   font-weight: 900;
   font-style: normal;
-  unicode-range: U+0370-052F;
+}
+
+@font-face {
+  font-family: 'TT Norms Pro';
+  src: url('TTNormsPro-Italic.eot');
+  src: local('TT Norms Pro Italic'), local('TTNormsPro-Italic'),
+    url('TTNormsPro-Italic.eot?#iefix') format('embedded-opentype'),
+    url('TTNormsPro-Italic.woff2') format('woff2'), url('TTNormsPro-Italic.woff') format('woff'),
+    url('TTNormsPro-Italic.ttf') format('truetype');
+  font-weight: normal;
+  font-style: italic;
 }
diff --git a/twake/frontend/src/app/app.tsx b/twake/frontend/src/app/app.tsx
index 482803e270..2b3e6c402e 100755
--- a/twake/frontend/src/app/app.tsx
+++ b/twake/frontend/src/app/app.tsx
@@ -39,10 +39,10 @@ export default () => {
           <Route
             path="/"
             component={() => {
-              RouterServices.history.replace(
-                RouterServices.pathnames.LOGIN +
-                  '?auto&' +
-                  RouterServices.history.location.search.substr(1),
+              RouterServices.replace(
+                `${
+                  RouterServices.pathnames.LOGIN
+                }?auto&${RouterServices.history.location.search.substr(1)}`,
               );
               return <div />;
             }}
diff --git a/twake/frontend/src/app/components/AddUserButton/AddUserButton.scss b/twake/frontend/src/app/components/AddUserButton/AddUserButton.scss
new file mode 100644
index 0000000000..14137faaf6
--- /dev/null
+++ b/twake/frontend/src/app/components/AddUserButton/AddUserButton.scss
@@ -0,0 +1,18 @@
+.addUserButton {
+  color: var(--primary);
+
+  .icon {
+    .iconBox {
+      width: 18px;
+      height: 18px;
+      background-color: var(--primary-background);
+      border-radius: 4px;
+      padding-left: 2px;
+
+      .icon-unicon {
+        color: var(--primary) !important;
+      }
+    }
+    color: var(--primary) !important ;
+  }
+}
diff --git a/twake/frontend/src/app/components/AddUserButton/AddUserButton.tsx b/twake/frontend/src/app/components/AddUserButton/AddUserButton.tsx
new file mode 100644
index 0000000000..a5895ac2dc
--- /dev/null
+++ b/twake/frontend/src/app/components/AddUserButton/AddUserButton.tsx
@@ -0,0 +1,37 @@
+import React, { Component } from 'react';
+import Icon from 'components/Icon/Icon.js';
+import Languages from 'services/languages/languages.js';
+import './AddUserButton.scss';
+import popupManager from 'services/popupManager/popupManager.js';
+import workspaceUserRightsService from 'services/workspaces/workspace_user_rights.js';
+import AddUser from 'app/scenes/Client/Popup/AddUser/AddUser';
+import AddUserFromTwakeConsole from 'app/scenes/Client/Popup/AddUser/AddUserFromTwakeConsole';
+import InitService from 'app/services/InitService';
+
+export default (props: any) => {
+  return (
+    <div
+      className="channel addUserButton"
+      onClick={() => {
+        if (InitService.server_infos?.auth?.console?.use) {
+          return popupManager.open(<AddUserFromTwakeConsole standalone />);
+        } else {
+          return popupManager.open(<AddUser standalone />);
+        }
+      }}
+    >
+      <div className="icon">
+        <div className="iconBox">
+          <Icon type="plus" />
+        </div>
+      </div>
+      <div className="text">
+        {Languages.t(
+          'scenes.app.popup.workspaceparameter.pages.collaboraters_adding_button',
+          [],
+          'Ajouter des collaborateurs',
+        )}
+      </div>
+    </div>
+  );
+};
diff --git a/twake/frontend/src/app/components/HighlightedCode/HighlightedCode.js b/twake/frontend/src/app/components/HighlightedCode/HighlightedCode.js
index 714518d38d..175e964931 100755
--- a/twake/frontend/src/app/components/HighlightedCode/HighlightedCode.js
+++ b/twake/frontend/src/app/components/HighlightedCode/HighlightedCode.js
@@ -5,7 +5,7 @@ import 'highlight.js/styles/railscasts.css'; //monokai-sublime
 export default class HighlightedCode extends React.Component {
   componentDidMount() {
     window.hljs = hljs;
-    hljs.highlightBlock(this.node);
+    hljs.highlightElement(this.node);
   }
   render() {
     var code = this.props.children;
diff --git a/twake/frontend/src/app/components/Inputs/Inputs.scss b/twake/frontend/src/app/components/Inputs/Inputs.scss
index edb990352d..47a614f3a3 100755
--- a/twake/frontend/src/app/components/Inputs/Inputs.scss
+++ b/twake/frontend/src/app/components/Inputs/Inputs.scss
@@ -341,9 +341,9 @@ select,
   display: inline-block;
   background: var(--grey-background);
   border-radius: var(--border-radius-base);
-  padding: 11px;
-  font-size: 18px;
-  line-height: 20px;
+  padding: 12px;
+  font-size: 16px;
+  line-height: 16px;
   box-sizing: border-box;
   cursor: pointer;
 
diff --git a/twake/frontend/src/app/components/OnBoarding/CompanyStatusComponent.tsx b/twake/frontend/src/app/components/OnBoarding/CompanyStatusComponent.tsx
index 12d6a05c07..83ba9b0d40 100644
--- a/twake/frontend/src/app/components/OnBoarding/CompanyStatusComponent.tsx
+++ b/twake/frontend/src/app/components/OnBoarding/CompanyStatusComponent.tsx
@@ -31,7 +31,7 @@ const CompanyStatusComponent = (): JSX.Element => {
     if (!workspace?.id) return;
 
     const isNewUser: boolean =
-      onboarding !== 'completed' && workspace?.group?.stats?.total_members <= 1 && isNewCompany();
+      onboarding !== 'completed' && workspace?.group?.stats?.total_members <= 1 && isNewCompany() && !user?.is_verified;
 
     if (isNewUser) {
       localStorage.setItem(`onboarding_${companyId}`, 'completed');
diff --git a/twake/frontend/src/app/components/OnBoarding/popups/BlockedAccount.tsx b/twake/frontend/src/app/components/OnBoarding/popups/BlockedAccount.tsx
index b34ac131ab..277bd95123 100644
--- a/twake/frontend/src/app/components/OnBoarding/popups/BlockedAccount.tsx
+++ b/twake/frontend/src/app/components/OnBoarding/popups/BlockedAccount.tsx
@@ -2,13 +2,20 @@ import { Button, Row, Typography } from 'antd';
 import React, { useState } from 'react';
 import ObjectModal from '../../ObjectModal/ObjectModal';
 import Languages from 'services/languages/languages.js';
+import ConsoleService from 'app/services/ConsoleService';
+import LoginService from 'services/login/login';
 
 type PropsType = {
   email: string;
 };
 
 const BlockedAccount = ({ email }: PropsType): JSX.Element => {
-  const onClickButton = () => console.log('clicked');
+  const [loading, setLoading] = useState<boolean>(false);
+
+  const onClickButton = () => {
+    setLoading(true);
+    return ConsoleService.verifyMail().finally(() => setLoading(false));
+  };
 
   return (
     <ObjectModal
@@ -21,9 +28,17 @@ const BlockedAccount = ({ email }: PropsType): JSX.Element => {
       hideFooterDivider
       footerAlign="center"
       footer={
-        <Button type="ghost" size="small" onClick={onClickButton}>
-          {Languages.t('general.re_send')}
-        </Button>
+        <>
+          <Button type="ghost" size="small" onClick={onClickButton} loading={loading}>
+            {Languages.t('general.re_send')}
+          </Button>
+
+          <Row justify="center" style={{ marginTop: 16 }}>
+            <a className="blue_link" onClick={() => LoginService.logout()}>
+              {Languages.t('scenes.apps.account.account.logout')}
+            </a>
+          </Row>
+        </>
       }
     >
       <Row justify="center" style={{ marginTop: 36 }}>
diff --git a/twake/frontend/src/app/components/PopupComponent/PopupComponent.scss b/twake/frontend/src/app/components/PopupComponent/PopupComponent.scss
index cc666f7808..cf9241bdd7 100755
--- a/twake/frontend/src/app/components/PopupComponent/PopupComponent.scss
+++ b/twake/frontend/src/app/components/PopupComponent/PopupComponent.scss
@@ -44,4 +44,19 @@
       transform: translateX(-50%) translateY(-50%);
     }
   }
+
+  @media only screen and (max-width: 600px) {
+    .header {
+      .close {
+        right: auto;
+        left: 16px;
+      }
+    }
+    .main .content {
+      margin-left: 0px !important;
+    }
+    .main .sideBar {
+      display: none;
+    }
+  }
 }
diff --git a/twake/frontend/src/app/components/ScrollHiddenComponents/HiddenNotificationService.ts b/twake/frontend/src/app/components/ScrollHiddenComponents/HiddenNotificationService.ts
index 9c0e1c249e..a9ce0ad6f5 100644
--- a/twake/frontend/src/app/components/ScrollHiddenComponents/HiddenNotificationService.ts
+++ b/twake/frontend/src/app/components/ScrollHiddenComponents/HiddenNotificationService.ts
@@ -56,15 +56,6 @@ class HiddenNotificationService extends Observable {
     });
   }
 
-  public setScroller(node: NodeType) {
-    this.scroller = { node, top: node.getBoundingClientRect().y };
-
-    node.addEventListener('scroll', this.detectHiddenBeacons, { passive: true });
-
-    this.setBeaconsTop(this.scroller);
-    this.detectHiddenBeacons();
-  }
-
   private detectHiddenBeacons(evt: any = null) {
     if (!this.scroller.node) return;
 
@@ -92,10 +83,21 @@ class HiddenNotificationService extends Observable {
     }, 500);
   }
 
+  public setScroller(node: NodeType) {
+    this.scroller = { node, top: node.getBoundingClientRect().y };
+
+    node.addEventListener('scroll', this.detectHiddenBeacons, { passive: true });
+    window.addEventListener('resize', this.detectHiddenBeacons);
+
+    this.setBeaconsTop(this.scroller);
+    this.detectHiddenBeacons();
+  }
+
   public removeScroller() {
+    window.removeEventListener('resize', this.detectHiddenBeacons);
     this.scroller = { node: undefined, top: undefined };
     if (this.scroller.node) {
-      this.scroller.node.removeEventListener('scroll', this.detectHiddenBeacons.bind(this));
+      this.scroller.node.removeEventListener('scroll', this.detectHiddenBeacons);
     }
   }
 }
diff --git a/twake/frontend/src/app/components/ScrollHiddenComponents/ScrollWithHiddenComponents.tsx b/twake/frontend/src/app/components/ScrollHiddenComponents/ScrollWithHiddenComponents.tsx
index e4dddcd5ae..b9f64240ce 100644
--- a/twake/frontend/src/app/components/ScrollHiddenComponents/ScrollWithHiddenComponents.tsx
+++ b/twake/frontend/src/app/components/ScrollHiddenComponents/ScrollWithHiddenComponents.tsx
@@ -9,6 +9,7 @@ type PropsType = {
   scrollTopComponent?: JSX.Element;
   scrollBottomComponent?: JSX.Element;
   tag: string;
+  disabled?: boolean;
 };
 
 const ScrollWithHiddenComponents: FC<PropsType> = ({
@@ -16,14 +17,18 @@ const ScrollWithHiddenComponents: FC<PropsType> = ({
   scrollTopComponent,
   scrollBottomComponent,
   tag,
+  disabled,
 }) => {
   const ref = useRef<any>(null);
   const service = HiddenNotificationService.get(tag);
 
   useEffect(() => {
+    if (disabled) {
+      return;
+    }
     service.setScroller(ref.current.firstChild);
     return () => service.removeScroller();
-  }, [tag, ref]);
+  }, [tag, ref, disabled]);
 
   const beacon: number[] = service.useWatcher(() => [
     service.state.beaconTop.length,
diff --git a/twake/frontend/src/app/components/Twacode/Twacode.scss b/twake/frontend/src/app/components/Twacode/Twacode.scss
index a032fdb811..a6447cda9b 100755
--- a/twake/frontend/src/app/components/Twacode/Twacode.scss
+++ b/twake/frontend/src/app/components/Twacode/Twacode.scss
@@ -16,9 +16,9 @@
   .emoji-container {
     display: inline-block;
     vertical-align: middle;
+    height: 1em;
     .emoji-mart-emoji {
       vertical-align: top;
-      transform: translateY(20%);
     }
   }
 
diff --git a/twake/frontend/src/app/environment/version.ts b/twake/frontend/src/app/environment/version.ts
index 501de93f90..fe3fa76296 100644
--- a/twake/frontend/src/app/environment/version.ts
+++ b/twake/frontend/src/app/environment/version.ts
@@ -1,5 +1,5 @@
 export default {
-  version: /* @VERSION */ '2021.Q1',
-  version_detail: /* @VERSION_DETAIL */ '2021.Q1.434',
+  version: /* @VERSION */ '2021.Q2',
+  version_detail: /* @VERSION_DETAIL */ '2021.Q2.481',
   version_name: /* @VERSION_NAME */ 'Albatros',
 };
diff --git a/twake/frontend/src/app/models/NotificationPreferences.ts b/twake/frontend/src/app/models/NotificationPreferences.ts
new file mode 100644
index 0000000000..21d30f7f33
--- /dev/null
+++ b/twake/frontend/src/app/models/NotificationPreferences.ts
@@ -0,0 +1,26 @@
+import { Resource } from 'services/CollectionsReact/Collections';
+ 
+export type preferencesType = {
+	highlight_words: string[],
+	night_break: {
+		enable: boolean,
+		from: number,
+		to: number,
+	},
+	private_message_content: boolean,
+	mobile_notifications: string,
+	email_notifications_delay: number,
+	deactivate_notifications_until: number,
+	notification_sound: string,
+}
+export type NotificationPreferencesType = {
+	user_id: string,
+	company_id: string,
+	workspace_id: string,
+	preferences: preferencesType,
+}
+
+export class NotificationPreferencesResource extends Resource<NotificationPreferencesType> {
+	_type = 'notification_preferences';
+  	_resourcePrimaryKey = ["user_id", "company_id", "workspace_id"];
+}
diff --git a/twake/frontend/src/app/scenes/Apps/Calendar/FullCalendar/FullCalendar.js b/twake/frontend/src/app/scenes/Apps/Calendar/FullCalendar/FullCalendar.js
index 97f2d25472..512569df3a 100755
--- a/twake/frontend/src/app/scenes/Apps/Calendar/FullCalendar/FullCalendar.js
+++ b/twake/frontend/src/app/scenes/Apps/Calendar/FullCalendar/FullCalendar.js
@@ -73,6 +73,8 @@ export default class FullCalendar extends Component {
         return true;
       },
       select: function (event) {
+        that.cancelClickOut = true;
+
         //Create event
         if (moment(event.end).diff(event.start) == 15 * 60 * 1000) {
           that.api.unselect();
diff --git a/twake/frontend/src/app/scenes/Apps/Drive/Drive.js b/twake/frontend/src/app/scenes/Apps/Drive/Drive.js
index 3b2071c3a1..6605fff145 100755
--- a/twake/frontend/src/app/scenes/Apps/Drive/Drive.js
+++ b/twake/frontend/src/app/scenes/Apps/Drive/Drive.js
@@ -314,7 +314,7 @@ export default class Drive extends Component {
         channelId: this.props.channel.id,
         directoryId: directory_id,
       });
-      RouterServices.history.replace(url);
+      RouterServices.replace(url);
       */
     }
 
@@ -828,6 +828,8 @@ export default class Drive extends Component {
                   data={files}
                   view_mode={DriveService.view_mode}
                 />
+
+                <div style={{ marginTop: 64 }} />
               </div>
             )}
           </DriveMultiSelector>
diff --git a/twake/frontend/src/app/scenes/Apps/Messages/Input/Input.tsx b/twake/frontend/src/app/scenes/Apps/Messages/Input/Input.tsx
index 364368f05b..2710643ecf 100644
--- a/twake/frontend/src/app/scenes/Apps/Messages/Input/Input.tsx
+++ b/twake/frontend/src/app/scenes/Apps/Messages/Input/Input.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import InputOptions from './Parts/InputOptions';
 import InputAutocomplete from './Parts/InputAutocomplete';
 import EphemeralMessages from './Parts/EphemeralMessages';
@@ -27,6 +27,7 @@ export default (props: Props) => {
   const [hasEphemeralMessage, setHasEphemeralMessage] = useState(false);
   const [content, setContent] = useState('');
   const [loading, setLoading] = useState(false);
+  const refInput = useRef<any>(null);
   const messageEditorService: MessageEditors = MessageEditorsManager.get(props.channelId);
   messageEditorService.useListener(useState);
 
@@ -41,6 +42,9 @@ export default (props: Props) => {
   };
   const onSend = async () => {
     const content = await messageEditorService.getContent(props.threadId, props.messageId || '');
+
+    refInput?.current?.change('');
+
     if (props.onSend) {
       props.onSend(content);
       return;
@@ -52,6 +56,7 @@ export default (props: Props) => {
       sendMessage(content);
       autocomplete.setContent('');
       autocomplete.blur();
+
       return true;
     }
     return false;
@@ -130,6 +135,7 @@ export default (props: Props) => {
       <AttachedFiles channelId={props.channelId} threadId={props.threadId} />
       {!hasEphemeralMessage && (
         <InputAutocomplete
+          ref={refInput}
           messageId={props.messageId || ''}
           onPaste={(evt: any) => messageEditorService.getUploadZone(props.threadId).paste(evt)}
           channelId={props.channelId}
diff --git a/twake/frontend/src/app/scenes/Apps/Messages/Input/Parts/InputAutocomplete.tsx b/twake/frontend/src/app/scenes/Apps/Messages/Input/Parts/InputAutocomplete.tsx
index 17a1e9f243..188a36ef1d 100644
--- a/twake/frontend/src/app/scenes/Apps/Messages/Input/Parts/InputAutocomplete.tsx
+++ b/twake/frontend/src/app/scenes/Apps/Messages/Input/Parts/InputAutocomplete.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, forwardRef, useImperativeHandle } from 'react';
 import AutoComplete from 'components/AutoComplete/AutoComplete';
 import EmojiService from 'services/emojis/emojis.js';
 import UsersService from 'services/user/user.js';
@@ -28,7 +28,7 @@ type Props = {
   threadId: string;
 };
 
-export default (props: Props) => {
+export default forwardRef((props: Props, ref) => {
   const [content, setContent] = useState('');
   const messageEditorService = MessageEditorsManager.get(props.channelId);
   messageEditorService.useListener(useState);
@@ -53,6 +53,12 @@ export default (props: Props) => {
     if (props.onChange) props.onChange(text);
   };
 
+  useImperativeHandle(ref, () => ({
+    change(v: string) {
+      change(v);
+    },
+  }));
+
   const focus = () => {
     autocomplete.focus();
   };
@@ -79,9 +85,7 @@ export default (props: Props) => {
       if (!evt.shiftKey) {
         evt.stopPropagation();
         evt.preventDefault();
-        if (props.onSend && props.onSend(content)) {
-          change('');
-        }
+        props.onSend && props.onSend(content);
       } else {
         var target = evt.target;
         var result = PseudoMarkdownCompiler.autoCompleteBulletList(target, true);
@@ -209,4 +213,4 @@ export default (props: Props) => {
       }}
     />
   );
-};
+});
diff --git a/twake/frontend/src/app/scenes/Client/ChannelsBar/ChannelsBar.tsx b/twake/frontend/src/app/scenes/Client/ChannelsBar/ChannelsBar.tsx
index 82ac0fa2a0..5346ef9fc6 100755
--- a/twake/frontend/src/app/scenes/Client/ChannelsBar/ChannelsBar.tsx
+++ b/twake/frontend/src/app/scenes/Client/ChannelsBar/ChannelsBar.tsx
@@ -9,11 +9,14 @@ import Footer from './Parts/Footer.js';
 import RouterServices from 'app/services/RouterService';
 import './ChannelsBar.scss';
 import Shortcuts, { defaultShortcutsMap, ShortcutType } from 'app/services/ShortcutService';
+import AddUserButton from 'components/AddUserButton/AddUserButton';
+import Workspaces from 'services/workspaces/workspaces.js';
 import ModalManager from 'app/components/Modal/ModalManager';
 import WorkspaceChannelList from './Modals/WorkspaceChannelList';
 import ScrollWithHiddenComponents from 'app/components/ScrollHiddenComponents/ScrollWithHiddenComponents';
 import HiddenNotificationsButton from 'app/components/ScrollHiddenComponents/HiddenNotificationsButton';
 import ChannelsBarService from 'app/services/channels/ChannelsBarService';
+import AccessRightsService from 'app/services/AccessRightsService';
 
 export default () => {
   const { companyId, workspaceId } = RouterServices.getStateFromRoute();
@@ -49,7 +52,6 @@ export default () => {
   if (!companyId || !workspaceId) {
     return <></>;
   }
-
   return (
     <Layout.Sider
       theme="light"
@@ -80,17 +82,19 @@ export default () => {
       )}
 
       <ScrollWithHiddenComponents
+        disabled={!ready}
         tag="channel_bar_component"
         scrollTopComponent={<HiddenNotificationsButton position="top" type="important" />}
         scrollBottomComponent={<HiddenNotificationsButton position="bottom" type="important" />}
       >
         <PerfectScrollbar options={{ suppressScrollX: true }}>
           <ChannelsApps key={workspaceId} />
+          {AccessRightsService.hasLevel(workspaceId || '', 'administrator') &&
+            Workspaces.getCurrentWorkspace().stats.total_members <= 5 && <AddUserButton />}
           <ChannelsWorkspace key={'workspace_chans_' + workspaceId} />
           <ChannelsUser key={companyId} />
         </PerfectScrollbar>
       </ScrollWithHiddenComponents>
-      {/*<Tutorial />*/}
       <Footer />
     </Layout.Sider>
   );
diff --git a/twake/frontend/src/app/scenes/Client/ChannelsBar/Modals/SearchListManager.ts b/twake/frontend/src/app/scenes/Client/ChannelsBar/Modals/SearchListManager.ts
index b89384343c..13a83cb199 100644
--- a/twake/frontend/src/app/scenes/Client/ChannelsBar/Modals/SearchListManager.ts
+++ b/twake/frontend/src/app/scenes/Client/ChannelsBar/Modals/SearchListManager.ts
@@ -94,6 +94,7 @@ class SearchListManager {
         UsersService.search(
           Strings.removeAccents(text),
           {
+            scope: 'group',
             group_id: Workspaces.currentGroupId,
           },
           (res: UserType[]) => users.push(...res.filter((el: UserType) => !!el)),
diff --git a/twake/frontend/src/app/scenes/Client/ChannelsBar/Modals/WorkspaceChannelList.tsx b/twake/frontend/src/app/scenes/Client/ChannelsBar/Modals/WorkspaceChannelList.tsx
index a037689109..4671d64e0e 100644
--- a/twake/frontend/src/app/scenes/Client/ChannelsBar/Modals/WorkspaceChannelList.tsx
+++ b/twake/frontend/src/app/scenes/Client/ChannelsBar/Modals/WorkspaceChannelList.tsx
@@ -76,7 +76,7 @@ export default () => {
     }
 
     ModalManager.closeAll();
-    return RouterServices.history.push(`/client/${channel.data.workspace_id}/c/${channel.data.id}`);
+    return RouterServices.push(`/client/${channel.data.workspace_id}/c/${channel.data.id}`);
   };
 
   const loadMore = () => {
diff --git a/twake/frontend/src/app/scenes/Client/ChannelsBar/Modals/WorkspaceChannelList/WorkspaceChannelRow.tsx b/twake/frontend/src/app/scenes/Client/ChannelsBar/Modals/WorkspaceChannelList/WorkspaceChannelRow.tsx
index 229ab840dd..42f57813c4 100644
--- a/twake/frontend/src/app/scenes/Client/ChannelsBar/Modals/WorkspaceChannelList/WorkspaceChannelRow.tsx
+++ b/twake/frontend/src/app/scenes/Client/ChannelsBar/Modals/WorkspaceChannelList/WorkspaceChannelRow.tsx
@@ -47,7 +47,7 @@ export default ({ channel, joined, active }: PropsType) => {
     }
 
     ModalManager.closeAll();
-    return RouterServices.history.push(`/client/${workspaceId}/c/${channel.data.id}`);
+    return RouterServices.push(`/client/${workspaceId}/c/${channel.data.id}`);
   };
 
   return (
diff --git a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/Channel/ChannelMenu.tsx b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/Channel/ChannelMenu.tsx
index 5eb45d4563..7d8513985b 100644
--- a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/Channel/ChannelMenu.tsx
+++ b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/Channel/ChannelMenu.tsx
@@ -91,7 +91,7 @@ export default (props: Props): JSX.Element => {
 
   const redirectToWorkspace = () => {
     const url = RouterServices.generateRouteFromState({ workspaceId: workspaceId, channelId: '' });
-    return RouterServices.history.push(url);
+    return RouterServices.push(url);
   };
 
   const editChannel = () => {
diff --git a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/CompanyHeader/CompanyHeader.js b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/CompanyHeader/CompanyHeader.js
index 7d5a4f5638..4a53cb78a7 100755
--- a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/CompanyHeader/CompanyHeader.js
+++ b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/CompanyHeader/CompanyHeader.js
@@ -1,20 +1,18 @@
-import React, { Component } from 'react';
+import React from 'react';
 
 import './CompanyHeader.scss';
 
-import User from 'components/User/User.js';
 import UserService from 'services/user/user.js';
 import Icon from 'components/Icon/Icon.js';
 import Emojione from 'components/Emojione/Emojione';
+import NotificationDelay from '../Notifications/NotificationDelay';
 
 export default class CompanyHeader extends React.Component {
-  constructor(props) {
+  constructor() {
     super();
   }
   render() {
     var user = this.props.user || {};
-    var notifications_disabled = this.props.notificationsDisabled;
-    var status = this.props.status;
     return (
       <div className="current-company-header">
         <div
@@ -30,14 +28,6 @@ export default class CompanyHeader extends React.Component {
           </div>
 
           <div className="user-info">
-            {/*<div
-              className={
-                'status ' +
-                (!user.connected && !notifications_disabled ? 'grey ' : '') +
-                (notifications_disabled ? 'red ' : '')
-              }
-            />*/}
-
             {!!(user.status_icon || [])[0] && <Emojione type={user.status_icon[0]} />}
 
             <span className="text">
@@ -45,68 +35,10 @@ export default class CompanyHeader extends React.Component {
             </span>
           </div>
         </div>
-
         <div className="notifications">
-          <div
-            ref={this.props.refDivBell}
-            className={
-              'bell ' +
-              (notifications_disabled ? 'disabled ' : '') +
-              (status == 'paused' && !notifications_disabled ? 'sleep ' : '')
-            }
-            onClick={evt => {
-              evt.stopPropagation();
-              evt.preventDefault();
-              this.props.onClickBell && this.props.onClickBell(evt);
-            }}
-          >
-            <Icon type={status == 'on' ? 'bell' : 'bell-slash'} className="bell-icon" />
-          </div>
-        </div>
-      </div>
-    );
-
-    /*
-    return (
-      <div
-        ref={this.props.refDiv}
-        className={'current_user '}
-        onClick={evt => this.props.onClickUser && this.props.onClickUser(evt)}
-        style={this.props.style || {}}
-      >
-        <div className="image">
-          <User user={user} big withStatus withBorder={false} />
-        </div>
-        <div className="content">
-          <div className="name">
-            <div className="text">{UserService.getFullName(user)}</div>
-            <div className="icon">
-              <Icon type="angle-down" />
-            </div>
-          </div>
-          <div className="subname">
-            <div className="icon">
-              {user.status_icon && <Emojione type={user.status_icon[0]} />}
-            </div>
-            <div className="text">{'@' + user.username}</div>
-            <div
-              className={
-                'bell ' +
-                (notifications_disabled ? 'disabled ' : '') +
-                (status == 'paused' && !notifications_disabled ? 'sleep ' : '')
-              }
-              onClick={evt => {
-                evt.stopPropagation();
-                evt.preventDefault();
-                this.props.onClickBell && this.props.onClickBell(evt);
-              }}
-            >
-              <Icon type={status == 'on' ? 'bell' : 'bell-slash'} className="bell-icon" />
-            </div>
-          </div>
+          <NotificationDelay />
         </div>
       </div>
     );
-    */
   }
 }
diff --git a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/CompanyHeader/CompanyHeader.scss b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/CompanyHeader/CompanyHeader.scss
index 861128ba1e..c7f2759cb7 100755
--- a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/CompanyHeader/CompanyHeader.scss
+++ b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/CompanyHeader/CompanyHeader.scss
@@ -28,6 +28,11 @@
         color: var(--warning);
       }
     }
+
+    .remaning-time {
+      color: grey;
+      font-style: italic;
+    }
   }
 
   .current-company {
diff --git a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/CurrentUser.js b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/CurrentUser.js
index e0217a3c92..7d5aebf64e 100755
--- a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/CurrentUser.js
+++ b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/CurrentUser.js
@@ -308,151 +308,7 @@ export default class CurrentUser extends Component {
       'bottom',
     );
   }
-  onClickBell(evt) {
-    var current_user = this.state.users_repository.known_objects_by_id[this.user_id];
-
-    this.dont_disturb = NotificationParameters.transform_period(
-      UserService.getCurrentUser().notifications_preferences.dont_disturb_between,
-      UserService.getCurrentUser().notifications_preferences.dont_disturb_and,
-      -new Date().getTimezoneOffset() / 60,
-    );
-    this.notifications_state = NotificationParameters.getNotificationsStatus(current_user);
 
-    this.notifications_menu = [
-      {
-        type: 'menu',
-        hide: true, //Disabled until refactor
-        text: Languages.t(
-          'scenes.app.channelsbar.currentuser.user_parameter',
-          [],
-          'Paramètres de notification',
-        ),
-        onClick: () => {
-          popupManager.open(<UserParameter defaultPage={3} />, true, true);
-        },
-      },
-      {
-        type: 'menu',
-        text: Languages.t(
-          'scenes.app.channelsbar.currentuser.disabling_notifications',
-          [],
-          'Désactiver pendant 1h',
-        ),
-        onClick: () => {
-          NotificationParameters.saveElements(
-            { disable_until: parseInt(new Date().getTime() / 1000 + 60 * 60) },
-            true,
-          );
-        },
-      },
-      {
-        type: 'menu',
-        text: Languages.t(
-          'scenes.app.channelsbar.currentuser.disabling_notifications_until',
-          [],
-          "Désactiver jusqu'à demain 9h",
-        ),
-        onClick: () => {
-          var a = new Date();
-          a.setDate(new Date().getDate() + 1);
-          a.setHours(9);
-          a.setMinutes(0);
-          a = parseInt(a.getTime() / 1000);
-          NotificationParameters.saveElements({ disable_until: a }, true);
-        },
-      },
-    ];
-
-    if (this.notifications_state != 'off') {
-      this.notifications_menu.push({
-        type: 'menu',
-        text: Languages.t(
-          'scenes.app.channelsbar.currentuser.disable_notifications',
-          [],
-          'Désactiver',
-        ),
-        onClick: () => {
-          NotificationParameters.saveElements(
-            { disable_until: parseInt(new Date().getTime() / 1000 + 60 * 60 * 24 * 10000) },
-            true,
-          );
-        },
-      });
-    }
-
-    if (this.notifications_state != 'on') {
-      this.notifications_menu.push({
-        type: 'menu',
-        text: Languages.t(
-          'scenes.app.channelsbar.currentuser.reactivate_notifications',
-          [],
-          'Réactiver',
-        ),
-        onClick: () => {
-          NotificationParameters.saveElements({ disable_until: 0 }, true);
-        },
-      });
-
-      var disabled_until = new Date(
-        UserService.getCurrentUser().notifications_preferences.disable_until * 1000,
-      );
-
-      if (this.notifications_state == 'off') {
-        this.notifications_menu.push({
-          type: 'text',
-          text: Languages.t(
-            'scenes.app.channelsbar.currentuser.desactivated_notifications_message',
-            [],
-            'Vos notifications sont désactivées.',
-          ),
-        });
-      } else if (NotificationParameters.is_in_period(this.dont_disturb[0], this.dont_disturb[1])) {
-        var a = this.dont_disturb[0];
-        var b = this.dont_disturb[1];
-        a = Math.floor(a) + 'h' + ((a - Math.floor(a)) * 60 || '00');
-        b = Math.floor(b) + 'h' + ((b - Math.floor(b)) * 60 || '00');
-        this.notifications_menu.push({
-          type: 'text',
-          text: Languages.t(
-            'scenes.app.channelsbar.currentuser.desactivated_notifiations_information',
-            [a, b],
-            "Vos notifications sont désactivées la nuit de $1 jusqu'à $2.",
-          ),
-        });
-      } else if (
-        UserService.getCurrentUser().notifications_preferences.disable_until <
-        new Date().getTime() / 1000 + 60 * 60 * 11
-      ) {
-        this.notifications_menu.push({
-          type: 'text',
-          text: Languages.t(
-            'scenes.app.channelsbar.currentuser.desactivated_notifiations_information_until',
-            [disabled_until.getHours(), disabled_until.getMinutes()],
-            "Vos notifications sont désactivées jusqu'à $1:$2.",
-          ),
-        });
-      } else {
-        this.notifications_menu.push({
-          type: 'text',
-          text: Languages.t(
-            'scenes.app.channelsbar.currentuser.desactivated_notifiations_information_no_choice',
-            [],
-            "Vos notifications sont désactivées jusqu'à demain 9h.",
-          ),
-        });
-      }
-    }
-
-    var pos = window.getBoundingClientRect(this.bell_node);
-    pos.x = pos.x || pos.left;
-    pos.y = pos.y || pos.top;
-
-    MenusManager.openMenu(
-      this.notifications_menu,
-      { x: pos.x + pos.width - 5, y: pos.y + pos.height + 10 },
-      'bottom',
-    );
-  }
   render() {
     var current_user = this.state.users_repository.known_objects_by_id[this.user_id];
 
@@ -483,9 +339,6 @@ export default class CurrentUser extends Component {
         onClickUser={evt => {
           this.onClickUser(evt);
         }}
-        onClickBell={evt => {
-          this.onClickBell(evt);
-        }}
         style={{ marginBottom: 10 }}
       />
     );
diff --git a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/Notifications/NotificationBell.tsx b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/Notifications/NotificationBell.tsx
new file mode 100644
index 0000000000..b2fb4024ed
--- /dev/null
+++ b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/Notifications/NotificationBell.tsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import moment from 'moment';
+
+import Menu from 'components/Menus/Menu';
+import Icon from 'components/Icon/Icon.js';
+
+import Languages from 'services/languages/languages.js';
+import NotificationParametersService from 'services/user/notificationParameters';
+
+type PropsType = {
+  preferences: any;
+};
+
+export default (props: PropsType) => {
+  const status = NotificationParametersService.areNotificationsAllowed();
+
+  const tomorrowMorning = moment().add(1, 'd').hour(9).minute(0).second(0);
+  const hoursUntilTomorrowMorning = moment
+    .duration(tomorrowMorning.diff(moment(new Date())))
+    .asHours();
+
+  const notifications_menu = [
+    {
+      type: 'menu',
+      hide: true, //Disabled until refactor
+      text: Languages.t('scenes.app.channelsbar.currentuser.user_parameter'),
+      onClick: () => {},
+    },
+    {
+      type: 'menu',
+      text: Languages.t('scenes.app.channelsbar.currentuser.disabling_notifications'),
+      onClick: () => NotificationParametersService.deactivateNotificationsUntil(1, 'h'),
+    },
+    {
+      type: 'menu',
+      text: '2 hours', // Add translation
+      onClick: () => NotificationParametersService.deactivateNotificationsUntil(2, 'h'),
+    },
+    {
+      type: 'menu',
+      text: Languages.t('scenes.app.channelsbar.currentuser.disabling_notifications_until'),
+      onClick: () =>
+        NotificationParametersService.deactivateNotificationsUntil(hoursUntilTomorrowMorning, 'h'),
+    },
+    {
+      type: 'menu',
+      text: Languages.t(
+        status
+          ? 'scenes.app.channelsbar.currentuser.disable_notifications'
+          : 'scenes.app.channelsbar.currentuser.reactivate_notifications',
+      ),
+      onClick: () => {
+        status
+          ? NotificationParametersService.deactivateNotificationsUntil(24, 'y')
+          : NotificationParametersService.deactivateNotificationsUntil(0, 's');
+      },
+    },
+    {
+      // TODO: Calculate the real value
+      hide: true,
+      type: 'text',
+      text: '35 minutes remaning', // Vos notifications sont désactivées jusqu'à hh:mm
+      className: 'remaning-time',
+    },
+  ];
+
+  return (
+    <Menu menu={notifications_menu} position="bottom">
+      <div className="notifications">
+        <div className={`bell ${status ? '' : 'sleep'}`}>
+          <Icon type={status ? 'bell' : 'bell-slash'} className="bell-icon" />
+        </div>
+      </div>
+    </Menu>
+  );
+};
diff --git a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/Notifications/NotificationDelay.tsx b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/Notifications/NotificationDelay.tsx
new file mode 100644
index 0000000000..4518080390
--- /dev/null
+++ b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/CurrentUser/Notifications/NotificationDelay.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import _ from 'lodash';
+
+import NotificationParametersService from 'services/user/notificationParameters';
+import NotificationBell from './NotificationBell';
+
+import { Collection } from 'services/CollectionsReact/Collections';
+import { NotificationPreferencesResource } from 'app/models/NotificationPreferences';
+
+export default () => {
+  // const preferences = NotificationParametersService.useWatcher(
+  //   () => NotificationParametersService.notificationPreferences,
+  // );
+
+  const url = '/notifications/v1/preferences/';
+  const notificationPreferencesCollection = Collection.get(url, NotificationPreferencesResource);
+  const notificationPreferences = notificationPreferencesCollection.useWatcher({});
+
+  return _.isEmpty(notificationPreferences) ? (
+    <></>
+  ) : (
+    <NotificationBell preferences={notificationPreferences} />
+  );
+};
diff --git a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/Footer.js b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/Footer.js
index ee9011c765..169a829cfc 100755
--- a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/Footer.js
+++ b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/Footer.js
@@ -40,17 +40,6 @@ export default class Footer extends Component {
             window.open(InitService.server_infos.help_link);
           })
         }
-        onClickFeedback={
-          () => {
-            const currentUser = UserService.getCurrentUser();
-            window.freddyWidget.show({
-              custom_fields: {
-                id: currentUser.id,
-                email: currentUser.email,
-              }
-            });
-          }
-        }
         onClickDocumentation={
           () => {
             window.open("https://doc.twake.app/how-to-use-it/welcome");
diff --git a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/Footer/Footer.js b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/Footer/Footer.js
index b71d58ebef..e53b0dc108 100755
--- a/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/Footer/Footer.js
+++ b/twake/frontend/src/app/scenes/Client/ChannelsBar/Parts/Footer/Footer.js
@@ -19,12 +19,6 @@ export default class Footer extends React.Component {
         icon: 'comment',
         onClick: props.onClickHelp,
       },
-      {
-        type: 'menu',
-        text: Languages.t('general.help.feedback', [], 'Feedback'),
-        icon: 'comment-alt-message',
-        onClick: props.onClickFeedback,
-      },
       {
         type: 'menu',
         text: Languages.t('general.help.documentation', [], 'Documentation'),
diff --git a/twake/frontend/src/app/scenes/Client/MainView/MainHeader/ChannelHeader/ChannelHeader.tsx b/twake/frontend/src/app/scenes/Client/MainView/MainHeader/ChannelHeader/ChannelHeader.tsx
index 89c0d295a1..cef5e50451 100644
--- a/twake/frontend/src/app/scenes/Client/MainView/MainHeader/ChannelHeader/ChannelHeader.tsx
+++ b/twake/frontend/src/app/scenes/Client/MainView/MainHeader/ChannelHeader/ChannelHeader.tsx
@@ -26,7 +26,7 @@ export default (): JSX.Element => {
       workspaceId: workspaceId,
       channelId: '',
     });
-    return RouterServices.history.push(url);
+    return RouterServices.push(url);
   };
 
   const collectionPath: string = `/channels/v1/companies/${companyId}/workspaces/${workspaceId}/channels/${
diff --git a/twake/frontend/src/app/scenes/Client/MainView/Tabs/DefaultChannelTab.tsx b/twake/frontend/src/app/scenes/Client/MainView/Tabs/DefaultChannelTab.tsx
index cb2b8b0830..7f7db6e706 100644
--- a/twake/frontend/src/app/scenes/Client/MainView/Tabs/DefaultChannelTab.tsx
+++ b/twake/frontend/src/app/scenes/Client/MainView/Tabs/DefaultChannelTab.tsx
@@ -61,7 +61,7 @@ export default ({ selected }: { selected: boolean }): JSX.Element => {
         const route: string = RouterServices.generateRouteFromState({
           tabId: '',
         });
-        return RouterServices.history.push(route);
+        return RouterServices.push(route);
       }}
     >
       <MessageCircle size={14} className="small-right-margin" />
diff --git a/twake/frontend/src/app/scenes/Client/MainView/Tabs/Tab.tsx b/twake/frontend/src/app/scenes/Client/MainView/Tabs/Tab.tsx
index 64e205bc67..1f1a333095 100644
--- a/twake/frontend/src/app/scenes/Client/MainView/Tabs/Tab.tsx
+++ b/twake/frontend/src/app/scenes/Client/MainView/Tabs/Tab.tsx
@@ -54,7 +54,7 @@ export default ({
         const route: string = RouterServices.generateRouteFromState({
           tabId: tabResource.data.id,
         });
-        return RouterServices.history.push(route);
+        return RouterServices.push(route);
       }}
     >
       {WorkspacesApps.getAppIconComponent(tabResource.data, { size: 14 })}
diff --git a/twake/frontend/src/app/scenes/Client/MainView/Tabs/Tabs.tsx b/twake/frontend/src/app/scenes/Client/MainView/Tabs/Tabs.tsx
index a751e933fb..5f0b1aa118 100644
--- a/twake/frontend/src/app/scenes/Client/MainView/Tabs/Tabs.tsx
+++ b/twake/frontend/src/app/scenes/Client/MainView/Tabs/Tabs.tsx
@@ -31,7 +31,7 @@ export default (): JSX.Element => {
     const route: string = RouterServices.generateRouteFromState({
       tabId: '',
     });
-    RouterServices.history.push(route);
+    RouterServices.push(route);
   }
 
   return (
diff --git a/twake/frontend/src/app/scenes/Client/Popup/AddUser/AddUser.tsx b/twake/frontend/src/app/scenes/Client/Popup/AddUser/AddUser.tsx
index 5214fb91a9..1615a17362 100644
--- a/twake/frontend/src/app/scenes/Client/Popup/AddUser/AddUser.tsx
+++ b/twake/frontend/src/app/scenes/Client/Popup/AddUser/AddUser.tsx
@@ -12,12 +12,12 @@ import './AddUser.scss';
 import WorkspacesUsers from 'services/workspaces/workspaces_users.js';
 
 type Props = {
-  standalone: boolean;
-  inline: boolean;
-  onChange: (members: any) => any;
-  previous: () => void;
-  finish: () => void;
-  loading: boolean;
+  standalone?: boolean;
+  inline?: boolean;
+  onChange?: (members: any) => any;
+  previous?: () => void;
+  finish?: () => void;
+  loading?: boolean;
 };
 
 type State = {
@@ -167,7 +167,6 @@ export default class AddUser extends Component<Props, State> {
       <div className={this.props.inline ? '' : 'addUserView'}>
         <div className="subtitle bottom-margin">
           {this.state.i18n.t('scenes.app.workspaces.create_company.invitations.title_2')}{' '}
-          <Emojione type=":upside_down:" />
         </div>
 
         {this.state.multi && (
diff --git a/twake/frontend/src/app/scenes/Client/Popup/AddUser/AddUserFromTwakeConsole.tsx b/twake/frontend/src/app/scenes/Client/Popup/AddUser/AddUserFromTwakeConsole.tsx
index de16adffe0..f342c87a75 100644
--- a/twake/frontend/src/app/scenes/Client/Popup/AddUser/AddUserFromTwakeConsole.tsx
+++ b/twake/frontend/src/app/scenes/Client/Popup/AddUser/AddUserFromTwakeConsole.tsx
@@ -24,13 +24,15 @@ const AddUserFromTwakeConsole = (props: PropsType) => {
   const onChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => setEmails(e.target.value);
 
   const onClickBtn = async () => {
-    if (props.onChange) props.onChange(emails);
+    if (props.onChange) {
+      props.onChange(emails);
+    }
 
     if (props.finish) {
       props.finish();
       return;
     }
-
+    
     setLoading(true);
     setDisabled(true);
 
@@ -53,12 +55,10 @@ const AddUserFromTwakeConsole = (props: PropsType) => {
       popupManager.close();
     }, 200);
   };
-
   return (
     <div className="add-user-from-twake-console">
       <Typography.Title level={3} className="">
         {Languages.t('scenes.app.workspaces.create_company.invitations.title_2')}{' '}
-        <Emojione type=":upside_down:" />
       </Typography.Title>
       <div className="user-list-container small-y-margin">
         <AutoHeight
@@ -79,7 +79,12 @@ const AddUserFromTwakeConsole = (props: PropsType) => {
         </Typography.Text>
       </div>
       <div className="add-user-button-container">
-        <Button type="primary" onClick={onClickBtn} disabled={disabled} loading={loading}>
+        <Button
+          type="primary"
+          onClick={onClickBtn}
+          disabled={disabled || props.loading}
+          loading={loading || props.loading}
+        >
           {emails.length === 0
             ? Languages.t('scenes.app.workspaces.components.skip')
             : Languages.t('general.add')}
diff --git a/twake/frontend/src/app/scenes/Client/Popup/CreateWorkspacePage/CreateWorkspacePage.js b/twake/frontend/src/app/scenes/Client/Popup/CreateWorkspacePage/CreateWorkspacePage.js
index 186683fb89..99f878a457 100755
--- a/twake/frontend/src/app/scenes/Client/Popup/CreateWorkspacePage/CreateWorkspacePage.js
+++ b/twake/frontend/src/app/scenes/Client/Popup/CreateWorkspacePage/CreateWorkspacePage.js
@@ -88,8 +88,9 @@ export default class CreateWorkspacePage extends Component {
         return (
           <AddUserFromTwakeConsole
             inline
-            onChange={members => {
-              this.setState({ members: members });
+            onChange={(members) => {
+              this.state.members = members;
+              this.setState({});
             }}
             previous={() => this.previous()}
             finish={() => this.next()}
diff --git a/twake/frontend/src/app/scenes/Client/Popup/UserParameter/Pages/Notifications.js b/twake/frontend/src/app/scenes/Client/Popup/UserParameter/Pages/Notifications.js
deleted file mode 100755
index b51013ba96..0000000000
--- a/twake/frontend/src/app/scenes/Client/Popup/UserParameter/Pages/Notifications.js
+++ /dev/null
@@ -1,325 +0,0 @@
-import React, { Component } from 'react';
-
-import Languages from 'services/languages/languages.js';
-import currentUserService from 'services/user/current_user.js';
-import ButtonWithTimeout from 'components/Buttons/ButtonWithTimeout.js';
-import Attribute from 'components/Parameters/Attribute.js';
-import NotificationParameters from 'services/user/notification_parameters.js';
-import Switch from 'components/Inputs/Switch.js';
-import Radio from 'components/Inputs/Radio.js';
-import AutoHeight from 'components/AutoHeight/AutoHeight.js';
-
-export default class Notifications extends Component {
-  constructor() {
-    super();
-    this.state = {
-      i18n: Languages,
-      notifications_parameters: NotificationParameters,
-    };
-    Languages.addListener(this);
-    NotificationParameters.addListener(this);
-    NotificationParameters.init();
-  }
-  componentWillUnmount() {
-    Languages.removeListener(this);
-    NotificationParameters.removeListener(this);
-  }
-  render() {
-    return (
-      <div className={this.state.notifications_parameters.loading ? 'loading ' : ''}>
-        <div className="title">{this.state.i18n.t('scenes.apps.account.notifications.title')}</div>
-
-        <div className="group_section">
-          <div className="subtitle">
-            {Languages.t(
-              'scenes.app.popup.userparameter.pages.frequency_notif_subtitle',
-              [],
-              'Fréquence des notifications',
-            )}
-          </div>
-
-          <Attribute
-            label={this.state.i18n.t('scenes.apps.account.notifications.keywords_subtitle')}
-            description={Languages.t(
-              'scenes.app.popup.userparameter.pages.keywords_notif_description',
-              [],
-              'Ne recevez que des notifications correspondant à certains mots clés.',
-            )}
-          >
-            <div className="parameters_form" style={{ maxWidth: 'none', paddingTop: 10 }}>
-              <Switch
-                label={this.state.i18n.t('scenes.apps.account.notifications.keywords_option')}
-                value={this.state.notifications_parameters.preferences.dont_use_keywords == 1}
-                onChange={checked => {
-                  NotificationParameters.preferences.dont_use_keywords = checked ? 1 : 0;
-                  NotificationParameters.notify();
-                }}
-              />
-
-              {!this.state.notifications_parameters.preferences.dont_use_keywords ? (
-                <span>
-                  <div className="text bottom-margin">
-                    {this.state.i18n.t(
-                      'scenes.apps.account.notifications.keywords_activated_text',
-                      currentUserService.get().username,
-                    )}
-                  </div>
-                  <AutoHeight
-                    value={NotificationParameters.preferences.keywords}
-                    placeholder={this.state.i18n.t(
-                      'scenes.apps.account.notifications.keywords_placeholder',
-                    )}
-                    className="bottom-margin"
-                    onChange={evt => {
-                      NotificationParameters.preferences.keywords = evt.target.value;
-                      NotificationParameters.notify();
-                    }}
-                  >
-                    {this.state.notifications_parameters.preferences.keywords}
-                  </AutoHeight>
-                </span>
-              ) : (
-                <span />
-              )}
-
-              <ButtonWithTimeout
-                className="small buttonValidation"
-                disabled={this.state.notifications_parameters.loading}
-                onClick={() => NotificationParameters.save(['keywords', 'dont_use_keywords'])}
-                value={this.state.i18n.t('general.update')}
-              />
-            </div>
-          </Attribute>
-
-          <Attribute
-            label={Languages.t(
-              'scenes.app.popup.userparameter.pages.no_night_disturbing_label',
-              [],
-              'Ne pas déranger la nuit',
-            )}
-            description={Languages.t(
-              'scenes.app.popup.userparameter.pages.no_disturbing_notif_period_description',
-              [],
-              'Choisissez une période pendant laquelle vous ne recevez pas de notifications.',
-            )}
-          >
-            <div className="parameters_form" style={{ maxWidth: 'none', paddingTop: 10 }}>
-              <div className="text">
-                {this.state.i18n.t('scenes.apps.account.notifications.disturb_option_a')}
-                <select
-                  id="after"
-                  className="select_inline"
-                  style={{ width: '80px', display: 'inline-block', margin: '0 10px' }}
-                  value={
-                    NotificationParameters.transform_period(
-                      this.state.notifications_parameters.preferences.dont_disturb_between,
-                      this.state.notifications_parameters.preferences.dont_disturb_and,
-                      -new Date().getTimezoneOffset() / 60,
-                    )[0]
-                  }
-                  onChange={evt => {
-                    NotificationParameters.preferences.dont_disturb_between = NotificationParameters.transform_period(
-                      evt.target.value,
-                      this.state.notifications_parameters.preferences.dont_disturb_and,
-                      new Date().getTimezoneOffset() / 60,
-                    )[0];
-                    NotificationParameters.notify();
-                  }}
-                >
-                  {(() => {
-                    var options = [];
-                    for (var i = 0; i < 24; i += 0.5) {
-                      var value = i;
-                      var text = parseInt(i) + ':' + ((i * 2) % 2 == 0 ? '00' : '30');
-                      options.push(<option value={value}>{text}</option>);
-                    }
-                    return options;
-                  })()}
-                </select>
-                {this.state.i18n.t('scenes.apps.account.notifications.disturb_option_b')}
-                <select
-                  id="before"
-                  className="select_inline"
-                  style={{ width: '80px', display: 'inline-block', margin: '0 10px' }}
-                  value={
-                    NotificationParameters.transform_period(
-                      this.state.notifications_parameters.preferences.dont_disturb_between,
-                      this.state.notifications_parameters.preferences.dont_disturb_and,
-                      -new Date().getTimezoneOffset() / 60,
-                    )[1]
-                  }
-                  onChange={evt => {
-                    NotificationParameters.preferences.dont_disturb_and = NotificationParameters.transform_period(
-                      this.state.notifications_parameters.preferences.dont_disturb_between,
-                      evt.target.value,
-                      new Date().getTimezoneOffset() / 60,
-                    )[1];
-                    NotificationParameters.notify();
-                  }}
-                >
-                  {(() => {
-                    var options = [];
-                    for (var i = 0; i < 24; i += 0.5) {
-                      var value = i;
-                      var text = parseInt(i) + ':' + ((i * 2) % 2 == 0 ? '00' : '30');
-                      options.push(<option value={value}>{text}</option>);
-                    }
-                    return options;
-                  })()}
-                </select>
-                {this.state.i18n.t('scenes.apps.account.notifications.disturb_option_c')}
-              </div>
-
-              <ButtonWithTimeout
-                className="small buttonValidation"
-                disabled={this.state.notifications_parameters.loading}
-                onClick={() =>
-                  NotificationParameters.save(['dont_disturb_and', 'dont_disturb_between'])
-                }
-                value={this.state.i18n.t('general.update')}
-              />
-            </div>
-          </Attribute>
-
-          <Attribute
-            label={this.state.i18n.t('scenes.apps.account.notifications.devices_subtitle')}
-            description={Languages.t(
-              'scenes.app.popup.userparameter.pages.frequency_notif_configuration_description',
-              [],
-              'Configurez la fréquence des notifications mobile.',
-            )}
-          >
-            <div className="parameters_form" style={{ maxWidth: 'none', paddingTop: 10 }}>
-              <Radio
-                small
-                label={this.state.i18n.t('scenes.apps.account.notifications.devices_option_ever')}
-                value={this.state.notifications_parameters.preferences.devices == 0}
-                onChange={checked => {
-                  NotificationParameters.preferences.devices = 0;
-                  NotificationParameters.notify();
-                }}
-              />
-              <br />
-
-              <Radio
-                small
-                label={this.state.i18n.t(
-                  'scenes.apps.account.notifications.devices_option_inactive',
-                )}
-                value={this.state.notifications_parameters.preferences.devices == 1}
-                onChange={checked => {
-                  NotificationParameters.preferences.devices = 1;
-                  NotificationParameters.notify();
-                }}
-              />
-              <br />
-
-              <Radio
-                small
-                label={this.state.i18n.t('scenes.apps.account.notifications.devices_option_never')}
-                value={this.state.notifications_parameters.preferences.devices == 3}
-                onChange={checked => {
-                  NotificationParameters.preferences.devices = 3;
-                  NotificationParameters.notify();
-                }}
-              />
-
-              <ButtonWithTimeout
-                className="small buttonValidation"
-                disabled={this.state.notifications_parameters.loading}
-                onClick={() => NotificationParameters.save(['devices'])}
-                value={this.state.i18n.t('general.update')}
-              />
-            </div>
-          </Attribute>
-
-          <Attribute
-            label={this.state.i18n.t('scenes.apps.account.notifications.mail_subtitle')}
-            description={Languages.t(
-              'scenes.app.popup.userparameter.pages.mail_frequency_notif_configuration_description',
-              [],
-              'Configurez la fréquence des notifications mail.',
-            )}
-          >
-            <div className="parameters_form" style={{ maxWidth: 'none', paddingTop: 10 }}>
-              <Radio
-                small
-                label={this.state.i18n.t('scenes.apps.account.notifications.mail_option_ever')}
-                value={this.state.notifications_parameters.preferences.mail_notifications == 2}
-                onChange={checked => {
-                  NotificationParameters.preferences.mail_notifications = 2;
-                  NotificationParameters.notify();
-                }}
-              />
-              <br />
-
-              <Radio
-                small
-                label={this.state.i18n.t('scenes.apps.account.notifications.mail_option_daily')}
-                value={this.state.notifications_parameters.preferences.mail_notifications == 1}
-                onChange={checked => {
-                  NotificationParameters.preferences.mail_notifications = 1;
-                  NotificationParameters.notify();
-                }}
-              />
-              <br />
-
-              <Radio
-                small
-                label={this.state.i18n.t('scenes.apps.account.notifications.mail_option_never')}
-                value={this.state.notifications_parameters.preferences.mail_notifications == 0}
-                onChange={checked => {
-                  NotificationParameters.preferences.mail_notifications = 0;
-                  NotificationParameters.notify();
-                }}
-              />
-
-              <ButtonWithTimeout
-                className="small buttonValidation"
-                disabled={this.state.notifications_parameters.loading}
-                onClick={() => NotificationParameters.save(['mail_notifications'])}
-                value={this.state.i18n.t('general.update')}
-              />
-            </div>
-          </Attribute>
-        </div>
-
-        <div className="group_section">
-          <div className="subtitle">
-            {this.state.i18n.t('scenes.apps.account.notifications.privacy_subtitle')}
-          </div>
-
-          <Attribute
-            label={Languages.t(
-              'scenes.app.popup.userparameter.pages.notif_content_label',
-              [],
-              'Contenu des notifications',
-            )}
-            description={Languages.t(
-              'scenes.app.popup.userparameter.pages.notif_content_description',
-              [],
-              'Masquer le contenu des notifications mobile.',
-            )}
-          >
-            <div className="parameters_form" style={{ maxWidth: 'none', paddingTop: 10 }}>
-              <Switch
-                label={this.state.i18n.t('scenes.apps.account.notifications.privacy_option')}
-                value={this.state.notifications_parameters.preferences.privacy == 1}
-                onChange={checked => {
-                  NotificationParameters.preferences.privacy = checked ? 1 : 0;
-                  NotificationParameters.notify();
-                }}
-              />
-              <ButtonWithTimeout
-                className="small buttonValidation"
-                disabled={this.state.notifications_parameters.loading}
-                onClick={() => NotificationParameters.save(['privacy'])}
-                value={this.state.i18n.t('general.update')}
-              />
-            </div>
-          </Attribute>
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/twake/frontend/src/app/scenes/Client/Popup/UserParameter/Pages/Notifications.tsx b/twake/frontend/src/app/scenes/Client/Popup/UserParameter/Pages/Notifications.tsx
new file mode 100755
index 0000000000..a6bfbb3f61
--- /dev/null
+++ b/twake/frontend/src/app/scenes/Client/Popup/UserParameter/Pages/Notifications.tsx
@@ -0,0 +1,285 @@
+import React, { useState, useRef } from 'react';
+import { Input } from 'antd';
+import _ from 'lodash';
+
+import Languages from 'services/languages/languages.js';
+import NotificationParameters from 'services/user/notification_parameters.js';
+import { Collection } from 'services/CollectionsReact/Collections';
+import NotificationParametersService from 'services/user/notificationParameters';
+
+import ButtonWithTimeout from 'components/Buttons/ButtonWithTimeout.js';
+import Attribute from 'components/Parameters/Attribute.js';
+import Switch from 'components/Inputs/Switch.js';
+import Radio from 'components/Inputs/Radio.js';
+
+import {
+  preferencesType,
+  NotificationPreferencesResource,
+} from 'app/models/NotificationPreferences';
+
+export default () => {
+  const loading = useRef(true);
+  const url = '/notifications/v1/preferences/';
+  const notificationPreferencesCollection = Collection.get(url, NotificationPreferencesResource);
+  const notificationPreferences = notificationPreferencesCollection.useWatcher({});
+
+  const [newPreferences, setNewPreferences] = useState<preferencesType>();
+
+  if (loading.current && !!notificationPreferences && notificationPreferences.length) {
+    setNewPreferences(notificationPreferences[0].data.preferences);
+    loading.current = false;
+  }
+
+  const saveNewPreferences = async (preferences: preferencesType) => {
+    const newPreferences: any = Object.entries(preferences).map(([key, value]) => ({ key, value }));
+
+    NotificationParametersService.save(newPreferences);
+  };
+
+  const generateTimeOptions = () => {
+    const options = [];
+    for (let value = 0; value < 24; value += 0.5) {
+      const text = ~~value + ':' + ((value * 2) % 2 == 0 ? '00' : '30');
+      options.push(
+        <option key={value} value={value}>
+          {text}
+        </option>,
+      );
+    }
+    return options;
+  };
+
+  if (!newPreferences) {
+    return <div></div>;
+  }
+
+  return (
+    <>
+      <div className="title">{Languages.t('scenes.apps.account.notifications.title')}</div>
+      <div className="group_section">
+        <div className="subtitle">
+          {Languages.t('scenes.app.popup.userparameter.pages.frequency_notif_subtitle')}
+        </div>
+        <Attribute
+          label={Languages.t('scenes.apps.account.notifications.keywords_subtitle')}
+          description={Languages.t(
+            'scenes.app.popup.userparameter.pages.keywords_notif_description',
+          )}
+        >
+          <div className="parameters_form" style={{ maxWidth: 'none', paddingTop: 10 }}>
+            <Input
+              value={newPreferences.highlight_words.join(', ')}
+              placeholder={Languages.t('scenes.apps.account.notifications.keywords_placeholder')}
+              className="bottom-margin"
+              size="large"
+              onChange={(evt: React.ChangeEvent<HTMLInputElement>) => {
+                setNewPreferences({
+                  ...newPreferences,
+                  highlight_words: evt.target.value.split(', '),
+                });
+              }}
+            ></Input>
+          </div>
+        </Attribute>
+        <Attribute
+          label={Languages.t('scenes.app.popup.userparameter.pages.no_night_disturbing_label')}
+          description={Languages.t(
+            'scenes.app.popup.userparameter.pages.no_disturbing_notif_period_description',
+          )}
+        >
+          <div style={{ display: 'flex', flexDirection: 'column' }}>
+            <Switch
+              // TODO: Change the title and add the traduction
+              label={'Enable night feature'}
+              value={newPreferences.night_break.enable}
+              onChange={(checked: boolean) => {
+                setNewPreferences({
+                  ...newPreferences,
+                  night_break: {
+                    ...newPreferences.night_break,
+                    enable: checked,
+                  },
+                });
+              }}
+            />
+            <div className="parameters_form" style={{ maxWidth: 'none', paddingTop: 10 }}>
+              <div className="text">
+                {Languages.t('scenes.apps.account.notifications.disturb_option_a')}
+                <select
+                  id="after"
+                  className="select_inline"
+                  style={{ width: '80px', display: 'inline-block', margin: '0 10px' }}
+                  value={
+                    NotificationParameters.transform_period(
+                      newPreferences.night_break.from,
+                      newPreferences.night_break.to,
+                      -new Date().getTimezoneOffset() / 60,
+                    )[0]
+                  }
+                  onChange={(evt: any) => {
+                    setNewPreferences({
+                      ...newPreferences,
+                      night_break: {
+                        ...newPreferences.night_break,
+                        from: NotificationParameters.transform_period(
+                          evt.target.value,
+                          newPreferences.night_break.to,
+                          new Date().getTimezoneOffset() / 60,
+                        )[0],
+                      },
+                    });
+                  }}
+                >
+                  {generateTimeOptions()}
+                </select>
+                {Languages.t('scenes.apps.account.notifications.disturb_option_b')}
+                <select
+                  id="before"
+                  className="select_inline"
+                  style={{ width: '80px', display: 'inline-block', margin: '0 10px' }}
+                  value={
+                    NotificationParameters.transform_period(
+                      newPreferences.night_break.from,
+                      newPreferences.night_break.to,
+                      -new Date().getTimezoneOffset() / 60,
+                    )[1]
+                  }
+                  onChange={(evt: any) => {
+                    setNewPreferences({
+                      ...newPreferences,
+                      night_break: {
+                        ...newPreferences.night_break,
+                        to: NotificationParameters.transform_period(
+                          newPreferences.night_break.from,
+                          evt.target.value,
+                          new Date().getTimezoneOffset() / 60,
+                        )[1],
+                      },
+                    });
+                  }}
+                >
+                  {generateTimeOptions()}
+                </select>
+                {Languages.t('scenes.apps.account.notifications.disturb_option_c')}
+              </div>
+            </div>
+          </div>
+        </Attribute>
+        <Attribute
+          label={Languages.t('scenes.apps.account.notifications.devices_subtitle')}
+          description={Languages.t(
+            'scenes.app.popup.userparameter.pages.frequency_notif_configuration_description',
+          )}
+        >
+          <div className="parameters_form" style={{ maxWidth: 'none', paddingTop: 10 }}>
+            <Radio
+              small
+              label={Languages.t('scenes.apps.account.notifications.devices_option_ever')}
+              value={newPreferences.mobile_notifications == 'always'}
+              onChange={() => {
+                setNewPreferences({
+                  ...newPreferences,
+                  mobile_notifications: 'always',
+                });
+              }}
+            />
+            <br />
+
+            <Radio
+              small
+              label={Languages.t('scenes.apps.account.notifications.devices_option_inactive')}
+              value={newPreferences.mobile_notifications == 'when_inactive'}
+              onChange={() => {
+                setNewPreferences({
+                  ...newPreferences,
+                  mobile_notifications: 'when_inactive',
+                });
+              }}
+            />
+            <br />
+
+            <Radio
+              small
+              label={Languages.t('scenes.apps.account.notifications.devices_option_never')}
+              value={newPreferences.mobile_notifications == 'never'}
+              onChange={() => {
+                setNewPreferences({
+                  ...newPreferences,
+                  mobile_notifications: 'never',
+                });
+              }}
+            />
+          </div>
+        </Attribute>
+        <Attribute
+          label={Languages.t('scenes.apps.account.notifications.mail_subtitle')}
+          description={Languages.t(
+            'scenes.app.popup.userparameter.pages.mail_frequency_notif_configuration_description',
+          )}
+        >
+          <div className="parameters_form" style={{ maxWidth: 'none', paddingTop: 10 }}>
+            {/* TODO: Add an explanatory message */}
+            <input
+              style={{
+                width: '80px',
+                height: '40px',
+                padding: '0 10px',
+                opacity: 0.8,
+                borderRadius: '3px',
+                border: 'solid 1px rgba(0, 0, 0, 0.3)',
+              }}
+              type="number"
+              value={newPreferences.email_notifications_delay}
+              onChange={(evt: any) => {
+                setNewPreferences({
+                  ...newPreferences,
+                  email_notifications_delay: evt.target.value,
+                });
+              }}
+            />
+          </div>
+        </Attribute>
+        {/* TODO: Add DE and RU traduction and implement the feature */}
+        <Attribute
+          label={Languages.t('scenes.apps.account.notifications.sound')}
+          description={Languages.t('scenes.apps.account.notifications.sound')}
+        ></Attribute>
+      </div>
+      <div className="group_section">
+        <div className="subtitle">
+          {Languages.t('scenes.apps.account.notifications.privacy_subtitle')}
+        </div>
+        <Attribute
+          label={Languages.t('scenes.app.popup.userparameter.pages.notif_content_label')}
+          description={Languages.t(
+            'scenes.app.popup.userparameter.pages.private_message_content.show',
+          )}
+        >
+          <Switch
+            label={Languages.t(
+              // TODO: Add DE and RU translation
+              newPreferences.private_message_content
+                ? 'scenes.app.popup.userparameter.pages.private_message_content.hide'
+                : 'scenes.app.popup.userparameter.pages.private_message_content.show',
+            )}
+            value={newPreferences.private_message_content}
+            onChange={(checked: boolean) => {
+              setNewPreferences({
+                ...newPreferences,
+                private_message_content: checked,
+              });
+            }}
+          />
+        </Attribute>
+      </div>
+      <div style={{ textAlign: 'right' }}>
+        <ButtonWithTimeout
+          className="small buttonValidation"
+          disabled={_.isEqual(newPreferences, notificationPreferences[0].data.preferences)}
+          onClick={() => saveNewPreferences(newPreferences)}
+          value={Languages.t('general.update')}
+        />
+      </div>
+    </>
+  );
+};
diff --git a/twake/frontend/src/app/scenes/Client/Popup/UserParameter/UserParameter.js b/twake/frontend/src/app/scenes/Client/Popup/UserParameter/UserParameter.js
index 8be4e6f593..1e285865dc 100755
--- a/twake/frontend/src/app/scenes/Client/Popup/UserParameter/UserParameter.js
+++ b/twake/frontend/src/app/scenes/Client/Popup/UserParameter/UserParameter.js
@@ -10,7 +10,7 @@ import currentUserService from 'services/user/current_user.js';
 import uploadService from 'services/uploadManager/uploadManager.js';
 import ButtonWithTimeout from 'components/Buttons/ButtonWithTimeout.js';
 import Attribute from 'components/Parameters/Attribute.js';
-import Notifications from './Pages/Notifications.js';
+import Notifications from './Pages/Notifications';
 import MenuList from 'components/Menus/MenuComponent.js';
 import './UserParameter.scss';
 import Input from 'components/Inputs/Input.js';
diff --git a/twake/frontend/src/app/scenes/Client/Popup/WorkspaceParameter/Pages/WorkspaceAppsSearch.js b/twake/frontend/src/app/scenes/Client/Popup/WorkspaceParameter/Pages/WorkspaceAppsSearch.js
index 2abfe2a4d2..efe7493df3 100755
--- a/twake/frontend/src/app/scenes/Client/Popup/WorkspaceParameter/Pages/WorkspaceAppsSearch.js
+++ b/twake/frontend/src/app/scenes/Client/Popup/WorkspaceParameter/Pages/WorkspaceAppsSearch.js
@@ -295,18 +295,6 @@ export default class WorkspaceAppsSearch extends Component {
 
         <div className="group_section">
           <div className="text" style={{ marginBottom: 16 }}>
-            <a
-              key="show_all_apps"
-              href="https://twakeapp.com"
-              target="_blank"
-              style={{ float: 'right' }}
-            >
-              {Languages.t(
-                'scenes.app.popup.workspaceparameter.pages.show_all_apps_text',
-                [],
-                "Voir la liste d'applications",
-              )}
-            </a>
             <a href="#" key="goback" onClick={() => this.props.exit()}>
               {Languages.t('general.back', [], 'Retour')}
             </a>
diff --git a/twake/frontend/src/app/scenes/Client/Popup/WorkspaceParameter/Pages/WorkspacePartner.js b/twake/frontend/src/app/scenes/Client/Popup/WorkspaceParameter/Pages/WorkspacePartner.js
index 9b1150a228..3f3b93aa1b 100755
--- a/twake/frontend/src/app/scenes/Client/Popup/WorkspaceParameter/Pages/WorkspacePartner.js
+++ b/twake/frontend/src/app/scenes/Client/Popup/WorkspaceParameter/Pages/WorkspacePartner.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 
 import Languages from 'services/languages/languages.js';
 import Collections from 'app/services/Depreciated/Collections/Collections.js';
-import workspaceService from 'services/workspaces/workspaces.js';
+import WorkspaceService from 'services/workspaces/workspaces.js';
 import groupService from 'services/workspaces/groups.js';
 import workspacesUsers from 'services/workspaces/workspaces_users.js';
 import Menu from 'components/Menus/Menu.js';
@@ -18,15 +18,16 @@ import Pending from 'app/scenes/Client/Popup/WorkspaceParameter/Pages/WorkspaceP
 import Members from 'app/scenes/Client/Popup/WorkspaceParameter/Pages/WorkspacePartnerTabs/Members.js';
 import Tabs from 'components/Tabs/Tabs.js';
 import InitService from 'app/services/InitService';
+import ConsoleService from 'app/services/ConsoleService';
 
 export default class WorkspacePartner extends Component {
   constructor() {
     super();
-    var workspace = Collections.get('workspaces').find(workspaceService.currentWorkspaceId);
+    var workspace = Collections.get('workspaces').find(WorkspaceService.currentWorkspaceId);
     this.state = {
       i18n: Languages,
       workspace: Collections.get('workspaces'),
-      workspaceService: workspaceService,
+      WorkspaceService: WorkspaceService,
       attributeOpen: 0,
       subMenuOpened: 0,
       workspaceName: workspace ? workspace.name : '',
@@ -42,7 +43,7 @@ export default class WorkspacePartner extends Component {
     };
     this.inputWorkspaceName = null;
     Collections.get('workspaces').addListener(this);
-    workspaceService.addListener(this);
+    WorkspaceService.addListener(this);
     workspacesUsers.addListener(this);
     workspaceUserRightsService.addListener(this);
     Languages.addListener(this);
@@ -52,7 +53,7 @@ export default class WorkspacePartner extends Component {
   }
   componentWillUnmount() {
     Collections.get('workspaces').removeListener(this);
-    workspaceService.removeListener(this);
+    WorkspaceService.removeListener(this);
     workspacesUsers.removeListener(this);
     workspaceUserRightsService.removeListener(this);
     Languages.removeListener(this);
@@ -130,7 +131,11 @@ export default class WorkspacePartner extends Component {
       {
         type: 'menu',
         text: Languages.t('scenes.app.popup.workspaceparameter.edit_from_console'),
-        onClick: () => window.open('https://console.qa.twake.app/company/users', '_blank'),
+        onClick: () =>
+          window.open(
+            ConsoleService.getCompanyUsersManagementUrl(WorkspaceService.currentGroupId),
+            '_blank',
+          ),
       },
     ];
 
@@ -227,7 +232,7 @@ export default class WorkspacePartner extends Component {
             AlertManager.confirm(() =>
               this.state.workspacesUsers.removeUser(
                 col.user.id,
-                workspaceService.currentWorkspaceId,
+                WorkspaceService.currentWorkspaceId,
               ),
             );
           },
@@ -245,7 +250,7 @@ export default class WorkspacePartner extends Component {
         workspaceUserRightsService.hasWorkspacePrivilege() &&
         (col.user || {}).mail_verification_override != false &&
         (col.user || {}).mail_verification_override ==
-          workspaceService.currentWorkspaceId + '_' + UserService.getCurrentUserId()
+          WorkspaceService.currentWorkspaceId + '_' + UserService.getCurrentUserId()
       ) {
         menu = [
           {
@@ -283,12 +288,12 @@ export default class WorkspacePartner extends Component {
       key => {
         var user = this.state.workspacesUsers.users_by_group[groupService.currentGroupId][key].user;
         if (
-          !this.state.workspacesUsers.getUsersByWorkspace(workspaceService.currentWorkspaceId)[
+          !this.state.workspacesUsers.getUsersByWorkspace(WorkspaceService.currentWorkspaceId)[
             key
           ] ||
-          !this.state.workspacesUsers.getUsersByWorkspace(workspaceService.currentWorkspaceId)[key]
+          !this.state.workspacesUsers.getUsersByWorkspace(WorkspaceService.currentWorkspaceId)[key]
             .user ||
-          !this.state.workspacesUsers.getUsersByWorkspace(workspaceService.currentWorkspaceId)[key]
+          !this.state.workspacesUsers.getUsersByWorkspace(WorkspaceService.currentWorkspaceId)[key]
             .user.id
         ) {
           usersInGroup.push({
@@ -296,7 +301,7 @@ export default class WorkspacePartner extends Component {
             user: user,
             externe: this.state.workspacesUsers.users_by_group[groupService.currentGroupId][key]
               .externe,
-            groupLevel: this.state.workspacesUsers.users_by_group[workspaceService.currentGroupId][
+            groupLevel: this.state.workspacesUsers.users_by_group[WorkspaceService.currentGroupId][
               key
             ].groupLevel,
           });
diff --git a/twake/frontend/src/app/scenes/Client/Popup/WorkspaceParameter/WorkspaceParameter.js b/twake/frontend/src/app/scenes/Client/Popup/WorkspaceParameter/WorkspaceParameter.js
index 1dd23bec0e..2dc179f012 100755
--- a/twake/frontend/src/app/scenes/Client/Popup/WorkspaceParameter/WorkspaceParameter.js
+++ b/twake/frontend/src/app/scenes/Client/Popup/WorkspaceParameter/WorkspaceParameter.js
@@ -15,6 +15,7 @@ import WorkspaceUserRights from 'services/workspaces/workspace_user_rights.js';
 import WorkspaceService from 'services/workspaces/workspaces.js';
 import MenuList from 'components/Menus/MenuComponent.js';
 import InitService from 'app/services/InitService';
+import ConsoleService from 'app/services/ConsoleService';
 import './WorkspaceParameter.scss';
 
 export default class WorkspaceParameter extends Component {
@@ -198,7 +199,7 @@ export default class WorkspaceParameter extends Component {
         onClick: () => {
           if (InitService.server_infos?.auth?.console?.use) {
             return window.open(
-              InitService.server_infos?.auth?.console?.company_management_url,
+              ConsoleService.getCompanyManagementUrl(WorkspaceService.currentGroupId),
               '_blank',
             );
           } else {
diff --git a/twake/frontend/src/app/scenes/Client/WorkspacesBar/Components/GroupSwitch/GroupSwitch.tsx b/twake/frontend/src/app/scenes/Client/WorkspacesBar/Components/GroupSwitch/GroupSwitch.tsx
index d0fd36d71f..5a3f7bffc4 100755
--- a/twake/frontend/src/app/scenes/Client/WorkspacesBar/Components/GroupSwitch/GroupSwitch.tsx
+++ b/twake/frontend/src/app/scenes/Client/WorkspacesBar/Components/GroupSwitch/GroupSwitch.tsx
@@ -34,7 +34,7 @@ export default (props: {
         {((group.mininame || group.name || '') + '-')[0].toUpperCase()}
         {unreadOtherCompanies > 0 && <div className="notification_dot" />}
       </div>
-      <div className="company_name">{group.mininame || (group.name || '').substr(0, 6)}</div>
+      <div className="company_name">{(group.name || '').trim()}</div>
     </div>
   );
 };
diff --git a/twake/frontend/src/app/scenes/Error/Error.tsx b/twake/frontend/src/app/scenes/Error/Error.tsx
index 83c6eb8215..b4c5a4a773 100644
--- a/twake/frontend/src/app/scenes/Error/Error.tsx
+++ b/twake/frontend/src/app/scenes/Error/Error.tsx
@@ -16,7 +16,7 @@ export default () => {
       },
     };
     if (!RouterServices.useRedirection()) {
-      RouterServices.history.push('/');
+      RouterServices.push('/');
     }
   }
   return (
diff --git a/twake/frontend/src/app/scenes/Error/ErrorBoundary.tsx b/twake/frontend/src/app/scenes/Error/ErrorBoundary.tsx
index 5c7b11f5f7..7c909e4a56 100755
--- a/twake/frontend/src/app/scenes/Error/ErrorBoundary.tsx
+++ b/twake/frontend/src/app/scenes/Error/ErrorBoundary.tsx
@@ -25,7 +25,7 @@ export default class ErrorBoundary extends React.Component<{}, { hasError: boole
         info: errorInfo.componentStack,
       },
     };
-    RouterServices.history.replace(RouterServices.addRedirection(RouterServices.pathnames.ERROR));
+    RouterServices.replace(RouterServices.addRedirection(RouterServices.pathnames.ERROR));
   }
 
   render() {
diff --git a/twake/frontend/src/app/scenes/Setup/Setup.tsx b/twake/frontend/src/app/scenes/Setup/Setup.tsx
index 5979873d42..1bf924fac8 100644
--- a/twake/frontend/src/app/scenes/Setup/Setup.tsx
+++ b/twake/frontend/src/app/scenes/Setup/Setup.tsx
@@ -16,7 +16,7 @@ export default function Setup() {
 
   if (ready === true) {
     if (!RouterServices.useRedirection()) {
-      RouterServices.history.push('/');
+      RouterServices.push('/');
     }
     return <div />;
   }
diff --git a/twake/frontend/src/app/services/AppView/MainViewService.ts b/twake/frontend/src/app/services/AppView/MainViewService.ts
index 135fefa15f..331c925624 100755
--- a/twake/frontend/src/app/services/AppView/MainViewService.ts
+++ b/twake/frontend/src/app/services/AppView/MainViewService.ts
@@ -14,10 +14,8 @@ class _MainViewService extends AppViewService {
   }
 
   public select(id: string, configuration?: ViewConfiguration) {
-    if (id != this.getId()) {
-      RouterService.history.push(
-        RouterService.generateRouteFromState({ channelId: id, tabId: '' }),
-      );
+    if (RouterService.history.action !== 'POP' && id != this.getId()) {
+      RouterService.push(RouterService.generateRouteFromState({ channelId: id, tabId: '' }));
     }
     super.select(id, configuration);
   }
diff --git a/twake/frontend/src/app/services/Apps/Calendar/Calendar.js b/twake/frontend/src/app/services/Apps/Calendar/Calendar.js
index c2f76d1e53..3d6ad88130 100755
--- a/twake/frontend/src/app/services/Apps/Calendar/Calendar.js
+++ b/twake/frontend/src/app/services/Apps/Calendar/Calendar.js
@@ -127,8 +127,6 @@ class Calendar extends Observable {
   }
 
   closePopups() {
-    console.log('close');
-    //console.trace();
     this.preview = null;
     if (this.edited) {
       Collections.get('events').cancelEdit(this.edited);
diff --git a/twake/frontend/src/app/services/Collections/Collection.ts b/twake/frontend/src/app/services/Collections/Collection.ts
index a4e3fe039f..cd79ae5a09 100644
--- a/twake/frontend/src/app/services/Collections/Collection.ts
+++ b/twake/frontend/src/app/services/Collections/Collection.ts
@@ -1,4 +1,4 @@
-import { assign } from 'lodash';
+import { assign, reject } from 'lodash';
 import getStore, { CollectionStore } from './Storage';
 import EventEmitter from './EventEmitter';
 import Resource from './Resource';
@@ -15,6 +15,7 @@ export type GeneralOptions = {
   alwaysNotify: boolean;
   withoutBackend: boolean;
   query: any;
+  callback: Function;
 } & any;
 
 export type ServerRequestOptions = {
@@ -189,6 +190,25 @@ export default class Collection<R extends Resource<any>> {
     return;
   }
 
+  public async get(
+    filter?: any,
+    options: GeneralOptions & ServerRequestOptions = {},
+  ): Promise<R[]> {
+    return new Promise((resolve, reject) => {
+      try {
+        this.find(filter, {
+          refresh: true,
+          callback: (items: R[]) => {
+            resolve(items);
+          },
+          ...options,
+        });
+      } catch (err) {
+        reject(err);
+      }
+    });
+  }
+
   /**
    * Find documents according to a filter and some option (sorting etc)
    * This will call backend if we ask for more items than existing in frontend.
@@ -202,20 +222,31 @@ export default class Collection<R extends Resource<any>> {
       return [this.findOne(filter, options)];
     }
 
-    if (!this.completion.isLocked && !options?.withoutBackend) {
-      this.completion.completeFind(mongoItems, filter, options).then(async mongoItems => {
-        if (mongoItems.length > 0) {
-          mongoItems.forEach(mongoItem => {
-            this.updateLocalResource(mongoItem);
+    if (!options?.withoutBackend) {
+      if (!this.completion.isLocked || options?.refresh) {
+        this.completion
+          .completeFind(mongoItems, filter, options)
+          .then(async mongoItems => {
+            if (mongoItems.length > 0) {
+              mongoItems.forEach(mongoItem => {
+                this.updateLocalResource(mongoItem);
+              });
+              this.eventEmitter.notify();
+            }
+
+            if (options?.callback) {
+              options?.callback(mongoItems.map(mongoItem => this.resources[mongoItem.id]));
+            }
+          })
+          .catch(err => {
+            throw err;
           });
-          this.eventEmitter.notify();
-        }
-      });
-    } else {
-      this.completeTimeout && clearTimeout(this.completeTimeout);
-      this.completeTimeout = setTimeout(() => {
-        this.find(filter, options);
-      }, 1000);
+      } else {
+        this.completeTimeout && clearTimeout(this.completeTimeout);
+        this.completeTimeout = setTimeout(() => {
+          this.find(filter, options);
+        }, 1000);
+      }
     }
 
     mongoItems.forEach(mongoItem => {
diff --git a/twake/frontend/src/app/services/ConsoleService.ts b/twake/frontend/src/app/services/ConsoleService.ts
index 02e4dd5bb3..eb1e99483b 100644
--- a/twake/frontend/src/app/services/ConsoleService.ts
+++ b/twake/frontend/src/app/services/ConsoleService.ts
@@ -1,8 +1,28 @@
 import { message as toaster } from 'antd';
 import Languages from 'services/languages/languages.js';
 import Api from './Api';
+import DepreciatedCollections from './Depreciated/Collections/Collections';
+import InitService from './InitService';
 
 class ConsoleService {
+  public getCompanyManagementUrl(companyId: string) {
+    const identity_provider_id = DepreciatedCollections.get('groups').find(companyId)
+      ?.identity_provider_id;
+    return (InitService.server_infos?.auth?.console?.company_management_url || '').replace(
+      '{company_id}',
+      identity_provider_id,
+    );
+  }
+
+  public getCompanyUsersManagementUrl(companyId: string) {
+    const identity_provider_id = DepreciatedCollections.get('groups').find(companyId)
+      ?.identity_provider_id;
+    return (InitService.server_infos?.auth?.console?.collaborators_management_url || '').replace(
+      '{company_id}',
+      identity_provider_id,
+    );
+  }
+
   public verifyMail() {
     const onVerification = new Promise(async resolve => {
       const response = await Api.post(
@@ -29,9 +49,12 @@ class ConsoleService {
         if (res) {
           if (res.error) return toaster.error(res.error);
           else if (res.data?.nok?.length) {
-            res.data.nok.map(({ email, message }: { email: string; message: string }) =>
-              toaster.warning(`${email} - ${message}`),
-            );
+            res.data.nok.map(({ email, message }: { email: string; message: string }) => {
+              if (message != 'User already belonged to the company') {
+                // FIXME : do not compare the message
+                toaster.warning(`${email} - ${message}`);
+              }
+            });
           }
 
           if (res.data?.ok?.length) {
diff --git a/twake/frontend/src/app/services/FeedbackMessageManager/FeedbackMessageManager.ts b/twake/frontend/src/app/services/FeedbackMessageManager/FeedbackMessageManager.ts
new file mode 100644
index 0000000000..cca8f08a31
--- /dev/null
+++ b/twake/frontend/src/app/services/FeedbackMessageManager/FeedbackMessageManager.ts
@@ -0,0 +1,23 @@
+import { message } from 'antd';
+
+class FeedbackMessage {
+  success(content:string, duration:number, onClose?:any) {
+    message.success(content, duration, onClose)
+  }
+  error(content:string, duration:number, onClose?:any) {
+    message.error(content, duration, onClose)
+  }
+  info(content:string, duration:number, onClose?:any) {
+    message.info(content, duration, onClose)
+  }
+  warning(content:string, duration:number, onClose?:any) {
+    message.warning(content, duration, onClose)
+  }
+  loading(content:string, duration:number, onClose?:any) {
+    message.loading(content, duration, onClose)
+  }
+}
+
+const feedbackMessage = new FeedbackMessage();
+export default feedbackMessage;
+
diff --git a/twake/frontend/src/app/services/InitService.ts b/twake/frontend/src/app/services/InitService.ts
index ff0fd82bcc..f8ff66687c 100644
--- a/twake/frontend/src/app/services/InitService.ts
+++ b/twake/frontend/src/app/services/InitService.ts
@@ -37,12 +37,9 @@ class InitService extends Observable {
 
     if (this.server_infos.ready !== true && this.server_infos.ready !== undefined) {
       //Server is not ready
-      RouterServices.history.replace(
-        RouterServices.addRedirection(RouterServices.pathnames.SETUP),
-        {
-          ...this.server_infos.ready,
-        },
-      );
+      RouterServices.replace(RouterServices.addRedirection(RouterServices.pathnames.SETUP), {
+        ...this.server_infos.ready,
+      });
       this.app_ready = false;
       this.notify();
       setTimeout(() => {
diff --git a/twake/frontend/src/app/services/Observable/Observable.ts b/twake/frontend/src/app/services/Observable/Observable.ts
index d15a890573..f9436599d3 100644
--- a/twake/frontend/src/app/services/Observable/Observable.ts
+++ b/twake/frontend/src/app/services/Observable/Observable.ts
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import EventListener from 'events';
 
 /**
@@ -27,38 +27,44 @@ export const useWatcher = <G>(
 
   const [, forceRender] = useState<G>(isAsync ? null : value);
 
+  const savedObservable = useRef(observable);
+  const savedForceRender = useRef((v: any) => forceRender(v));
+
   useMemo(() => {
-    observable.removeWatcher(forceRender);
+    savedObservable.current.removeWatcher(forceRender);
     observable.addWatcher(forceRender, observedScope, options);
+    savedObservable.current = observable;
   }, options?.memoizedFilters || []);
 
   useEffect(() => {
-    observable.removeWatcher(forceRender);
-    const watcher = observable.addWatcher(
-      v => {
-        forceRender(v);
-      },
+    savedObservable.current.removeWatcher(savedForceRender.current);
+    observable.addWatcher(savedForceRender.current, observedScope, options);
+    savedObservable.current = observable;
+  }, [observable]);
+
+  useEffect(() => {
+    const watcher = savedObservable.current.addWatcher(
+      savedForceRender.current,
       observedScope,
       options,
     );
 
-    observable.getChanges<G>(watcher).then(changes => {
+    savedObservable.current.getChanges<G>(watcher).then(changes => {
       if (changes.didChange) {
         forceRender(changes.changes);
       }
     });
 
-    //Called on component unmount
     return () => {
-      observable.removeWatcher(forceRender);
+      savedObservable.current.removeWatcher(savedForceRender.current);
     };
-  }, [observable]);
+  }, []);
 
   return value as G;
 };
 
 export default class Observable extends EventListener {
-  protected watchers: Watcher[] = [];
+  public watchers: Watcher[] = [];
 
   constructor() {
     super();
diff --git a/twake/frontend/src/app/services/RouterService.ts b/twake/frontend/src/app/services/RouterService.ts
index e1e5d81619..5bf3bd9554 100644
--- a/twake/frontend/src/app/services/RouterService.ts
+++ b/twake/frontend/src/app/services/RouterService.ts
@@ -257,6 +257,14 @@ class RouterServices extends Observable {
     }
     return false;
   }
+
+  push(path: string, state?: unknown): void {
+    return this.history.push(path, state);
+  }
+
+  replace(path: string, state?: unknown): void {
+    return this.history.replace(path, state);
+  }
 }
 
 export default new RouterServices();
diff --git a/twake/frontend/src/app/services/channels/ChannelsBarService.ts b/twake/frontend/src/app/services/channels/ChannelsBarService.ts
index b6e513d3aa..0e792c7514 100755
--- a/twake/frontend/src/app/services/channels/ChannelsBarService.ts
+++ b/twake/frontend/src/app/services/channels/ChannelsBarService.ts
@@ -1,5 +1,6 @@
 import { ChannelResource } from 'app/models/Channel';
 import Observable from 'app/services/Observable/Observable';
+import { constant } from 'lodash';
 import MainViewService from '../AppView/MainViewService';
 import { Collection } from '../CollectionsReact/Collections';
 import RouterService from '../RouterService';
@@ -35,11 +36,22 @@ class ChannelsBarService extends Observable {
     localStorage.setItem(companyId + ':' + workspaceId + ':channel', channelId);
   }
 
-  autoSelectChannel(companyId: string, workspaceId: string) {
-    const channelId = localStorage.getItem(companyId + ':' + workspaceId + ':channel');
+  async autoSelectChannel(companyId: string, workspaceId: string) {
+    let channelId = localStorage.getItem(companyId + ':' + workspaceId + ':channel');
+
+    if (!channelId) {
+      const url: string = `/channels/v1/companies/${companyId}/workspaces/${workspaceId}/channels/::mine`;
+      const channelsCollection = Collection.get(url, ChannelResource);
+      const channels = await channelsCollection.get({}, { query: { mine: true } });
+      console.log('TRY TO SELECT A CHANNEL FROM HERE', channels);
+      if (channels.length > 0) {
+        channelId = channels[0].id;
+      }
+    }
+
     if (channelId) {
       this.updateCurrentChannelId(companyId, workspaceId, '');
-      RouterService.history.push(RouterService.generateRouteFromState({ channelId: channelId }));
+      RouterService.push(RouterService.generateRouteFromState({ channelId: channelId }));
     }
   }
 }
diff --git a/twake/frontend/src/app/services/channels/channels.js b/twake/frontend/src/app/services/channels/channels.js
index 4021718284..f2a848c48a 100755
--- a/twake/frontend/src/app/services/channels/channels.js
+++ b/twake/frontend/src/app/services/channels/channels.js
@@ -79,7 +79,7 @@ class Channels extends Observable {
     }
 
     if (res) {
-      RouterService.history.push(
+      RouterService.push(
         RouterService.generateRouteFromState({
           channelId: res.id,
           companyId: res.data.company_id,
@@ -147,7 +147,7 @@ class Channels extends Observable {
       this.currentChannelFrontId = channel.front_id;
       this.currentChannelFrontIdByWorkspace[Workspaces.currentWorkspaceId] = channel.front_id;
 
-      RouterService.history.push(RouterService.generateRouteFromState({ channelId: channel.id }));
+      RouterService.push(RouterService.generateRouteFromState({ channelId: channel.id }));
 
       this.current_tab_id = this.current_tab_id_by_channel_id[channel.id] || null;
 
diff --git a/twake/frontend/src/app/services/languages/locale/de.js b/twake/frontend/src/app/services/languages/locale/de.js
index 39f01835e6..6dadcaddbd 100755
--- a/twake/frontend/src/app/services/languages/locale/de.js
+++ b/twake/frontend/src/app/services/languages/locale/de.js
@@ -1106,7 +1106,7 @@ export default {
     'Die Anzahl der Felder nimmt automatisch zu.',
   'scenes.app.workspaces.create_company.invitations.title_1':
     'Bevor Sie fertig sind, können Sie Ihrem Unternehmen Mitarbeiter hinzufügen.',
-  'scenes.app.workspaces.create_company.invitations.title_2': 'Twake ist besser mit deinem Team.',
+  'scenes.app.workspaces.create_company.invitations.title_2': 'Hinzufügen Ihrer Teammitglieder.',
   'scenes.app.workspaces.create_company.title': 'Schaffe meine Firma',
   'scenes.app.workspaces.welcome_page.add_secondary_emails':
     'Fügen Sie eine sekundäre E-Mail hinzu',
@@ -1387,7 +1387,7 @@ export default {
   'scenes.app.popup.appsparameters.pages.website_label': 'Webseite',
   'scenes.app.popup.appsparameters.pages.write_privileges_label': 'Schreibrechte',
   'scenes.app.popup.createworkspacepage.add_subtitle':
-    'Brauche mehr Platz? Ein neuer Arbeitsplatz und es wird perfekt!',
+    'Brauche mehr Platz?',
   'scenes.app.popup.createworkspacepage.create_new_workspace':
     'Erstellen Sie einen neuen Arbeitsbereich',
   'scenes.app.popup.createworkspacepage.placeholder_name': 'Name des Arbeitsbereichs',
@@ -1396,7 +1396,7 @@ export default {
   'scenes.app.popup.userparameter.pages.frequency_notif_subtitle':
     'Häufigkeit der Benachrichtigungen',
   'scenes.app.popup.userparameter.pages.keywords_notif_description':
-    'Erhalten Sie nur Benachrichtigungen, die bestimmten Keywords entsprechen.',
+    'Markieren Sie die folgenden Schlüsselwörter:',
   'scenes.app.popup.userparameter.pages.mail_frequency_notif_configuration_description':
     'Legen Sie die Häufigkeit der E-Mail-Benachrichtigungen fest.',
   'scenes.app.popup.userparameter.pages.no_disturbing_notif_period_description':
@@ -1428,7 +1428,7 @@ export default {
   'scenes.app.popup.workspaceparameter.membership_information': '',
   'scenes.app.popup.workspaceparameter.pages.deleteworkspace': 'Leerzeichen löschen',
   'scenes.app.popup.workspaceparameter.pages.deleteworkspace_description':
-    'Löschen Sie diesen Arbeitsbereich',
+    'Um zu bestätigen, dass Sie diesen Arbeitsbereich löschen möchten, geben Sie bitte den Namen unten ein und drücken Sie auf Löschen',
   'scenes.app.popup.workspaceparameter.pages.enter': 'Eingeben ',
   'scenes.app.popup.workspaceparameter.pages.access_apps':
     'Greifen Sie auf Ihre Anwendungen und Konnektoren zu',
diff --git a/twake/frontend/src/app/services/languages/locale/en.js b/twake/frontend/src/app/services/languages/locale/en.js
index a8eb59047b..7b9177b11e 100755
--- a/twake/frontend/src/app/services/languages/locale/en.js
+++ b/twake/frontend/src/app/services/languages/locale/en.js
@@ -662,6 +662,7 @@ export default {
   'scenes.apps.account.notifications.mail_option_ever': 'Send me all the notification emails',
   'scenes.apps.account.notifications.mail_option_daily': 'Just send me a daily report',
   'scenes.apps.account.notifications.mail_option_never': 'Never send e-mail notifications',
+  'scenes.apps.account.notifications.sound': 'Sound notification',
   'scenes.apps.account.workspaces.workspace_name': 'Workspace name',
   'scenes.apps.account.workspaces.members_number': 'Number of members',
   'scenes.apps.account.workspaces.favorite_workspace': 'Favorite workspaces',
@@ -1085,7 +1086,7 @@ export default {
     'The number of fields increases when you press enter.',
   'scenes.app.workspaces.create_company.invitations.title_1':
     'Before you finish, you can add collaborators to your company.',
-  'scenes.app.workspaces.create_company.invitations.title_2': 'Twake is better in team.',
+  'scenes.app.workspaces.create_company.invitations.title_2': 'Add your team members.',
   'scenes.app.workspaces.create_company.title': 'Create my company',
   'scenes.app.workspaces.welcome_page.add_secondary_emails': 'Add a secondary email',
   'scenes.app.workspaces.welcome_page.added_to_company': 'You have been invited to ',
@@ -1359,17 +1360,20 @@ export default {
     'An error occurred while updating the application.',
   'scenes.app.popup.appsparameters.pages.remove_app_button': 'Delete application',
   'scenes.app.popup.appsparameters.pages.update_button': 'Update',
-  'scenes.app.popup.createworkspacepage.add_subtitle':
-    'Need more space? Create a new workspace and it will be perfect!',
+  'scenes.app.popup.createworkspacepage.add_subtitle': 'Need more space?',
   'scenes.app.popup.createworkspacepage.create_new_workspace': 'Create a new workspace',
   'scenes.app.popup.createworkspacepage.placeholder_name': 'Name of the workspace',
   'scenes.app.popup.userparameter.pages.frequency_notif_configuration_description':
     'Set the frequency of mobile notifications.',
   'scenes.app.popup.userparameter.pages.frequency_notif_subtitle': 'Frenquency of notifications',
   'scenes.app.popup.userparameter.pages.keywords_notif_description':
-    'Receive only notifications that match certain keywords.',
+    'Highlight the following keywords:',
   'scenes.app.popup.userparameter.pages.mail_frequency_notif_configuration_description':
     'Set the frequency of email notifications.',
+  'scenes.app.popup.userparameter.pages.private_message_content.show':
+    'Show private messages content',
+  'scenes.app.popup.userparameter.pages.private_message_content.hide':
+    'Hide private messages content',
   'scenes.app.popup.userparameter.pages.no_disturbing_notif_period_description':
     'Choose a period during which you do not receive notifications.',
   'scenes.app.popup.userparameter.pages.no_night_disturbing_label': 'Do not disturb at night',
@@ -1381,12 +1385,12 @@ export default {
   'scenes.app.popup.userparameter.personnal_workspaces_title': 'Your workspaces',
   'scenes.app.popup.workspaceparameter.admin_current_status': 'You are an Administrator.',
   'scenes.app.popup.workspaceparameter.admin_manager_current_status':
-    'You are a Director and Manager of the company.',
-  'scenes.app.popup.workspaceparameter.manager_current_status':
-    'You are the manager of the company.',
+    'You are a workspace administrator.',
+  'scenes.app.popup.workspaceparameter.manager_current_status': 'You are a company administrator.',
   'scenes.app.popup.workspaceparameter.membership_information': '',
   'scenes.app.popup.workspaceparameter.pages.deleteworkspace': 'Delete workspace',
-  'scenes.app.popup.workspaceparameter.pages.deleteworkspace_description': 'Delete this workspace',
+  'scenes.app.popup.workspaceparameter.pages.deleteworkspace_description':
+    'To confirm you want to delete this workspace, please type the name below and hit delete',
   'scenes.app.popup.workspaceparameter.pages.enter': 'Enter ',
   'scenes.app.popup.workspaceparameter.pages.access_apps':
     'Access your applications and connectors',
@@ -1406,15 +1410,15 @@ export default {
   'scenes.app.popup.workspaceparameter.pages.back_to_search_button': 'Return to the search',
   'scenes.app.popup.workspaceparameter.pages.cancel_invitation_button':
     'Cancel the invitation by e-mail.',
-  'scenes.app.popup.workspaceparameter.pages.collaboraters_adding_button': 'Add collaborators',
+  'scenes.app.popup.workspaceparameter.pages.collaboraters_adding_button': 'Add colleagues',
   'scenes.app.popup.workspaceparameter.pages.collaboraters_small_text':
     'Collaborators in this workspace $1',
   'scenes.app.popup.workspaceparameter.pages.collaborateurs': 'Collaborators',
   'scenes.app.popup.workspaceparameter.pages.company_developped_apps_subtitle':
     'Applications developed by the company',
   'scenes.app.popup.workspaceparameter.pages.company_identity_title': 'Identity of the company',
-  'scenes.app.popup.workspaceparameter.pages.company_manager_label': 'Manager of the company',
-  'scenes.app.popup.workspaceparameter.pages.company_manager_status': 'Manager of the company',
+  'scenes.app.popup.workspaceparameter.pages.company_manager_label': 'Company Admin',
+  'scenes.app.popup.workspaceparameter.pages.company_manager_status': 'Company Admin',
   'scenes.app.popup.workspaceparameter.pages.company_name_description':
     'Change the name of this company',
   'scenes.app.popup.workspaceparameter.pages.company_name_label': 'Name of the company',
@@ -1936,5 +1940,5 @@ export default {
   'services.console_services.toaster.success_verify_email':
     'A verification link has been sent to your email account',
   'scenes.app.popup.workspaceparameter.edit_from_console': 'Edit from Console',
-  'services.console_services.toaster.success_invite_emails': 'Successfully added $1 email(s)',
+  'services.console_services.toaster.success_invite_emails': 'Successfully added $1 user(s)',
 };
diff --git a/twake/frontend/src/app/services/languages/locale/es.js b/twake/frontend/src/app/services/languages/locale/es.js
index 0c49b0d22b..5199fb04c6 100755
--- a/twake/frontend/src/app/services/languages/locale/es.js
+++ b/twake/frontend/src/app/services/languages/locale/es.js
@@ -419,7 +419,7 @@ export default {
   'scenes.apps.parameters.group_sections.payment': 'Suscripción',
   'scenes.app.popup.workspaceparameter.pages.deleteworkspace': 'Eliminar espacio',
   'scenes.app.popup.workspaceparameter.pages.deleteworkspace_description':
-    'Eliminar este espacio de trabajo',
+    'Para confirmar que desea eliminar este espacio de trabajo, escriba el nombre que aparece a continuación y pulse suprimir',
   'scenes.app.popup.workspaceparameter.pages.enter': 'Entrar ',
 
   //--AccountPage
diff --git a/twake/frontend/src/app/services/languages/locale/fr.js b/twake/frontend/src/app/services/languages/locale/fr.js
index d811becd5d..0cca578363 100755
--- a/twake/frontend/src/app/services/languages/locale/fr.js
+++ b/twake/frontend/src/app/services/languages/locale/fr.js
@@ -681,6 +681,7 @@ export default {
     'Envoyez-moi seulement un rapport journalier',
   'scenes.apps.account.notifications.mail_option_never':
     'Ne jamais envoyez de notifications par e-mail',
+  'scenes.apps.account.notifications.sound': 'Notification sonore',
   'scenes.apps.account.workspaces.workspace_name': 'Nom des espaces de travail',
   'scenes.apps.account.workspaces.members_number': 'Nombre de membres',
   'scenes.apps.account.workspaces.favorite_workspace': 'Espaces de travail favoris',
@@ -1138,7 +1139,7 @@ export default {
     'Le nombre de champs augmente en appuyant sur entrée.',
   'scenes.app.workspaces.create_company.invitations.title_1':
     'Avant de terminer, vous pouvez ajouter des collaborateurs dans votre entreprise.',
-  'scenes.app.workspaces.create_company.invitations.title_2': "Twake, c'est mieux à plusieurs.",
+  'scenes.app.workspaces.create_company.invitations.title_2': 'Ajoutez vos collaborateurs.',
   'scenes.app.workspaces.create_company.title': 'Création de mon entreprise',
   'scenes.app.workspaces.welcome_page.add_secondary_emails': 'Ajouter un e-mail secondaire',
   'scenes.app.workspaces.welcome_page.added_to_company': 'Vous avez été invité dans l’entreprise',
@@ -1421,15 +1422,14 @@ export default {
     "Une erreur s'est produite lors de la mise à jour de l'application.",
   'scenes.app.popup.appsparameters.pages.remove_app_button': "Supprimer l'application",
   'scenes.app.popup.appsparameters.pages.update_button': 'Mettre à jour',
-  'scenes.app.popup.createworkspacepage.add_subtitle':
-    'Besoin de plus de place ? Un nouvel espace de travail et ce sera parfait !',
+  'scenes.app.popup.createworkspacepage.add_subtitle': 'Besoin de plus de place ?',
   'scenes.app.popup.createworkspacepage.create_new_workspace': 'Créer un nouvel espace de travail',
   'scenes.app.popup.createworkspacepage.placeholder_name': "Nom de l'espace de travail",
   'scenes.app.popup.userparameter.pages.frequency_notif_configuration_description':
     'Configurez la fréquence des notifications mobile.',
   'scenes.app.popup.userparameter.pages.frequency_notif_subtitle': 'Fréquence des notifications',
   'scenes.app.popup.userparameter.pages.keywords_notif_description':
-    'Ne recevez que des notifications correspondant à certains mots clés.',
+    'Mettre en surbrillance les mots clés suivants:',
   'scenes.app.popup.userparameter.pages.mail_frequency_notif_configuration_description':
     'Configurez la fréquence des notifications mail.',
   'scenes.app.popup.userparameter.pages.no_disturbing_notif_period_description':
@@ -1441,6 +1441,10 @@ export default {
   'scenes.aie': 'Aïe !',
   'scenes.app.mainview.quick_search_placeholder': 'Recherche rapide',
   'scenes.app.popup.userparameter.personnal_workspaces_title': 'Vos espaces de travail',
+  'scenes.app.popup.userparameter.pages.private_message_content.show':
+    'Afficher le contenu des messages privés',
+  'scenes.app.popup.userparameter.pages.private_message_content.hide':
+    'Masquer le contenu des messages privés',
   'scenes.app.popup.workspaceparameter.admin_current_status': 'Vous êtes Administrateur.',
   'scenes.app.popup.workspaceparameter.admin_manager_current_status':
     "Vous êtes Administrateur et Gérant de l'entreprise.",
@@ -1448,7 +1452,7 @@ export default {
   'scenes.app.popup.workspaceparameter.membership_information': '',
   'scenes.app.popup.workspaceparameter.pages.deleteworkspace': "Supprimer l'espace",
   'scenes.app.popup.workspaceparameter.pages.deleteworkspace_description':
-    'Supprimer cet espace de travail',
+    'Pour confirmer que vous souhaitez supprimer cet espace de travail, veuillez saisir le nom ci-dessous et cliquer sur "supprimer".',
   'scenes.app.popup.workspaceparameter.pages.enter': 'Entrer ',
   'scenes.app.popup.workspaceparameter.pages.access_apps':
     'Accédez à vos applications et connecteurs',
@@ -1477,8 +1481,8 @@ export default {
   'scenes.app.popup.workspaceparameter.pages.company_developped_apps_subtitle':
     "Applications développées par l'entreprise",
   'scenes.app.popup.workspaceparameter.pages.company_identity_title': "Identité de l'entreprise",
-  'scenes.app.popup.workspaceparameter.pages.company_manager_label': "Gérant de l'entreprise",
-  'scenes.app.popup.workspaceparameter.pages.company_manager_status': "Gérant d'entreprise",
+  'scenes.app.popup.workspaceparameter.pages.company_manager_label': "Admin de l'entreprise",
+  'scenes.app.popup.workspaceparameter.pages.company_manager_status': "Admin d'entreprise",
   'scenes.app.popup.workspaceparameter.pages.company_name_description':
     'Modifiez le nom de cette entreprise',
   'scenes.app.popup.workspaceparameter.pages.company_name_label': "Nom de l'entreprise",
@@ -2007,5 +2011,6 @@ export default {
   'services.console_services.toaster.success_verify_email':
     'Un lien de vérification a été envoyé à votre compte de messagerie',
   'scenes.app.popup.workspaceparameter.edit_from_console': 'Modifier à partir de la console',
-  'services.console_services.toaster.success_invite_emails': '$1 email(s) ajouté(s) avec succès',
+  'services.console_services.toaster.success_invite_emails':
+    '$1 utilisateur(s) ajouté(s) avec succès',
 };
diff --git a/twake/frontend/src/app/services/languages/locale/ru.js b/twake/frontend/src/app/services/languages/locale/ru.js
index 29eb8bd05f..d5ae2cfdc0 100644
--- a/twake/frontend/src/app/services/languages/locale/ru.js
+++ b/twake/frontend/src/app/services/languages/locale/ru.js
@@ -1129,7 +1129,7 @@ export default {
     'Количество полей увеличивается автоматически.',
   'scenes.app.workspaces.create_company.invitations.title_1':
     'Прежде чем вы закончите, вы можете добавить сотрудников в вашу компанию.',
-  'scenes.app.workspaces.create_company.invitations.title_2': 'Twake лучше в команде.',
+  'scenes.app.workspaces.create_company.invitations.title_2': 'Добавьте членов своей команды.',
   'scenes.app.workspaces.create_company.title': 'Создать мою компанию',
   'scenes.app.workspaces.welcome_page.add_secondary_emails': 'Добавить вторичную электронную почту',
   'scenes.app.workspaces.welcome_page.added_to_company': 'Вы были приглашены в ',
@@ -1410,15 +1410,14 @@ export default {
     'Ошибка произошла при обновлении приложения.',
   'scenes.app.popup.appsparameters.pages.remove_app_button': 'Удалить приложение',
   'scenes.app.popup.appsparameters.pages.update_button': 'Обновить',
-  'scenes.app.popup.createworkspacepage.add_subtitle':
-    'Нужно больше места? Новое рабочее пространство и будет идеально!',
+  'scenes.app.popup.createworkspacepage.add_subtitle': 'Нужно больше места?',
   'scenes.app.popup.createworkspacepage.create_new_workspace': 'Создать новое рабочее пространство',
   'scenes.app.popup.createworkspacepage.placeholder_name': 'Название рабочего пространства',
   'scenes.app.popup.userparameter.pages.frequency_notif_configuration_description':
     'Установить частоту мобильных уведомлений.',
   'scenes.app.popup.userparameter.pages.frequency_notif_subtitle': 'Частота уведомлений',
   'scenes.app.popup.userparameter.pages.keywords_notif_description':
-    'Получайте только те уведомления, которые соответствуют определенным ключевым словам.',
+    'Выделите следующие ключевые слова:',
   'scenes.app.popup.userparameter.pages.mail_frequency_notif_configuration_description':
     'Установите частоту уведомлений по электронной почте.',
   'scenes.app.popup.userparameter.pages.no_disturbing_notif_period_description':
@@ -1437,7 +1436,7 @@ export default {
   'scenes.app.popup.workspaceparameter.membership_information': '',
   'scenes.app.popup.workspaceparameter.pages.deleteworkspace': 'Удалить рабочее пространство',
   'scenes.app.popup.workspaceparameter.pages.deleteworkspace_description':
-    'Удалить это рабочее пространство',
+    'Чтобы подтвердить, что вы хотите удалить эту рабочую область, пожалуйста, введите имя ниже и нажмите кнопку "Удалить".',
   'scenes.app.popup.workspaceparameter.pages.enter': 'Введите ',
   'scenes.app.popup.workspaceparameter.pages.access_apps': 'Доступ к вашим приложениям и разъёмам',
   'scenes.app.popup.workspaceparameter.pages.administrater_status': 'Администратор',
diff --git a/twake/frontend/src/app/services/login/login.js b/twake/frontend/src/app/services/login/login.js
index fbdd5ebf27..8e993a0cfb 100755
--- a/twake/frontend/src/app/services/login/login.js
+++ b/twake/frontend/src/app/services/login/login.js
@@ -224,11 +224,9 @@ class Login extends Observable {
           that.notify();
 
           WindowState.setTitle();
-          RouterServices.history.push(
+          RouterServices.push(
             RouterServices.addRedirection(
-              RouterServices.pathnames.LOGIN +
-                '?' +
-                RouterServices.history.location.search.substr(1),
+              `${RouterServices.pathnames.LOGIN}${RouterServices.history.location.search}`,
             ),
           );
         } else {
@@ -292,7 +290,7 @@ class Login extends Observable {
             }
             that.login_loading = false;
             that.init();
-            return RouterServices.history.replace(RouterServices.pathnames.LOGIN);
+            return RouterServices.replace(RouterServices.pathnames.LOGIN);
           } else {
             that.login_error = true;
             that.login_loading = false;
@@ -335,8 +333,8 @@ class Login extends Observable {
         if (!no_reload) {
           Globals.window.location.reload();
         } else {
-          RouterServices.history.push(
-            RouterServices.pathnames.LOGIN + '?' + RouterServices.history.location.search.substr(1),
+          RouterServices.push(
+            `${RouterServices.pathnames.LOGIN}${RouterServices.history.location.search}`,
           );
         }
       }
@@ -369,7 +367,7 @@ class Login extends Observable {
 
     this.state = 'app';
     this.notify();
-    RouterServices.history.push(RouterServices.generateRouteFromState({}));
+    RouterServices.push(RouterServices.generateRouteFromState({}));
 
     Notifications.start();
     CurrentUser.start();
diff --git a/twake/frontend/src/app/services/popupManager/popupManager.js b/twake/frontend/src/app/services/popupManager/popupManager.js
index 0c78f6f897..c93f255956 100755
--- a/twake/frontend/src/app/services/popupManager/popupManager.js
+++ b/twake/frontend/src/app/services/popupManager/popupManager.js
@@ -17,6 +17,9 @@ class PopupService extends Observable {
     if (this.component[this.component.length - 1]?.key === key) {
       return;
     }
+    if (key != 'no-key') {
+      delete this.popupStates[key];
+    }
     WindowService.setTitle();
     MenusManager.closeMenu();
 
diff --git a/twake/frontend/src/app/services/user/notificationParameters.ts b/twake/frontend/src/app/services/user/notificationParameters.ts
new file mode 100644
index 0000000000..607690abe2
--- /dev/null
+++ b/twake/frontend/src/app/services/user/notificationParameters.ts
@@ -0,0 +1,148 @@
+import moment from 'moment';
+import { message } from 'antd';
+
+import Observable from 'services/Observable/Observable';
+import Languages from 'services/languages/languages.js';
+import FeedbackMessageManager from 'services/FeedbackMessageManager/FeedbackMessageManager';
+import Login from 'services/login/login.js';
+
+import { Collection } from '../CollectionsReact/Collections';
+import {
+    preferencesType,
+    NotificationPreferencesResource,
+  } from 'app/models/NotificationPreferences';
+
+type Keys = keyof preferencesType;
+type Values = preferencesType[Keys];
+
+class NotificationParametersService extends Observable {
+  constructor() {
+    super();
+  }
+  
+  url = '/notifications/v1/preferences/';
+  notificationPreferences!: NotificationPreferencesResource;
+
+  async init() {
+    const collection = Collection.get(this.url, NotificationPreferencesResource);
+
+    collection.addWatcher(()=>{
+      //Will be called each time something happen on this collection
+      this.notificationPreferences = collection.findOne({}, {withoutBackend: true}); //Get preferences from collection store
+      this.notify(); //Tell all subscribed components to reload
+    }, {}, {})
+  }
+
+  /**
+   * 
+   * @param preferences 
+   */
+  async save(preferences: {key:Keys, value:Values}[]) {
+    const newPreferences:any = {},
+      user_id = Login.currentUserId,
+      workspace_id = "all",
+      company_id = "all";
+
+    preferences.map(({key, value})=> newPreferences[key] = value);
+
+    const collection = Collection.get(this.url, NotificationPreferencesResource);
+    const currentPreferences = collection.findOne({user_id, workspace_id, company_id});
+
+    await collection.upsert(
+      new NotificationPreferencesResource({
+        ...currentPreferences.data,
+        preferences: {
+          ...currentPreferences.data.preferences,
+          ...newPreferences
+        }
+      })
+    );
+
+    FeedbackMessageManager.success(Languages.t('services.user.notification_parameters_update_alert'), 3);
+  }
+
+
+  areNotificationsAllowed() {
+    const _is_in_period = (a:number, b:number) => {
+      const currentDate = new Date().getHours() + Math.floor(new Date().getMinutes() / 30) / 2;
+      if (a != null && b != null) {
+        if (a < b && currentDate >= a && currentDate < b) {
+          return true;
+        }
+        if (a > b && (currentDate >= a || currentDate < b)) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    const _transform_period = (a:any, b:any, offset:number) => {
+      a = parseFloat(a);
+      b = parseFloat(b);
+  
+      if (offset > 0) {
+        offset += -24;
+      }
+  
+      a += offset;
+      b += offset;
+  
+      if (a < 0 || b < 0) {
+        a += 24;
+        b += 24;
+  
+        if (b >= 24) {
+          if (a < b) {
+            b += -24;
+          } else {
+            b += -24;
+            const c = b;
+            b = a;
+            a = c;
+          }
+        }
+  
+        if (a >= 24) {
+          if (b < a) {
+            a += -24;
+          } else {
+            a += -24;
+            const c = a;
+            a = b;
+            b = c;
+          }
+        }
+      }
+  
+      return [a, b];
+    }
+
+    if (this.notificationPreferences) {
+      const nightBreakIntrv = _transform_period(
+        this.notificationPreferences.data.preferences.night_break.from,
+        this.notificationPreferences.data.preferences.night_break.to,
+        -new Date().getTimezoneOffset() / 60,
+      );
+
+      const isNightBreak = _is_in_period(nightBreakIntrv[0], nightBreakIntrv[1]);
+      const isDeactivate = moment.unix(this.notificationPreferences.data.preferences.deactivate_notifications_until).diff(moment());
+
+      return isNightBreak ? false : isDeactivate > 0 ? false : true;
+    }
+
+    return false;
+  } 
+
+  /**
+   * 
+   * @param timeToAdd Time to add
+   * @param format Unit of time
+   */
+  deactivateNotificationsUntil(timeToAdd:number, format:'s'|'m'|'h'|'d'|'y') {
+    const unixtimestamp = moment().add(timeToAdd, format).unix();
+
+    this.save([{key:"deactivate_notifications_until", value:unixtimestamp}])
+  }
+}
+
+export default new NotificationParametersService();
\ No newline at end of file
diff --git a/twake/frontend/src/app/services/user/notifications.tsx b/twake/frontend/src/app/services/user/notifications.tsx
index 97d74a567d..722b052764 100755
--- a/twake/frontend/src/app/services/user/notifications.tsx
+++ b/twake/frontend/src/app/services/user/notifications.tsx
@@ -15,6 +15,7 @@ import ChannelsService from 'services/channels/channels.js';
 import emojione from 'emojione';
 import NotificationParameters from 'services/user/notification_parameters.js';
 import UserService from 'services/user/user.js';
+import NotificationPreferences from './notificationParameters';
 
 type DesktopNotification = {
   channel_id: string;
@@ -67,27 +68,13 @@ class Notifications extends Observable {
         request.then(function (result) {});
       }
     }
-  }
 
-  //This method is called each time we change our current company
-  subscribeToCurrentCompanyNotifications(companyId: string) {
     const notificationsCollection = Collection.get(
       '/notifications/v1/badges/',
       NotificationResource,
     );
-    notificationsCollection.setOptions({
-      reloadStrategy: 'ontime',
-      queryParameters: {
-        company_id: companyId,
-        all_companies: true,
-      },
-    });
 
     notificationsCollection.getTransport().start();
-    notificationsCollection.removeEventListener(
-      'notification:desktop',
-      this.triggerUnreadMessagesPushNotification,
-    );
     notificationsCollection.addEventListener(
       'notification:desktop',
       this.triggerUnreadMessagesPushNotification,
@@ -97,7 +84,21 @@ class Notifications extends Observable {
     notificationsCollection.addWatcher(() => {
       this.getNotifications();
     }, {});
+  }
 
+  //This method is called each time we change our current company
+  subscribeToCurrentCompanyNotifications(companyId: string) {
+    const notificationsCollection = Collection.get(
+      '/notifications/v1/badges/',
+      NotificationResource,
+    );
+    notificationsCollection.setOptions({
+      reloadStrategy: 'ontime',
+      queryParameters: {
+        company_id: companyId,
+        all_companies: true,
+      },
+    });
     notificationsCollection.find({}, { limit: 1000, refresh: true });
   }
 
@@ -156,6 +157,7 @@ class Notifications extends Observable {
       }
     }
     this.updateAppBadge(badgeCount);
+    NotificationPreferences.init();
     this.notify();
   }
 
@@ -219,7 +221,7 @@ class Notifications extends Observable {
             )[0]?.id;
           }
           if (workspaceId) {
-            RouterService.history.push(
+            RouterService.push(
               RouterService.generateRouteFromState({
                 companyId: notificationObject.company_id,
                 workspaceId: workspaceId,
diff --git a/twake/frontend/src/app/services/workspaces/workspaces.js b/twake/frontend/src/app/services/workspaces/workspaces.js
index 8fe56df9c8..8aa76289f6 100755
--- a/twake/frontend/src/app/services/workspaces/workspaces.js
+++ b/twake/frontend/src/app/services/workspaces/workspaces.js
@@ -163,9 +163,9 @@ class Workspaces extends Observable {
       channelId: '',
     });
     if (replace) {
-      RouterServices.history.replace(route);
+      RouterServices.replace(route);
     } else {
-      RouterServices.history.push(route);
+      RouterServices.push(route);
     }
 
     LocalStorage.setItem('autoload_workspaces', { id: workspace.id });
@@ -250,14 +250,13 @@ class Workspaces extends Observable {
         that.addToUser(res.data.workspace);
         group_id = res.data.workspace.group.id;
         workspace = res.data.workspace;
-
         if (wsMembers.length > 0) {
           if (InitService.server_infos?.auth?.console?.use) {
             //Invite using console
             ConsoleService.addMailsInWorkspace({
               workspace_id: res.data.workspace.id || '',
               company_id: res.data.workspace.group.id || '',
-              wsMembers,
+              emails : wsMembers,
             }).finally(() => {
               that.loading = false;
               popupManager.close();
diff --git a/twake/frontend/src/app/theme.less b/twake/frontend/src/app/theme.less
index 1e20c60de8..aa0ff3dac9 100644
--- a/twake/frontend/src/app/theme.less
+++ b/twake/frontend/src/app/theme.less
@@ -11,12 +11,11 @@
 @import '~antd/lib/style/themes/default.less';
 @import '~antd/dist/antd.less';
 
-// Circular Std = France
-// Helvetica Neue = Vietnam
-// TT Norms = Russia
+// 'TT Norms Pro' = Default
+// Helvetica Neue = Other alphabets fallback
 
 // --- Twake fonts --- //
-@main-font: 'Circular Std', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Helvetica Neue',
+@main-font: 'TT Norms Pro', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Helvetica Neue',
   'Apple Color Emoji', Arial, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';
 
 // --- Twake colors --- //
diff --git a/twake/start.sh b/twake/start.sh
index b377c195a2..12d3430d52 100755
--- a/twake/start.sh
+++ b/twake/start.sh
@@ -1,4 +1,4 @@
-cp -n docker-compose.yml.onpremise docker-compose.yml
+cp -n docker-compose.yml.dist.onpremise docker-compose.yml
 cp -nR default-configuration/ configuration/
 
 docker-compose pull
diff --git a/twake/update_version.js b/twake/update_version.js
index 5e80a78f7a..8d9715db74 100755
--- a/twake/update_version.js
+++ b/twake/update_version.js
@@ -4,9 +4,9 @@
 
 const versions = {
   VERSION_NAME: process.env.TWAKE_VERSION_NAME || "Albatros",
-  VERSION: process.env.TWAKE_VERSION || "2021.Q1",
-  VERSION_DETAIL: process.env.TWAKE_VERSION_DETAIL || "2021.Q1.434",
-  MIN_VERSION_WEB: process.env.TWAKE_MIN_VERSION_WEB || "2021.Q1.385",
+  VERSION: process.env.TWAKE_VERSION || "2021.Q2",
+  VERSION_DETAIL: process.env.TWAKE_VERSION_DETAIL || "2021.Q2.481",
+  MIN_VERSION_WEB: process.env.TWAKE_MIN_VERSION_WEB || "2021.Q1.481",
   MIN_VERSION_MOBILE: process.env.TWAKE_MIN_VERSION_MOBILE || "2021.Q1.385",
 };