diff --git a/.gitignore b/.gitignore
index e11b341..41775f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,4 +45,4 @@ Thumbs.db
 .firebase
 *-debug.log
 .runtimeconfig.json
-/src/app/environments/config.ts
\ No newline at end of file
+src/environments/config.ts
\ No newline at end of file
diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index 387c40d..f80652a 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -8,7 +8,7 @@ import { provideStorage, getStorage } from '@angular/fire/storage';
 import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
 import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
-import { firebaseConfig } from './environments/config';
+import { firebaseConfig } from '../environments/config';
 
 export function HttpLoaderFactory(httpClient: HttpClient) {
   return new TranslateHttpLoader(httpClient, './assets/i18n/', '.json');
diff --git a/src/app/components/main-chat/single-chat/options-menu/options-menu.component.html b/src/app/components/main-chat/single-chat/options-menu/options-menu.component.html
index b2b3fc2..dc89ff8 100644
--- a/src/app/components/main-chat/single-chat/options-menu/options-menu.component.html
+++ b/src/app/components/main-chat/single-chat/options-menu/options-menu.component.html
@@ -24,15 +24,6 @@
       (click)="addReactionIcon('clap-hands', currentChat)"
     >
     </app-small-btn>
-    <app-small-btn
-      [imgSrc]="'add-reaction.svg'"
-      [imgSize]="viewWidth >= RESPONSIVE_THRESHOLD_MOBILE ? '24px' : '17px'"
-      [btnSize]="viewWidth >= RESPONSIVE_THRESHOLD_MOBILE ? '36px' : '25px'"
-      [btnBgHoverColor]="'#edeefe'"
-      [ngClass]="{ mirror: user.id === userService.getCurrentUserId() }"
-      (click)="toggleEmojiPicker()"
-    >
-    </app-small-btn>
     @if (!isPrivatChannel) {
     <app-small-btn
       [imgSrc]="'answer.svg'"
@@ -81,13 +72,25 @@
   } @else {
   <div class="content">
     <app-small-btn
-      [imgSrc]="'add-reaction.svg'"
+      [imgSrc]="'okay.svg'"
       [imgSize]="viewWidth >= RESPONSIVE_THRESHOLD_MOBILE ? '24px' : '17px'"
       [btnSize]="viewWidth >= RESPONSIVE_THRESHOLD_MOBILE ? '36px' : '25px'"
+      [imgFilter]="'none'"
       [btnBgHoverColor]="'#edeefe'"
       [ngClass]="{ mirror: user.id === userService.getCurrentUserId() }"
-      (click)="toggleEmojiPicker()"
-    ></app-small-btn>
+      (click)="addReactionIcon('okay', currentChat)"
+    >
+    </app-small-btn>
+    <app-small-btn
+      [imgSrc]="'clap-hands.svg'"
+      [imgSize]="viewWidth >= RESPONSIVE_THRESHOLD_MOBILE ? '24px' : '17px'"
+      [btnSize]="viewWidth >= RESPONSIVE_THRESHOLD_MOBILE ? '36px' : '25px'"
+      [imgFilter]="'none'"
+      [btnBgHoverColor]="'#edeefe'"
+      [ngClass]="{ mirror: user.id === userService.getCurrentUserId() }"
+      (click)="addReactionIcon('clap-hands', currentChat)"
+    >
+    </app-small-btn>
     @if (user.id === userService.getCurrentUserId()) {
     <app-small-btn
       [imgSrc]="'more-vertical.svg'"
diff --git a/src/app/components/main-login/login/login.component.scss b/src/app/components/main-login/login/login.component.scss
index ec25642..ed43036 100644
--- a/src/app/components/main-login/login/login.component.scss
+++ b/src/app/components/main-login/login/login.component.scss
@@ -246,4 +246,7 @@ button {
   .loginContainer {
     max-width: 306px;
   }
+  .error {
+    font-size: 11px;
+  }
 }
diff --git a/src/app/components/main-login/register/register.component.scss b/src/app/components/main-login/register/register.component.scss
index 1bec886..e46289c 100644
--- a/src/app/components/main-login/register/register.component.scss
+++ b/src/app/components/main-login/register/register.component.scss
@@ -132,4 +132,7 @@ button {
     max-width: 306px;
     gap: 12px !important;
   }
+  .error {
+    font-size: 11px;
+  }
 }
diff --git a/src/app/interface/chat.interface.ts b/src/app/interface/chat.interface.ts
index c679387..f4eac8e 100644
--- a/src/app/interface/chat.interface.ts
+++ b/src/app/interface/chat.interface.ts
@@ -27,7 +27,7 @@ export interface MessageData {
   message: string;
   publishedTimestamp: number;
   userId: string;
-  channelId?: string;
-  chatId?: string;
+  channelId: string;
+  chatId: string;
   edited: boolean;
 }
diff --git a/src/app/service/login.service.ts b/src/app/service/login.service.ts
index 6dd06f5..1073fb4 100644
--- a/src/app/service/login.service.ts
+++ b/src/app/service/login.service.ts
@@ -166,7 +166,6 @@ export class loginService {
           email: this.email,
           status: true,
         };
-
         this.createUserInFirestore(userDataToSave);
         this.deleteUserFormData();
       })
@@ -176,6 +175,15 @@ export class loginService {
       });
   }
 
+  /**
+   * Clears user forms data.
+   */
+  deleteUserFormData() {
+    this.name = '';
+    this.email = '';
+    this.password = '';
+  }
+
   /**
    * Saves user data to Firestore and updates the application state.
    * @param user The user object containing information to be saved.
@@ -369,18 +377,18 @@ export class loginService {
     window.location.reload();
   }
 
-  deleteUserFormData() {
-    this.name = '';
-    this.email = '';
-    this.password = '';
-  }
-
+  /**
+   * Toggles password visibility.
+   */
   togglePasswordVisibility() {
     this.passwordFieldType =
       this.passwordFieldType === 'password' ? 'text' : 'password';
     this.toggleIcon();
   }
 
+  /**
+   * Toggles password icon.
+   */
   toggleIcon() {
     this.passwordIcon =
       this.passwordIcon === './assets/img/login/close-eye.svg'