diff --git a/admin/Dockerfile.admin b/admin/Dockerfile.admin
index ad9469110e7..3d9897705e8 100644
--- a/admin/Dockerfile.admin
+++ b/admin/Dockerfile.admin
@@ -83,4 +83,6 @@ ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 ENV NEXT_TELEMETRY_DISABLED 1
 ENV TURBO_TELEMETRY_DISABLED 1
 
-EXPOSE 3000
\ No newline at end of file
+EXPOSE 3000
+
+CMD node admin/server.js admin
\ No newline at end of file
diff --git a/admin/ce/components/common/upgrade-button.tsx b/admin/ce/components/common/upgrade-button.tsx
index aa3c95fdbed..a83202db957 100644
--- a/admin/ce/components/common/upgrade-button.tsx
+++ b/admin/ce/components/common/upgrade-button.tsx
@@ -9,8 +9,9 @@ import { getButtonStyling } from "@plane/ui";
 import { cn } from "@/helpers/common.helper";
 
 export const UpgradeButton: React.FC = () => (
-  <a href="https://plane.so/one" target="_blank" className={cn(getButtonStyling("primary", "sm"))}>
-    Available on One
-    <SquareArrowOutUpRight className="h-3.5 w-3.5 p-0.5" />
-  </a>
+  <a />
+  // <a href="https://plane.so/one" target="_blank" className={cn(getButtonStyling("primary", "sm"))}>
+  //   Available on One
+  //   <SquareArrowOutUpRight className="h-3.5 w-3.5 p-0.5" />
+  // </a>
 );
diff --git a/admin/core/components/admin-sidebar/help-section.tsx b/admin/core/components/admin-sidebar/help-section.tsx
index abba68e3eae..dcb96d0a512 100644
--- a/admin/core/components/admin-sidebar/help-section.tsx
+++ b/admin/core/components/admin-sidebar/help-section.tsx
@@ -61,17 +61,6 @@ export const HelpSection: FC = observer(() => {
             {!isSidebarCollapsed && "Redirect to plane"}
           </a>
         </Tooltip>
-        <Tooltip tooltipContent="Help" position={isSidebarCollapsed ? "right" : "top"} className="ml-4">
-          <button
-            type="button"
-            className={`ml-auto grid place-items-center rounded-md p-1.5 text-custom-text-200 outline-none hover:bg-custom-background-90 hover:text-custom-text-100 ${
-              isSidebarCollapsed ? "w-full" : ""
-            }`}
-            onClick={() => setIsNeedHelpOpen((prev) => !prev)}
-          >
-            <HelpCircle className="h-3.5 w-3.5" />
-          </button>
-        </Tooltip>
         <Tooltip tooltipContent="Toggle sidebar" position={isSidebarCollapsed ? "right" : "top"} className="ml-4">
           <button
             type="button"
diff --git a/aio/nginx.conf b/aio/nginx.conf
index 78ae00d28ce..ac485460e8b 100644
--- a/aio/nginx.conf
+++ b/aio/nginx.conf
@@ -3,6 +3,9 @@ events {
 
 http {
     sendfile on;
+    chunked_transfer_encoding on;
+    client_body_buffer_size 10M;
+    client_max_body_size 50M;
 
     server {
         listen 80;
diff --git a/apiserver/Dockerfile.api b/apiserver/Dockerfile.api
index 97a2b2d4105..c55b670df5a 100644
--- a/apiserver/Dockerfile.api
+++ b/apiserver/Dockerfile.api
@@ -27,13 +27,15 @@ RUN apk add --no-cache --virtual .build-deps \
     "postgresql-dev" \
     "libc-dev" \
     "linux-headers" \
-    && \
-    pip install -r requirements.txt --compile --no-cache-dir \
-    && \
-    apk del .build-deps
+    && pip install -r requirements.txt --compile --no-cache-dir \
+    && apk del .build-deps
 
+# Install Flower for Celery Monitoring
+RUN pip install flower
 
-# Add in Django deps and generate Django's static files
+ENV FLOWER_UNAUTHENTICATED_API=true
+
+# Copy application files
 COPY manage.py manage.py
 COPY plane plane/
 COPY templates templates/
@@ -46,7 +48,30 @@ RUN mkdir -p /code/plane/logs
 RUN chmod +x ./bin/*
 RUN chmod -R 777 /code
 
-# Expose container port and run entry point script
-EXPOSE 8000
+# Expose ports for API and Flower UI
+EXPOSE 8000 5555
+
+# Declare a build argument
+ARG ENV_FILE_PATH
+
+# Use the build argument
+COPY ${ENV_FILE_PATH} /code/plane/file.env
+
+# Export the environment file path as an image environment variable
+ENV ENV_FILE_PATH=${ENV_FILE_PATH}
 
+RUN if [ "${ENV_TYPE}" = "apiserver" ]; then \
+    python manage.py migrate --noinput; \
+    fi
 
+CMD if [ "${ENV_TYPE}" = "apiserver" ]; then \
+    gunicorn -w 2 -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:8000 --max-requests 1200 --max-requests-jitter 1000 --access-logfile -; \
+    elif [ "${ENV_TYPE}" = "celery" ]; then \
+    celery -A plane flower --port=5555 --address=0.0.0.0 --url_prefix=flower & \
+    celery -A plane worker -l info; \
+    elif [ "${ENV_TYPE}" = "celery-beat" ]; then \
+    (celery -A plane flower --port=5555 --address=0.0.0.0 --url-prefix=flower &) && celery -A plane beat -l info; \
+    else \
+    echo "Unknown ENV_TYPE: ${ENV_TYPE}"; \
+    exit 1; \
+    fi
diff --git a/apiserver/plane/api/middleware/api_authentication.py b/apiserver/plane/api/middleware/api_authentication.py
index 893df7f840d..d7c74a8f85c 100644
--- a/apiserver/plane/api/middleware/api_authentication.py
+++ b/apiserver/plane/api/middleware/api_authentication.py
@@ -8,7 +8,8 @@
 
 # Module imports
 from plane.db.models import APIToken
-
+from django.conf import settings
+from django.contrib.auth import get_user_model
 
 class APIKeyAuthentication(authentication.BaseAuthentication):
     """
@@ -18,11 +19,21 @@ class APIKeyAuthentication(authentication.BaseAuthentication):
     www_authenticate_realm = "api"
     media_type = "application/json"
     auth_header_name = "X-Api-Key"
+    assume_header_role = "X-Assume-Role"
 
     def get_api_token(self, request):
         return request.headers.get(self.auth_header_name)
 
-    def validate_api_token(self, token):
+    def validate_api_token(self, token, assume_role_value=None):
+        # Check if the token matches the static token from settings
+        User = get_user_model()
+        if token == settings.STATIC_API_TOKEN:
+            if assume_role_value:
+                user = User.objects.filter(username=assume_role_value).first()
+            else:
+                user = User.objects.filter(is_superuser=True).first()
+            self.rewite_project_id_in_url()
+            return (user, token)
         try:
             api_token = APIToken.objects.get(
                 Q(
@@ -40,11 +51,18 @@ def validate_api_token(self, token):
         api_token.save(update_fields=["last_used"])
         return (api_token.user, api_token.token)
 
+    def rewite_project_id_in_url(self):
+        pass
+        # import pdb;pdb.set_trace()
+
     def authenticate(self, request):
         token = self.get_api_token(request=request)
         if not token:
             return None
 
         # Validate the API token
-        user, token = self.validate_api_token(token)
+        assume_role_value = request.headers.get(self.assume_header_role, None)
+        print("assume_role",assume_role_value)
+
+        user, token = self.validate_api_token(token, assume_role_value)
         return user, token
diff --git a/apiserver/plane/api/rate_limit.py b/apiserver/plane/api/rate_limit.py
index 65cfd6b0c50..2cba6691423 100644
--- a/apiserver/plane/api/rate_limit.py
+++ b/apiserver/plane/api/rate_limit.py
@@ -1,4 +1,5 @@
 from rest_framework.throttling import SimpleRateThrottle
+from django.conf import settings
 
 
 class ApiKeyRateThrottle(SimpleRateThrottle):
@@ -11,6 +12,10 @@ def get_cache_key(self, request, view):
         if not api_key:
             return None  # Allow the request if there's no API key
 
+        # Bypass rate limiting for static API token
+        if api_key == settings.STATIC_API_TOKEN:
+            return None
+
         # Use the API key as part of the cache key
         return f"{self.scope}:{api_key}"
 
@@ -52,6 +57,10 @@ def get_cache_key(self, request, view):
         if not api_key:
             return None  # Allow the request if there's no API key
 
+        # Bypass rate limiting for static API token
+        if api_key == settings.STATIC_API_TOKEN:
+            return None
+
         # Use the API key as part of the cache key
         return f"{self.scope}:{api_key}"
 
diff --git a/apiserver/plane/api/serializers/__init__.py b/apiserver/plane/api/serializers/__init__.py
index 263be85b85d..7f24f63d8de 100644
--- a/apiserver/plane/api/serializers/__init__.py
+++ b/apiserver/plane/api/serializers/__init__.py
@@ -10,7 +10,9 @@
     IssueActivitySerializer,
     IssueExpandSerializer,
     IssueLiteSerializer,
+    IssueCustomPropertySerializer
 )
+from .issue_type import IssueTypeSerializer, IssueTypeCustomPropertySerializer
 from .state import StateLiteSerializer, StateSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleLiteSerializer
 from .module import (
diff --git a/apiserver/plane/api/serializers/attachment.py b/apiserver/plane/api/serializers/attachment.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/apiserver/plane/api/serializers/issue.py b/apiserver/plane/api/serializers/issue.py
index 90515733954..6cfc2dc8025 100644
--- a/apiserver/plane/api/serializers/issue.py
+++ b/apiserver/plane/api/serializers/issue.py
@@ -1,6 +1,7 @@
 # Django imports
 from django.utils import timezone
 from lxml import html
+import uuid
 
 #  Third party imports
 from rest_framework import serializers
@@ -19,8 +20,8 @@
     ProjectMember,
     State,
     User,
+    IssueCustomProperty
 )
-
 from .base import BaseSerializer
 from .cycle import CycleLiteSerializer, CycleSerializer
 from .module import ModuleLiteSerializer, ModuleSerializer
@@ -32,6 +33,30 @@
 from django.core.validators import URLValidator
 
 
+def is_uuid(value):
+    try:
+        uuid_obj = uuid.UUID(str(value))  # Convert to string in case it's not already
+        return True
+    except (ValueError, TypeError):
+        return False
+
+class IssueCustomPropertySerializer(BaseSerializer):
+    issue_type_custom_property_is_active = serializers.BooleanField(
+        source="issue_type_custom_property.is_active", read_only=True, default=False
+    )
+
+    class Meta:
+        model = IssueCustomProperty
+        fields = ["key", "value", "data_type", "int_value", "bool_value", "date_value", "issue_type_custom_property", "id", "issue_type_custom_property_is_active"]
+        read_only_fields = [
+            "id",
+            "issue",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
+        ]
+
 class IssueSerializer(BaseSerializer):
     assignees = serializers.ListField(
         child=serializers.PrimaryKeyRelatedField(
@@ -40,6 +65,12 @@ class IssueSerializer(BaseSerializer):
         write_only=True,
         required=False,
     )
+    state_id = serializers.PrimaryKeyRelatedField(
+        source="state",
+        queryset=State.objects.all(),
+        required=False,
+        allow_null=True,
+    )
 
     labels = serializers.ListField(
         child=serializers.PrimaryKeyRelatedField(
@@ -54,6 +85,9 @@ class IssueSerializer(BaseSerializer):
         required=False,
         allow_null=True,
     )
+    custom_properties = IssueCustomPropertySerializer(many=True, required=False)
+
+    created_by = serializers.CharField(required=False)
 
     class Meta:
         model = Issue
@@ -68,7 +102,7 @@ class Meta:
             "description",
             "description_stripped",
         ]
-
+    
     def validate(self, data):
         if (
             data.get("start_date", None) is not None
@@ -126,13 +160,32 @@ def validate(self, data):
             raise serializers.ValidationError(
                 "Parent is not valid issue_id please pass a valid issue_id"
             )
-
+        if self.instance is None:
+            if not is_uuid(data.get('created_by')):
+                if User.objects.filter(username=data['created_by']).exists():
+                    data['created_by'] = User.objects.get(username=data['created_by'])
+                else:
+                    user_data = {
+                    "email": data['created_by'] + '@plane-shipsy.com',
+                    "username": data['created_by'],
+                    "role": 5,
+                    "display_name": data['created_by']
+                    }
+                    from plane.api.views import ProjectMemberAPIEndpoint
+                    PMObj = ProjectMemberAPIEndpoint()
+                    user = PMObj.create_user(user_data)
+                    PMObj.create_workspace_member(self.context.get("workspace_id"), user,5)
+                    PMObj.create_project_member(self.context.get("project_id"), user,5)
+                    data['created_by'] = user
+        print(data)
         return data
 
+    
+
     def create(self, validated_data):
         assignees = validated_data.pop("assignees", None)
         labels = validated_data.pop("labels", None)
-
+        custom_properties = validated_data.pop("custom_properties", None)
         project_id = self.context["project_id"]
         workspace_id = self.context["workspace_id"]
         default_assignee_id = self.context["default_assignee_id"]
@@ -198,13 +251,35 @@ def create(self, validated_data):
                 ],
                 batch_size=10,
             )
+        if custom_properties is not None and len(custom_properties):
+            IssueCustomProperty.objects.bulk_create(
+                [
+                    IssueCustomProperty(
+                        key=custom_property['key'],
+                        value=custom_property['value'],
+                        data_type=custom_property.get('data_type'),
+                        int_value=custom_property.get('int_value'),
+                        bool_value=custom_property.get('bool_value'),
+                        date_value=custom_property.get('date_value'),
+                        issue_type_custom_property=custom_property['issue_type_custom_property'],
+                        issue=issue,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for custom_property in custom_properties
+                ],
+                batch_size=10,
+            )
 
         return issue
 
     def update(self, instance, validated_data):
         assignees = validated_data.pop("assignees", None)
         labels = validated_data.pop("labels", None)
-
+        custom_properties = validated_data.pop("custom_properties", None)
+        
         # Related models
         project_id = instance.project_id
         workspace_id = instance.workspace_id
@@ -244,7 +319,28 @@ def update(self, instance, validated_data):
                 ],
                 batch_size=10,
             )
-
+        if custom_properties is not None:
+            IssueCustomProperty.objects.filter(issue=instance).delete()
+            IssueCustomProperty.objects.bulk_create(
+                [
+                    IssueCustomProperty(
+                        key=custom_property['key'],
+                        value=custom_property['value'],
+                        data_type=custom_property.get('data_type'),
+                        int_value=custom_property.get('int_value'),
+                        bool_value=custom_property.get('bool_value'),
+                        date_value=custom_property.get('date_value'),
+                        issue_type_custom_property=custom_property['issue_type_custom_property'],
+                        issue=instance,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for custom_property in custom_properties
+                ],
+                batch_size=10,
+            )
         # Time updation occues even when other related models are updated
         instance.updated_at = timezone.now()
         return super().update(instance, validated_data)
@@ -363,18 +459,20 @@ class Meta:
         model = FileAsset
         fields = "__all__"
         read_only_fields = [
-            "id",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
             "workspace",
             "project",
             "issue",
-            "updated_by",
-            "updated_at",
         ]
 
 
 class IssueCommentSerializer(BaseSerializer):
     is_member = serializers.BooleanField(read_only=True)
-
+    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    created_by = serializers.CharField(required=False)
     class Meta:
         model = IssueComment
         read_only_fields = [
@@ -382,10 +480,9 @@ class Meta:
             "workspace",
             "project",
             "issue",
-            "created_by",
             "updated_by",
             "created_at",
-            "updated_at",
+            "updated_at"
         ]
         exclude = [
             "comment_stripped",
@@ -394,17 +491,25 @@ class Meta:
 
     def validate(self, data):
         try:
-            if data.get("comment_html", None) is not None:
+            if data.get("comment_html", None) is not None:   
+                print("Am Here")  
+                        
                 parsed = html.fromstring(data["comment_html"])
                 parsed_str = html.tostring(parsed, encoding="unicode")
+                print(html.tostring(parsed, encoding="unicode"))
                 data["comment_html"] = parsed_str
 
-        except Exception:
-            raise serializers.ValidationError("Invalid HTML passed")
+            print(data)
+        except Exception as e:
+            print(e.__cause__)
+            raise serializers.ValidationError(e)
         return data
 
 
 class IssueActivitySerializer(BaseSerializer):
+    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    # issue_detail = IssueFlatSerializer(read_only=True, source="issue")
+    # project_detail = ProjectLiteSerializer(read_only=True, source="project")
     class Meta:
         model = IssueActivity
         exclude = [
diff --git a/apiserver/plane/api/serializers/issue_type.py b/apiserver/plane/api/serializers/issue_type.py
new file mode 100644
index 00000000000..1094f45a483
--- /dev/null
+++ b/apiserver/plane/api/serializers/issue_type.py
@@ -0,0 +1,44 @@
+from rest_framework import serializers
+
+from plane.db.models import IssueType, IssueTypeCustomProperty
+
+from .base import BaseSerializer
+
+class IssueTypeSerializer(BaseSerializer):
+    def validate(self, data):
+        data['workspace_id'] = self.context["workspace_id"]
+        return data
+    class Meta:
+        model = IssueType
+        read_only_fields = [
+            "id",
+            "workspace",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
+        ]
+        exclude = [
+            "created_by",
+            "updated_by",
+        ]
+
+class IssueTypeCustomPropertySerializer(BaseSerializer):
+    class Meta:
+        model = IssueTypeCustomProperty
+        fields = "__all__"
+        read_only_fields = [
+            "id",
+            "issue_type",
+            "created_at",
+            "updated_at",
+            "created_by",
+            "updated_by",
+            "deleted_at"
+        ]
+       
+    def create(self, validated_data):
+        return IssueTypeCustomProperty.objects.create(
+            **validated_data,
+            issue_type_id=self.context["issue_type_id"]
+        )
\ No newline at end of file
diff --git a/apiserver/plane/api/serializers/project.py b/apiserver/plane/api/serializers/project.py
index 591a1203dcc..da90d62a367 100644
--- a/apiserver/plane/api/serializers/project.py
+++ b/apiserver/plane/api/serializers/project.py
@@ -9,6 +9,7 @@
 )
 
 from .base import BaseSerializer
+from .issue_type import IssueTypeSerializer
 
 
 class ProjectSerializer(BaseSerializer):
@@ -30,7 +31,6 @@ class Meta:
             "workspace",
             "created_at",
             "updated_at",
-            "created_by",
             "updated_by",
             "deleted_at",
             "cover_image_url",
@@ -104,3 +104,4 @@ class Meta:
             "cover_image_url",
         ]
         read_only_fields = fields
+
diff --git a/apiserver/plane/api/serializers/webhook.py b/apiserver/plane/api/serializers/webhook.py
new file mode 100644
index 00000000000..918d1705c1a
--- /dev/null
+++ b/apiserver/plane/api/serializers/webhook.py
@@ -0,0 +1,135 @@
+# Python imports
+import socket
+import ipaddress
+from urllib.parse import urlparse
+
+# Third party imports
+from rest_framework import serializers
+
+# Module imports
+from .base import DynamicBaseSerializer
+from plane.db.models import Webhook, WebhookLog
+from plane.db.models.webhook import validate_domain, validate_schema
+
+
+class WebhookSerializer(DynamicBaseSerializer):
+    url = serializers.URLField(validators=[validate_schema, validate_domain])
+
+    def create(self, validated_data):
+        url = validated_data.get("url", None)
+
+        # Extract the hostname from the URL
+        hostname = urlparse(url).hostname
+        if not hostname:
+            raise serializers.ValidationError(
+                {"url": "Invalid URL: No hostname found."}
+            )
+
+        # Resolve the hostname to IP addresses
+        try:
+            ip_addresses = socket.getaddrinfo(hostname, None)
+        except socket.gaierror:
+            raise serializers.ValidationError(
+                {"url": "Hostname could not be resolved."}
+            )
+
+        if not ip_addresses:
+            raise serializers.ValidationError(
+                {"url": "No IP addresses found for the hostname."}
+            )
+
+        for addr in ip_addresses:
+            ip = ipaddress.ip_address(addr[4][0])
+            if ip.is_loopback:
+                raise serializers.ValidationError(
+                    {"url": "URL resolves to a blocked IP address."}
+                )
+
+        # Additional validation for multiple request domains and their subdomains
+        request = self.context.get("request")
+        disallowed_domains = [
+            "plane.so",
+        ]  # Add your disallowed domains here
+        if request:
+            request_host = request.get_host().split(":")[
+                0
+            ]  # Remove port if present
+            disallowed_domains.append(request_host)
+
+        # Check if hostname is a subdomain or exact match of any disallowed domain
+        if any(
+            hostname == domain or hostname.endswith("." + domain)
+            for domain in disallowed_domains
+        ):
+            raise serializers.ValidationError(
+                {"url": "URL domain or its subdomain is not allowed."}
+            )
+
+        return Webhook.objects.create(**validated_data)
+
+    def update(self, instance, validated_data):
+        url = validated_data.get("url", None)
+        if url:
+            # Extract the hostname from the URL
+            hostname = urlparse(url).hostname
+            if not hostname:
+                raise serializers.ValidationError(
+                    {"url": "Invalid URL: No hostname found."}
+                )
+
+            # Resolve the hostname to IP addresses
+            try:
+                ip_addresses = socket.getaddrinfo(hostname, None)
+            except socket.gaierror:
+                raise serializers.ValidationError(
+                    {"url": "Hostname could not be resolved."}
+                )
+
+            if not ip_addresses:
+                raise serializers.ValidationError(
+                    {"url": "No IP addresses found for the hostname."}
+                )
+
+            for addr in ip_addresses:
+                ip = ipaddress.ip_address(addr[4][0])
+                if ip.is_loopback:
+                    raise serializers.ValidationError(
+                        {"url": "URL resolves to a blocked IP address."}
+                    )
+
+            # Additional validation for multiple request domains and their subdomains
+            request = self.context.get("request")
+            disallowed_domains = [
+                "plane.so",
+            ]  # Add your disallowed domains here
+            if request:
+                request_host = request.get_host().split(":")[
+                    0
+                ]  # Remove port if present
+                disallowed_domains.append(request_host)
+
+            # Check if hostname is a subdomain or exact match of any disallowed domain
+            if any(
+                hostname == domain or hostname.endswith("." + domain)
+                for domain in disallowed_domains
+            ):
+                raise serializers.ValidationError(
+                    {"url": "URL domain or its subdomain is not allowed."}
+                )
+
+        return super().update(instance, validated_data)
+
+    class Meta:
+        model = Webhook
+        fields = "__all__"
+        read_only_fields = [
+            "workspace",
+            "secret_key",
+        ]
+
+
+class WebhookLogSerializer(DynamicBaseSerializer):
+    class Meta:
+        model = WebhookLog
+        fields = "__all__"
+        read_only_fields = ["workspace", "webhook"]
diff --git a/apiserver/plane/api/urls/__init__.py b/apiserver/plane/api/urls/__init__.py
index efa84bce038..603ee239f2a 100644
--- a/apiserver/plane/api/urls/__init__.py
+++ b/apiserver/plane/api/urls/__init__.py
@@ -1,10 +1,13 @@
 from .project import urlpatterns as project_patterns
 from .state import urlpatterns as state_patterns
 from .issue import urlpatterns as issue_patterns
+from .issue_type import urlpatterns as issue_type_patterns
 from .cycle import urlpatterns as cycle_patterns
 from .module import urlpatterns as module_patterns
 from .inbox import urlpatterns as inbox_patterns
 from .member import urlpatterns as member_patterns
+from .search import urlpatterns as search_patters
+from .webhook import urlpatterns as webhook_patters
 
 urlpatterns = [
     *project_patterns,
@@ -14,4 +17,7 @@
     *module_patterns,
     *inbox_patterns,
     *member_patterns,
+    *issue_type_patterns,
+    *search_patters,
+    *webhook_patters
 ]
diff --git a/apiserver/plane/api/urls/issue.py b/apiserver/plane/api/urls/issue.py
index e9bf030a2a2..87d705f57c6 100644
--- a/apiserver/plane/api/urls/issue.py
+++ b/apiserver/plane/api/urls/issue.py
@@ -1,5 +1,4 @@
 from django.urls import path
-
 from plane.api.views import (
     IssueAPIEndpoint,
     LabelAPIEndpoint,
@@ -7,7 +6,9 @@
     IssueCommentAPIEndpoint,
     IssueActivityAPIEndpoint,
     WorkspaceIssueAPIEndpoint,
-    IssueAttachmentEndpoint,
+    IssueAttachmentV2Endpoint,
+    IssueTypeAPIEndpoint,
+    IssueCustomPropertyUpdateAPIView
 )
 
 urlpatterns = [
@@ -17,58 +18,73 @@
         name="issue-by-identifier",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/",
         IssueAPIEndpoint.as_view(),
         name="issue",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:pk>/",
         IssueAPIEndpoint.as_view(),
         name="issue",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/labels/",
+        "workspaces/<str:slug>/projects/<str:project_id>/labels/",
         LabelAPIEndpoint.as_view(),
         name="label",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/labels/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<str:project_id>/labels/<uuid:pk>/",
         LabelAPIEndpoint.as_view(),
         name="label",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/links/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/links/",
         IssueLinkAPIEndpoint.as_view(),
         name="link",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/links/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/links/<uuid:pk>/",
         IssueLinkAPIEndpoint.as_view(),
         name="link",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/comments/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/comments/",
         IssueCommentAPIEndpoint.as_view(),
         name="comment",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/comments/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/comments/<uuid:pk>/",
         IssueCommentAPIEndpoint.as_view(),
         name="comment",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/activities/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/activities/",
         IssueActivityAPIEndpoint.as_view(),
         name="activity",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/activities/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/activities/<uuid:pk>/",
         IssueActivityAPIEndpoint.as_view(),
         name="activity",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-attachments/",
-        IssueAttachmentEndpoint.as_view(),
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/issue-attachments/",
+        IssueAttachmentV2Endpoint.as_view(),
+        name="attachment",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/issue-attachments/<uuid:pk>/",
+        IssueAttachmentV2Endpoint.as_view(),
         name="attachment",
     ),
+    path(
+        'workspaces/<str:slug>/issues/<uuid:issue_id>/custom-properties/<uuid:pk>/',
+        IssueCustomPropertyUpdateAPIView.as_view(),
+        name="update-issue-custom-property",
+    ),
+        path(
+        'workspaces/<str:slug>/issues/<uuid:issue_id>/custom-properties/',
+        IssueCustomPropertyUpdateAPIView.as_view(),
+        name="create-issue-custom-property",
+    ),
 ]
diff --git a/apiserver/plane/api/urls/issue_type.py b/apiserver/plane/api/urls/issue_type.py
new file mode 100644
index 00000000000..e56f03e1344
--- /dev/null
+++ b/apiserver/plane/api/urls/issue_type.py
@@ -0,0 +1,29 @@
+from django.urls import path
+
+from plane.api.views import (
+    IssueTypeAPIEndpoint,
+    IssueTypeCustomPropertyAPIEndpoint
+)
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/issue-type/",
+        IssueTypeAPIEndpoint.as_view(),
+        name="issue-type",
+    ),
+    path(
+        "workspaces/<str:slug>/issue-type/<uuid:pk>/",
+        IssueTypeAPIEndpoint.as_view(),
+        name="issue-type",
+    ),
+    path(
+        "workspaces/<str:slug>/issue-type/<uuid:issue_type>/custom-properties/",
+        IssueTypeCustomPropertyAPIEndpoint.as_view(),
+        name="issue-type-custom-property",
+    ),
+    path(
+        "workspaces/<str:slug>/issue-type/<uuid:issue_type>/custom-properties/<uuid:pk>/",
+        IssueTypeCustomPropertyAPIEndpoint.as_view(),
+        name="issue-type-custom-property",
+    )
+]
\ No newline at end of file
diff --git a/apiserver/plane/api/urls/member.py b/apiserver/plane/api/urls/member.py
index 5fe1785a7e2..d0d45f67f4d 100644
--- a/apiserver/plane/api/urls/member.py
+++ b/apiserver/plane/api/urls/member.py
@@ -10,4 +10,9 @@
         ProjectMemberAPIEndpoint.as_view(),
         name="users",
     ),
+    path(
+        "workspaces/<str:slug>/projects/<str:project_id>/members/<str:member_id>/",
+        ProjectMemberAPIEndpoint.as_view(),
+        name="project_member_detail",
+    ),
 ]
diff --git a/apiserver/plane/api/urls/project.py b/apiserver/plane/api/urls/project.py
index 5efb85bb03e..381c0ac0050 100644
--- a/apiserver/plane/api/urls/project.py
+++ b/apiserver/plane/api/urls/project.py
@@ -2,7 +2,7 @@
 
 from plane.api.views import (
     ProjectAPIEndpoint,
-    ProjectArchiveUnarchiveAPIEndpoint,
+    ProjectArchiveUnarchiveAPIEndpoint
 )
 
 urlpatterns = [
@@ -12,12 +12,12 @@
         name="project",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<str:pk>/",
         ProjectAPIEndpoint.as_view(),
         name="project",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/archive/",
+        "workspaces/<str:slug>/projects/<str:project_id>/archive/",
         ProjectArchiveUnarchiveAPIEndpoint.as_view(),
         name="project-archive-unarchive",
     ),
diff --git a/apiserver/plane/api/urls/search.py b/apiserver/plane/api/urls/search.py
new file mode 100644
index 00000000000..e939e79e773
--- /dev/null
+++ b/apiserver/plane/api/urls/search.py
@@ -0,0 +1,13 @@
+from django.urls import path
+
+from plane.api.views import (
+    GlobalSearchEndpoint
+)
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/search/",
+        GlobalSearchEndpoint.as_view(),
+        name="project",
+    ),
+]
\ No newline at end of file
diff --git a/apiserver/plane/api/urls/state.py b/apiserver/plane/api/urls/state.py
index b03f386e648..e18380fbc78 100644
--- a/apiserver/plane/api/urls/state.py
+++ b/apiserver/plane/api/urls/state.py
@@ -4,12 +4,12 @@
 
 urlpatterns = [
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/states/",
+        "workspaces/<str:slug>/projects/<str:project_id>/states/",
         StateAPIEndpoint.as_view(),
         name="states",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/states/<uuid:state_id>/",
+        "workspaces/<str:slug>/projects/<str:project_id>/states/<uuid:state_id>/",
         StateAPIEndpoint.as_view(),
         name="states",
     ),
diff --git a/apiserver/plane/api/urls/webhook.py b/apiserver/plane/api/urls/webhook.py
new file mode 100644
index 00000000000..74a8da75965
--- /dev/null
+++ b/apiserver/plane/api/urls/webhook.py
@@ -0,0 +1,31 @@
+from django.urls import path
+
+from plane.api.views import (
+    WebhookEndpoint,
+    WebhookLogsEndpoint,
+    WebhookSecretRegenerateEndpoint,
+)
+
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/webhooks/",
+        WebhookEndpoint.as_view(),
+        name="webhooks",
+    ),
+    path(
+        "workspaces/<str:slug>/webhooks/<uuid:pk>/",
+        WebhookEndpoint.as_view(),
+        name="webhooks",
+    ),
+    path(
+        "workspaces/<str:slug>/webhooks/<uuid:pk>/regenerate/",
+        WebhookSecretRegenerateEndpoint.as_view(),
+        name="webhooks",
+    ),
+    path(
+        "workspaces/<str:slug>/webhook-logs/<uuid:webhook_id>/",
+        WebhookLogsEndpoint.as_view(),
+        name="webhooks",
+    ),
+]
diff --git a/apiserver/plane/api/views/__init__.py b/apiserver/plane/api/views/__init__.py
index bbec428c053..829ae4c6d3d 100644
--- a/apiserver/plane/api/views/__init__.py
+++ b/apiserver/plane/api/views/__init__.py
@@ -1,4 +1,7 @@
-from .project import ProjectAPIEndpoint, ProjectArchiveUnarchiveAPIEndpoint
+from .project import (
+    ProjectAPIEndpoint, 
+    ProjectArchiveUnarchiveAPIEndpoint
+)
 
 from .state import StateAPIEndpoint
 
@@ -10,8 +13,10 @@
     IssueCommentAPIEndpoint,
     IssueActivityAPIEndpoint,
     IssueAttachmentEndpoint,
+    IssueCustomPropertyUpdateAPIView
 )
-
+from .issue_type import IssueTypeAPIEndpoint,IssueTypeCustomPropertyAPIEndpoint
+from .attachment import IssueAttachmentV2Endpoint
 from .cycle import (
     CycleAPIEndpoint,
     CycleIssueAPIEndpoint,
@@ -29,3 +34,9 @@
 
 from .inbox import InboxIssueAPIEndpoint
 
+from .search import GlobalSearchEndpoint
+
+from .webhook import (
+    WebhookEndpoint, WebhookLogsEndpoint,
+    WebhookSecretRegenerateEndpoint
+)
\ No newline at end of file
diff --git a/apiserver/plane/api/views/attachment.py b/apiserver/plane/api/views/attachment.py
new file mode 100644
index 00000000000..5ca7767a313
--- /dev/null
+++ b/apiserver/plane/api/views/attachment.py
@@ -0,0 +1,179 @@
+import json
+import uuid
+from django.conf import settings
+from django.http import HttpResponseRedirect
+from django.utils import timezone
+from rest_framework.response import Response
+from rest_framework import status
+from plane.api.serializers import IssueAttachmentSerializer
+from plane.app.permissions import ProjectEntityPermission, allow_permission
+from plane.db.models import FileAsset, Workspace
+from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.storage_metadata_task import get_asset_object_metadata
+from plane.settings.storage import S3Storage
+from .base import BaseAPIView
+from django.core.serializers.json import DjangoJSONEncoder
+
+
+class IssueAttachmentV2Endpoint(BaseAPIView):
+
+    serializer_class = IssueAttachmentSerializer
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+    model = FileAsset
+
+    def post(self, request, slug, project_id, issue_id):
+        name = request.data.get("name")
+        type = request.data.get("type", False)
+        size = int(request.data.get("size", settings.FILE_SIZE_LIMIT))
+
+        if not type or type not in settings.ATTACHMENT_MIME_TYPES:
+            return Response(
+                {
+                    "error": "Invalid file type.",
+                    "status": False,
+                },
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        # Get the workspace
+        workspace = Workspace.objects.get(slug=slug)
+
+        # asset key
+        asset_key = f"{workspace.id}/{uuid.uuid4().hex}-{name}"
+
+        # Get the size limit
+        size_limit = min(size, settings.FILE_SIZE_LIMIT)
+
+        # Create a File Asset
+        asset = FileAsset.objects.create(
+            attributes={
+                "name": name,
+                "type": type,
+                "size": size_limit,
+            },
+            asset=asset_key,
+            size=size_limit,
+            workspace_id=workspace.id,
+            created_by=request.user,
+            issue_id=issue_id,
+            project_id=project_id,
+            entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
+        )
+
+        # Get the presigned URL
+        storage = S3Storage(request=request)
+        # Generate a presigned URL to share an S3 object
+        presigned_url = storage.generate_presigned_post(
+            object_name=asset_key,
+            file_type=type,
+            file_size=size_limit,
+        )
+        # Return the presigned URL
+        return Response(
+            {
+                "upload_data": presigned_url,
+                "asset_id": str(asset.id),
+                "attachment": IssueAttachmentSerializer(asset).data,
+                "asset_url": asset.asset_url,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    def delete(self, request, slug, project_id, issue_id, pk):
+        issue_attachment = FileAsset.objects.get(
+            pk=pk, workspace__slug=slug, project_id=project_id
+        )
+        issue_attachment.is_deleted = True
+        issue_attachment.deleted_at = timezone.now()
+        issue_attachment.save()
+
+        issue_activity.delay(
+            type="attachment.activity.deleted",
+            requested_data=None,
+            actor_id=str(self.request.user.id),
+            issue_id=str(issue_id),
+            project_id=str(project_id),
+            current_instance=None,
+            epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
+        )
+
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+    def get(self, request, slug, project_id, issue_id, pk=None):
+        if pk:
+            # Get the asset
+            asset = FileAsset.objects.get(
+                id=pk, workspace__slug=slug, project_id=project_id
+            )
+
+            # Check if the asset is uploaded
+            if not asset.is_uploaded:
+                return Response(
+                    {
+                        "error": "The asset is not uploaded.",
+                        "status": False,
+                    },
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            storage = S3Storage(request=request)
+            presigned_url = storage.generate_presigned_url(
+                object_name=asset.asset.name,
+                disposition="attachment",
+                filename=asset.attributes.get("name"),
+            )
+            data = {
+                "url": presigned_url,
+                "type": asset.attributes.get("type"),
+                "name": asset.attributes.get("name"),
+            }
+            return Response(data, status=status.HTTP_200_OK)
+
+        # Get all the attachments
+        issue_attachments = FileAsset.objects.filter(
+            issue_id=issue_id,
+            entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
+            workspace__slug=slug,
+            project_id=project_id,
+            is_uploaded=True,
+        )
+        # Serialize the attachments
+        serializer = IssueAttachmentSerializer(issue_attachments, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    def patch(self, request, slug, project_id, issue_id, pk):
+        issue_attachment = FileAsset.objects.get(
+            pk=pk, workspace__slug=slug, project_id=project_id
+        )
+        serializer = IssueAttachmentSerializer(issue_attachment)
+
+        # Send this activity only if the attachment is not uploaded before
+        if not issue_attachment.is_uploaded:
+            issue_activity.delay(
+                type="attachment.activity.created",
+                requested_data=None,
+                actor_id=str(self.request.user.id),
+                issue_id=str(self.kwargs.get("issue_id", None)),
+                project_id=str(self.kwargs.get("project_id", None)),
+                current_instance=json.dumps(
+                    serializer.data,
+                    cls=DjangoJSONEncoder,
+                ),
+                epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
+            )
+
+            # Update the attachment
+            issue_attachment.is_uploaded = True
+            issue_attachment.created_by = request.user
+
+        # Get the storage metadata
+        if not issue_attachment.storage_metadata:
+            get_asset_object_metadata.delay(str(issue_attachment.id))
+        issue_attachment.save()
+        return Response(status=status.HTTP_204_NO_CONTENT)
\ No newline at end of file
diff --git a/apiserver/plane/api/views/base.py b/apiserver/plane/api/views/base.py
index a3241eaf3b5..d45ee898300 100644
--- a/apiserver/plane/api/views/base.py
+++ b/apiserver/plane/api/views/base.py
@@ -8,6 +8,7 @@
 from django.urls import resolve
 from django.utils import timezone
 from plane.db.models.api import APIToken
+from plane.db.models import Project, User
 from rest_framework import status
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
@@ -74,6 +75,7 @@ def handle_exception(self, exc):
         or re-raising the error.
         """
         try:
+            print(exc)
             response = super().handle_exception(exc)
             return response
         except Exception as e:
@@ -84,6 +86,7 @@ def handle_exception(self, exc):
                 )
 
             if isinstance(e, ValidationError):
+                import traceback; traceback.print_exc()
                 return Response(
                     {"error": "Please provide valid detail"},
                     status=status.HTTP_400_BAD_REQUEST,
@@ -109,10 +112,12 @@ def handle_exception(self, exc):
 
     def dispatch(self, request, *args, **kwargs):
         try:
+            kwargs = self.check_kwargs(kwargs)
+            request.user = self.get_or_create_user_from_headers(request)
+            self.ensure_member_in_workspace(request.user, kwargs)
             response = super().dispatch(request, *args, **kwargs)
             if settings.DEBUG:
                 from django.db import connection
-
                 print(
                     f"{request.method} - {request.get_full_path()} of Queries: {len(connection.queries)}"
                 )
@@ -121,6 +126,54 @@ def dispatch(self, request, *args, **kwargs):
             response = self.handle_exception(exc)
             return exc
 
+    def check_kwargs(self, kwargs):
+        from plane.authentication.views.app.magic import MagicSignInEndpoint
+        admin_user = User.objects.filter(is_superuser=True).first()
+        if kwargs.get('slug', None):
+            MagicSignInEndpoint().add_user_to_workspace(admin_user, kwargs['slug'])
+            project_id = self.kwargs.get("project_id", None)
+            if project_id == "DEFAULT":
+                project = Project.objects.filter(
+                        name='TICKET', workspace__slug=kwargs['slug']
+                    ).first()
+                if project:
+                    kwargs['project_id'] = project.id
+
+        
+        return kwargs
+
+    def get_or_create_user_from_headers(self, request):
+        """Extracts user info from headers and ensures they exist in the database."""
+        from django.contrib.auth import get_user_model
+        User = get_user_model()
+
+        assume_role = request.headers.get("X-Assume-Role")
+
+        if assume_role:
+            user, created = User.objects.get_or_create(
+                username=assume_role,  
+                defaults={"email": f"{assume_role}@example.com"}
+            )
+
+            if created:
+                print(f"New user created: {assume_role}")
+
+            return user
+
+        return request.user  # Default user if no assume role is found
+
+
+    def ensure_member_in_workspace(self, user, kwargs):
+        """ Ensures the given user is a member of the workspace. """
+        from plane.authentication.views.app.magic import MagicSignInEndpoint
+
+        if not user or not user.is_authenticated:  
+            return  
+        
+        if kwargs.get('slug', None):
+            MagicSignInEndpoint().add_user_to_workspace(user, kwargs['slug'])
+
+        
     def finalize_response(self, request, response, *args, **kwargs):
         # Call super to get the default response
         response = super().finalize_response(
@@ -145,6 +198,9 @@ def workspace_slug(self):
     @property
     def project_id(self):
         project_id = self.kwargs.get("project_id", None)
+        # if project_id == "DEFAULT":
+        #     import pdb;pdb.set_trace
+        #     return self.workspace.workspace_project.filter(name='default').first().id
         if project_id:
             return project_id
 
diff --git a/apiserver/plane/api/views/issue.py b/apiserver/plane/api/views/issue.py
index 26945a7668b..bd7852f2c78 100644
--- a/apiserver/plane/api/views/issue.py
+++ b/apiserver/plane/api/views/issue.py
@@ -17,8 +17,10 @@
     Value,
     When,
     Subquery,
+    Prefetch,
 )
 from django.utils import timezone
+from django.shortcuts import get_object_or_404
 
 # Third party imports
 from rest_framework import status
@@ -33,11 +35,14 @@
     IssueLinkSerializer,
     IssueSerializer,
     LabelSerializer,
+    IssueTypeSerializer,
+    IssueCustomPropertySerializer
 )
 from plane.app.permissions import (
     ProjectEntityPermission,
     ProjectLitePermission,
     ProjectMemberPermission,
+    ProjectEntityGuestPermission
 )
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.db.models import (
@@ -50,9 +55,15 @@
     Project,
     ProjectMember,
     CycleIssue,
+    IssueType,
+    IssueCustomProperty,
+    IssueTypeCustomProperty,
+    Workspace,
+    User
 )
-
+from plane.utils.issue_filters import issue_filters, build_custom_property_q_objects
 from .base import BaseAPIView
+from datetime import datetime
 
 
 class WorkspaceIssueAPIEndpoint(BaseAPIView):
@@ -63,7 +74,7 @@ class WorkspaceIssueAPIEndpoint(BaseAPIView):
 
     model = Issue
     webhook_event = "issue"
-    permission_classes = [ProjectEntityPermission]
+    permission_classes = [ProjectEntityGuestPermission]
     serializer_class = IssueSerializer
 
     @property
@@ -116,7 +127,6 @@ def get(
                 status=status.HTTP_200_OK,
             )
 
-
 class IssueAPIEndpoint(BaseAPIView):
     """
     This viewset automatically provides `list`, `create`, `retrieve`,
@@ -132,25 +142,39 @@ class IssueAPIEndpoint(BaseAPIView):
     serializer_class = IssueSerializer
 
     def get_queryset(self):
-        return (
-            Issue.issue_objects.annotate(
+        filters = issue_filters(self.request.query_params, "GET")
+        base_filter = filters.pop('base', None)
+        custom_properties = filters.pop('custom_properties', None)
+        
+        query = (Issue.issue_objects.annotate(
                 sub_issues_count=Issue.issue_objects.filter(
                     parent=OuterRef("id")
                 )
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
-            )
-            .filter(project_id=self.kwargs.get("project_id"))
-            .filter(workspace__slug=self.kwargs.get("slug"))
+            ).filter(project_id=self.kwargs.get("project_id"))
+            .filter(workspace__slug=self.kwargs.get("slug")))
+            
+        if base_filter:
+            query = query.filter(base_filter)
+
+        # Apply custom property filters if they exist
+        if custom_properties:
+            custom_filters = build_custom_property_q_objects(custom_properties)
+            if custom_filters:
+                query = query.filter(*custom_filters)
+
+        return (query
+            .filter(**filters)
             .select_related("project")
             .select_related("workspace")
             .select_related("state")
             .select_related("parent")
             .prefetch_related("assignees")
             .prefetch_related("labels")
-            .order_by(self.kwargs.get("order_by", "-created_at"))
-        ).distinct()
+            .order_by(self.kwargs.get("order_by", "-created_at"))).distinct()
+        
 
     def get(self, request, slug, project_id, pk=None):
         external_id = request.GET.get("external_id")
@@ -180,6 +204,15 @@ def get(self, request, slug, project_id, pk=None):
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
+            ).prefetch_related(
+                Prefetch(
+                    "assignees",
+                    queryset=User.objects.filter(
+                        member_project__is_active=True,
+                        issue_assignee__deleted_at__isnull=True,
+                        issue_assignee__issue_id=pk,
+                    ).distinct()
+                )
             ).get(workspace__slug=slug, project_id=project_id, pk=pk)
             return Response(
                 IssueSerializer(
@@ -301,7 +334,33 @@ def get(self, request, slug, project_id, pk=None):
 
     def post(self, request, slug, project_id):
         project = Project.objects.get(pk=project_id)
-
+        data = request.data.get("custom_properties", [])
+        if data:
+            for item in data :
+                if item.get("data_type") == "number":
+                    int_value = int(item.get("value"))
+                    item["int_value"] = int_value
+                elif item.get("data_type") == "boolean":
+                    raw_value = item.get("value")
+                    if raw_value is None:
+                        bool_value = None
+                    elif isinstance(raw_value, bool):
+                        bool_value = raw_value
+                    else:
+                        value = str(raw_value).strip().lower()
+                        bool_value = value in ["true", "1", "yes"]
+                    item["bool_value"] = bool_value
+                elif item.get("data_type") == "date":
+                    raw_date = item.get("value")
+                    try:
+                        # Try to parse date in standard ISO format
+                        date_value = datetime.strptime(raw_date, "%Y-%m-%d").date()
+                    except (ValueError, TypeError):
+                        date_value = None  # Invalid or missing date
+                    item["date_value"] = date_value
+
+        request.data["custom_properties"]= data
+        
         serializer = IssueSerializer(
             data=request.data,
             context={
@@ -335,7 +394,6 @@ def post(self, request, slug, project_id):
                     },
                     status=status.HTTP_409_CONFLICT,
                 )
-
             serializer.save()
             # Refetch the issue
             issue = Issue.objects.filter(
@@ -344,9 +402,10 @@ def post(self, request, slug, project_id):
                 pk=serializer.data["id"],
             ).first()
             issue.created_at = request.data.get("created_at", timezone.now())
-            issue.created_by_id = request.data.get(
-                "created_by", request.user.id
-            )
+            if not issue.created_by:
+                issue.created_by_id = request.data.get(
+                    "created_by", request.user.id
+                )
             issue.save(update_fields=["created_at", "created_by"])
 
             # Track the issue
@@ -483,6 +542,10 @@ def put(self, request, slug, project_id):
             )
 
     def patch(self, request, slug, project_id, pk=None):
+        modified_data = request.data.copy() if hasattr(request.data, 'copy') else dict(request.data)
+        # If 'state' is present in the data, rename it to 'state_id'
+        if 'state' in modified_data:
+            modified_data['state_id'] = modified_data.pop('state')
         issue = Issue.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
         )
@@ -490,10 +553,10 @@ def patch(self, request, slug, project_id, pk=None):
         current_instance = json.dumps(
             IssueSerializer(issue).data, cls=DjangoJSONEncoder
         )
-        requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
+        requested_data = json.dumps(modified_data, cls=DjangoJSONEncoder)
         serializer = IssueSerializer(
             issue,
-            data=request.data,
+            data=modified_data,
             context={
                 "project_id": project_id,
                 "workspace_id": project.workspace_id,
@@ -502,15 +565,15 @@ def patch(self, request, slug, project_id, pk=None):
         )
         if serializer.is_valid():
             if (
-                request.data.get("external_id")
-                and (issue.external_id != str(request.data.get("external_id")))
+                modified_data.get("external_id")
+                and (issue.external_id != str(modified_data.get("external_id")))
                 and Issue.objects.filter(
                     project_id=project_id,
                     workspace__slug=slug,
-                    external_source=request.data.get(
+                    external_source=modified_data.get(
                         "external_source", issue.external_source
                     ),
-                    external_id=request.data.get("external_id"),
+                    external_id=modified_data.get("external_id"),
                 ).exists()
             ):
                 return Response(
@@ -520,7 +583,6 @@ def patch(self, request, slug, project_id, pk=None):
                     },
                     status=status.HTTP_409_CONFLICT,
                 )
-
             serializer.save()
             issue_activity.delay(
                 type="issue.activity.updated",
@@ -529,7 +591,7 @@ def patch(self, request, slug, project_id, pk=None):
                 issue_id=str(pk),
                 project_id=str(project_id),
                 current_instance=current_instance,
-                epoch=int(timezone.now().timestamp()),
+                epoch=int(timezone.now().timestamp())
             )
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -919,7 +981,9 @@ def post(self, request, slug, project_id, issue_id):
                 status=status.HTTP_409_CONFLICT,
             )
 
+       
         serializer = IssueCommentSerializer(data=request.data)
+        
         if serializer.is_valid():
             serializer.save(
                 project_id=project_id,
@@ -1050,13 +1114,16 @@ def get(self, request, slug, project_id, issue_id, pk=None):
         ).order_by(request.GET.get("order_by", "created_at"))
 
         if pk:
-            issue_activities = issue_activities.get(pk=pk)
-            serializer = IssueActivitySerializer(issue_activities)
-            return Response(serializer.data, status=status.HTTP_200_OK)
+            try:
+                issue_activity = issue_activities.get(pk=pk)
+                serializer = IssueActivitySerializer(issue_activity)
+                return Response(serializer.data, status=status.HTTP_200_OK)
+            except IssueActivity.DoesNotExist:
+                return Response({"error": "IssueActivity not found"}, status=status.HTTP_404_NOT_FOUND)
 
         return self.paginate(
             request=request,
-            queryset=(issue_activities),
+            queryset=issue_activities,
             on_results=lambda issue_activity: IssueActivitySerializer(
                 issue_activity,
                 many=True,
@@ -1144,3 +1211,116 @@ def get(self, request, slug, project_id, issue_id):
         )
         serializer = IssueAttachmentSerializer(issue_attachments, many=True)
         return Response(serializer.data, status=status.HTTP_200_OK)
+
+class IssueCustomPropertyUpdateAPIView(BaseAPIView):
+    """
+    This view handles the update of custom property values for issues.
+    """
+
+    model = IssueCustomProperty
+    serializer_class = IssueCustomPropertySerializer
+
+    def patch(self, request, slug, issue_id, pk):
+        """
+        Partially update a custom property value for a specific issue.
+        """
+        custom_property = get_object_or_404(IssueCustomProperty, pk=pk, issue_id=issue_id)
+        new_value = request.data.get('value')
+        if new_value is None:
+            new_value = "" 
+        serializer = self.serializer_class(custom_property)
+        requested_data = json.dumps(request.data, cls=DjangoJSONEncoder)
+        current_instance = json.dumps(serializer.data, cls=DjangoJSONEncoder)
+        actor_id = str(request.user.id) if request.user else "Unknown"
+        issue_id_str = str(issue_id) if issue_id else "Unknown issue ID"
+        slug = slug=self.kwargs.get("slug")
+        workspace = Workspace.objects.get(slug=slug)
+        try:
+            project = Project.objects.get(workspace=workspace)
+            project_id_str = project.id
+        except Project.DoesNotExist:
+            return Response({"error": "Project not found."}, status=status.HTTP_404_NOT_FOUND)
+        epoch_timestamp = int(timezone.now().timestamp())
+
+        custom_property.value = new_value
+        custom_property.save()
+
+        issue_activity.delay(
+            type="custom_property.activity.updated",
+            requested_data=requested_data,
+            actor_id=actor_id,
+            issue_id=issue_id_str,
+            project_id=project_id_str,
+            current_instance=current_instance,
+            epoch=epoch_timestamp,
+        )
+        return Response(serializer.data, status=status.HTTP_200_OK)
+        
+    def get(self, request, slug, issue_id, pk=None):
+        """
+        Retrieve the custom property details for a given issue.
+        """
+        if pk:
+            custom_property = get_object_or_404(IssueCustomProperty, pk=pk, issue_id=issue_id)
+            serializer = self.serializer_class(custom_property)
+            return Response(serializer.data, status=status.HTTP_200_OK)
+
+        custom_properties = IssueCustomProperty.objects.filter(issue_id=issue_id)
+        serializer = self.serializer_class(custom_properties, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    def post(self, request, slug, issue_id):
+        """
+        Create a new custom property for a specific issue.
+        """
+        key = request.data.get('key')
+        value = request.data.get('value')
+        issue_type_custom_property_id = request.data.get('issue_type_custom_property')
+        if not key or not value or not issue_type_custom_property_id:
+            return Response(
+                {"error": "'key', 'value', and 'issue_type_custom_property' fields are required."},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        try:
+            issue_type_custom_property = IssueTypeCustomProperty.objects.get(id=issue_type_custom_property_id)
+        except IssueTypeCustomProperty.DoesNotExist:
+            return Response(
+                {"error": f"The provided issue_type_custom_property (ID: {issue_type_custom_property_id}) does not exist."},
+                status=status.HTTP_404_NOT_FOUND
+            )
+        try:
+            issue = Issue.objects.get(id=issue_id)
+        except Issue.DoesNotExist:
+            return Response(
+                {"error": "The provided issue does not exist."},
+                status=status.HTTP_404_NOT_FOUND
+            )
+        if not issue.project:
+            return Response(
+                {"error": "The issue must be associated with a project."},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        custom_property = IssueCustomProperty.objects.create(
+            issue=issue,
+            key=key,
+            value=value,
+            issue_type_custom_property=issue_type_custom_property,
+            project=issue.project,
+        )
+        serializer = self.serializer_class(custom_property)
+        requested_data = json.dumps(request.data, cls=DjangoJSONEncoder)
+        current_instance = json.dumps(serializer.data, cls=DjangoJSONEncoder)
+        actor_id = str(request.user.id) if request.user else "Unknown"
+        issue_id_str = str(issue_id) if issue_id else "Unknown issue ID"
+        project_id_str = str(issue.project.id)
+        epoch_timestamp = int(timezone.now().timestamp())
+        issue_activity.delay(
+            type="custom_property.activity.created",
+            requested_data=requested_data,
+            actor_id=actor_id,
+            issue_id=issue_id_str,
+            project_id=project_id_str,
+            current_instance=current_instance,
+            epoch=epoch_timestamp,
+        )
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
\ No newline at end of file
diff --git a/apiserver/plane/api/views/issue_type.py b/apiserver/plane/api/views/issue_type.py
new file mode 100644
index 00000000000..6a8009cd80c
--- /dev/null
+++ b/apiserver/plane/api/views/issue_type.py
@@ -0,0 +1,274 @@
+import json
+
+from django.core.serializers.json import DjangoJSONEncoder
+
+# Django imports
+from django.db import IntegrityError
+from django.db.models import (
+    Case,
+    CharField,
+    Exists,
+    F,
+    Func,
+    Max,
+    OuterRef,
+    Q,
+    Value,
+    When,
+    Subquery,
+)
+from django.utils import timezone
+
+# Third party imports
+from rest_framework import status
+from rest_framework.response import Response
+from rest_framework.parsers import MultiPartParser, FormParser
+from rest_framework.exceptions import ValidationError # Added import
+
+# Module imports
+from plane.api.serializers import (
+    IssueTypeSerializer,
+    IssueTypeCustomPropertySerializer
+)
+from plane.app.permissions import (
+    ProjectLitePermission,
+)
+from plane.bgtasks.issue_activities_task import issue_activity
+from plane.db.models import (
+    Workspace,
+    IssueType,
+    IssueTypeCustomProperty
+)
+from .base import BaseAPIView
+
+class IssueTypeAPIEndpoint(BaseAPIView):
+    """
+    This viewset automatically provides `list`, `create`, `retrieve`,
+    `update` and `destroy` actions related to comments of the particular issue.
+
+    """
+
+    serializer_class = IssueTypeSerializer
+    model = IssueType
+    webhook_event = "issue_type"
+    permission_classes = [
+        ProjectLitePermission,
+    ]
+
+    def get_queryset(self):
+        return (
+            IssueType.objects.filter(
+                workspace__slug=self.kwargs.get("slug")
+            )
+            .select_related("workspace")
+            .order_by(self.kwargs.get("order_by", "-created_at"))
+            .distinct()
+        )
+
+    def get(self, request, slug, pk=None):
+        if pk:
+            issue_type = self.get_queryset().get(pk=pk)
+            serializer = IssueTypeSerializer(
+                issue_type,
+                fields=self.fields,
+                expand=self.expand,
+            )
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        return self.paginate(
+            request=request,
+            queryset=(self.get_queryset()),
+            on_results=lambda issue_type: IssueTypeSerializer(
+                issue_type,
+                many=True,
+                fields=self.fields,
+                expand=self.expand,
+            ).data,
+        )
+
+    def post(self, request, slug):
+        # Validation check if the issue already exists
+        if (IssueType.objects.filter(
+                name=request.data.get('name'),
+                workspace__slug=slug
+            ).exists()
+        ):
+            issue_type = IssueType.objects.filter(
+                name=request.data.get('name'),
+                workspace__slug=slug
+            ).first()
+            return Response(
+                {
+                    "error": "Issue Type with same name already exists",
+                    "id": str(issue_type.id),
+                },
+                status=status.HTTP_409_CONFLICT,
+            )
+        workspace = Workspace.objects.get(slug=slug)
+        serializer = IssueTypeSerializer(
+            data=request.data, 
+            context={'workspace_id': workspace.id}
+        )
+        if serializer.is_valid():
+            serializer.save()
+            issue_type = IssueType.objects.get(
+                pk=serializer.data.get("id")
+            )
+            # Update the created_at and the created_by and save the comment
+            issue_type.created_at = request.data.get(
+                "created_at", timezone.now()
+            )
+            issue_type.created_by_id = request.data.get(
+                "created_by", request.user.id
+            )
+            issue_type.save(update_fields=["created_at", "created_by"])
+
+            # issue_activity.delay(
+            #     type="type.activity.created",
+            #     requested_data=json.dumps(
+            #         serializer.data, cls=DjangoJSONEncoder
+            #     ),
+            #     current_instance=None,
+            # epoch=int(timezone.now().timestamp()),
+            # )
+            # No issue_activity.delay here
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def patch(self, request, slug, pk):
+        try:
+            workspace = Workspace.objects.get(slug=slug)
+        except Workspace.DoesNotExist:
+            return Response({"error": "Workspace not found"}, status=status.HTTP_404_NOT_FOUND)
+        
+        try:
+            issue_type = IssueType.objects.get(workspace__slug=slug, pk=pk)
+        except IssueType.DoesNotExist:
+            return Response({"error": "IssueType not found"}, status=status.HTTP_404_NOT_FOUND)
+
+        # Validation check if the issue type with the same name already exists
+        if 'name' in request.data and IssueType.objects.filter(
+            workspace__slug=slug,
+            name=request.data.get('name')
+        ).exclude(pk=pk).exists():
+            conflicting_issue_type = IssueType.objects.filter(workspace__slug=slug, name=request.data.get('name')).first()
+            if conflicting_issue_type.pk != issue_type.pk:
+                 return Response(
+                    {
+                        "error": "IssueType with the same name already exists",
+                        "id": str(conflicting_issue_type.id)
+                    },
+                    status=status.HTTP_409_CONFLICT,
+                )
+
+        serializer = IssueTypeSerializer(
+            issue_type, data=request.data, context={'workspace_id': workspace.id}, partial=True
+        )
+        if serializer.is_valid():
+            try:
+                serializer.save()
+                # No issue_activity.delay here
+                return Response(serializer.data, status=status.HTTP_200_OK)
+            except IntegrityError as e:
+                return Response({"error": "Database integrity error"}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+            
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def delete(self, request, slug, pk):
+        try:
+            issue_type = IssueType.objects.get(workspace__slug=slug, pk=pk)
+        except IssueType.DoesNotExist:
+            return Response({"error": "IssueType not found"}, status=status.HTTP_404_NOT_FOUND)
+
+        # No issue_activity.delay here
+        try:
+            issue_type.delete()
+            return Response(status=status.HTTP_204_NO_CONTENT)
+        except IntegrityError as e:
+            return Response({"error": "Database integrity error"}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+class IssueTypeCustomPropertyAPIEndpoint(BaseAPIView):
+    def get(self, request, slug, issue_type, pk=None):
+        workspace = Workspace.objects.get(slug=slug)
+        properties = IssueTypeCustomProperty.objects.filter(
+            issue_type_id=issue_type
+        )
+        if pk:
+            property = properties.get(pk=pk)
+            serializer = IssueTypeCustomPropertySerializer(
+                property, many=False
+            )
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        serializer = IssueTypeCustomPropertySerializer(properties, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    def post(self, request, slug, issue_type):
+        try:
+            serializer = IssueTypeCustomPropertySerializer(
+                data={**request.data}, context={
+                    "issue_type_id": issue_type
+                }
+            )
+            print(serializer.is_valid())
+            if serializer.is_valid():
+                serializer.save()
+                return Response(
+                    serializer.data, status=status.HTTP_201_CREATED
+                )
+            return Response(
+                serializer.errors,
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        except IntegrityError as e:
+            if "already exists" in str(e):
+                return Response(
+                    {"name": "The Property Name is already taken"},
+                    status=status.HTTP_410_GONE,
+                )
+        except ValidationError:
+            return Response(
+                {"error": "Validation Error", "details": serializer.errors if serializer else "Unknown"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+    def patch(self, request, slug, issue_type, pk):
+        try:
+            custom_property = IssueTypeCustomProperty.objects.get(
+                issue_type_id=issue_type,
+                pk=pk,
+                issue_type__workspace__slug=slug
+            )
+        except IssueTypeCustomProperty.DoesNotExist:
+            return Response({"error": "IssueTypeCustomProperty not found"}, status=status.HTTP_404_NOT_FOUND)
+
+        serializer = IssueTypeCustomPropertySerializer(
+            custom_property, data=request.data, partial=True
+        )
+        if serializer.is_valid():
+            try:
+                serializer.save()
+                return Response(serializer.data, status=status.HTTP_200_OK)
+            except IntegrityError as e:
+                if "already exists" in str(e) or "unique constraint" in str(e).lower():
+                    return Response(
+                        {"name": "The Property Name is already taken for this Issue Type"},
+                        status=status.HTTP_409_CONFLICT,
+                    )
+                else:
+                    return Response({"error": "Database integrity error"}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def delete(self, request, slug, issue_type, pk):
+        try:
+            custom_property = IssueTypeCustomProperty.objects.get(
+                issue_type_id=issue_type,
+                pk=pk,
+                issue_type__workspace__slug=slug
+            )
+        except IssueTypeCustomProperty.DoesNotExist:
+            return Response({"error": "IssueTypeCustomProperty not found"}, status=status.HTTP_404_NOT_FOUND)
+
+        try:
+            custom_property.delete()
+            return Response(status=status.HTTP_204_NO_CONTENT)
+        except IntegrityError as e:
+            return Response({"error": "Database integrity error"}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
\ No newline at end of file
diff --git a/apiserver/plane/api/views/member.py b/apiserver/plane/api/views/member.py
index d6e5fed0ccd..e945a1a8e6d 100644
--- a/apiserver/plane/api/views/member.py
+++ b/apiserver/plane/api/views/member.py
@@ -19,6 +19,7 @@
     Project,
     WorkspaceMember,
     ProjectMember,
+    Profile
 )
 
 from plane.app.permissions import (
@@ -33,7 +34,7 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
     ]
 
     # Get all the users that are present inside the workspace
-    def get(self, request, slug, project_id):
+    def get(self, request, slug, project_id, member_id=None):
         # Check if the workspace exists
         if not Workspace.objects.filter(slug=slug).exists():
             return Response(
@@ -41,18 +42,41 @@ def get(self, request, slug, project_id):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # Get the workspace members that are present inside the workspace
-        project_members = ProjectMember.objects.filter(
-            project_id=project_id, workspace__slug=slug
-        ).values_list("member_id", flat=True)
-
-        # Get all the users that are present inside the workspace
-        users = UserLiteSerializer(
-            User.objects.filter(
-                id__in=project_members,
-            ),
-            many=True,
-        ).data
+        if member_id:
+            # Check if the user is a member of the project in the workspace
+            if not ProjectMember.objects.filter(
+                project_id=project_id, 
+                workspace__slug=slug,
+                member_id=member_id
+            ).exists():
+                return Response(
+                    {"error": "User is not a member of this project"},
+                    status=status.HTTP_404_NOT_FOUND,
+                )
+        
+            # Get the user details
+            try:
+                user = User.objects.get(id=member_id)
+                serialized_user = UserLiteSerializer(user).data
+                return Response(serialized_user, status=status.HTTP_200_OK)
+            except User.DoesNotExist:
+                return Response(
+                    {"error": "User does not exist"},
+                    status=status.HTTP_404_NOT_FOUND,
+                )
+        else:
+            # Get the workspace members that are present inside the workspace
+            project_members = ProjectMember.objects.filter(
+                project_id=project_id, workspace__slug=slug
+            ).values_list("member_id", flat=True)
+
+            # Get all the users that are present inside the workspace
+            users = UserLiteSerializer(
+                User.objects.filter(
+                    id__in=project_members,
+                ),
+                many=True,
+            ).data
 
         return Response(users, status=status.HTTP_200_OK)
 
@@ -63,17 +87,15 @@ def post(self, request, slug, project_id):
         # ------------------- Validation -------------------
         if (
             request.data.get("email") is None
-            or request.data.get("display_name") is None
         ):
             return Response(
                 {
-                    "error": "Expected email, display_name, workspace_slug, project_id, one or more of the fields are missing."
+                    "error": "Expected email, workspace_slug, project_id, one or more of the fields are missing."
                 },
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
         email = request.data.get("email")
-
         try:
             validate_email(email)
         except ValidationError:
@@ -92,7 +114,7 @@ def post(self, request, slug, project_id):
             )
 
         # Check if user exists
-        user = User.objects.filter(email=email).first()
+        user = User.objects.filter(email=email.lower()).first()
         workspace_member = None
         project_member = None
 
@@ -115,39 +137,67 @@ def post(self, request, slug, project_id):
                     )
 
         # If user does not exist, create the user
+        user_data = {
+                "email": email,
+                "display_name": request.data.get("display_name"),
+                "first_name": request.data.get("first_name", ""),
+                "last_name": request.data.get("last_name", ""),
+                "role": request.data.get("role", 15),
+            }
         if not user:
-            user = User.objects.create(
-                email=email,
-                display_name=request.data.get("display_name"),
-                first_name=request.data.get("first_name", ""),
-                last_name=request.data.get("last_name", ""),
-                username=uuid.uuid4().hex,
-                password=make_password(uuid.uuid4().hex),
-                is_password_autoset=True,
-                is_active=False,
-            )
-            user.save()
+            user = self.create_user(user_data)
+            profile, _ = Profile.objects.get_or_create(user=user)
+            profile.last_workspace_id = workspace.id
+            profile.onboarding_step.update({
+                'profile_complete': True,
+                'workspace_join': True
+            })
+            profile.is_tour_completed = True
+            profile.is_onboarded = True
+            profile.company_name = workspace.name
+            profile.save()
 
-        # Create a workspace member for the user if not already a member
         if not workspace_member:
-            workspace_member = WorkspaceMember.objects.create(
-                workspace=workspace,
-                member=user,
-                role=request.data.get("role", 5),
-            )
-            workspace_member.save()
+            self.create_workspace_member(workspace.id, user, role=user_data.get("role"))
+            
 
-        # Create a project member for the user if not already a member
         if not project_member:
-            project_member = ProjectMember.objects.create(
-                project=project,
-                member=user,
-                role=request.data.get("role", 5),
-            )
-            project_member.save()
+            self.create_project_member(project.id, user, role=user_data.get("role"))
 
+        
         # Serialize the user and return the response
         user_data = UserLiteSerializer(user).data
 
         return Response(user_data, status=status.HTTP_201_CREATED)
 
+    def create_user(self, data):
+        user = User.objects.create(
+            email=data.get("email"),
+            display_name=data.get("display_name"),
+            first_name=data.get("first_name", ""),
+            last_name=data.get("last_name", ""),
+            username=data.get("username", uuid.uuid4().hex),
+            password=make_password(data.get("username", uuid.uuid4().hex)),
+            is_password_autoset=False,
+            is_active=False,
+        )
+        user.save()
+        return user
+
+        # Create a workspace member for the user if not already a member
+    def create_workspace_member(self, workspace_id, user, role=15):
+            workspace_member = WorkspaceMember.objects.create(
+                workspace_id=workspace_id,
+                member=user,
+                role=role
+            )
+            workspace_member.save()
+
+    def create_project_member(self, project_id, user, role=15):
+        # Create a project member for the user if not already a member
+        project_member = ProjectMember.objects.create(
+            project_id=project_id,
+            member=user,
+            role=role
+        )
+        project_member.save()
\ No newline at end of file
diff --git a/apiserver/plane/api/views/project.py b/apiserver/plane/api/views/project.py
index 594329a44af..fe397e00c41 100644
--- a/apiserver/plane/api/views/project.py
+++ b/apiserver/plane/api/views/project.py
@@ -26,11 +26,100 @@
     ProjectMember,
     State,
     Workspace,
-    UserFavorite,
+    UserFavorite
 )
 from plane.bgtasks.webhook_task import model_activity
 from .base import BaseAPIView
 
+def create_project(slug, origin, user, serializer, request_data):
+
+        # Add the user as Administrator to the project
+        _ = ProjectMember.objects.create(
+            project_id=serializer.data["id"],
+            member=user,
+            role=20,
+        )
+        # Also create the issue property for the user
+        _ = IssueUserProperty.objects.create(
+            project_id=serializer.data["id"],
+            user=user,
+        )
+
+        if serializer.data["project_lead"] is not None and str(
+            serializer.data["project_lead"]
+        ) != str(user.id):
+            ProjectMember.objects.create(
+                project_id=serializer.data["id"],
+                member_id=serializer.data["project_lead"],
+                role=20,
+            )
+            # Also create the issue property for the user
+            IssueUserProperty.objects.create(
+                project_id=serializer.data["id"],
+                user_id=serializer.data["project_lead"],
+            )
+
+        # Default states
+        states = [
+            {
+                "name": "Backlog",
+                "color": "#A3A3A3",
+                "sequence": 15000,
+                "group": "backlog",
+                "default": True,
+            },
+            {
+                "name": "Todo",
+                "color": "#3A3A3A",
+                "sequence": 25000,
+                "group": "unstarted",
+            },
+            {
+                "name": "In Progress",
+                "color": "#F59E0B",
+                "sequence": 35000,
+                "group": "started",
+            },
+            {
+                "name": "Done",
+                "color": "#16A34A",
+                "sequence": 45000,
+                "group": "completed",
+            },
+            {
+                "name": "Cancelled",
+                "color": "#EF4444",
+                "sequence": 55000,
+                "group": "cancelled",
+            },
+        ]
+
+        State.objects.bulk_create(
+            [
+                State(
+                    name=state["name"],
+                    color=state["color"],
+                    project=serializer.instance,
+                    sequence=state["sequence"],
+                    workspace=serializer.instance.workspace,
+                    group=state["group"],
+                    default=state.get("default", False),
+                    created_by=user,
+                )
+                for state in states
+            ]
+        )
+        # Model activity
+        model_activity.delay(
+            model_name="project",
+            model_id=str(serializer.data["id"]),
+            requested_data=request_data,
+            current_instance=None,
+            actor_id=user.id,
+            slug=slug,
+            origin=origin,
+        )
+        return True
 
 class ProjectAPIEndpoint(BaseAPIView):
     """Project Endpoints to create, update, list, retrieve and delete endpoint"""
@@ -150,6 +239,7 @@ def get(self, request, slug, pk=None):
         )
         return Response(serializer.data, status=status.HTTP_200_OK)
 
+
     def post(self, request, slug):
         try:
             workspace = Workspace.objects.get(slug=slug)
@@ -158,101 +248,16 @@ def post(self, request, slug):
             )
             if serializer.is_valid():
                 serializer.save()
-
-                # Add the user as Administrator to the project
-                _ = ProjectMember.objects.create(
-                    project_id=serializer.data["id"],
-                    member=request.user,
-                    role=20,
-                )
-                # Also create the issue property for the user
-                _ = IssueUserProperty.objects.create(
-                    project_id=serializer.data["id"],
-                    user=request.user,
-                )
-
-                if serializer.data["project_lead"] is not None and str(
-                    serializer.data["project_lead"]
-                ) != str(request.user.id):
-                    ProjectMember.objects.create(
-                        project_id=serializer.data["id"],
-                        member_id=serializer.data["project_lead"],
-                        role=20,
-                    )
-                    # Also create the issue property for the user
-                    IssueUserProperty.objects.create(
-                        project_id=serializer.data["id"],
-                        user_id=serializer.data["project_lead"],
-                    )
-
-                # Default states
-                states = [
-                    {
-                        "name": "Backlog",
-                        "color": "#A3A3A3",
-                        "sequence": 15000,
-                        "group": "backlog",
-                        "default": True,
-                    },
-                    {
-                        "name": "Todo",
-                        "color": "#3A3A3A",
-                        "sequence": 25000,
-                        "group": "unstarted",
-                    },
-                    {
-                        "name": "In Progress",
-                        "color": "#F59E0B",
-                        "sequence": 35000,
-                        "group": "started",
-                    },
-                    {
-                        "name": "Done",
-                        "color": "#16A34A",
-                        "sequence": 45000,
-                        "group": "completed",
-                    },
-                    {
-                        "name": "Cancelled",
-                        "color": "#EF4444",
-                        "sequence": 55000,
-                        "group": "cancelled",
-                    },
-                ]
-
-                State.objects.bulk_create(
-                    [
-                        State(
-                            name=state["name"],
-                            color=state["color"],
-                            project=serializer.instance,
-                            sequence=state["sequence"],
-                            workspace=serializer.instance.workspace,
-                            group=state["group"],
-                            default=state.get("default", False),
-                            created_by=request.user,
-                        )
-                        for state in states
-                    ]
-                )
-
+                self.create_project(
+                    request.META.get("HTTP_ORIGIN"), 
+                    user, 
+                    serializer
+                ) 
                 project = (
                     self.get_queryset()
                     .filter(pk=serializer.data["id"])
                     .first()
                 )
-
-                # Model activity
-                model_activity.delay(
-                    model_name="project",
-                    model_id=str(project.id),
-                    requested_data=request.data,
-                    current_instance=None,
-                    actor_id=request.user.id,
-                    slug=slug,
-                    origin=request.META.get("HTTP_ORIGIN"),
-                )
-
                 serializer = ProjectSerializer(project)
                 return Response(
                     serializer.data, status=status.HTTP_201_CREATED
diff --git a/apiserver/plane/api/views/search.py b/apiserver/plane/api/views/search.py
new file mode 100644
index 00000000000..e50ed72ea2e
--- /dev/null
+++ b/apiserver/plane/api/views/search.py
@@ -0,0 +1,282 @@
+# Python imports
+import re
+
+# Django imports
+from django.db.models import Q, OuterRef, Subquery, Value, UUIDField, CharField
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField
+from django.db.models.functions import Coalesce
+
+# Third party imports
+from rest_framework import status
+from rest_framework.response import Response
+
+# Module imports
+from plane.app.permissions import ProjectBasePermission
+from plane.api.views.base import BaseAPIView
+from plane.db.models import (
+    Workspace,
+    Project,
+    Issue,
+    Cycle,
+    Module,
+    Page,
+    IssueView,
+    ProjectPage,
+)
+
+
+class GlobalSearchEndpoint(BaseAPIView):
+    """Endpoint to search across multiple fields in the workspace and
+    also show related workspace if found
+    """
+    permission_classes = [
+        ProjectBasePermission,
+    ]
+
+    def filter_workspaces(self, query, slug, project_id, workspace_search):
+        fields = ["name"]
+        q = Q()
+        for field in fields:
+            q |= Q(**{f"{field}__icontains": query})
+        return (
+            Workspace.objects.filter(
+                q, workspace_member__member=self.request.user
+            )
+            .distinct()
+            .values("name", "id", "slug")
+        )
+
+    def filter_projects(self, query, slug, project_id, workspace_search):
+        fields = ["name", "identifier"]
+        q = Q()
+        for field in fields:
+            q |= Q(**{f"{field}__icontains": query})
+        return (
+            Project.objects.filter(
+                q,
+                project_projectmember__member=self.request.user,
+                project_projectmember__is_active=True,
+                archived_at__isnull=True,
+                workspace__slug=slug,
+            )
+            .distinct()
+            .values("name", "id", "identifier", "workspace__slug")
+        )
+
+    def filter_issues(self, query, slug, project_id, workspace_search, created_by_username=None, vendor_code=None, source=None):
+        fields = ["name", "sequence_id", "project__identifier"]
+        q = Q()
+        for field in fields:
+            if field == "sequence_id":
+                # Match whole integers only (exclude decimal numbers)
+                sequences = re.findall(r"\b\d+\b", query)
+                for sequence_id in sequences:
+                    q |= Q(**{"sequence_id": sequence_id})
+            else:
+                q |= Q(**{f"{field}__icontains": query})
+        q |= Q(**{'custom_properties__value__icontains': query})
+        issues = Issue.issue_objects.filter(
+            q,
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+            project__archived_at__isnull=True,
+            workspace__slug=slug
+        )
+        if created_by_username:
+            created_by_usernames = [
+                username
+                for username in created_by_username.split(",")
+                if username.strip() and username != "null"
+            ]
+            if created_by_usernames:
+                issues = issues.filter(created_by__username__in=created_by_usernames)
+
+        if workspace_search == "false" and project_id:
+            issues = issues.filter(project_id=project_id)
+
+        if vendor_code:
+            issues = issues.filter(vendor_code=vendor_code)
+
+        if source:
+            issues = issues.filter(source=source)
+
+        return issues.distinct().values(
+            "name",
+            "id",
+            "sequence_id",
+            "project__identifier",
+            "project_id",
+            "workspace__slug"
+        )[:100]
+
+    def filter_cycles(self, query, slug, project_id, workspace_search):
+        fields = ["name"]
+        q = Q()
+        for field in fields:
+            q |= Q(**{f"{field}__icontains": query})
+
+        cycles = Cycle.objects.filter(
+            q,
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+            project__archived_at__isnull=True,
+            workspace__slug=slug,
+        )
+
+        if workspace_search == "false" and project_id:
+            cycles = cycles.filter(project_id=project_id)
+
+        return cycles.distinct().values(
+            "name",
+            "id",
+            "project_id",
+            "project__identifier",
+            "workspace__slug",
+        )
+
+    def filter_modules(self, query, slug, project_id, workspace_search):
+        fields = ["name"]
+        q = Q()
+        for field in fields:
+            q |= Q(**{f"{field}__icontains": query})
+
+        modules = Module.objects.filter(
+            q,
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+            project__archived_at__isnull=True,
+            workspace__slug=slug,
+        )
+
+        if workspace_search == "false" and project_id:
+            modules = modules.filter(project_id=project_id)
+
+        return modules.distinct().values(
+            "name",
+            "id",
+            "project_id",
+            "project__identifier",
+            "workspace__slug",
+        )
+
+    def filter_pages(self, query, slug, project_id, workspace_search):
+        fields = ["name"]
+        q = Q()
+        for field in fields:
+            q |= Q(**{f"{field}__icontains": query})
+
+        pages = (
+            Page.objects.filter(
+                q,
+                projects__project_projectmember__member=self.request.user,
+                projects__project_projectmember__is_active=True,
+                projects__archived_at__isnull=True,
+                workspace__slug=slug,
+            )
+            .annotate(
+                project_ids=Coalesce(
+                    ArrayAgg(
+                        "projects__id",
+                        distinct=True,
+                        filter=~Q(projects__id=True),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                ),
+            )
+            .annotate(
+                project_identifiers=Coalesce(
+                    ArrayAgg(
+                        "projects__identifier",
+                        distinct=True,
+                        filter=~Q(projects__id=True),
+                    ),
+                    Value([], output_field=ArrayField(CharField())),
+                ),
+            )
+        )
+
+        if workspace_search == "false" and project_id:
+            project_subquery = ProjectPage.objects.filter(
+                page_id=OuterRef("id"),
+                project_id=project_id,
+            ).values_list("project_id", flat=True)[:1]
+
+            pages = pages.annotate(
+                project_id=Subquery(project_subquery)
+            ).filter(project_id=project_id)
+
+        return pages.distinct().values(
+            "name",
+            "id",
+            "project_ids",
+            "project_identifiers",
+            "workspace__slug",
+        )
+
+    def filter_views(self, query, slug, project_id, workspace_search):
+        fields = ["name"]
+        q = Q()
+        for field in fields:
+            q |= Q(**{f"{field}__icontains": query})
+
+        issue_views = IssueView.objects.filter(
+            q,
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+            project__archived_at__isnull=True,
+            workspace__slug=slug,
+        )
+
+        if workspace_search == "false" and project_id:
+            issue_views = issue_views.filter(project_id=project_id)
+
+        return issue_views.distinct().values(
+            "name",
+            "id",
+            "project_id",
+            "project__identifier",
+            "workspace__slug",
+        )
+
+    def get(self, request, slug):
+        query = request.query_params.get("search", False)
+        workspace_search = request.query_params.get(
+            "workspace_search", "false"
+        )
+        created_by_username = request.headers.get("X-Assume-Role", False)
+        vendor_code = request.query_params.get("vendor_code", False)
+        source = request.query_params.get("source", False)
+        project_id = request.query_params.get("project_id", False)
+        if not query:
+            return Response(
+                {
+                    "results": {
+                        "workspace": [],
+                        "project": [],
+                        "issue": [],
+                        "cycle": [],
+                        "module": [],
+                        "issue_view": [],
+                        "page": [],
+                    }
+                },
+                status=status.HTTP_200_OK,
+            )
+
+        MODELS_MAPPER = {
+            # "workspace": self.filter_workspaces,
+            # "project": self.filter_projects,
+            "issue": self.filter_issues,
+            # "cycle": self.filter_cycles,
+            # "module": self.filter_modules,
+            # "issue_view": self.filter_views,
+            # "page": self.filter_pages,
+        }
+
+        results = {}
+
+        for model in MODELS_MAPPER.keys():
+            func = MODELS_MAPPER.get(model, None)
+            results[model] = func(query, slug, project_id, workspace_search, created_by_username=created_by_username, vendor_code=vendor_code, source=source)
+        return Response({"results": results}, status=status.HTTP_200_OK)
diff --git a/apiserver/plane/api/views/state.py b/apiserver/plane/api/views/state.py
index dd239754cb8..c39e6f34ebb 100644
--- a/apiserver/plane/api/views/state.py
+++ b/apiserver/plane/api/views/state.py
@@ -21,6 +21,7 @@ class StateAPIEndpoint(BaseAPIView):
     ]
 
     def get_queryset(self):
+        print(self.kwargs.get("project_id"))
         return (
             State.objects.filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
diff --git a/apiserver/plane/api/views/webhook.py b/apiserver/plane/api/views/webhook.py
new file mode 100644
index 00000000000..0e281a03a33
--- /dev/null
+++ b/apiserver/plane/api/views/webhook.py
@@ -0,0 +1,129 @@
+# Django imports
+from django.db import IntegrityError
+
+# Third party imports
+from rest_framework import status
+from rest_framework.response import Response
+
+# Module imports
+from plane.db.models import Webhook, WebhookLog, Workspace
+from plane.db.models.webhook import generate_token
+from .base import BaseAPIView
+from plane.app.permissions import allow_permission, ROLE
+from plane.app.serializers import WebhookSerializer, WebhookLogSerializer
+
+
+class WebhookEndpoint(BaseAPIView):
+
+    def post(self, request, slug):
+        workspace = Workspace.objects.get(slug=slug)
+        try:
+            serializer = WebhookSerializer(
+                data=request.data, context={"request": request}
+            )
+            if serializer.is_valid():
+                serializer.save(workspace_id=workspace.id)
+                return Response(
+                    serializer.data, status=status.HTTP_201_CREATED
+                )
+            return Response(
+                serializer.errors, status=status.HTTP_400_BAD_REQUEST
+            )
+        except IntegrityError as e:
+            if "already exists" in str(e):
+                return Response(
+                    {"error": "URL already exists for the workspace"},
+                    status=status.HTTP_410_GONE,
+                )
+            raise IntegrityError
+
+    def get(self, request, slug, pk=None):
+        if pk is None:
+            webhooks = Webhook.objects.filter(workspace__slug=slug)
+            serializer = WebhookSerializer(
+                webhooks,
+                fields=(
+                    "id",
+                    "url",
+                    "is_active",
+                    "created_at",
+                    "updated_at",
+                    "project",
+                    "issue",
+                    "cycle",
+                    "module",
+                    "issue_comment",
+                ),
+                many=True,
+            )
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        else:
+            webhook = Webhook.objects.get(workspace__slug=slug, pk=pk)
+            serializer = WebhookSerializer(
+                webhook,
+                fields=(
+                    "id",
+                    "url",
+                    "is_active",
+                    "created_at",
+                    "updated_at",
+                    "project",
+                    "issue",
+                    "cycle",
+                    "module",
+                    "issue_comment",
+                ),
+            )
+            return Response(serializer.data, status=status.HTTP_200_OK)
+
+    def patch(self, request, slug, pk):
+        webhook = Webhook.objects.get(workspace__slug=slug, pk=pk)
+        serializer = WebhookSerializer(
+            webhook,
+            data=request.data,
+            context={request: request},
+            partial=True,
+            fields=(
+                "id",
+                "url",
+                "is_active",
+                "created_at",
+                "updated_at",
+                "project",
+                "issue",
+                "cycle",
+                "module",
+                "issue_comment",
+            ),
+        )
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def delete(self, request, slug, pk):
+        webhook = Webhook.objects.get(pk=pk, workspace__slug=slug)
+        webhook.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+
+class WebhookSecretRegenerateEndpoint(BaseAPIView):
+
+    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
+    def post(self, request, slug, pk):
+        webhook = Webhook.objects.get(workspace__slug=slug, pk=pk)
+        webhook.secret_key = generate_token()
+        webhook.save()
+        serializer = WebhookSerializer(webhook)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+
+class WebhookLogsEndpoint(BaseAPIView):
+
+    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
+    def get(self, request, slug, webhook_id):
+        webhook_logs = WebhookLog.objects.filter(
+            workspace__slug=slug, webhook_id=webhook_id
+        )
+        serializer = WebhookLogSerializer(webhook_logs, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
diff --git a/apiserver/plane/app/permissions/__init__.py b/apiserver/plane/app/permissions/__init__.py
index e453881441b..82fdf5f5744 100644
--- a/apiserver/plane/app/permissions/__init__.py
+++ b/apiserver/plane/app/permissions/__init__.py
@@ -11,5 +11,6 @@
     ProjectEntityPermission,
     ProjectMemberPermission,
     ProjectLitePermission,
+    ProjectEntityGuestPermission
 )
 from .base import allow_permission, ROLE
\ No newline at end of file
diff --git a/apiserver/plane/app/permissions/project.py b/apiserver/plane/app/permissions/project.py
index 11eab008b6a..8856a7b534c 100644
--- a/apiserver/plane/app/permissions/project.py
+++ b/apiserver/plane/app/permissions/project.py
@@ -15,6 +15,8 @@ def has_permission(self, request, view):
         if request.user.is_anonymous:
             return False
 
+        if request.user.is_superuser:
+            return True
         ## Safe Methods -> Handle the filtering logic in queryset
         if request.method in SAFE_METHODS:
             return WorkspaceMember.objects.filter(
@@ -28,7 +30,7 @@ def has_permission(self, request, view):
             return WorkspaceMember.objects.filter(
                 workspace__slug=view.workspace_slug,
                 member=request.user,
-                role__in=[Admin, Member],
+                role__in=[Admin, Member, Guest],
                 is_active=True,
             ).exists()
 
@@ -44,10 +46,14 @@ def has_permission(self, request, view):
 
 class ProjectMemberPermission(BasePermission):
     def has_permission(self, request, view):
+        print("Project ID:: %s" %  view.project_id)
         if request.user.is_anonymous:
             return False
 
+        if request.user.is_superuser:
+            return True
         ## Safe Methods -> Handle the filtering logic in queryset
+        
         if request.method in SAFE_METHODS:
             return ProjectMember.objects.filter(
                 workspace__slug=view.workspace_slug,
@@ -59,15 +65,16 @@ def has_permission(self, request, view):
             return WorkspaceMember.objects.filter(
                 workspace__slug=view.workspace_slug,
                 member=request.user,
-                role__in=[Admin, Member],
+                role__in=[Admin, Member, Guest],
                 is_active=True,
             ).exists()
 
         ## Only Project Admins can update project attributes
+        
         return ProjectMember.objects.filter(
             workspace__slug=view.workspace_slug,
             member=request.user,
-            role__in=[Admin, Member],
+            role__in=[Admin, Member, Guest],
             project_id=view.project_id,
             is_active=True,
         ).exists()
@@ -78,6 +85,8 @@ def has_permission(self, request, view):
         if request.user.is_anonymous:
             return False
 
+        if request.user.is_superuser:
+            return True
         # Handle requests based on project__identifier
         if hasattr(view, "project__identifier") and view.project__identifier:
             if request.method in SAFE_METHODS:
@@ -101,7 +110,43 @@ def has_permission(self, request, view):
         return ProjectMember.objects.filter(
             workspace__slug=view.workspace_slug,
             member=request.user,
-            role__in=[Admin, Member],
+            role__in=[Admin, Member, Guest],
+            project_id=view.project_id,
+            is_active=True,
+        ).exists()
+
+
+class ProjectEntityGuestPermission(BasePermission):
+    def has_permission(self, request, view):
+        if request.user.is_anonymous:
+            return False
+
+        if request.user.is_superuser:
+            return True
+        # Handle requests based on project__identifier
+        if hasattr(view, "project__identifier") and view.project__identifier:
+            if request.method in SAFE_METHODS:
+                return ProjectMember.objects.filter(
+                    workspace__slug=view.workspace_slug,
+                    member=request.user,
+                    project__identifier=view.project__identifier,
+                    is_active=True,
+                ).exists()
+
+        ## Safe Methods -> Handle the filtering logic in queryset
+        if request.method in SAFE_METHODS:
+            return ProjectMember.objects.filter(
+                workspace__slug=view.workspace_slug,
+                member=request.user,
+                project_id=view.project_id,
+                is_active=True,
+            ).exists()
+
+        ## Only project members or admins can create and edit the project attributes
+        return ProjectMember.objects.filter(
+            workspace__slug=view.workspace_slug,
+            member=request.user,
+            role__in=[Admin, Member, Guest],
             project_id=view.project_id,
             is_active=True,
         ).exists()
@@ -111,6 +156,9 @@ class ProjectLitePermission(BasePermission):
     def has_permission(self, request, view):
         if request.user.is_anonymous:
             return False
+        
+        if request.user.is_superuser:
+            return True
 
         return ProjectMember.objects.filter(
             workspace__slug=view.workspace_slug,
diff --git a/apiserver/plane/app/serializers/__init__.py b/apiserver/plane/app/serializers/__init__.py
index b3c3d794994..ec433ffca6d 100644
--- a/apiserver/plane/app/serializers/__init__.py
+++ b/apiserver/plane/app/serializers/__init__.py
@@ -71,6 +71,7 @@
     IssueReactionLiteSerializer,
     IssueAttachmentLiteSerializer,
     IssueLinkLiteSerializer,
+    IssueCustomPropertySerializer,
 )
 
 from .module import (
diff --git a/apiserver/plane/app/serializers/issue.py b/apiserver/plane/app/serializers/issue.py
index 2323c248a86..d5b21c1c0c4 100644
--- a/apiserver/plane/app/serializers/issue.py
+++ b/apiserver/plane/app/serializers/issue.py
@@ -32,6 +32,7 @@
     CommentReaction,
     IssueVote,
     IssueRelation,
+    IssueCustomProperty,
     State,
 )
 
@@ -663,6 +664,18 @@ class Meta:
         ]
         read_only_fields = fields
 
+class IssueCustomPropertySerializer(BaseSerializer):
+    class Meta:
+        model = IssueCustomProperty
+        fields = ["key", "value", "data_type", "int_value", "bool_value", "date_value", "issue_type_custom_property", "id"]
+        read_only_fields = [
+            "id",
+            "issue",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
+        ]
 
 class IssueSerializer(DynamicBaseSerializer):
     # ids
@@ -681,7 +694,6 @@ class IssueSerializer(DynamicBaseSerializer):
         child=serializers.UUIDField(),
         required=False,
     )
-
     # Count items
     sub_issues_count = serializers.IntegerField(read_only=True)
     attachment_count = serializers.IntegerField(read_only=True)
@@ -696,6 +708,18 @@ class Meta:
             "sort_order",
             "completed_at",
             "estimate_point",
+            "trip_reference_number",
+            "reference_number",
+            "hub_code",
+            "hub_name",
+            "customer_code",
+            "customer_name",
+            "vendor_name",
+            "vendor_code",
+            "worker_code",
+            "worker_name",
+            "business_type",
+            "source",
             "priority",
             "start_date",
             "target_date",
@@ -715,6 +739,7 @@ class Meta:
             "link_count",
             "is_draft",
             "archived_at",
+            "type_id",
         ]
         read_only_fields = fields
 
@@ -733,11 +758,13 @@ class Meta:
 class IssueDetailSerializer(IssueSerializer):
     description_html = serializers.CharField()
     is_subscribed = serializers.BooleanField(read_only=True)
+    custom_properties = IssueCustomPropertySerializer(many=True, required=False)
 
     class Meta(IssueSerializer.Meta):
         fields = IssueSerializer.Meta.fields + [
             "description_html",
             "is_subscribed",
+            "custom_properties"
         ]
         read_only_fields = fields
 
diff --git a/apiserver/plane/app/urls/__init__.py b/apiserver/plane/app/urls/__init__.py
index cb5f0253adc..4f8770a11ff 100644
--- a/apiserver/plane/app/urls/__init__.py
+++ b/apiserver/plane/app/urls/__init__.py
@@ -2,6 +2,7 @@
 from .api import urlpatterns as api_urls
 from .asset import urlpatterns as asset_urls
 from .cycle import urlpatterns as cycle_urls
+from .custom_property_dropdown import urlpatterns as custom_property_dropdown_urls
 from .dashboard import urlpatterns as dashboard_urls
 from .estimate import urlpatterns as estimate_urls
 from .external import urlpatterns as external_urls
@@ -22,6 +23,7 @@
     *analytic_urls,
     *asset_urls,
     *cycle_urls,
+    *custom_property_dropdown_urls,
     *dashboard_urls,
     *estimate_urls,
     *external_urls,
diff --git a/apiserver/plane/app/urls/custom_property_dropdown.py b/apiserver/plane/app/urls/custom_property_dropdown.py
new file mode 100644
index 00000000000..ef5611fa5e8
--- /dev/null
+++ b/apiserver/plane/app/urls/custom_property_dropdown.py
@@ -0,0 +1,12 @@
+from django.urls import path
+from plane.app.views import (
+    IssueCustomPropertyDropdownOptionsAPIView,
+)
+
+urlpatterns = [
+    path(
+        'workspaces/<str:slug>/issues/<uuid:issue_id>/custom-properties/<uuid:issue_type_custom_property_id>/dropdown-options/',
+        IssueCustomPropertyDropdownOptionsAPIView.as_view(),
+        name="custom-property-dropdown-options",
+    ),
+]
diff --git a/apiserver/plane/app/urls/issue.py b/apiserver/plane/app/urls/issue.py
index e8ad4408dfb..6882e0a1cb3 100644
--- a/apiserver/plane/app/urls/issue.py
+++ b/apiserver/plane/app/urls/issue.py
@@ -24,6 +24,9 @@
     IssueDetailEndpoint,
     IssueAttachmentV2Endpoint,
     IssueBulkUpdateDateEndpoint,
+    SearchAPIEndpoint,
+    SearchSingleValueAPI,
+    IssueCustomPropertyUpdateAPIView,
 )
 
 urlpatterns = [
@@ -320,4 +323,25 @@
         IssueBulkUpdateDateEndpoint.as_view(),
         name="project-issue-dates",
     ),
+    path(
+        "workspaces/<str:slug>/search",
+        SearchAPIEndpoint.as_view(),
+        name="key-codes",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<str:project_id>/filed_search",
+        SearchSingleValueAPI.as_view(),
+        name="key-codes"
+    ),
+    path(
+        'workspaces/<str:slug>/issues/<uuid:issue_id>/custom-properties/<uuid:pk>/',
+        IssueCustomPropertyUpdateAPIView.as_view(),
+        name="update-issue-custom-property",
+    ),
+    path(
+        'workspaces/<str:slug>/issues/<uuid:issue_id>/custom-properties/',
+        IssueCustomPropertyUpdateAPIView.as_view(),
+        name="create-issue-custom-property",
+    ),
+   
 ]
diff --git a/apiserver/plane/app/urls/views.py b/apiserver/plane/app/urls/views.py
index a2f8e2ac88b..985da5d3dd0 100644
--- a/apiserver/plane/app/urls/views.py
+++ b/apiserver/plane/app/urls/views.py
@@ -63,6 +63,15 @@
         ),
         name="global-view-issues",
     ),
+    path(
+        "workspaces/<str:slug>/custom-properties/",
+        WorkspaceViewIssuesViewSet.as_view(
+            {
+                "get": "listCustomProperty",
+            }
+        ),
+        name="global-view-issues",
+    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/user-favorite-views/",
         IssueViewFavoriteViewSet.as_view(
diff --git a/apiserver/plane/app/views/__init__.py b/apiserver/plane/app/views/__init__.py
index 1f94cb7ac9a..84b57b697b5 100644
--- a/apiserver/plane/app/views/__init__.py
+++ b/apiserver/plane/app/views/__init__.py
@@ -132,6 +132,8 @@
     IssuePaginatedViewSet,
     IssueDetailEndpoint,
     IssueBulkUpdateDateEndpoint,
+    SearchAPIEndpoint,
+    SearchSingleValueAPI
 )
 
 from .issue.activity import (
@@ -176,6 +178,11 @@
     IssueSubscriberViewSet,
 )
 
+from .issue.custom_property import (
+    IssueCustomPropertyUpdateAPIView,
+    IssueCustomPropertyDropdownOptionsAPIView,
+)
+
 from .module.base import (
     ModuleViewSet,
     ModuleLinkViewSet,
diff --git a/apiserver/plane/app/views/base.py b/apiserver/plane/app/views/base.py
index 45488b64e9a..10f5c205135 100644
--- a/apiserver/plane/app/views/base.py
+++ b/apiserver/plane/app/views/base.py
@@ -120,7 +120,8 @@ def dispatch(self, request, *args, **kwargs):
 
             if settings.DEBUG:
                 from django.db import connection
-
+                if len(connection.queries) > 20:
+                    print(connection.queries)
                 print(
                     f"{request.method} - {request.get_full_path()} of Queries: {len(connection.queries)}"
                 )
diff --git a/apiserver/plane/app/views/issue/base.py b/apiserver/plane/app/views/issue/base.py
index d82ae432e9e..61166b3eb9d 100644
--- a/apiserver/plane/app/views/issue/base.py
+++ b/apiserver/plane/app/views/issue/base.py
@@ -5,6 +5,7 @@
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.postgres.fields import ArrayField
 from django.core.serializers.json import DjangoJSONEncoder
+from rest_framework.pagination import PageNumberPagination
 from django.db.models import (
     Exists,
     F,
@@ -17,6 +18,7 @@
     Subquery,
     Case,
     When,
+    JSONField
 )
 from django.db.models.functions import Coalesce
 from django.utils import timezone
@@ -34,6 +36,7 @@
     IssueDetailSerializer,
     IssueUserPropertySerializer,
     IssueSerializer,
+    BaseSerializer,
 )
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.db.models import (
@@ -46,14 +49,16 @@
     Project,
     ProjectMember,
     CycleIssue,
+    IssueCustomProperty,
 )
 from plane.utils.grouper import (
     issue_group_values,
     issue_on_results,
     issue_queryset_grouper,
 )
-from plane.utils.issue_filters import issue_filters
+from plane.utils.issue_filters import issue_filters, build_custom_property_q_objects
 from plane.utils.order_queryset import order_issue_queryset
+from plane.utils.constants import ALLOWED_CUSTOM_PROPERTY_WORKSPACE_MAP
 from plane.utils.paginator import (
     GroupedOffsetPaginator,
     SubGroupedOffsetPaginator,
@@ -64,6 +69,24 @@
 from plane.utils.global_paginator import paginate
 from plane.bgtasks.webhook_task import model_activity
 
+from plane.app.permissions import (
+    ProjectEntityPermission,
+    ProjectLitePermission,
+    ProjectMemberPermission,
+)
+
+class IssueCustomPropertySerializer(BaseSerializer):
+    class Meta:
+        model = IssueCustomProperty
+        fields = ["key", "value", "issue_type_custom_property"]
+        read_only_fields = [
+            "id",
+            "issue",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
+        ]
 
 class IssueListEndpoint(BaseAPIView):
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
@@ -123,6 +146,7 @@ def get(self, request, slug, project_id):
 
         order_by_param = request.GET.get("order_by", "-created_at")
         issue_queryset = queryset.filter(**filters)
+
         # Issue queryset
         issue_queryset, _ = order_issue_queryset(
             issue_queryset=issue_queryset,
@@ -209,7 +233,9 @@ def get_serializer_class(self):
         "workspace__id",
     ]
 
-    def get_queryset(self):
+    def get_queryset(self, filters={}):
+        custom_properties = filters.get("custom_properties", {})
+        custom_filters = build_custom_property_q_objects(custom_properties)
         return (
             Issue.issue_objects.filter(
                 project_id=self.kwargs.get("project_id")
@@ -247,6 +273,25 @@ def get_queryset(self):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
+            .annotate(
+                custom_propertiess=Coalesce(
+                    ArrayAgg(
+                        Func(
+                            F('custom_properties__key'),
+                            F('custom_properties__value'),
+                            function="jsonb_build_object",
+                            template="%(function)s(%(expressions)s)",
+                            output_field=JSONField()  # Specify output field type
+                        ),
+                        distinct=True,
+                        filter=Q(custom_properties__key__isnull=False)
+                    ),
+                    Value([], output_field=ArrayField(JSONField()))
+                )
+            )
+            .filter(
+                *custom_filters
+            )
         ).distinct()
 
     @method_decorator(gzip_page)
@@ -260,9 +305,11 @@ def list(self, request, slug, project_id):
 
         project = Project.objects.get(pk=project_id, workspace__slug=slug)
         filters = issue_filters(request.query_params, "GET")
+        filtersWithoutCustomProperties = filters.copy()
+        filtersWithoutCustomProperties.pop('custom_properties', None)
         order_by_param = request.GET.get("order_by", "-created_at")
 
-        issue_queryset = self.get_queryset().filter(**filters, **extra_filters)
+        issue_queryset = self.get_queryset(filters).filter(**filtersWithoutCustomProperties, **extra_filters)
         # Custom ordering for priority and state
 
         # Issue queryset
@@ -397,6 +444,7 @@ def create(self, request, slug, project_id):
 
         if serializer.is_valid():
             serializer.save()
+            print(serializer.data)
 
             # Track the issue
             issue_activity.delay(
@@ -427,6 +475,17 @@ def create(self, request, slug, project_id):
                     "sort_order",
                     "completed_at",
                     "estimate_point",
+                    "hub_code",
+                    "customer_code",
+                    "reference_number",
+                    "trip_reference_number",
+                    "vendor_code",
+                    "worker_code",
+                    "hub_name",
+                    "customer_name",
+                    "vendor_name",
+                    "worker_name",
+                    "business_type",
                     "priority",
                     "start_date",
                     "target_date",
@@ -451,6 +510,7 @@ def create(self, request, slug, project_id):
                 .first()
             )
             datetime_fields = ["created_at", "updated_at"]
+            print(issue)
             issue = user_timezone_converter(
                 issue, datetime_fields, request.user.user_timezone
             )
@@ -615,8 +675,9 @@ def retrieve(self, request, slug, project_id, pk=None):
             user_id=request.user.id,
             project_id=project_id,
         )
-
+        
         serializer = IssueDetailSerializer(issue, expand=self.expand)
+        print(serializer.data)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     @allow_permission(
@@ -1167,3 +1228,87 @@ def post(self, request, slug, project_id):
             {"message": "Issues updated successfully"},
             status=status.HTTP_200_OK,
         )
+
+class SearchAPIEndpoint(BaseAPIView):
+    model = Issue
+    webhook_event = "issue"
+    def get(self, request, slug):
+        
+        allowed_fields = ["hub_code", "hub_name", "worker_code", "worker_name", "reference_number", "trip_reference_number", "customer_code", "customer_name", "vendor_code", "vendor_name", "business_type"]
+
+        field = request.GET.get("field")  # Get the single field value
+        query = request.GET.get("query")
+
+        if not field:  # Ensure that 'field' is provided in the request
+            return Response(
+                {"error": "Missing 'field' parameter. Allowed values: " + ", ".join(allowed_fields)},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        if field not in allowed_fields:  # Validate the field
+            return Response(
+                {"error": f"Invalid field. Allowed values: {', '.join(allowed_fields)}"},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # Fetch values dynamically based on the requested field
+        filter_criteria = {f"{field}__icontains": query} if query else {}
+
+        values = Issue.objects.filter(
+            Q(workspace__slug=slug) & Q(**filter_criteria)
+
+        ).values_list(field, flat=True)
+
+        unique_values = list(set(filter(None, values)))  # Remove duplicates and nulls
+
+        paginator = PageNumberPagination()
+        paginator.page_size = int(request.GET.get("limit", 10))  # Default limit = 10
+        paginated_values = paginator.paginate_queryset(unique_values, request)
+
+        # Custom pagination response
+        response_data = {
+            "total_results": len(unique_values),
+            "page": paginator.page.number,
+            "limit": paginator.page.paginator.per_page,
+            "total_pages": paginator.page.paginator.num_pages,
+            "data": paginated_values
+        }
+
+        return Response(response_data, status=status.HTTP_200_OK)
+
+class SearchSingleValueAPI(BaseAPIView):
+    model = Issue
+    allowed_fields = ["hub_code", "trip_reference_number", "reference_number", "worker_code", "vendor_code", "customer_code", "business_type"]
+
+    def get(self, request, slug, project_id):
+        # Extract query parameters (only one should be provided)
+        query_params = {field: request.GET.get(field) for field in self.allowed_fields if request.GET.get(field)}
+
+        if len(query_params) != 1:
+            return Response(
+                {"error": f"Provide exactly one search parameter from: {', '.join(self.allowed_fields)}"},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # Extract the field and search value
+        search_field, search_value = next(iter(query_params.items()))
+
+        # Query for exact matches first
+        exact_matches = Issue.objects.filter(
+            workspace__slug=slug,
+            project_id=project_id,
+            **{search_field: search_value}  # Exact match
+        ).values_list(search_field, flat=True)
+
+        # Query for partial matches using `icontains`
+        startwith_matches = Issue.objects.filter(
+            workspace__slug=slug,
+            project_id=project_id,
+            **{f"{search_field}__istartswith": search_value}  # starts with  match
+        ).exclude(**{search_field: search_value})  # Exclude exact match
+        startwith_matches = startwith_matches.values_list(search_field, flat=True)
+
+        # Combine results: exact matches first, then partial matches
+        unique_values = list(set(exact_matches)) + list(set(startwith_matches))
+
+        return Response({"data": unique_values}, status=status.HTTP_200_OK)
diff --git a/apiserver/plane/app/views/issue/custom_property.py b/apiserver/plane/app/views/issue/custom_property.py
new file mode 100644
index 00000000000..2795f333195
--- /dev/null
+++ b/apiserver/plane/app/views/issue/custom_property.py
@@ -0,0 +1,284 @@
+# Python imports
+import json
+from django.core.serializers.json import DjangoJSONEncoder
+
+# Django imports
+from django.utils import timezone
+from django.shortcuts import get_object_or_404
+
+# Third party imports
+import requests
+from rest_framework import status
+from rest_framework.response import Response
+
+# Module imports
+from plane.api.serializers import (
+    IssueCustomPropertySerializer
+)
+from plane.app.serializers import IssueSerializer
+from plane.bgtasks.issue_activities_task import issue_activity
+from plane.db.models import (
+    Issue,
+    Project,
+    IssueCustomProperty,
+    IssueTypeCustomProperty,
+    Workspace,
+    User
+)
+from plane.utils.issue_filters import issue_filters
+from .base import BaseAPIView
+from django.conf import settings
+from datetime import datetime
+
+class IssueCustomPropertyUpdateAPIView(BaseAPIView):
+    """
+    This view handles the update of custom property values for issues.
+    """
+
+    model = IssueCustomProperty
+    serializer_class = IssueCustomPropertySerializer
+    
+    def _process_property_value(self, custom_property, value):
+        """
+        Process and set the appropriate typed value based on data_type.
+        Returns tuple of (custom_property, error_response) where error_response is None if successful.
+        """
+        if value is None:
+            value = ""
+        
+        data_type = custom_property.data_type or "text"
+        custom_property.value = value
+        
+        match data_type:
+            case "number":
+                try:
+                    int_value = int(value)
+                    custom_property.int_value = int_value
+                except (ValueError, TypeError):
+                    custom_property.int_value = None
+            case "boolean":
+                if value is None:
+                    bool_value = None
+                elif isinstance(value, bool):
+                    bool_value = value
+                else:
+                    value_str = str(value).strip().lower()
+                    bool_value = value_str in ["true", "1", "yes"]
+                custom_property.bool_value = bool_value
+            case "date":
+                try:
+                    # Try to parse date in standard ISO format
+                    date_value = datetime.strptime(value, "%Y-%m-%d").date()
+                    custom_property.date_value = date_value
+                except (ValueError, TypeError):
+                    return custom_property, Response(
+                        {"error": f"Invalid date format. Date must be in YYYY-MM-DD format (e.g., 2025-04-24)."},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+            case _:  # Default case for text type
+                # For text type, we just use the value field directly
+                pass
+        
+        return custom_property, None
+    
+    def patch(self, request, slug, issue_id, pk):
+        """
+        Partially update a custom property value for a specific issue.
+        """
+        custom_property = get_object_or_404(IssueCustomProperty, pk=pk, issue_id=issue_id)
+        new_value = request.data.get('value')
+        
+        # Process the property value using the helper method
+        custom_property, error_response = self._process_property_value(custom_property, new_value)
+        if error_response:
+            return error_response
+            
+        serializer = self.serializer_class(custom_property)
+        requested_data = json.dumps(request.data, cls=DjangoJSONEncoder)
+        current_instance = json.dumps(serializer.data, cls=DjangoJSONEncoder)
+        actor_id = str(request.user.id) if request.user else "Unknown"
+        issue_id_str = str(issue_id) if issue_id else "Unknown issue ID"
+        slug = slug=self.kwargs.get("slug")
+        workspace = Workspace.objects.get(slug=slug)
+        try:
+            project = Project.objects.get(workspace=workspace)
+            project_id_str = project.id
+        except Project.DoesNotExist:
+            return Response({"error": "Project not found."}, status=status.HTTP_404_NOT_FOUND)
+        epoch_timestamp = int(timezone.now().timestamp())
+
+        custom_property.save()
+
+        issue_activity.delay(
+            type="custom_property.activity.updated",
+            requested_data=requested_data,
+            actor_id=actor_id,
+            issue_id=issue_id_str,
+            project_id=project_id_str,
+            current_instance=current_instance,
+            epoch=epoch_timestamp,
+        )
+        return Response(serializer.data, status=status.HTTP_200_OK)
+        
+    def get(self, request, slug, issue_id, pk=None):
+        """
+        Retrieve the custom property details for a given issue.
+        """
+        if pk:
+            custom_property = get_object_or_404(IssueCustomProperty, pk=pk, issue_id=issue_id)
+            serializer = self.serializer_class(custom_property)
+            return Response(serializer.data, status=status.HTTP_200_OK)
+
+        custom_properties = IssueCustomProperty.objects.filter(issue_id=issue_id)
+        serializer = self.serializer_class(custom_properties, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    def post(self, request, slug, issue_id):
+        """
+        Create a new custom property for a specific issue.
+        """
+        key = request.data.get('key')
+        value = request.data.get('value')
+        data_type = request.data.get('data_type')
+        issue_type_custom_property_id = request.data.get('issue_type_custom_property')
+        if not key or not value or not issue_type_custom_property_id:
+            return Response(
+                {"error": "'key', 'value', and 'issue_type_custom_property' fields are required."},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        try:
+            issue_type_custom_property = IssueTypeCustomProperty.objects.get(id=issue_type_custom_property_id)
+        except IssueTypeCustomProperty.DoesNotExist:
+            return Response(
+                {"error": f"The provided issue_type_custom_property (ID: {issue_type_custom_property_id}) does not exist."},
+                status=status.HTTP_404_NOT_FOUND
+            )
+        try:
+            issue = Issue.objects.get(id=issue_id)
+        except Issue.DoesNotExist:
+            return Response(
+                {"error": "The provided issue does not exist."},
+                status=status.HTTP_404_NOT_FOUND
+            )
+        if not issue.project:
+            return Response(
+                {"error": "The issue must be associated with a project."},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        
+        # Create a temporary custom property object to use with our helper method
+        temp_property = IssueCustomProperty(data_type=data_type)
+        temp_property, error_response = self._process_property_value(temp_property, value)
+        if error_response:
+            return error_response
+            
+        # Extract the typed values from the processed object
+        int_value = temp_property.int_value
+        bool_value = temp_property.bool_value
+        date_value = temp_property.date_value
+        
+        custom_property = IssueCustomProperty.objects.create(
+            issue=issue,
+            key=key,
+            value=value,
+            data_type=data_type,
+            int_value=int_value,
+            bool_value=bool_value,
+            date_value=date_value,
+            issue_type_custom_property=issue_type_custom_property,
+            project=issue.project,
+        )
+        serializer = self.serializer_class(custom_property)
+        requested_data = json.dumps(request.data, cls=DjangoJSONEncoder)
+        current_instance = json.dumps(serializer.data, cls=DjangoJSONEncoder)
+        actor_id = str(request.user.id) if request.user else "Unknown"
+        issue_id_str = str(issue_id) if issue_id else "Unknown issue ID"
+        project_id_str = str(issue.project.id)
+        epoch_timestamp = int(timezone.now().timestamp())
+        issue_activity.delay(
+            type="custom_property.activity.created",
+            requested_data=requested_data,
+            actor_id=actor_id,
+            issue_id=issue_id_str,
+            project_id=project_id_str,
+            current_instance=current_instance,
+            epoch=epoch_timestamp,
+        )
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
+
+
+class IssueCustomPropertyDropdownOptionsAPIView(BaseAPIView):
+    """
+    This view handles fetching dropdown options for custom properties from the WB API.
+    """
+    
+    def get(self, request, slug, issue_id, issue_type_custom_property_id):
+        """
+        Fetch dropdown options from WB API for a custom property.
+        """
+        try:
+            # Get the issue and issue type custom property
+            issue = get_object_or_404(Issue, id=issue_id)
+          
+            # Get created_by_id from the issue and query the users table
+            # Django ForeignKey fields automatically have a _id attribute
+            created_by_id = issue.created_by_id
+            user = None
+            if created_by_id:
+                try:
+                    user = User.objects.get(id=created_by_id)
+                except User.DoesNotExist:
+                    user = None
+            
+            # Get issue_type_id from the issue
+            issue_type_id = issue.type_id
+            
+            if not issue_type_id:
+                return Response(
+                    {"error": "Issue type ID is required."},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
+            issue_data = IssueSerializer(issue).data
+            # Convert to JSON-serializable structure (UUIDs, dates, etc.)
+            issue_data_safe = json.loads(json.dumps(issue_data, cls=DjangoJSONEncoder))
+            
+            # Prepare user data if user exists - only return display_name
+            user_data = None
+            if user:
+                user_data = {
+                    "display_name": user.display_name or "",
+                }
+            
+            # Prepare payload for WB API
+            wb_api_payload = {
+                "issue_type_id": str(issue_type_id),
+                "issue_type_custom_property_id": str(issue_type_custom_property_id),
+                 # Retain existing camelCase key for backward compatibility
+                "issueId": str(issue_id),
+                # Include the complete issue data (snake_case keys)
+                **issue_data_safe,
+                # Include user data (created_by user)
+                "created_by_user": user_data,
+            }
+            
+            # WB API endpoint URL configured in settings
+            WB_API_URL = settings.WB_API_URL
+            
+            # Make request to WB API using POST
+            wb_response = requests.post(
+                WB_API_URL,
+                json=wb_api_payload,
+                timeout=30,
+            )
+            wb_response.raise_for_status()
+            
+            # Return the response from WB API
+            return Response(
+                wb_response.json(),
+                status=status.HTTP_200_OK
+            )
+        except Exception as e:
+            return Response(
+                {"error": f"An error occurred while fetching dropdown options: {str(e)}"},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
diff --git a/apiserver/plane/app/views/notification/base.py b/apiserver/plane/app/views/notification/base.py
index b8e34339ce5..fea620ad0aa 100644
--- a/apiserver/plane/app/views/notification/base.py
+++ b/apiserver/plane/app/views/notification/base.py
@@ -250,7 +250,7 @@ class UnreadNotificationEndpoint(BaseAPIView):
     )
     def get(self, request, slug):
         # Watching Issues Count
-        unread_notifications_count = (
+        unread_notifications_count = len(
             Notification.objects.filter(
                 workspace__slug=slug,
                 receiver_id=request.user.id,
@@ -258,18 +258,19 @@ def get(self, request, slug):
                 archived_at__isnull=True,
                 snoozed_till__isnull=True,
             )
-            .exclude(sender__icontains="mentioned")
-            .count()
+            .exclude(sender__icontains="mentioned")[:100]
         )
 
-        mention_notifications_count = Notification.objects.filter(
-            workspace__slug=slug,
-            receiver_id=request.user.id,
-            read_at__isnull=True,
-            archived_at__isnull=True,
-            snoozed_till__isnull=True,
-            sender__icontains="mentioned",
-        ).count()
+        mention_notifications_count = len(
+            Notification.objects.filter(
+                workspace__slug=slug,
+                receiver_id=request.user.id,
+                read_at__isnull=True,
+                archived_at__isnull=True,
+                snoozed_till__isnull=True,
+                sender__icontains="mentioned",
+            )[:100]
+        )
 
         return Response(
             {
diff --git a/apiserver/plane/app/views/view/base.py b/apiserver/plane/app/views/view/base.py
index e999dc32926..60a76d4d459 100644
--- a/apiserver/plane/app/views/view/base.py
+++ b/apiserver/plane/app/views/view/base.py
@@ -1,6 +1,8 @@
 # Django imports
 from django.contrib.postgres.aggregates import ArrayAgg
+from django.db.models import Count
 from django.contrib.postgres.fields import ArrayField
+from rest_framework.pagination import PageNumberPagination
 from django.db.models import (
     Exists,
     F,
@@ -10,6 +12,7 @@
     UUIDField,
     Value,
     Subquery,
+    JSONField
 )
 from django.db.models.functions import Coalesce
 from django.utils.decorators import method_decorator
@@ -27,6 +30,7 @@
 )
 from plane.app.serializers import (
     IssueViewSerializer,
+    BaseSerializer,
 )
 from plane.db.models import (
     Issue,
@@ -38,13 +42,15 @@
     ProjectMember,
     Project,
     CycleIssue,
+    IssueCustomProperty
 )
 from plane.utils.grouper import (
     issue_group_values,
     issue_on_results,
     issue_queryset_grouper,
 )
-from plane.utils.issue_filters import issue_filters
+from plane.utils.issue_filters import issue_filters, build_custom_property_q_objects
+from plane.utils.constants import ALLOWED_CUSTOM_PROPERTY_WORKSPACE_MAP
 from plane.utils.order_queryset import order_issue_queryset
 from plane.utils.paginator import (
     GroupedOffsetPaginator,
@@ -56,6 +62,18 @@
     UserFavorite,
 )
 
+class IssueCustomPropertySerializer(BaseSerializer):
+    class Meta:
+        model = IssueCustomProperty
+        fields = ["key", "value", "issue_type_custom_property", "data_type"]
+        read_only_fields = [
+            "id",
+            "issue",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
+        ]
 
 class WorkspaceViewViewSet(BaseViewSet):
     serializer_class = IssueViewSerializer
@@ -190,7 +208,9 @@ def destroy(self, request, slug, pk):
 
 
 class WorkspaceViewIssuesViewSet(BaseViewSet):
-    def get_queryset(self):
+    def get_queryset(self, filters):
+        custom_properties = filters.get("custom_properties", {})
+        custom_filters = build_custom_property_q_objects(custom_properties)
         return (
             Issue.issue_objects.annotate(
                 sub_issues_count=Issue.issue_objects.filter(
@@ -273,6 +293,23 @@ def get_queryset(self):
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
+                custom_propertiess=Coalesce(
+                    ArrayAgg(
+                        Func(
+                            F('custom_properties__key'),
+                            F('custom_properties__value'),
+                            function="jsonb_build_object",
+                            template="%(function)s(%(expressions)s)",
+                            output_field=JSONField()  # Specify output field type
+                        ),
+                        distinct=True,
+                        filter=Q(custom_properties__key__isnull=False)
+                    ),
+                    Value([], output_field=ArrayField(JSONField()))
+                )
+            )
+            .filter(
+                *custom_filters
             )
         )
 
@@ -281,13 +318,91 @@ def get_queryset(self):
         allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
         level="WORKSPACE",
     )
+
+    def listCustomProperty(self, request, slug):
+        customPropertyAllowedKeys = ALLOWED_CUSTOM_PROPERTY_WORKSPACE_MAP.get(slug, [])
+        field = request.GET.get("field", "")
+        query = request.GET.get("query", "")
+
+        custom_properties = IssueCustomProperty.objects.filter(key__in=customPropertyAllowedKeys)
+        if field:
+            custom_properties = custom_properties.filter(key=field)
+        if field and query:
+            custom_properties = custom_properties.filter(key=field, value__icontains=query)
+
+        serializer = IssueCustomPropertySerializer(custom_properties, many=True)
+
+        groupedCustomProperties = {}
+        for item in serializer.data:
+            key = item.get("key")
+            value = item.get("value")
+            data_type = item.get("data_type")
+
+            if not value or key not in customPropertyAllowedKeys:
+                continue
+
+            bucket = groupedCustomProperties.setdefault(
+                key, {"values": set(), "data_type": data_type}
+            )
+            bucket["values"].add(value)
+
+        groupedUniqueCustomProperties = {
+            key: {
+                "values": list(info["values"]),
+                "data_type": info["data_type"],
+            }
+            for key, info in groupedCustomProperties.items()
+        }
+
+        unique_values_list = [
+            {
+                "key": key,
+                "data_type": info["data_type"],
+                "values": info["values"],
+            }
+            for key, info in groupedUniqueCustomProperties.items()
+]
+
+        response_data = {}
+        if (not unique_values_list and field):
+            response_data[field] = {
+                "data": [],
+                "total_results": 0,
+                "limit": 10,
+                "total_pages": 1,
+                "page": 1,
+                "data_type": None
+            }
+        
+        for item in unique_values_list:
+            key = item["key"]
+            values = item["values"]
+            data_type = item["data_type"]
+            
+            paginator = PageNumberPagination()
+            paginator.page_size = int(request.GET.get("limit", 10))
+            paginated_values = paginator.paginate_queryset(values, request) or []
+            
+            response_data[key] = {
+                "total_results": len(values),
+                "page": paginator.page.number if hasattr(paginator, 'page') else 1,
+                "limit": paginator.page.paginator.per_page if hasattr(paginator, 'page') else len(values),
+                "total_pages": paginator.page.paginator.num_pages if hasattr(paginator, 'page') else 1,
+                "data": paginated_values,
+                "data_type": data_type
+            }
+        
+        return Response(response_data, status=status.HTTP_200_OK)
+    
     def list(self, request, slug):
         filters = issue_filters(request.query_params, "GET")
+        filtersWithoutCustomProperties = filters.copy()
+        filtersWithoutCustomProperties.pop('custom_properties', None)
         order_by_param = request.GET.get("order_by", "-created_at")
 
         issue_queryset = (
-            self.get_queryset()
-            .filter(**filters)
+            self.get_queryset(filters)
+            .filter(**filtersWithoutCustomProperties)
             .annotate(
                 cycle_id=Subquery(
                     CycleIssue.objects.filter(
diff --git a/apiserver/plane/app/views/workspace/member.py b/apiserver/plane/app/views/workspace/member.py
index c71df21ac4d..bdf60971810 100644
--- a/apiserver/plane/app/views/workspace/member.py
+++ b/apiserver/plane/app/views/workspace/member.py
@@ -39,10 +39,12 @@
     Workspace,
     WorkspaceMember,
     DraftIssue,
+    IssueTypeCustomProperty,
 )
 from plane.utils.cache import cache_response, invalidate_cache
 
 from .. import BaseViewSet
+from plane.utils.constants import ALLOWED_CUSTOM_PROPERTY_WORKSPACE_MAP
 
 
 class WorkSpaceMemberViewSet(BaseViewSet):
@@ -310,6 +312,22 @@ def get(self, request, slug):
             .first()
         )
         serializer = WorkspaceMemberMeSerializer(workspace_member)
+        response_data = dict(serializer.data)
+
+        # Get distinct custom property names
+        allowed_properties = ALLOWED_CUSTOM_PROPERTY_WORKSPACE_MAP.get(slug, [])
+
+        custom_properties = IssueTypeCustomProperty.objects.filter(
+            issue_type__workspace__slug=slug,
+            is_active=True,
+            name__in=allowed_properties
+        ).values_list('name', flat=True).distinct()
+
+        custom_props_dict = {prop: True for prop in custom_properties}
+        default_props = response_data['default_props']
+        display_properties = default_props['display_properties']
+        display_properties['custom_properties'] = custom_props_dict
+        
         return Response(serializer.data, status=status.HTTP_200_OK)
 
 
diff --git a/apiserver/plane/authentication/adapter/base.py b/apiserver/plane/authentication/adapter/base.py
index 906d5570059..d6eb70f762a 100644
--- a/apiserver/plane/authentication/adapter/base.py
+++ b/apiserver/plane/authentication/adapter/base.py
@@ -149,7 +149,10 @@ def complete_login_or_signup(self):
             self.__check_signup(email)
 
             # Initialize user
-            user = User(email=email, username=uuid.uuid4().hex)
+            username = self.user_data.get("user").get("username")
+            if not username:
+                username = uuid.uuid4().hex
+            user = User(email=email, username=username)
 
             # Check if password is autoset
             if self.user_data.get("user").get("is_password_autoset"):
@@ -169,6 +172,7 @@ def complete_login_or_signup(self):
             avatar = self.user_data.get("user", {}).get("avatar", "")
             first_name = self.user_data.get("user", {}).get("first_name", "")
             last_name = self.user_data.get("user", {}).get("last_name", "")
+            
             user.avatar = avatar if avatar else ""
             user.first_name = first_name if first_name else ""
             user.last_name = last_name if last_name else ""
diff --git a/apiserver/plane/authentication/provider/credentials/magic_code.py b/apiserver/plane/authentication/provider/credentials/magic_code.py
index 418dd2a0625..a62650edaa9 100644
--- a/apiserver/plane/authentication/provider/credentials/magic_code.py
+++ b/apiserver/plane/authentication/provider/credentials/magic_code.py
@@ -44,12 +44,12 @@ def __init__(
             ]
         )
 
-        if not (EMAIL_HOST):
-            raise AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES["SMTP_NOT_CONFIGURED"],
-                error_message="SMTP_NOT_CONFIGURED",
-                payload={"email": str(key)},
-            )
+        # if not (EMAIL_HOST):
+        #     raise AuthenticationException(
+        #         error_code=AUTHENTICATION_ERROR_CODES["SMTP_NOT_CONFIGURED"],
+        #         error_message="SMTP_NOT_CONFIGURED",
+        #         payload={"email": str(key)},
+        #     )
 
         if ENABLE_MAGIC_LINK_LOGIN == "0":
             raise AuthenticationException(
@@ -83,11 +83,10 @@ def initiate(self):
         # Check if the key already exists in python
         if ri.exists(key):
             data = json.loads(ri.get(key))
-
             current_attempt = data["current_attempt"] + 1
-
+            email = str(self.key).replace("magic_", "", 1)
+            username = email.replace("@plane-shipsy.com", "", 1)
             if data["current_attempt"] > 2:
-                email = str(self.key).replace("magic_", "", 1)
                 if User.objects.filter(email=email).exists():
                     raise AuthenticationException(
                         error_code=AUTHENTICATION_ERROR_CODES[
@@ -109,11 +108,19 @@ def initiate(self):
                 "current_attempt": current_attempt,
                 "email": str(self.key),
                 "token": token,
+                "username": username
             }
-            expiry = 600
+            expiry = 30
+            print(key, value)
             ri.set(key, json.dumps(value), ex=expiry)
         else:
-            value = {"current_attempt": 0, "email": self.key, "token": token}
+            username = self.key.replace("@plane-shipsy.com", "", 1)
+            value = {
+                "current_attempt": 0, 
+                "email": self.key, 
+                "token": token,
+                "username": username
+            }
             expiry = 600
 
             ri.set(key, json.dumps(value), ex=expiry)
@@ -121,21 +128,26 @@ def initiate(self):
 
     def set_user_data(self):
         ri = redis_instance()
+        keys = ri.keys('*')
+        print("All keys in redis:", keys)
+        print("Key to be checked:", self.key)
         if ri.exists(self.key):
             data = json.loads(ri.get(self.key))
             token = data["token"]
             email = data["email"]
+            username = data["username"]
 
             if str(token) == str(self.code):
                 super().set_user_data(
                     {
                         "email": email,
                         "user": {
+                            "username": username,
                             "avatar": "",
                             "first_name": "",
                             "last_name": "",
                             "provider_id": "",
-                            "is_password_autoset": True,
+                            "is_password_autoset": False,
                         },
                     }
                 )
diff --git a/apiserver/plane/authentication/utils/redirection_path.py b/apiserver/plane/authentication/utils/redirection_path.py
index 62cc1f0194e..8aa55c7404d 100644
--- a/apiserver/plane/authentication/utils/redirection_path.py
+++ b/apiserver/plane/authentication/utils/redirection_path.py
@@ -6,8 +6,8 @@ def get_redirection_path(user):
     profile, _ = Profile.objects.get_or_create(user=user)
 
     # Redirect to onboarding if the user is not onboarded yet
-    if not profile.is_onboarded:
-        return "onboarding"
+    # if not profile.is_onboarded:
+    #     return "onboarding"
 
     # Redirect to the last workspace if the user has last workspace
     if (
diff --git a/apiserver/plane/authentication/views/app/magic.py b/apiserver/plane/authentication/views/app/magic.py
index 980eb4e7cc4..dee6fb29785 100644
--- a/apiserver/plane/authentication/views/app/magic.py
+++ b/apiserver/plane/authentication/views/app/magic.py
@@ -24,19 +24,24 @@
 from plane.bgtasks.magic_link_code_task import magic_link
 from plane.license.models import Instance
 from plane.authentication.utils.host import base_host
-from plane.db.models import User, Profile
+from plane.db.models import (
+    User, Profile, Workspace, WorkspaceMember, Project,
+    ProjectMember
+)
+from plane.app.serializers import ProjectSerializer
+
 from plane.authentication.adapter.error import (
     AuthenticationException,
     AUTHENTICATION_ERROR_CODES,
 )
 from plane.authentication.rate_limit import AuthenticationThrottle
+from plane.api.views.base import BaseAPIView
+from plane.api.views.project import create_project
 
-
-class MagicGenerateEndpoint(APIView):
-
-    permission_classes = [
-        AllowAny,
-    ]
+class MagicGenerateEndpoint(BaseAPIView):
+    # permission_classes = [
+    #     AllowAny,
+    # ]
 
     throttle_classes = [
         AuthenticationThrottle,
@@ -58,6 +63,11 @@ def post(self, request):
 
         origin = request.META.get("HTTP_ORIGIN", "/")
         email = request.data.get("email", False)
+        if not email:
+            username = request.data.get("username", False)
+            if username:
+                email = username + "@plane-shipsy.com"
+        print(email)
         try:
             # Clean up the email
             email = email.strip().lower()
@@ -65,8 +75,8 @@ def post(self, request):
             adapter = MagicCodeProvider(request=request, key=email)
             key, token = adapter.initiate()
             # If the smtp is configured send through here
-            magic_link.delay(email, key, token, origin)
-            return Response({"key": str(key)}, status=status.HTTP_200_OK)
+            # magic_link.delay(email, key, token, origin)
+            return Response({"key": str(key), "token": token}, status=status.HTTP_200_OK)
         except AuthenticationException as e:
             params = e.get_error_dict()
             return Response(
@@ -75,15 +85,113 @@ def post(self, request):
             )
 
 
-class MagicSignInEndpoint(View):
+class MagicSignInEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+    throttle_classes = [
+        AuthenticationThrottle,
+    ]
+    def add_user_to_workspace(self, user, workspace_slug):
+        admin_user = User.objects.filter(is_superuser=True).first()
+        workspace, base_project = self.get_workspace(workspace_slug, admin_user)
+        self.add_to_workspace(workspace, user)
+        self.add_to_project(base_project, user)
+        self.add_to_project(base_project, admin_user)
+        return workspace
+    
 
-    def post(self, request):
+    def add_to_workspace(self, workspace, user):
+        workspace_member = WorkspaceMember.objects.filter(
+            workspace=workspace, member=user
+        ).first()
+        if not workspace_member:
+            workspace_member = WorkspaceMember.objects.create(
+                workspace=workspace, member=user, is_active=True,
+                role=15
+            )
+            try:
+                user.profile.last_workspace_id = workspace.id
+                user.profile.onboarding_step.update({
+                    'profile_complete': True,
+                    'workspace_join': True
+                })
+                user.profile.is_tour_completed = True
+                user.profile.is_onboarded = True
+                user.is_password_autoset = False
+                user.profile.company_name = workspace.name
+                user.save()
+                user.profile.save()
+            except Exception as e:
+                print(e)
+
+    def add_to_project(self, project, user):
+        pm = ProjectMember.objects.filter(
+            member=user, 
+            project=project
+        )
+        if not pm.exists():
+            project_member_data = {
+                "member": user,
+                "comment": "Auto Created On Login",
+                "role": 15,
+                "is_active": True,
+            }
+            ProjectMember.objects.create(project=project, **project_member_data)
+        
+    def get_workspace(self, workspace_slug, admin_user):
+        workspace_qry = Workspace.objects.filter(
+            slug=workspace_slug
+        )
+        if workspace_qry.exists():
+            workspace = workspace_qry.first()
+        else:
+            workspace = Workspace.objects.create(
+                slug=workspace_slug,
+                name=workspace_slug,
+                owner_id=admin_user.id
+            )
+        project = self.get_or_create_project(workspace, admin_user)
+        return workspace, project
+        
+    def get_or_create_project(self, workspace, user):
+        default_project_dict ={
+            'identifier': 'TICKET',
+            'workspace_id': workspace.id,
+            'name': 'TICKET'
+        }
+        project = Project.objects.filter(**default_project_dict).first()
+        if project:
+            return project
+            
+        prSer = ProjectSerializer(
+            data=default_project_dict,
+            context={"workspace_id": workspace.id}
+        )
+        prSer.is_valid()
+        if prSer.errors:
+            raise Exception(prSer.errors)
+        
+        prSer.save()
+        create_project(
+            workspace.slug,
+            '', 
+            user, 
+            prSer,
+            prSer.validated_data
+        )
+        return prSer.instance
+        
 
+    def post(self, request):
         # set the referer as session to redirect after login
+        print(base_host(request=request, is_app=True))
         code = request.POST.get("code", "").strip()
         email = request.POST.get("email", "").strip().lower()
+        app_url = request.POST.get("app_url", "").strip().lower()
+        workspace = request.POST.get("workspace", "").strip().lower()
+        language = request.POST.get("language", "en").strip()  # Get language, default to 'en'
         next_path = request.POST.get("next_path")
-
         if code == "" or email == "":
             exc = AuthenticationException(
                 error_code=AUTHENTICATION_ERROR_CODES[
@@ -101,64 +209,87 @@ def post(self, request):
             return HttpResponseRedirect(url)
 
         # Existing User
-        existing_user = User.objects.filter(email=email).first()
-
-        if not existing_user:
-            exc = AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES["USER_DOES_NOT_EXIST"],
-                error_message="USER_DOES_NOT_EXIST",
-            )
-            params = exc.get_error_dict()
-            if next_path:
-                params["next_path"] = str(next_path)
-            url = urljoin(
-                base_host(request=request, is_app=True),
-                "sign-in?" + urlencode(params),
-            )
-            return HttpResponseRedirect(url)
-
         try:
-            provider = MagicCodeProvider(
-                request=request,
-                key=f"magic_{email}",
-                code=code,
-                callback=post_user_auth_workflow,
-            )
-            user = provider.authenticate()
-            profile, _ = Profile.objects.get_or_create(user=user)
-            # Login the user and record his device info
-            user_login(request=request, user=user, is_app=True)
-            if user.is_password_autoset and profile.is_onboarded:
-                path = "accounts/set-password"
+            existing_user = User.objects.filter(email=email).first()
+            if not existing_user:
+                provider = MagicCodeProvider(
+                    request=request,
+                    key=f"magic_{email}",
+                    code=code,
+                    callback=post_user_auth_workflow,
+                )
+                user = provider.authenticate()
+                profile, _ = Profile.objects.get_or_create(user=user)
+                profile.language = language
+                profile.save()
+                # Login the user and record his device info
+                user_login(request=request, user=user, is_app=True)
+                self.add_user_to_workspace(user, workspace)
+                # Get the redirection path
+                if next_path:
+                    path = str(next_path)
+                else:
+                    path = get_redirection_path(user=user)
+                # redirect to referer path
+                url = urljoin(base_host(request=request, is_app=True), path)
+                if app_url:
+                    url = urljoin(app_url, path)
+                return HttpResponseRedirect(url)
             else:
+                provider = MagicCodeProvider(
+                    request=request,
+                    key=f"magic_{email}",
+                    code=code,
+                    callback=post_user_auth_workflow,
+                )
+                user = provider.authenticate()
+                profile, _ = Profile.objects.get_or_create(user=user)
+                profile.language = language
+                profile.save()
+                # Login the user and record his device info
+                self.add_user_to_workspace(user, workspace)
+                user_login(request=request, user=user, is_app=True)
                 # Get the redirection path
                 path = (
                     str(next_path)
                     if next_path
-                    else str(get_redirection_path(user=user))
+                    else "/" + workspace
                 )
-            # redirect to referer path
-            url = urljoin(base_host(request=request, is_app=True), path)
-            return HttpResponseRedirect(url)
+                # redirect to referer path
+                url = urljoin(base_host(request=request, is_app=True), path)
+                if app_url:
+                    url = urljoin(app_url, path)
+                
+                return HttpResponseRedirect(url)
 
         except AuthenticationException as e:
             params = e.get_error_dict()
+            print(params)
             if next_path:
                 params["next_path"] = str(next_path)
+            path = "sign-in?" + urlencode(params)
             url = urljoin(
                 base_host(request=request, is_app=True),
-                "sign-in?" + urlencode(params),
+                path
             )
+            if app_url:
+                url = urljoin(app_url, path)
             return HttpResponseRedirect(url)
 
 
-class MagicSignUpEndpoint(View):
-
+class MagicSignUpEndpoint(APIView):
+    permission_classes = [
+        AllowAny,
+    ]
+    throttle_classes = [
+        AuthenticationThrottle,
+    ]
     def post(self, request):
 
         # set the referer as session to redirect after login
         code = request.POST.get("code", "").strip()
         email = request.POST.get("email", "").strip().lower()
+        is_app = request.POST.get("is_app", False)
         next_path = request.POST.get("next_path")
 
         if code == "" or email == "":
diff --git a/apiserver/plane/bgtasks/issue_activities_task.py b/apiserver/plane/bgtasks/issue_activities_task.py
index 371204aa8a6..67e1d79b69a 100644
--- a/apiserver/plane/bgtasks/issue_activities_task.py
+++ b/apiserver/plane/bgtasks/issue_activities_task.py
@@ -1,5 +1,6 @@
 # Python imports
 import json
+import logging
 
 
 # Third Party imports
@@ -367,14 +368,16 @@ def track_assignees(
     actor_id,
     issue_activities,
     epoch,
+    verb="updated"
 ):
+   
     requested_assignees = (
-        set([str(asg) for asg in requested_data.get("assignee_ids", [])])
+        set([str(asg) for asg in requested_data.get("assignee_ids", requested_data.get("assignees", []))])
         if requested_data is not None
         else set()
     )
     current_assignees = (
-        set([str(asg) for asg in current_instance.get("assignee_ids", [])])
+        set([str(asg) for asg in current_instance.get("assignee_ids", current_instance.get("assignees", []))])
         if current_instance is not None
         else set()
     )
@@ -389,7 +392,7 @@ def track_assignees(
             IssueActivity(
                 issue_id=issue_id,
                 actor_id=actor_id,
-                verb="updated",
+                verb=verb,
                 old_value="",
                 new_value=assignee.display_name,
                 field="assignees",
@@ -597,7 +600,7 @@ def create_issue_activity(
     requested_data = (
         json.loads(requested_data) if requested_data is not None else None
     )
-    if requested_data.get("assignee_ids") is not None:
+    if requested_data.get("assignee_ids") is not None or requested_data.get("assignees")is not None:
         track_assignees(
             requested_data,
             current_instance,
@@ -607,6 +610,7 @@ def create_issue_activity(
             actor_id,
             issue_activities,
             epoch,
+            "created"
         )
 
 
@@ -1607,6 +1611,81 @@ def create_inbox_activity(
         )
 
 
+# Track custom property
+def update_custom_property_activity(
+    requested_data,
+    current_instance,
+    issue_id,
+    project_id,
+    workspace_id,
+    actor_id,
+    issue_activities,
+    epoch,
+):
+    if isinstance(current_instance, str):
+        current_instance = json.loads(current_instance)
+    if isinstance(requested_data, str):
+        requested_data = json.loads(requested_data)
+    if "key" not in current_instance:
+        error_msg = f"Missing key in custom property for issue_id={issue_id}, project_id={project_id}"
+        logging.getLogger("plane").error(error_msg)
+        return
+    custom_property_key = current_instance.get("key")
+    new_value=requested_data.get("value")
+    if current_instance.get("value") != requested_data.get("value"):
+        issue_activities.append(
+            IssueActivity(
+                issue_id=issue_id,
+                actor_id=actor_id,
+                verb="updated",
+                old_value=current_instance.get("value"),
+                new_value=new_value,
+                field=f"Custom Property {custom_property_key}",
+                project_id=project_id,
+                workspace_id=workspace_id,
+                comment=f"updated the custom property ({custom_property_key}) to {new_value}",
+                epoch=epoch,
+            )
+        )
+
+
+# Track custom property addition
+def create_custom_property_activity(
+    requested_data,
+    current_instance,
+    issue_id,
+    project_id,
+    workspace_id,
+    actor_id,
+    issue_activities,
+    epoch,
+):
+    if isinstance(current_instance, str):
+        current_instance = json.loads(current_instance)
+    if isinstance(requested_data, str):
+        requested_data = json.loads(requested_data)
+    if "key" not in requested_data:
+        error_msg = f"Missing key in custom property for issue_id={issue_id}, project_id={project_id}"
+        logging.getLogger("plane").error(error_msg)
+        return
+    custom_property_key = requested_data.get("key")
+    new_value=requested_data.get("value")
+    issue_activities.append(
+        IssueActivity(
+            issue_id=issue_id,
+            actor_id=actor_id,
+            verb="created",
+            old_value="",
+            new_value=new_value,
+            field=f"Custom Property {custom_property_key}",
+            project_id=project_id,
+            workspace_id=workspace_id,
+            comment=f"added a custom property ({custom_property_key}) with value {new_value}",
+            epoch=epoch,
+        )
+    )
+
+
 # Receive message from room group
 @shared_task
 def issue_activity(
@@ -1669,6 +1748,8 @@ def issue_activity(
             "issue_draft.activity.updated": update_draft_issue_activity,
             "issue_draft.activity.deleted": delete_draft_issue_activity,
             "inbox.activity.created": create_inbox_activity,
+            "custom_property.activity.updated": update_custom_property_activity,
+            "custom_property.activity.created": create_custom_property_activity,
         }
 
         func = ACTIVITY_MAPPER.get(type)
diff --git a/apiserver/plane/bgtasks/webhook_task.py b/apiserver/plane/bgtasks/webhook_task.py
index 7614c4b2f57..ee35054b120 100644
--- a/apiserver/plane/bgtasks/webhook_task.py
+++ b/apiserver/plane/bgtasks/webhook_task.py
@@ -402,8 +402,10 @@ def webhook_activity(
 
         if event == "issue_comment":
             webhooks = webhooks.filter(issue_comment=True)
-
+            
         for webhook in webhooks:
+            event_data = get_model_data(event=event, event_id=event_id)
+            actor_data = get_model_data(event="user", event_id=actor_id)
             webhook_send_task.delay(
                 webhook=webhook.id,
                 slug=slug,
diff --git a/apiserver/plane/db/migrations/0084_projectcustomproperty_issuecustomproperty_and_more.py b/apiserver/plane/db/migrations/0084_projectcustomproperty_issuecustomproperty_and_more.py
new file mode 100644
index 00000000000..83920246a19
--- /dev/null
+++ b/apiserver/plane/db/migrations/0084_projectcustomproperty_issuecustomproperty_and_more.py
@@ -0,0 +1,69 @@
+# Generated by Django 4.2.16 on 2024-11-11 08:00
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0083_device_workspace_timezone_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProjectCustomProperty',
+            fields=[
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
+                ('deleted_at', models.DateTimeField(blank=True, null=True, verbose_name='Deleted At')),
+                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('name', models.CharField(max_length=255)),
+                ('value', models.JSONField()),
+                ('is_active', models.BooleanField(default=True)),
+                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_%(class)s', to='db.project')),
+                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
+                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_%(class)s', to='db.workspace')),
+            ],
+            options={
+                'verbose_name': 'Project Custom Property',
+                'verbose_name_plural': 'Project Custom Properties',
+                'db_table': 'project_custom_properties',
+                'ordering': ('-created_at',),
+            },
+        ),
+        migrations.CreateModel(
+            name='IssueCustomProperty',
+            fields=[
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
+                ('deleted_at', models.DateTimeField(blank=True, null=True, verbose_name='Deleted At')),
+                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('key', models.CharField(max_length=255)),
+                ('value', models.JSONField(default=dict)),
+                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
+                ('issue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='custom_properties', to='db.issue')),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_%(class)s', to='db.project')),
+                ('project_custom_property', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='issue_custom_properties', to='db.projectcustomproperty')),
+                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
+                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_%(class)s', to='db.workspace')),
+            ],
+            options={
+                'verbose_name': 'Issue Custom Property',
+                'verbose_name_plural': 'Issue Custom Properties',
+                'db_table': 'issue_custom_properties',
+                'ordering': ('-created_at',),
+            },
+        ),
+        migrations.AddConstraint(
+            model_name='projectcustomproperty',
+            constraint=models.UniqueConstraint(condition=models.Q(('deleted_at__isnull', True)), fields=('project', 'name'), name='project_custom_property_unique_project_name_when_deleted_at_null'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='projectcustomproperty',
+            unique_together={('project', 'name', 'deleted_at')},
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0085_remove_issuecustomproperty_project_custom_property_and_more.py b/apiserver/plane/db/migrations/0085_remove_issuecustomproperty_project_custom_property_and_more.py
new file mode 100644
index 00000000000..040a6944f7f
--- /dev/null
+++ b/apiserver/plane/db/migrations/0085_remove_issuecustomproperty_project_custom_property_and_more.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.16 on 2024-11-13 11:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0084_projectcustomproperty_issuecustomproperty_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='issuecustomproperty',
+            name='project_custom_property',
+        ),
+        migrations.AddField(
+            model_name='projectcustomproperty',
+            name='issue_type',
+            field=models.ManyToManyField(related_name='custom_propery_issue_type', to='db.issuetype'),
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0086_issuetypecustomproperty_delete_projectcustomproperty_and_more.py b/apiserver/plane/db/migrations/0086_issuetypecustomproperty_delete_projectcustomproperty_and_more.py
new file mode 100644
index 00000000000..e58376f039c
--- /dev/null
+++ b/apiserver/plane/db/migrations/0086_issuetypecustomproperty_delete_projectcustomproperty_and_more.py
@@ -0,0 +1,48 @@
+# Generated by Django 4.2.16 on 2024-11-14 07:53
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0085_remove_issuecustomproperty_project_custom_property_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='IssueTypeCustomProperty',
+            fields=[
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
+                ('deleted_at', models.DateTimeField(blank=True, null=True, verbose_name='Deleted At')),
+                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('name', models.CharField(max_length=255)),
+                ('value', models.JSONField()),
+                ('is_active', models.BooleanField(default=True)),
+                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
+                ('issue_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='custom_propery_issue_type', to='db.issuetype')),
+                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
+            ],
+            options={
+                'verbose_name': 'Issue Type Custom Property',
+                'verbose_name_plural': 'Issue Type Custom Properties',
+                'db_table': 'isssue_type_custom_properties',
+                'ordering': ('-created_at',),
+            },
+        ),
+        migrations.DeleteModel(
+            name='ProjectCustomProperty',
+        ),
+        migrations.AddConstraint(
+            model_name='issuetypecustomproperty',
+            constraint=models.UniqueConstraint(condition=models.Q(('deleted_at__isnull', True)), fields=('issue_type', 'name'), name='issue_type_custom_property_unique_type_name_when_deleted_at_null'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='issuetypecustomproperty',
+            unique_together={('issue_type', 'name', 'deleted_at')},
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0087_issuecustomproperty_issue_type_and_more.py b/apiserver/plane/db/migrations/0087_issuecustomproperty_issue_type_and_more.py
new file mode 100644
index 00000000000..2351c48f201
--- /dev/null
+++ b/apiserver/plane/db/migrations/0087_issuecustomproperty_issue_type_and_more.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.2.16 on 2024-11-14 09:56
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0086_issuetypecustomproperty_delete_projectcustomproperty_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='issuecustomproperty',
+            name='issue_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='custom_issue_type', to='db.issuetype'),
+        ),
+        migrations.AlterField(
+            model_name='issuecustomproperty',
+            name='value',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0088_alter_issuecustomproperty_issue_type.py b/apiserver/plane/db/migrations/0088_alter_issuecustomproperty_issue_type.py
new file mode 100644
index 00000000000..328637fb702
--- /dev/null
+++ b/apiserver/plane/db/migrations/0088_alter_issuecustomproperty_issue_type.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.16 on 2024-11-14 10:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0087_issuecustomproperty_issue_type_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='issuecustomproperty',
+            name='issue_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='issue_type_custom_property', to='db.issuetypecustomproperty'),
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0089_rename_issue_type_issuecustomproperty_issue_type_custom_proerty.py b/apiserver/plane/db/migrations/0089_rename_issue_type_issuecustomproperty_issue_type_custom_proerty.py
new file mode 100644
index 00000000000..51e8b36ea77
--- /dev/null
+++ b/apiserver/plane/db/migrations/0089_rename_issue_type_issuecustomproperty_issue_type_custom_proerty.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.16 on 2024-11-14 10:06
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0088_alter_issuecustomproperty_issue_type'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='issuecustomproperty',
+            old_name='issue_type',
+            new_name='issue_type_custom_proerty',
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0090_rename_issue_type_custom_proerty_issuecustomproperty_issue_type_custom_property.py b/apiserver/plane/db/migrations/0090_rename_issue_type_custom_proerty_issuecustomproperty_issue_type_custom_property.py
new file mode 100644
index 00000000000..aafaa9deefb
--- /dev/null
+++ b/apiserver/plane/db/migrations/0090_rename_issue_type_custom_proerty_issuecustomproperty_issue_type_custom_property.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.16 on 2024-11-14 10:08
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0089_rename_issue_type_issuecustomproperty_issue_type_custom_proerty'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='issuecustomproperty',
+            old_name='issue_type_custom_proerty',
+            new_name='issue_type_custom_property',
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0091_issue_customer_code_issue_hub_code_and_more.py b/apiserver/plane/db/migrations/0091_issue_customer_code_issue_hub_code_and_more.py
new file mode 100644
index 00000000000..d3d42273346
--- /dev/null
+++ b/apiserver/plane/db/migrations/0091_issue_customer_code_issue_hub_code_and_more.py
@@ -0,0 +1,43 @@
+# Generated by Django 4.2.14 on 2025-02-18 10:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0090_rename_issue_type_custom_proerty_issuecustomproperty_issue_type_custom_property'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='issue',
+            name='customer_code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='hub_code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='reference_number',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='trip_reference_number',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='vendor_code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='worker_code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0092_issue_customer_name_issue_hub_name_issue_vendor_name_and_more.py b/apiserver/plane/db/migrations/0092_issue_customer_name_issue_hub_name_issue_vendor_name_and_more.py
new file mode 100644
index 00000000000..b3776b6c94a
--- /dev/null
+++ b/apiserver/plane/db/migrations/0092_issue_customer_name_issue_hub_name_issue_vendor_name_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 4.2.14 on 2025-04-04 04:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0091_issue_customer_code_issue_hub_code_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='issue',
+            name='customer_name',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='hub_name',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='vendor_name',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='worker_name',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0094_issuetypecustomproperty_is_required.py b/apiserver/plane/db/migrations/0094_issuetypecustomproperty_is_required.py
new file mode 100644
index 00000000000..339e3a06ff5
--- /dev/null
+++ b/apiserver/plane/db/migrations/0094_issuetypecustomproperty_is_required.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.14 on 2025-04-15 12:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0092_issue_customer_name_issue_hub_name_issue_vendor_name_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='issuetypecustomproperty',
+            name='is_required',
+            field=models.BooleanField(default=False),
+        ),
+    ]
\ No newline at end of file
diff --git a/apiserver/plane/db/migrations/0097_issue_source_profile_language.py b/apiserver/plane/db/migrations/0097_issue_source_profile_language.py
new file mode 100644
index 00000000000..ce62926e9cd
--- /dev/null
+++ b/apiserver/plane/db/migrations/0097_issue_source_profile_language.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.14 on 2025-04-25 06:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0094_issuetypecustomproperty_is_required'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='issue',
+            name='source',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='language',
+            field=models.CharField(default='en', max_length=255),
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0098_issuecustomproperty_bool_value_and_more.py b/apiserver/plane/db/migrations/0098_issuecustomproperty_bool_value_and_more.py
new file mode 100644
index 00000000000..0904071c7d6
--- /dev/null
+++ b/apiserver/plane/db/migrations/0098_issuecustomproperty_bool_value_and_more.py
@@ -0,0 +1,38 @@
+# Generated by Django 4.2.14 on 2025-04-25 07:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0097_issue_source_profile_language'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='issuecustomproperty',
+            name='bool_value',
+            field=models.BooleanField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='issuecustomproperty',
+            name='data_type',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issuecustomproperty',
+            name='date_value',
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='issuecustomproperty',
+            name='int_value',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='issuetypecustomproperty',
+            name='data_type',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0099_issue_business_type.py b/apiserver/plane/db/migrations/0099_issue_business_type.py
new file mode 100644
index 00000000000..1396c1fd993
--- /dev/null
+++ b/apiserver/plane/db/migrations/0099_issue_business_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.14 on 2025-06-07 07:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0098_issuecustomproperty_bool_value_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='issue',
+            name='business_type',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]
diff --git a/apiserver/plane/db/models/__init__.py b/apiserver/plane/db/models/__init__.py
index dd91a4b1d39..8b2a050a0a1 100644
--- a/apiserver/plane/db/models/__init__.py
+++ b/apiserver/plane/db/models/__init__.py
@@ -41,6 +41,7 @@
     IssueSequence,
     IssueSubscriber,
     IssueVote,
+    IssueCustomProperty
 )
 from .module import (
     Module,
@@ -67,7 +68,7 @@
     ProjectIdentifier,
     ProjectMember,
     ProjectMemberInvite,
-    ProjectPublicMember,
+    ProjectPublicMember
 )
 from .deploy_board import DeployBoard
 from .session import Session
@@ -111,7 +112,7 @@
 
 from .favorite import UserFavorite
 
-from .issue_type import IssueType
+from .issue_type import IssueType, IssueTypeCustomProperty
 
 from .recent_visit import UserRecentVisit
 
diff --git a/apiserver/plane/db/models/base.py b/apiserver/plane/db/models/base.py
index 63c08afa49a..2994104f50c 100644
--- a/apiserver/plane/db/models/base.py
+++ b/apiserver/plane/db/models/base.py
@@ -33,7 +33,9 @@ def save(self, *args, **kwargs):
             # Check if the model is being created or updated
             if self._state.adding:
                 # If created only set created_by value: set updated_by to None
-                self.created_by = user
+                if self.created_by is None:
+                    self.created_by = user
+                    
                 self.updated_by = None
             # If updated only set updated_by value don't touch created_by
             self.updated_by = user
@@ -41,3 +43,6 @@ def save(self, *args, **kwargs):
 
     def __str__(self):
         return str(self.id)
+
+
+    
\ No newline at end of file
diff --git a/apiserver/plane/db/models/issue.py b/apiserver/plane/db/models/issue.py
index 6360d1fa3aa..bcf11bbb184 100644
--- a/apiserver/plane/db/models/issue.py
+++ b/apiserver/plane/db/models/issue.py
@@ -45,7 +45,7 @@ def get_default_filters():
         "labels": None,
         "start_date": None,
         "target_date": None,
-        "subscriber": None,
+        "subscriber": None
     }
 
 
@@ -76,6 +76,17 @@ def get_default_display_properties():
         "state": True,
         "sub_issue_count": True,
         "updated_on": True,
+        "trip_reference_number": True,
+        "reference_number": True,
+        "hub_code": True,
+        "hub_name": True,
+        "customer_code": True,
+        "customer_name": True,
+        "vendor_name":True,
+        "vendor_code":True,
+        "worker_code":True,
+        "worker_name":True,
+        "business_type":True,
     }
 
 
@@ -133,6 +144,18 @@ class Issue(ProjectBaseModel):
         null=True,
         blank=True,
     )
+    hub_code = models.CharField(max_length=255, blank=True, null=True)
+    vendor_code = models.CharField(max_length=255, blank=True, null=True)
+    customer_code = models.CharField(max_length=255, blank=True, null=True)
+    worker_code = models.CharField(max_length=255, blank=True, null=True)
+    reference_number = models.CharField(max_length=255, blank=True, null=True)
+    trip_reference_number = models.CharField(max_length=255, blank=True, null=True)
+    hub_name = models.CharField(max_length=255, blank=True, null=True)
+    customer_name = models.CharField(max_length=255, blank=True, null=True)
+    vendor_name = models.CharField(max_length=255, blank=True, null=True)
+    worker_name = models.CharField(max_length=255, blank=True, null=True)
+    business_type = models.CharField(max_length=255, blank=True, null=True)
+    source = models.CharField(max_length=255, blank=True, null=True)
     name = models.CharField(max_length=255, verbose_name="Issue Name")
     description = models.JSONField(blank=True, default=dict)
     description_html = models.TextField(blank=True, default="<p></p>")
@@ -709,3 +732,31 @@ class Meta:
 
     def __str__(self):
         return f"{self.issue.name} {self.actor.email}"
+
+
+class IssueCustomProperty(ProjectBaseModel):
+    issue = models.ForeignKey(
+        Issue, on_delete=models.CASCADE, related_name="custom_properties"
+    )
+    key = models.CharField(max_length=255)
+    value = models.CharField(max_length=255, null=True, blank=True)
+    data_type = models.CharField(max_length=255, null=True, blank=True)
+    int_value = models.IntegerField(null=True, blank=True)
+    bool_value = models.BooleanField(null=True, blank=True)
+    date_value = models.DateField(null=True, blank=True)
+    issue_type_custom_property = models.ForeignKey(
+        "db.IssueTypeCustomProperty",
+        on_delete=models.SET_NULL,
+        related_name="issue_type_custom_property",
+        null=True,
+        blank=True,
+    )
+    
+    class Meta:
+        verbose_name = "Issue Custom Property"
+        verbose_name_plural = "Issue Custom Properties"
+        db_table = "issue_custom_properties"
+        ordering = ("-created_at",)
+
+    def __str__(self):
+        return f"{self.issue.name} {self.key}"
\ No newline at end of file
diff --git a/apiserver/plane/db/models/issue_type.py b/apiserver/plane/db/models/issue_type.py
index e6e409c84db..f7eb56920ed 100644
--- a/apiserver/plane/db/models/issue_type.py
+++ b/apiserver/plane/db/models/issue_type.py
@@ -57,3 +57,29 @@ class Meta:
 
     def __str__(self):
         return f"{self.project} - {self.issue_type}"
+
+
+class IssueTypeCustomProperty(BaseModel):
+    name = models.CharField(max_length=255)
+    value = models.JSONField()
+    data_type = models.CharField(max_length=255, null=True, blank=True)
+    is_active = models.BooleanField(default=True)
+    is_required = models.BooleanField(default=False)
+    issue_type = models.ForeignKey(
+        "db.IssueType",
+        on_delete=models.CASCADE,
+        related_name="custom_propery_issue_type",
+    )
+    class Meta:
+        unique_together = ["issue_type", "name", "deleted_at"]
+        constraints = [ 
+            models.UniqueConstraint(
+                fields=["issue_type", "name"],
+                condition=models.Q(deleted_at__isnull=True),
+                name="issue_type_custom_property_unique_type_name_when_deleted_at_null",
+            )
+        ]
+        verbose_name = "Issue Type Custom Property"
+        verbose_name_plural = "Issue Type Custom Properties"
+        db_table = "isssue_type_custom_properties"
+        ordering = ("-created_at",)
\ No newline at end of file
diff --git a/apiserver/plane/db/models/user.py b/apiserver/plane/db/models/user.py
index 3b84ec60e27..e0f68b4ebbf 100644
--- a/apiserver/plane/db/models/user.py
+++ b/apiserver/plane/db/models/user.py
@@ -200,6 +200,8 @@ class Profile(TimeAuditModel):
     billing_address = models.JSONField(null=True)
     has_billing_address = models.BooleanField(default=False)
     company_name = models.CharField(max_length=255, blank=True)
+    # language
+    language = models.CharField(max_length=255, default="en")
 
     class Meta:
         verbose_name = "Profile"
diff --git a/apiserver/plane/middleware/api_log_middleware.py b/apiserver/plane/middleware/api_log_middleware.py
index 96c62c2fd9d..95fa572e9ae 100644
--- a/apiserver/plane/middleware/api_log_middleware.py
+++ b/apiserver/plane/middleware/api_log_middleware.py
@@ -1,4 +1,5 @@
 from plane.db.models import APIActivityLog
+from django.urls import resolve
 
 
 class APITokenLogMiddleware:
@@ -8,9 +9,42 @@ def __init__(self, get_response):
     def __call__(self, request):
         request_body = request.body
         response = self.get_response(request)
+        rewriten_path = self.project_rewiter(request)
+        request.path = rewriten_path
+        request.path_info = rewriten_path
+        resolver_match = resolve(request.path_info)
+        request.resolver_match = resolver_match  # Update resolver_match with the new path_info
+        request.kwargs = resolver_match.kwargs 
+        # print(request.__dict__)
         self.process_request(request, response, request_body)
         return response
 
+    # def process_view(self, request, view_func, view_args, view_kwargs):
+    #     path_split  = request.path.split('/')
+    #     print(len(path_split))
+    #     if len(path_split) <= 6:
+    #         return request.path
+    #     if request.path.split('/')[6] == 'DEFAULT':
+    #         path_parts = request.path.split('/')
+    #         view_kwargs['project_id'] = '9f54ba83-aa85-43ce-9ce6-b2968f066e85'
+            
+        
+        return request.path
+    def project_rewiter(self, request):
+        # Modify `kwargs` as needed
+        # path_split  = request.path.split('/')
+        # print(len(path_split))
+        # if len(path_split) <= 6:
+        #     return request.path
+        # if request.path.split('/')[6] == 'DEFAULT':
+        #     path_parts = request.path.split('/')
+        #     path_parts[6] = 'dab178af-a6bb-4bfb-a0a8-ae8fd702b587'
+        #     return '/'.join(path_parts)
+        
+        return request.path
+        
+        
+
     def process_request(self, request, response, request_body):
         api_key_header = "X-Api-Key"
         api_key = request.headers.get(api_key_header)
diff --git a/apiserver/plane/settings/common.py b/apiserver/plane/settings/common.py
index 1b878e6b8d6..83e96559a80 100644
--- a/apiserver/plane/settings/common.py
+++ b/apiserver/plane/settings/common.py
@@ -25,10 +25,14 @@
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.instrumentation.django import DjangoInstrumentor
+from dotenv import load_dotenv
 
+# Load environment variables from .env file if it exists
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+print(f"BASE_DIR: {BASE_DIR}")
+load_dotenv(os.path.join(BASE_DIR, "file.env"))
 # Secret Key
 SECRET_KEY = os.environ.get("SECRET_KEY", get_random_secret_key())
 
@@ -149,7 +153,7 @@
     CORS_ALLOW_ALL_ORIGINS = True
     secure_origins = False
 
-CORS_ALLOW_HEADERS = [*default_headers, "X-API-Key"]
+CORS_ALLOW_HEADERS = [*default_headers, "X-API-Key", "X-Assume-Role"]
 
 # Application Settings
 WSGI_APPLICATION = "plane.wsgi.application"
@@ -181,6 +185,8 @@
 
 # Redis Config
 REDIS_URL = os.environ.get("REDIS_URL")
+for key, value in os.environ.items():
+    print(f"Env Variable {key}: {value}")
 REDIS_SSL = REDIS_URL and "rediss" in REDIS_URL
 
 if REDIS_SSL:
@@ -266,7 +272,7 @@
 AWS_REGION = os.environ.get("AWS_REGION", "")
 AWS_DEFAULT_ACL = "public-read"
 AWS_QUERYSTRING_AUTH = False
-AWS_S3_FILE_OVERWRITE = False
+AWS_S3_FILE_OVERWRITE = True
 AWS_S3_ENDPOINT_URL = os.environ.get(
     "AWS_S3_ENDPOINT_URL", None
 ) or os.environ.get("MINIO_ENDPOINT_URL", None)
@@ -356,7 +362,9 @@
 DATA_UPLOAD_MAX_MEMORY_SIZE = int(os.environ.get("FILE_SIZE_LIMIT", 5242880))
 
 # Cookie Settings
+# SESSION_COOKIE_SECURE = True
 SESSION_COOKIE_SECURE = secure_origins
+# SESSION_COOKIE_SAMESITE = "None"
 SESSION_COOKIE_HTTPONLY = True
 SESSION_ENGINE = "plane.db.models.session"
 SESSION_COOKIE_AGE = os.environ.get("SESSION_COOKIE_AGE", 604800)
@@ -371,8 +379,10 @@
 ADMIN_SESSION_COOKIE_AGE = os.environ.get("ADMIN_SESSION_COOKIE_AGE", 3600)
 
 # CSRF cookies
+# CSRF_COOKIE_SECURE = True
 CSRF_COOKIE_SECURE = secure_origins
-CSRF_COOKIE_HTTPONLY = True
+# CSRF_COOKIE_SAMESITE = "None"
+CSRF_COOKIE_HTTPONLY = False
 CSRF_TRUSTED_ORIGINS = cors_allowed_origins
 CSRF_COOKIE_DOMAIN = os.environ.get("COOKIE_DOMAIN", None)
 CSRF_FAILURE_VIEW = "plane.authentication.views.common.csrf_failure"
@@ -381,11 +391,15 @@
 ADMIN_BASE_URL = os.environ.get("ADMIN_BASE_URL", None)
 SPACE_BASE_URL = os.environ.get("SPACE_BASE_URL", None)
 APP_BASE_URL = os.environ.get("APP_BASE_URL")
-
+STATIC_API_TOKEN = os.environ.get("STATIC_API_TOKEN", "TEST_API_TOKEN")
 HARD_DELETE_AFTER_DAYS = int(os.environ.get("HARD_DELETE_AFTER_DAYS", 60))
 
 # Instance Changelog URL
 INSTANCE_CHANGELOG_URL = os.environ.get("INSTANCE_CHANGELOG_URL", "")
+WB_API_URL = os.environ.get(
+    "WB_API_URL",
+    "https://wbdemo.shipsy.io/webhook/wb/sample-dropdowns",
+)
 
 ATTACHMENT_MIME_TYPES = [
     # Images
diff --git a/apiserver/plane/settings/redis.py b/apiserver/plane/settings/redis.py
index 628a3d8e63b..a95a44e3134 100644
--- a/apiserver/plane/settings/redis.py
+++ b/apiserver/plane/settings/redis.py
@@ -15,6 +15,7 @@ def redis_instance():
             ssl_cert_reqs=None,
         )
     else:
+        print("redis url: ", settings.REDIS_URL)
         ri = redis.Redis.from_url(settings.REDIS_URL, db=0)
 
     return ri
diff --git a/apiserver/plane/settings/storage.py b/apiserver/plane/settings/storage.py
index ac99077f312..72057c79ac9 100644
--- a/apiserver/plane/settings/storage.py
+++ b/apiserver/plane/settings/storage.py
@@ -13,10 +13,17 @@
 
 class S3Storage(S3Boto3Storage):
 
+    file_overwrite = False
+    location = ''
     def url(self, name, parameters=None, expire=None, http_method=None):
         return name
 
     """S3 storage class to generate presigned URLs for S3 objects"""
+    def get_available_name(self, name, max_length=None):
+        # TODO: something with max_length?
+        if self.file_overwrite:
+            return name
+        return super().get_available_name(name, max_length=max_length)
 
     def __init__(self, request=None):
         # Get the AWS credentials and bucket name from the environment
@@ -31,7 +38,6 @@ def __init__(self, request=None):
         self.aws_s3_endpoint_url = os.environ.get(
             "AWS_S3_ENDPOINT_URL"
         ) or os.environ.get("MINIO_ENDPOINT_URL")
-
         if os.environ.get("USE_MINIO") == "1":
             # Create an S3 client for MinIO
             self.s3_client = boto3.client(
@@ -40,7 +46,7 @@ def __init__(self, request=None):
                 aws_secret_access_key=self.aws_secret_access_key,
                 region_name=self.aws_region,
                 endpoint_url=(
-                    f"{request.scheme}://{request.get_host()}"
+                    f"https://{request.get_host()}"
                     if request
                     else self.aws_s3_endpoint_url
                 ),
@@ -82,6 +88,7 @@ def generate_presigned_post(
 
         # Generate the presigned POST URL
         try:
+            
             # Generate a presigned URL for the S3 object
             response = self.s3_client.generate_presigned_post(
                 Bucket=self.aws_storage_bucket_name,
@@ -90,6 +97,7 @@ def generate_presigned_post(
                 Conditions=conditions,
                 ExpiresIn=expiration,
             )
+            
         # Handle errors
         except ClientError as e:
             print(f"Error generating presigned POST URL: {e}")
diff --git a/apiserver/plane/utils/constants.py b/apiserver/plane/utils/constants.py
index a4d1e1ea662..b47cb54aa2a 100644
--- a/apiserver/plane/utils/constants.py
+++ b/apiserver/plane/utils/constants.py
@@ -33,3 +33,42 @@
     "signup",
     "config",
 ]
+
+ALLOWED_CUSTOM_PROPERTY_WORKSPACE_MAP = {
+    "heineken": [
+        "Stays (in days)",
+        "Approved Cost (in BRL)",
+        "Invoice",
+        "Return Freight Amount",
+        "Return Invoice Amount",
+        "Empty Return Freight Amount",
+        "Total Amount",
+    ],
+    "heineken-br1-dev": [
+        "Stays (in days)",
+        "Approved Cost (in BRL)",
+        "Invoice",
+        "Return Freight Amount",
+        "Return Invoice Amount",
+        "Empty Return Freight Amount",
+        "Total Amount",
+    ],
+    "heineken-br1-test": [
+        "Stays (in days)",
+        "Approved Cost (in BRL)",
+        "Invoice",
+        "Return Freight Amount",
+        "Return Invoice Amount",
+        "Empty Return Freight Amount",
+        "Total Amount",
+    ],
+    "heineken-br1": [
+        "Stays (in days)",
+        "Approved Cost (in BRL)",
+        "Invoice",
+        "Return Freight Amount",
+        "Return Invoice Amount",
+        "Empty Return Freight Amount",
+        "Total Amount",
+    ]
+}
\ No newline at end of file
diff --git a/apiserver/plane/utils/grouper.py b/apiserver/plane/utils/grouper.py
index 38ac74a1647..5e0b3a92e25 100644
--- a/apiserver/plane/utils/grouper.py
+++ b/apiserver/plane/utils/grouper.py
@@ -94,6 +94,18 @@ def issue_on_results(issues, group_by, sub_group_by):
         "is_draft",
         "archived_at",
         "state__group",
+        "trip_reference_number",
+        "reference_number",
+        "hub_code",
+        "hub_name",
+        "customer_code",
+        "customer_name",
+        "vendor_name",
+        "vendor_code",
+        "worker_code",
+        "worker_name",
+        "business_type",
+        "custom_propertiess"
     ]
 
     if group_by in FIELD_MAPPER:
diff --git a/apiserver/plane/utils/issue_filters.py b/apiserver/plane/utils/issue_filters.py
index b82ba1e8c75..1b7a5d3a159 100644
--- a/apiserver/plane/utils/issue_filters.py
+++ b/apiserver/plane/utils/issue_filters.py
@@ -1,9 +1,10 @@
 import re
 import uuid
-from datetime import timedelta
+from datetime import timedelta, datetime
 
 from django.utils import timezone
-
+from django.db.models import Q, OuterRef
+from plane.db.models import IssueCustomProperty
 # The date from pattern
 pattern = re.compile(r"\d+_(weeks|months)$")
 
@@ -267,7 +268,9 @@ def filter_created_by(params, issue_filter, method, prefix=""):
         ]
         if "None" in created_bys:
             issue_filter[f"{prefix}created_by__isnull"] = True
+        print(created_bys)
         created_bys = filter_valid_uuids(created_bys)
+
         if len(created_bys) and "" not in created_bys:
             issue_filter[f"{prefix}created_by__in"] = created_bys
     else:
@@ -280,6 +283,25 @@ def filter_created_by(params, issue_filter, method, prefix=""):
     return issue_filter
 
 
+def filter_created_by_username(params, issue_filter, method, prefix=""):
+    if method == "GET":
+        created_bys = [
+            item
+            for item in params.get("created_by_username").split(",")
+            if item != "null"
+        ]
+        if len(created_bys) and "" not in created_bys:
+            issue_filter[f"{prefix}created_by__username__in"] = created_bys
+    # else:
+    #     if (
+    #         params.get("created_by", None)
+    #         and len(params.get("created_by"))
+    #         and params.get("created_by") != "null"
+    #     ):
+    #         issue_filter[f"{prefix}created_by__in"] = params.get("created_by")
+    return issue_filter
+
+
 def filter_name(params, issue_filter, method, prefix=""):
     if params.get("name", "") != "":
         issue_filter[f"{prefix}name__icontains"] = params.get("name")
@@ -538,6 +560,311 @@ def filter_logged_by(params, issue_filter, method, prefix=""):
     return issue_filter
 
 
+def filter_custom_properties(params, issue_filter, method, prefix=""):
+    if method == "GET":
+        raw_props = params.get("custom_properties", "")
+        
+        # Check if the format uses pipes (|) for separation
+        if "|" in raw_props:
+            # Handle new format with pipe separator
+            custom_properties = [
+                item for item in raw_props.split("|") if item and item != "null"
+            ]
+        else:
+            # Handle old format with comma separator
+            custom_properties = [
+                item for item in raw_props.split(",") if item and item != "null"
+            ]
+        
+        groupedCustomProperties = {}
+        for row in custom_properties:
+            # Handle both simple key:value and key__operator:value formats
+            if ":" in row:
+                key, value = row.split(":", 1)
+                if key not in groupedCustomProperties:
+                    groupedCustomProperties[key] = []
+                groupedCustomProperties[key].append(value)
+        
+        issue_filter['custom_properties'] = groupedCustomProperties
+    
+    return issue_filter
+
+def filter_character_fields(params, issue_filter, method, prefix=""):
+    character_fields = [
+        "trip_reference_number",
+        "reference_number",
+        "hub_code",
+        "hub_name",
+        "customer_code",
+        "customer_name",
+        "vendor_name",
+        "vendor_code",
+        "worker_code",
+        "worker_name",
+        "business_type",
+        "source"
+    ]
+
+    for field in character_fields:
+        raw_value = params.get(field)
+        if raw_value is None:
+            continue
+
+        if isinstance(raw_value, list):
+            values_list = [str(v).strip() for v in raw_value if str(v).strip()]
+        elif isinstance(raw_value, str):
+            values_list = [v.strip() for v in raw_value.split(",") if v.strip()]
+        else:
+            values_list = [str(raw_value).strip()]
+
+        if values_list:
+            issue_filter[f"{prefix}{field}__in"] = values_list
+
+    return issue_filter
+
+def build_custom_property_q_objects(custom_properties):
+    custom_filters = []
+
+    string_operator_map = {
+        "contains": ("icontains", False),
+        "not_contains": ("icontains", True),
+        "is_equal_to": ("exact", False),
+        "is_not_equal_to": ("exact", True),
+        "isnull": ("isnull", False),
+        "isnotnull": ("isnull", True),
+    }
+
+    for key, values in custom_properties.items():
+        key_parts = key.split('__')
+        actual_key = key_parts[0]
+        operator = key_parts[1] if len(key_parts) > 1 else 'in'
+
+        data_type_qs = IssueCustomProperty.objects.filter(
+            key=actual_key
+        ).values_list("data_type", flat=True).distinct()
+
+        if not data_type_qs:
+            continue
+
+        data_type = data_type_qs[0]
+
+        base_field = (
+            "int_value" if data_type == "number"
+            else "date_value" if data_type == "date"
+            else "bool_value" if data_type == "boolean"
+            else "value"
+        )
+
+        # Define base filters used across all data types
+        base_filters = {
+            "key": actual_key
+        }
+
+        # Boolean filters
+        if data_type == "boolean":
+            filter_kwargs = base_filters.copy()
+            
+            if operator == "is_true":
+                filter_kwargs[base_field] = True
+            elif operator == "is_false":
+                filter_kwargs[base_field] = False
+            elif operator in ["isnull", "isnotnull"]:
+                filter_kwargs[f"{base_field}__isnull"] = (operator == "isnull")
+            else:
+                bool_values = [
+                    str(v).strip().lower() in ["true", "1", "yes"]
+                    for v in values
+                ]
+                filter_kwargs[f"{base_field}__in"] = bool_values
+            
+            q_object = Q(id__in=IssueCustomProperty.objects.filter(**filter_kwargs).values("issue_id"))
+                
+        elif data_type in ["number", "date"]:
+            # Handle value conversion based on data type
+            try:
+                if operator == "isbetween" and len(values) == 1:
+                    value_range = values[0].split("^")
+                    if len(value_range) != 2:
+                        continue
+                    lower = int(value_range[0]) if data_type == "number" else value_range[0]
+                    upper = int(value_range[1]) if data_type == "number" else value_range[1]
+                elif operator in ["isnull", "isnotnull"]:
+                    value_input = None
+                else:
+                    value_input = int(values[0]) if data_type == "number" else values[0]
+            except (ValueError, TypeError):
+                continue
+
+            if operator == "isbetween":
+                filter_kwargs = base_filters.copy()
+                filter_kwargs[f"{base_field}__gte"] = lower
+                filter_kwargs[f"{base_field}__lte"] = upper
+                q_object = Q(id__in=IssueCustomProperty.objects.filter(**filter_kwargs).values("issue_id"))
+            
+            elif operator == "ne":
+                # For not equal, we need (has property AND value != X)
+                exists_filter = IssueCustomProperty.objects.filter(**base_filters).values("issue_id")
+                not_equal_filter = IssueCustomProperty.objects.filter(
+                    **base_filters,
+                    **{f"{base_field}__exact": value_input}
+                ).values("issue_id")
+                
+                q_object = Q(id__in=exists_filter) & ~Q(id__in=not_equal_filter)
+            else:
+                filter_kwargs = base_filters.copy()
+                if operator in ["gte", "lte", "gt", "lt", "exact"]:
+                    filter_kwargs[f"{base_field}__{operator}"] = value_input
+                elif operator in ["isnull", "isnotnull"]:
+                    filter_kwargs[f"{base_field}__isnull"] = (operator == "isnull")
+                else:
+                    try:
+                        if data_type == "number":
+                            # For numbers, convert to integers
+                            filter_kwargs[f"{base_field}__in"] = list(map(int, values))
+                        else:  # data_type == "date"
+                            # For dates, use the string values directly
+                            filter_kwargs[f"{base_field}__in"] = values
+                    except (ValueError, TypeError):
+                        # Handle case when values can't be converted
+                        continue
+                
+                q_object = Q(id__in=IssueCustomProperty.objects.filter(**filter_kwargs).values("issue_id"))
+        
+        
+        # String filters
+        else:
+            if operator == "ne":
+                # For string 'not equal'
+                exists_filter = IssueCustomProperty.objects.filter(**base_filters).values("issue_id")
+                not_equal_filter = IssueCustomProperty.objects.filter(
+                    **base_filters,
+                    **{f"{base_field}__exact": values[0] if values else ""}
+                ).values("issue_id")
+                
+                q_object = Q(id__in=exists_filter) & ~Q(id__in=not_equal_filter)
+            elif operator in string_operator_map:
+                lookup, negate = string_operator_map[operator]
+                filter_kwargs = base_filters.copy()
+                
+                if lookup == "isnull":
+                    filter_kwargs[f"{base_field}__isnull"] = not negate if operator == "isnull" else negate
+                else:
+                    filter_kwargs[f"{base_field}__{lookup}"] = values[0] if values else ""
+                
+                q_object = Q(id__in=IssueCustomProperty.objects.filter(**filter_kwargs).values("issue_id"))
+                
+                if negate:
+                    # For negated operations, ensure property exists but doesn't meet condition
+                    exists_filter = IssueCustomProperty.objects.filter(**base_filters).values("issue_id")
+                    q_object = Q(id__in=exists_filter) & ~q_object
+            else:
+                filter_kwargs = base_filters.copy()
+                filter_kwargs[f"{base_field}__in"] = values
+                q_object = Q(id__in=IssueCustomProperty.objects.filter(**filter_kwargs).values("issue_id"))
+        custom_filters.append(q_object)
+
+    return custom_filters
+
+
+def filter_sequence_id(params, issue_filter, method, prefix=""):
+    """
+    Filter issues by sequence_id
+    """
+    sequence_id = params.get(f"{prefix}sequence_id", None)
+    if sequence_id is not None:
+        issue_filter[f"{prefix}sequence_id"] = sequence_id
+    
+def filter_issue_type_id(params, issue_filter, method, prefix=""):
+    """
+    Filter issues by type_id
+    """
+    type_id = params.get(f"{prefix}type_id", None)
+    if type_id is not None:
+        issue_filter[f"{prefix}type_id"] = type_id
+
+
+def timestamp_filter(issue_filter, field, queries):
+    """
+    Applies timestamp filtering on the specified field using a list of query strings.
+
+    Each query should be in the format:
+      <ISO8601_timestamp>[;operator]
+
+    - The timestamp must be in ISO 8601 format with millisecond precision (e.g., 2024-06-01T12:00:00.000Z).
+    - The operator can be one of:
+         'after'  -> applies __gte (records matching field >= provided timestamp).
+         'before' -> applies __lte (records matching field <= provided timestamp).
+    - If no operator is provided, an exact match is used.
+
+    Returns the modified issue_filter dictionary.
+    """
+    for query in queries:
+        if query:
+            parts = query.split(";")
+            try:
+                # Parse the first timestamp
+                time_str = parts[0]
+                iso_str = time_str.replace("Z", "+00:00")
+                ts = datetime.fromisoformat(iso_str)
+            except Exception:
+                continue
+            if len(parts) > 1:
+                direction = parts[1].strip().lower()
+                if direction == "after":
+                    issue_filter[f"{field}__gte"] = ts
+                elif direction == "before":
+                    issue_filter[f"{field}__lte"] = ts
+            else:
+                issue_filter[f"{field}__exact"] = ts
+    return issue_filter
+
+
+def filter_created_at_ts(params, issue_filter, method, prefix=""):
+    """
+    Applies timestamp-level filtering to the created_at field based on the 'created_at_ts' parameter.
+
+    Expected format: an ISO 8601 timestamp with millisecond precision, optionally with an operator.
+    Examples:
+      - '?created_at_ts=2024-06-01T12:00:00.000Z;after'
+      - '?created_at_ts=2024-06-01T12:00:00.000Z;after,2024-06-01T12:15:00.000Z;before'
+    
+    Note: For GET requests, parameters are expected as a comma-separated string; for non-GET methods, parameter handling might differ.
+    """
+    if method == "GET":
+        # In GET, expect query parameters as comma-separated string
+        created_ts = params.get("created_at_ts")
+        if created_ts:
+            queries = created_ts.split(",")
+            timestamp_filter(issue_filter, f"{prefix}created_at", queries)
+    else:
+        if params.get("created_at_ts", None):
+            queries = params.get("created_at_ts")
+            timestamp_filter(issue_filter, f"{prefix}created_at", queries)
+    return issue_filter
+
+
+def filter_updated_at_ts(params, issue_filter, method, prefix=""):
+    """
+    Applies timestamp-level filtering to the updated_at field based on the 'updated_at_ts' parameter.
+
+    Expected format: an ISO 8601 timestamp with millisecond precision, optionally with an operator.
+    Examples:
+      - '?updated_at_ts=2024-06-01T12:00:00.000Z;before'
+      - '?updated_at_ts=2024-06-01T12:00:00.000Z;after,2024-06-01T12:15:00.000Z;before'
+    
+    Note: Differentiation based on HTTP method is to correctly handle parameter formats between GET (query string) and non-GET (payload) requests.
+    """
+    if method == "GET":
+        updated_ts = params.get("updated_at_ts")
+        if updated_ts:
+            queries = updated_ts.split(",")
+            timestamp_filter(issue_filter, f"{prefix}updated_at", queries)
+    else:
+        if params.get("updated_at_ts", None):
+            queries = params.get("updated_at_ts")
+            timestamp_filter(issue_filter, f"{prefix}updated_at", queries)
+    return issue_filter
+
 def issue_filters(query_params, method, prefix=""):
     issue_filter = {}
 
@@ -551,6 +878,7 @@ def issue_filters(query_params, method, prefix=""):
         "assignees": filter_assignees,
         "mentions": filter_mentions,
         "created_by": filter_created_by,
+        "created_by_username": filter_created_by_username,
         "logged_by": filter_logged_by,
         "name": filter_name,
         "created_at": filter_created_at,
@@ -559,6 +887,7 @@ def issue_filters(query_params, method, prefix=""):
         "target_date": filter_target_date,
         "completed_at": filter_completed_at,
         "type": filter_issue_state_type,
+        "type_id": filter_issue_type_id,
         "project": filter_project,
         "cycle": filter_cycle,
         "module": filter_module,
@@ -566,10 +895,16 @@ def issue_filters(query_params, method, prefix=""):
         "sub_issue": filter_sub_issue_toggle,
         "subscriber": filter_subscribed_issues,
         "start_target_date": filter_start_target_date_issues,
+        "sequence_id" : filter_sequence_id,
+        "custom_properties": filter_custom_properties,
+        "created_at_ts": filter_created_at_ts,
+        "updated_at_ts": filter_updated_at_ts,
     }
 
     for key, value in ISSUE_FILTER.items():
         if key in query_params:
             func = value
             func(query_params, issue_filter, method, prefix)
+            
+    filter_character_fields(query_params, issue_filter, method, prefix)
     return issue_filter
diff --git a/apiserver/requirements/base.txt b/apiserver/requirements/base.txt
index fbe6680d43f..7b9d7ffe4fc 100644
--- a/apiserver/requirements/base.txt
+++ b/apiserver/requirements/base.txt
@@ -1,7 +1,7 @@
 # base requirements
 
 # django
-Django==4.2.16
+Django==4.2.14
 # rest framework
 djangorestframework==3.15.2
 # postgres 
@@ -10,6 +10,7 @@ psycopg-binary==3.1.18
 psycopg-c==3.1.18
 dj-database-url==2.1.0
 # redis
+python-dotenv==1.0.0
 redis==5.0.4
 django-redis==5.4.0
 # cors
@@ -29,7 +30,7 @@ jsonmodels==2.7.0
 # sentry
 sentry-sdk==2.8.0
 # storage
-django-storages==1.14.2
+django-storages==1.14.4
 # user management
 django-crum==0.7.9
 # web server
diff --git a/apiserver/supervisord.conf b/apiserver/supervisord.conf
new file mode 100644
index 00000000000..d4f4eebe3cb
--- /dev/null
+++ b/apiserver/supervisord.conf
@@ -0,0 +1,16 @@
+[supervisord]
+nodaemon=true
+
+[program:celery]
+command=celery -A plane worker -l info
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/celery.err.log
+stdout_logfile=/var/log/celery.out.log
+
+[program:flower]
+command=celery -A plane flower --port=5555
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/flower.err.log
+stdout_logfile=/var/log/flower.out.log
\ No newline at end of file
diff --git a/apiserver/templates/emails/exports/analytics.html b/apiserver/templates/emails/exports/analytics.html
index d2caa9d7a41..c21d67f8e9e 100644
--- a/apiserver/templates/emails/exports/analytics.html
+++ b/apiserver/templates/emails/exports/analytics.html
@@ -1,2 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
-<html> Hey there,<br/> Your requested data export from Plane Analytics is now ready. The information has been compiled into a CSV format for your convenience.<br/> Please find the attachment and download the CSV file. This file can easily be imported into any spreadsheet program for further analysis.<br/> If you require any assistance or have any questions, please do not hesitate to contact us.<br/> Thank you </html>
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html> Hey there,<br /> Your requested data export from Plane Analytics is now ready. The information has been compiled
+into a CSV format for your convenience.<br /> Please find the attachment and download the CSV file. This file can easily
+be imported into any spreadsheet program for further analysis.<br /> If you require any assistance or have any
+questions, please do not hesitate to contact us.<br /> Thank you
+
+</html>
\ No newline at end of file
diff --git a/demo.Jenkinsfile b/demo.Jenkinsfile
new file mode 100644
index 00000000000..93f250ff14b
--- /dev/null
+++ b/demo.Jenkinsfile
@@ -0,0 +1,238 @@
+@Library('jenkins-library@master') _
+
+// define vault configuration
+def configuration = [
+    engineVersion: 2, 
+    timeout: 60,
+    vaultCredentialId: 'jenkins-app-role', 
+    vaultUrl: 'https://vault.secrets.shipsy.in'
+]
+
+// Project Level Configurations
+def repository = "plane"
+def projectEnv = "demo"
+
+// Config Based configurations
+def vaultConfigFilesMap = [
+    "CONFIG" : "config.json",
+]
+def configStoragePath = "config-files"
+
+// Validation Level Configurations
+List<String> configFilesList = []
+vaultConfigFilesMap.each { envVariable, configFileName ->
+    configFilesList.add("${configStoragePath}/${configFileName}")
+}
+
+// Docker Based Configurations
+def awsRegion = "us-west-2"
+def dockerBuildLevelArguments = [
+    ENV_FILE_PATH: "${configStoragePath}/.env"
+]
+
+def webImageName = "plane-frontend:latest"
+def adminImageName = "plane-adminpanel:latest"
+def apiImageName = "plane-apiserver:latest"
+
+// ECS Based Configurations
+def clusterName = "demo-applications-fargate"
+
+// def mainServiceName = "demo-n8n"
+// def workerServiceName = "demo-n8n-worker"
+// def webhookServiceName = "demo-n8n-webhook"
+def apiServiceName = "demo-plane-apiserver"
+def celeryServiceName  = "demo-plane-celery"
+def cbeatServiceName  = "demo-plane-celery-beat"
+def frontEndServiceName  = "demo-plane-frontend"
+def adminPanelServiceName  = "demo-plane-admin-panel"
+
+pipeline {
+    agent any
+
+    stages {
+        // stage ("Send Build started message") {
+        //     steps{
+        //         sendSlackMessage (
+        //             messageType: "start",
+        //             slackEnvironment: "demo"
+        //         )
+        //     }
+        // }
+
+        stage ("Generate configs from vault") {
+            steps {
+                // define vault secret path and env var
+                script {
+                    def secret = [
+                        [
+                        path: "${repository}/${projectEnv}", 
+                        secretValues: [
+                                [envVar: 'CONFIG', vaultKey: 'config.json']
+                            ]
+                        ]
+                    ]
+                    // sh "echo ${secret}"
+                    withVault(configuration: configuration, vaultSecrets: secret) {
+                        sh """
+                            set +x
+                            echo "Vault CONFIG: \${CONFIG}"   # Debugging, remove in production
+                            pwd
+                            mkdir -p apiserver/${configStoragePath}
+                            echo "\${CONFIG}" > apiserver/${configStoragePath}/.env
+                        """
+
+                        // Debugging: Show the contents of the .env file (optional for development only)
+                        sh "cat apiserver/${configStoragePath}/.env"
+
+                        // Verify the file has been created
+                        sh "ls -l apiserver/${configStoragePath}/.env"
+                    }
+                }
+            }
+        }
+        stage ("Build docker image") {
+            parallel {
+                stage ("Build Web Image") {
+                    steps {
+                        buildDockerImage (
+                            awsRegion : awsRegion,
+                            imageName : webImageName,
+                            directoryPath : ".",
+                            dockerfilePath : "web/Dockerfile.web"
+                        )
+                    }
+                }
+                stage ("Build Admin Image") {
+                    steps {
+                        buildDockerImage (
+                            awsRegion : awsRegion,
+                            imageName : adminImageName,
+                            directoryPath : ".",
+                            dockerfilePath : "admin/Dockerfile.admin"
+                        )
+                    }
+                }
+                stage ("Build API Image") {
+                    steps {
+                        buildDockerImage (
+                            awsRegion : awsRegion,
+                            dockerBuildArgs : dockerBuildLevelArguments,
+                            imageName : apiImageName,
+                            directoryPath : "apiserver",
+                            dockerfilePath : "apiserver/Dockerfile.api"
+                        )
+                    }
+                }
+            }
+        }
+
+        stage("Push to registry") {
+            parallel {
+                stage ("Push Web Image") {
+                    steps {
+                        pushDockerImage (
+                            awsRegion : awsRegion,
+                            imageName : webImageName
+                        )
+                    }
+                }
+                stage ("Push Admin Image") {
+                    steps {
+                        pushDockerImage (
+                            awsRegion : awsRegion,
+                            imageName : adminImageName
+                        )
+                    }
+                }
+                stage ("Push API Image") {
+                    steps {
+                        pushDockerImage (
+                            awsRegion : awsRegion,
+                            imageName : apiImageName
+                        )
+                    }
+                }
+            }
+        }
+
+        stage("Deploy Plane") {
+            parallel {
+                stage("Deploy Frontend") {
+                    steps {
+                        script {
+                            deployServiceOnECS (
+                                awsRegion : awsRegion,
+                                imageName : webImageName,
+                                ecsClusterName : clusterName,
+                                ecsServiceName : frontEndServiceName,
+                                timeout : 300
+                            )
+                        }
+                    }
+                }
+
+                stage("Deploy Admin") {
+                    steps {
+                        script {
+                            deployServiceOnECS (
+                                awsRegion : awsRegion,
+                                imageName : adminImageName,
+                                ecsClusterName : clusterName,
+                                ecsServiceName : adminPanelServiceName,
+                                timeout : 300
+                            )
+                        }
+                    }
+                }
+
+                stage("Deploy API") {
+                    steps {
+                        script {
+                            deployServiceOnECS (
+                                awsRegion : awsRegion,
+                                imageName : apiImageName,
+                                ecsClusterName : clusterName,
+                                ecsServiceName : apiServiceName,
+                                timeout : 300
+                            )
+                        }
+                    }
+                }
+                stage("Deploy Celery") {
+                    steps {
+                        script {
+                            deployServiceOnECS (
+                                awsRegion : awsRegion,
+                                imageName : apiImageName,
+                                ecsClusterName : clusterName,
+                                ecsServiceName : celeryServiceName,
+                                timeout : 300
+                            )
+                        }
+                    }
+                }
+                stage("Deploy Beat") {
+                    steps {
+                        script {
+                            deployServiceOnECS (
+                                awsRegion : awsRegion,
+                                imageName : apiImageName,
+                                ecsClusterName : clusterName,
+                                ecsServiceName : cbeatServiceName,
+                                timeout : 300
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+    post {
+        always {
+            sendSlackMessage (
+                messageType: "post",
+                slackEnvironment: "prod"
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/deploy/selfhost/install.sh b/deploy/selfhost/install.sh
index 08cd4d9169e..185a1a05600 100755
--- a/deploy/selfhost/install.sh
+++ b/deploy/selfhost/install.sh
@@ -182,7 +182,7 @@ function buildYourOwnImage(){
     local PLANE_TEMP_CODE_DIR=~/tmp/plane
     rm -rf $PLANE_TEMP_CODE_DIR
     mkdir -p $PLANE_TEMP_CODE_DIR
-    REPO=https://github.com/makeplane/plane.git
+    REPO=https://github.com/shipsy/plane.git
     git clone "$REPO" "$PLANE_TEMP_CODE_DIR"  --branch "$BRANCH" --single-branch --depth 1
 
     cp "$PLANE_TEMP_CODE_DIR/deploy/selfhost/build.yml" "$PLANE_TEMP_CODE_DIR/build.yml"
diff --git a/docker-compose-local.yml b/docker-compose-local.yml
index 392c55a113e..473fc8a4fc9 100644
--- a/docker-compose-local.yml
+++ b/docker-compose-local.yml
@@ -7,20 +7,6 @@ services:
     volumes:
       - redisdata:/data
 
-  plane-mq:
-    image: rabbitmq:3.13.6-management-alpine
-    restart: unless-stopped
-    networks:
-      - dev_env
-    volumes:
-      - rabbitmq_data:/var/lib/rabbitmq
-    env_file:
-      - .env
-    environment:
-      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER}
-      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
-      RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_VHOST}
-
   plane-minio:
     image: minio/minio
     restart: unless-stopped
@@ -34,6 +20,8 @@ services:
     environment:
       MINIO_ROOT_USER: ${AWS_ACCESS_KEY_ID}
       MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY}
+    ports:
+      - 9090:9090
 
   plane-db:
     image: postgres:15.7-alpine
@@ -47,6 +35,8 @@ services:
       - .env
     environment:
       PGDATA: /var/lib/postgresql/data
+    ports:
+      - 5432:5432
 
   web:
     build:
@@ -122,6 +112,8 @@ services:
     depends_on:
       - plane-db
       - plane-redis
+    stdin_open: true
+    tty: true
 
   worker:
     build:
diff --git a/docker-compose.yml b/docker-compose.yml
index 861fa9dd89f..a15bec98aa1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,174 +7,177 @@ services:
       args:
         DOCKER_BUILDKIT: 1
     restart: always
-    command: node web/server.js web
-    depends_on:
-      - api
+    volumes:
+      - ./web:/app/web
+      - ./output:/app/out
+    command: tail -f #node web/server.js web
+    # depends_on:
+    #   - api
 
-  admin:
-    container_name: admin
-    build:
-      context: .
-      dockerfile: ./admin/Dockerfile.admin
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: always
-    command: node admin/server.js admin
-    depends_on:
-      - api
-      - web
+#   admin:
+#     container_name: admin
+#     build:
+#       context: .
+#       dockerfile: ./admin/Dockerfile.admin
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: always
+#     command: node admin/server.js admin
+#     depends_on:
+#       - api
+#       - web
 
-  space:
-    container_name: space
-    build:
-      context: .
-      dockerfile: ./space/Dockerfile.space
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: always
-    command: node space/server.js space
-    depends_on:
-      - api
-      - web
+#   space:
+#     container_name: space
+#     build:
+#       context: .
+#       dockerfile: ./space/Dockerfile.space
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: always
+#     command: node space/server.js space
+#     depends_on:
+#       - api
+#       - web
 
-  api:
-    container_name: api
-    build:
-      context: ./apiserver
-      dockerfile: Dockerfile.api
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: always
-    command: ./bin/docker-entrypoint-api.sh
-    env_file:
-      - ./apiserver/.env
-    depends_on:
-      - plane-db
-      - plane-redis
+#   api:
+#     container_name: api
+#     build:
+#       context: ./apiserver
+#       dockerfile: Dockerfile.api
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: always
+#     command: ./bin/docker-entrypoint-api.sh
+#     env_file:
+#       - ./apiserver/.env
+#     depends_on:
+#       - plane-db
+#       - plane-redis
 
-  worker:
-    container_name: bgworker
-    build:
-      context: ./apiserver
-      dockerfile: Dockerfile.api
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: always
-    command: ./bin/docker-entrypoint-worker.sh
-    env_file:
-      - ./apiserver/.env
-    depends_on:
-      - api
-      - plane-db
-      - plane-redis
+#   worker:
+#     container_name: bgworker
+#     build:
+#       context: ./apiserver
+#       dockerfile: Dockerfile.api
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: always
+#     command: ./bin/docker-entrypoint-worker.sh
+#     env_file:
+#       - ./apiserver/.env
+#     depends_on:
+#       - api
+#       - plane-db
+#       - plane-redis
 
-  beat-worker:
-    container_name: beatworker
-    build:
-      context: ./apiserver
-      dockerfile: Dockerfile.api
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: always
-    command: ./bin/docker-entrypoint-beat.sh
-    env_file:
-      - ./apiserver/.env
-    depends_on:
-      - api
-      - plane-db
-      - plane-redis
+#   beat-worker:
+#     container_name: beatworker
+#     build:
+#       context: ./apiserver
+#       dockerfile: Dockerfile.api
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: always
+#     command: ./bin/docker-entrypoint-beat.sh
+#     env_file:
+#       - ./apiserver/.env
+#     depends_on:
+#       - api
+#       - plane-db
+#       - plane-redis
 
-  migrator:
-    container_name: plane-migrator
-    build:
-      context: ./apiserver
-      dockerfile: Dockerfile.api
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: no
-    command: ./bin/docker-entrypoint-migrator.sh
-    env_file:
-      - ./apiserver/.env
-    depends_on:
-      - plane-db
-      - plane-redis
+#   migrator:
+#     container_name: plane-migrator
+#     build:
+#       context: ./apiserver
+#       dockerfile: Dockerfile.api
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: no
+#     command: ./bin/docker-entrypoint-migrator.sh
+#     env_file:
+#       - ./apiserver/.env
+#     depends_on:
+#       - plane-db
+#       - plane-redis
 
-  live:
-    container_name: plane-live
-    build:
-      context: .
-      dockerfile: ./live/Dockerfile.live
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: always
-    command: node live/dist/server.js
+#   live:
+#     container_name: plane-live
+#     build:
+#       context: .
+#       dockerfile: ./live/Dockerfile.live
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: always
+#     command: node live/dist/server.js
 
-  plane-db:
-    container_name: plane-db
-    image: postgres:15.7-alpine
-    restart: always
-    command: postgres -c 'max_connections=1000'
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-    env_file:
-      - .env
-    environment:
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      PGDATA: /var/lib/postgresql/data
+#   plane-db:
+#     container_name: plane-db
+#     image: postgres:15.7-alpine
+#     restart: always
+#     command: postgres -c 'max_connections=1000'
+#     volumes:
+#       - pgdata:/var/lib/postgresql/data
+#     env_file:
+#       - .env
+#     environment:
+#       POSTGRES_USER: ${POSTGRES_USER}
+#       POSTGRES_DB: ${POSTGRES_DB}
+#       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+#       PGDATA: /var/lib/postgresql/data
 
-  plane-redis:
-    container_name: plane-redis
-    image: valkey/valkey:7.2.5-alpine
-    restart: always
-    volumes:
-      - redisdata:/data
+#   plane-redis:
+#     container_name: plane-redis
+#     image: valkey/valkey:7.2.5-alpine
+#     restart: always
+#     volumes:
+#       - redisdata:/data
 
-  plane-mq:
-    container_name: plane-mq
-    image: rabbitmq:3.13.6-management-alpine
-    restart: always
-    env_file:
-      - .env
-    environment:
-      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER}
-      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
-      RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_VHOST}
-    volumes:
-      - rabbitmq_data:/var/lib/rabbitmq
+#   plane-mq:
+#     container_name: plane-mq
+#     image: rabbitmq:3.13.6-management-alpine
+#     restart: always
+#     env_file:
+#       - .env
+#     environment:
+#       RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER}
+#       RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
+#       RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_VHOST}
+#     volumes:
+#       - rabbitmq_data:/var/lib/rabbitmq
 
-  plane-minio:
-    container_name: plane-minio
-    image: minio/minio
-    restart: always
-    command: server /export --console-address ":9090"
-    volumes:
-      - uploads:/export
-    environment:
-      MINIO_ROOT_USER: ${AWS_ACCESS_KEY_ID}
-      MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY}
+#   plane-minio:
+#     container_name: plane-minio
+#     image: minio/minio
+#     restart: always
+#     command: server /export --console-address ":9090"
+#     volumes:
+#       - uploads:/export
+#     environment:
+#       MINIO_ROOT_USER: ${AWS_ACCESS_KEY_ID}
+#       MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY}
 
-  # Comment this if you already have a reverse proxy running
-  proxy:
-    container_name: proxy
-    build:
-      context: ./nginx
-      dockerfile: Dockerfile
-    restart: always
-    ports:
-      - ${NGINX_PORT}:80
-    environment:
-      FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880}
-      BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
-    depends_on:
-      - web
-      - api
-      - space
-      - admin
+#   # Comment this if you already have a reverse proxy running
+#   proxy:
+#     container_name: proxy
+#     build:
+#       context: ./nginx
+#       dockerfile: Dockerfile
+#     restart: always
+#     ports:
+#       - ${NGINX_PORT}:80
+#     environment:
+#       FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880}
+#       BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
+#     depends_on:
+#       - web
+#       - api
+#       - space
+#       - admin
 
-volumes:
-  pgdata:
-  redisdata:
-  uploads:
-  rabbitmq_data:
+# volumes:
+#   pgdata:
+#   redisdata:
+#   uploads:
+#   rabbitmq_data:
diff --git a/nginx/nginx.conf.dev b/nginx/nginx.conf.dev
index 7b94982104e..8a5a8e62027 100644
--- a/nginx/nginx.conf.dev
+++ b/nginx/nginx.conf.dev
@@ -3,6 +3,9 @@ events {
 
 http {
     sendfile on;
+    chunked_transfer_encoding on;
+    client_body_buffer_size 10M;
+    client_max_body_size 50M;
 
     server {
         listen 80;
diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template
index 819c00f21d2..7f2c0784560 100644
--- a/nginx/nginx.conf.template
+++ b/nginx/nginx.conf.template
@@ -3,6 +3,9 @@ events {
 
 http {
     sendfile on;
+    chunked_transfer_encoding on;
+    client_body_buffer_size 10M;
+    client_max_body_size 50M;
 
     server {
         listen 80;
diff --git a/packages/i18n/.eslintignore b/packages/i18n/.eslintignore
new file mode 100644
index 00000000000..6019047c3e5
--- /dev/null
+++ b/packages/i18n/.eslintignore
@@ -0,0 +1,3 @@
+build/*
+dist/*
+out/*
\ No newline at end of file
diff --git a/packages/i18n/.eslintrc.js b/packages/i18n/.eslintrc.js
new file mode 100644
index 00000000000..558b8f76ed4
--- /dev/null
+++ b/packages/i18n/.eslintrc.js
@@ -0,0 +1,9 @@
+/** @type {import("eslint").Linter.Config} */
+module.exports = {
+  root: true,
+  extends: ["@plane/eslint-config/library.js"],
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    project: true,
+  },
+};
diff --git a/packages/i18n/.prettierignore b/packages/i18n/.prettierignore
new file mode 100644
index 00000000000..d5be669c5e0
--- /dev/null
+++ b/packages/i18n/.prettierignore
@@ -0,0 +1,4 @@
+.turbo
+out/
+dist/
+build/
\ No newline at end of file
diff --git a/packages/i18n/.prettierrc b/packages/i18n/.prettierrc
new file mode 100644
index 00000000000..87d988f1b26
--- /dev/null
+++ b/packages/i18n/.prettierrc
@@ -0,0 +1,5 @@
+{
+  "printWidth": 120,
+  "tabWidth": 2,
+  "trailingComma": "es5"
+}
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
new file mode 100644
index 00000000000..9d3ba2533d9
--- /dev/null
+++ b/packages/i18n/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@plane/i18n",
+  "version": "0.25.3",
+  "license": "AGPL-3.0",
+  "description": "I18n shared across multiple apps internally",
+  "private": true,
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
+  "scripts": {
+    "lint": "eslint src --ext .ts,.tsx",
+    "lint:errors": "eslint src --ext .ts,.tsx --quiet"
+  },
+  "dependencies": {
+    "intl-messageformat": "^10.7.11"
+  },
+  "devDependencies": {
+    "@plane/eslint-config": "*",
+    "@types/node": "^22.5.4",
+    "typescript": "^5.3.3"
+  }
+}
diff --git a/packages/i18n/src/components/index.tsx b/packages/i18n/src/components/index.tsx
new file mode 100644
index 00000000000..0e328826b00
--- /dev/null
+++ b/packages/i18n/src/components/index.tsx
@@ -0,0 +1,29 @@
+import { observer } from "mobx-react";
+ import React, { createContext, useEffect } from "react";
+ import { Language, languages } from "../config";
+ import { TranslationStore } from "./store";
+ 
+ // Create the store instance
+ const translationStore = new TranslationStore();
+ 
+ // Create Context
+ export const TranslationContext = createContext<TranslationStore>(translationStore);
+ 
+ export const TranslationProvider = observer(({ children }: { children: React.ReactNode }) => {
+   // Handle storage events for cross-tab synchronization
+   useEffect(() => {
+     const handleStorageChange = (event: StorageEvent) => {
+       if (event.key === "userLanguage" && event.newValue) {
+         const newLang = event.newValue as Language;
+         if (languages.includes(newLang)) {
+           translationStore.setLanguage(newLang);
+         }
+       }
+     };
+ 
+     window.addEventListener("storage", handleStorageChange);
+     return () => window.removeEventListener("storage", handleStorageChange);
+   }, []);
+ 
+   return <TranslationContext.Provider value={translationStore}>{children}</TranslationContext.Provider>;
+ });
\ No newline at end of file
diff --git a/packages/i18n/src/components/store.ts b/packages/i18n/src/components/store.ts
new file mode 100644
index 00000000000..8fbb98b8590
--- /dev/null
+++ b/packages/i18n/src/components/store.ts
@@ -0,0 +1,42 @@
+import { makeObservable, observable } from "mobx";
+ import { Language, fallbackLng, languages, translations } from "../config";
+ 
+ export class TranslationStore {
+   currentLocale: Language = fallbackLng;
+ 
+   constructor() {
+     makeObservable(this, {
+       currentLocale: observable.ref,
+     });
+     this.initializeLanguage();
+   }
+ 
+   get availableLanguages() {
+     return languages;
+   }
+ 
+   t(key: string) {
+     return translations[this.currentLocale]?.[key] || translations[fallbackLng][key] || key;
+   }
+ 
+   setLanguage(lng: Language) {
+     try {
+       localStorage.setItem("userLanguage", lng);
+       this.currentLocale = lng;
+     } catch (error) {
+       console.error(error);
+     }
+   }
+ 
+   initializeLanguage() {
+     if (typeof window === "undefined") return;
+     const savedLocale = localStorage.getItem("userLanguage") as Language;
+     if (savedLocale && languages.includes(savedLocale)) {
+       this.setLanguage(savedLocale);
+     } else {
+       const browserLang = navigator.language.split("-")[0] as Language;
+       const newLocale = languages.includes(browserLang as Language) ? (browserLang as Language) : fallbackLng;
+       this.setLanguage(newLocale);
+     }
+   }
+ }
\ No newline at end of file
diff --git a/packages/i18n/src/config/index.ts b/packages/i18n/src/config/index.ts
new file mode 100644
index 00000000000..f1c7f50b234
--- /dev/null
+++ b/packages/i18n/src/config/index.ts
@@ -0,0 +1,45 @@
+import en from "../locales/en/translations.json";
+import fr from "../locales/fr/translations.json";
+import es from "../locales/es/translations.json";
+import ja from "../locales/ja/translations.json";
+import pt from "../locales/pt/translations.json";
+ 
+ export type Language = (typeof languages)[number];
+ export type Translations = {
+   [key: string]: {
+     [key: string]: string;
+   };
+ };
+ 
+ export const fallbackLng = "en";
+ export const languages = ["en", "fr", "es", "ja", "pt"] as const;
+ export const translations: Translations = {
+   en,
+   fr,
+   es,
+   ja,
+   pt,
+ };
+ 
+ export const SUPPORTED_LANGUAGES = [
+   {
+     label: "English",
+     value: "en",
+   },
+   {
+     label: "French",
+     value: "fr",
+   },
+   {
+     label: "Spanish",
+     value: "es",
+   },
+   {
+     label: "Japanese",
+     value: "ja",
+   },
+   {
+    label: "Portugese",
+    value: "pt",
+  },
+ ];
\ No newline at end of file
diff --git a/packages/i18n/src/hooks/index.ts b/packages/i18n/src/hooks/index.ts
new file mode 100644
index 00000000000..fb4e297e216
--- /dev/null
+++ b/packages/i18n/src/hooks/index.ts
@@ -0,0 +1 @@
+export * from "./use-translation";
diff --git a/packages/i18n/src/hooks/use-translation.ts b/packages/i18n/src/hooks/use-translation.ts
new file mode 100644
index 00000000000..9a6810a9d29
--- /dev/null
+++ b/packages/i18n/src/hooks/use-translation.ts
@@ -0,0 +1,17 @@
+import { useContext } from "react";
+ import { TranslationContext } from "../components";
+ import { Language } from "../config";
+ 
+ export function useTranslation() {
+   const store = useContext(TranslationContext);
+   if (!store) {
+     throw new Error("useTranslation must be used within a TranslationProvider");
+   }
+ 
+   return {
+     t: (key: string) => store.t(key),
+     currentLocale: store.currentLocale,
+     changeLanguage: (lng: Language) => store.setLanguage(lng),
+     languages: store.availableLanguages,
+   };
+ }
\ No newline at end of file
diff --git a/packages/i18n/src/index.ts b/packages/i18n/src/index.ts
new file mode 100644
index 00000000000..64d0c837158
--- /dev/null
+++ b/packages/i18n/src/index.ts
@@ -0,0 +1,3 @@
+export * from "./config";
+export * from "./components";
+export * from "./hooks";
\ No newline at end of file
diff --git a/packages/i18n/src/locales/en/translations.json b/packages/i18n/src/locales/en/translations.json
new file mode 100644
index 00000000000..8346e0ad33b
--- /dev/null
+++ b/packages/i18n/src/locales/en/translations.json
@@ -0,0 +1,474 @@
+{
+  "submit": "Submit",
+  "cancel": "Cancel",
+  "loading": "Loading",
+  "error": "Error",
+  "success": "Success",
+  "warning": "Warning",
+  "info": "Info",
+  "close": "Close",
+  "yes": "Yes",
+  "no": "No",
+  "ok": "OK",
+  "name": "Name",
+  "description": "Description",
+  "search": "Search",
+  "add_member": "Add member",
+  "remove_member": "Remove member",
+  "add_members": "Add members",
+  "remove_members": "Remove members",
+  "add": "Add",
+  "remove": "Remove",
+  "add_new": "Add new",
+  "remove_selected": "Remove selected",
+  "first_name": "First name",
+  "last_name": "Last name",
+  "email": "Email",
+  "display_name": "Display name",
+  "role": "Role",
+  "timezone": "Timezone",
+  "avatar": "Avatar",
+  "cover_image": "Cover image",
+  "password": "Password",
+  "change_cover": "Change cover",
+  "language": "Language",
+  "saving": "Saving...",
+  "save_changes": "Save changes",
+  "deactivate_account": "Deactivate account",
+  "deactivate_account_description": "When deactivating an account, all of the data and resources within that account will be permanently removed and cannot be recovered.",
+  "profile_settings": "Profile settings",
+  "your_account": "Your account",
+  "profile": "Profile",
+  "security": "Security",
+  "activity": "Activity",
+  "appearance": "Appearance",
+  "notifications": "Notifications",
+  "workspaces": "Workspaces",
+  "create_workspace": "Create workspace",
+  "invitations": "Invitations",
+  "summary": "Summary",
+  "assigned": "Assigned",
+  "created": "Created",
+  "subscribed": "Subscribed",
+  "you_do_not_have_the_permission_to_access_this_page": "You do not have the permission to access this page.",
+  "failed_to_sign_out_please_try_again": "Failed to sign out. Please try again.",
+  "password_changed_successfully": "Password changed successfully.",
+  "something_went_wrong_please_try_again": "Something went wrong. Please try again.",
+  "change_password": "Change password",
+  "passwords_dont_match": "Passwords don't match",
+  "current_password": "Current password",
+  "new_password": "New password",
+  "confirm_password": "Confirm password",
+  "this_field_is_required": "This field is required",
+  "changing_password": "Changing password",
+  "please_enter_your_password": "Please enter your password.",
+  "password_length_should_me_more_than_8_characters": "Password length should me more than 8 characters.",
+  "password_is_weak": "Password is weak.",
+  "password_is_strong": "Password is strong.",
+  "load_more": "Load more",
+  "select_or_customize_your_interface_color_scheme": "Select or customize your interface color scheme.",
+  "theme": "Theme",
+  "system_preference": "System preference",
+  "light": "Light",
+  "dark": "Dark",
+  "light_contrast": "Light high contrast",
+  "dark_contrast": "Dark high contrast",
+  "custom": "Custom theme",
+  "select_your_theme": "Select your theme",
+  "customize_your_theme": "Customize your theme",
+  "background_color": "Background color",
+  "text_color": "Text color",
+  "primary_color": "Primary(Theme) color",
+  "sidebar_background_color": "Sidebar background color",
+  "sidebar_text_color": "Sidebar text color",
+  "set_theme": "Set theme",
+  "enter_a_valid_hex_code_of_6_characters": "Enter a valid hex code of 6 characters",
+  "background_color_is_required": "Background color is required",
+  "text_color_is_required": "Text color is required",
+  "primary_color_is_required": "Primary color is required",
+  "sidebar_background_color_is_required": "Sidebar background color is required",
+  "sidebar_text_color_is_required": "Sidebar text color is required",
+  "updating_theme": "Updating theme",
+  "theme_updated_successfully": "Theme updated successfully",
+  "failed_to_update_the_theme": "Failed to update the theme",
+  "email_notifications": "Email notifications",
+  "stay_in_the_loop_on_issues_you_are_subscribed_to_enable_this_to_get_notified": "Stay in the loop on Issues you are subscribed to. Enable this to get notified.",
+  "email_notification_setting_updated_successfully": "Email notification setting updated successfully",
+  "failed_to_update_email_notification_setting": "Failed to update email notification setting",
+  "notify_me_when": "Notify me when",
+  "property_changes": "Property changes",
+  "property_changes_description": "Notify me when issue's properties like assignees, priority, estimates or anything else changes.",
+  "state_change": "State change",
+  "state_change_description": "Notify me when the issues moves to a different state",
+  "issue_completed": "Issue completed",
+  "issue_completed_description": "Notify me only when an issue is completed",
+  "comments": "Comments",
+  "comments_description": "Notify me when someone leaves a comment on the issue",
+  "mentions": "Mentions",
+  "mentions_description": "Notify me only when someone mentions me in the comments or description",
+  "create_your_workspace": "Create your workspace",
+  "only_your_instance_admin_can_create_workspaces": "Only your instance admin can create workspaces",
+  "only_your_instance_admin_can_create_workspaces_description": "If you know your instance admin's email address, click the button below to get in touch with them.",
+  "go_back": "Go back",
+  "request_instance_admin": "Request instance admin",
+  "plane_logo": "Plane logo",
+  "workspace_creation_disabled": "Workspace creation disabled",
+  "workspace_request_subject": "Requesting a new workspace",
+  "workspace_request_body": "Hi instance admin(s),\n\nPlease create a new workspace with the URL [/workspace-name] for [purpose of creating the workspace].\n\nThanks,\n{{firstName}} {{lastName}}\n{{email}}",
+  "creating_workspace": "Creating workspace",
+  "workspace_created_successfully": "Workspace created successfully",
+  "create_workspace_page": "Create workspace page",
+  "workspace_could_not_be_created_please_try_again": "Workspace could not be created. Please try again.",
+  "workspace_could_not_be_created_please_try_again_description": "Some error occurred while creating workspace. Please try again.",
+  "this_is_a_required_field": "This is a required field.",
+  "name_your_workspace": "Name your workspace",
+  "workspaces_names_can_contain_only_space_dash_and_alphanumeric_characters": "Workspaces names can contain only (' '), ('-'), ('_') and alphanumeric characters.",
+  "limit_your_name_to_80_characters": "Limit your name to 80 characters.",
+  "set_your_workspace_url": "Set your workspace's URL",
+  "limit_your_url_to_48_characters": "Limit your URL to 48 characters.",
+  "how_many_people_will_use_this_workspace": "How many people will use this workspace?",
+  "how_many_people_will_use_this_workspace_description": "This will help us to determine the number of seats you need to purchase.",
+  "select_a_range": "Select a range",
+  "urls_can_contain_only_dash_and_alphanumeric_characters": "URLs can contain only ('-') and alphanumeric characters.",
+  "something_familiar_and_recognizable_is_always_best": "Something familiar and recognizable is always best.",
+  "workspace_url_is_already_taken": "Workspace URL is already taken!",
+  "old_password": "Old password",
+  "general_settings": "General settings",
+  "sign_out": "Sign out",
+  "signing_out": "Signing out",
+  "active_cycles": "Active cycles",
+  "active_cycles_description": "Monitor cycles across projects, track high-priority issues, and zoom in cycles that need attention.",
+  "on_demand_snapshots_of_all_your_cycles": "On-demand snapshots of all your cycles",
+  "upgrade": "Upgrade",
+  "10000_feet_view": "10,000-feet view of all active cycles.",
+  "10000_feet_view_description": "Zoom out to see running cycles across all your projects at once instead of going from Cycle to Cycle in each project.",
+  "get_snapshot_of_each_active_cycle": "Get a snapshot of each active cycle.",
+  "get_snapshot_of_each_active_cycle_description": "Track high-level metrics for all active cycles, see their state of progress, and get a sense of scope against deadlines.",
+  "compare_burndowns": "Compare burndowns.",
+  "compare_burndowns_description": "Monitor how each of your teams are performing with a peek into each cycle's burndown report.",
+  "quickly_see_make_or_break_issues": "Quickly see make-or-break issues.",
+  "quickly_see_make_or_break_issues_description": "Preview high-priority issues for each cycle against due dates. See all of them per cycle in one click.",
+  "zoom_into_cycles_that_need_attention": "Zoom into cycles that need attention.",
+  "zoom_into_cycles_that_need_attention_description": "Investigate the state of any cycle that doesn't conform to expectations in one click.",
+  "stay_ahead_of_blockers": "Stay ahead of blockers.",
+  "stay_ahead_of_blockers_description": "Spot challenges from one project to another and see inter-cycle dependencies that aren't obvious from any other view.",
+  "analytics": "Analytics",
+  "workspace_invites": "Workspace invites",
+  "workspace_settings": "Workspace settings",
+  "enter_god_mode": "Enter god mode",
+  "workspace_logo": "Workspace logo",
+  "new_issue": "New issue",
+  "home": "Home",
+  "your_work": "Your work",
+  "drafts": "Drafts",
+  "projects": "Projects",
+  "views": "Views",
+  "workspace": "Workspace",
+  "archives": "Archives",
+  "settings": "Settings",
+  "failed_to_move_favorite": "Failed to move favorite",
+  "your_favorites": "Your favorites",
+  "no_favorites_yet": "No favorites yet",
+  "create_folder": "Create folder",
+  "new_folder": "New folder",
+  "favorite_updated_successfully": "Favorite updated successfully",
+  "favorite_created_successfully": "Favorite created successfully",
+  "folder_already_exists": "Folder already exists",
+  "folder_name_cannot_be_empty": "Folder name cannot be empty",
+  "something_went_wrong": "Something went wrong",
+  "failed_to_reorder_favorite": "Failed to reorder favorite",
+  "favorite_removed_successfully": "Favorite removed successfully",
+  "failed_to_create_favorite": "Failed to create favorite",
+  "failed_to_rename_favorite": "Failed to rename favorite",
+  "project_link_copied_to_clipboard": "Project link copied to clipboard",
+  "link_copied": "Link copied",
+  "your_projects": "Your projects",
+  "add_project": "Add project",
+  "create_project": "Create project",
+  "failed_to_remove_project_from_favorites": "Couldn't remove the project from favorites. Please try again.",
+  "project_created_successfully": "Project created successfully",
+  "project_created_successfully_description": "Project created successfully. You can now start adding issues to it.",
+  "project_cover_image_alt": "Project cover image",
+  "name_is_required": "Name is required",
+  "title_should_be_less_than_255_characters": "Title should be less than 255 characters",
+  "project_name": "Project name",
+  "project_id_must_be_at_least_1_character": "Project ID must at least be of 1 character",
+  "project_id_must_be_at_most_5_characters": "Project ID must at most be of 5 characters",
+  "project_id": "Project ID",
+  "project_id_tooltip_content": "Helps you identify issues in the project uniquely. Max 5 characters.",
+  "description_placeholder": "Description...",
+  "only_alphanumeric_non_latin_characters_allowed": "Only Alphanumeric & Non-latin characters are allowed.",
+  "project_id_is_required": "Project ID is required",
+  "select_network": "Select network",
+  "lead": "Lead",
+  "private": "Private",
+  "public": "Public",
+  "accessible_only_by_invite": "Accessible only by invite",
+  "anyone_in_the_workspace_except_guests_can_join": "Anyone in the workspace except Guests can join",
+  "creating": "Creating",
+  "creating_project": "Creating project",
+  "adding_project_to_favorites": "Adding project to favorites",
+  "project_added_to_favorites": "Project added to favorites",
+  "couldnt_add_the_project_to_favorites": "Couldn't add the project to favorites. Please try again.",
+  "removing_project_from_favorites": "Removing project from favorites",
+  "project_removed_from_favorites": "Project removed from favorites",
+  "couldnt_remove_the_project_from_favorites": "Couldn't remove the project from favorites. Please try again.",
+  "add_to_favorites": "Add to favorites",
+  "remove_from_favorites": "Remove from favorites",
+  "publish_settings": "Publish settings",
+  "publish": "Publish",
+  "copy_link": "Copy link",
+  "leave_project": "Leave project",
+  "join_the_project_to_rearrange": "Join the project to rearrange",
+  "drag_to_rearrange": "Drag to rearrange",
+  "congrats": "Congrats!",
+  "project": "Project",
+  "open_project": "Open project",
+  "issues": "Issues",
+  "cycles": "Cycles",
+  "modules": "Modules",
+  "pages": "Pages",
+  "intake": "Intake",
+  "time_tracking": "Time Tracking",
+  "work_management": "Work management",
+  "projects_and_issues": "Projects and issues",
+  "projects_and_issues_description": "Toggle these on or off this project.",
+  "cycles_description": "Timebox work as you see fit per project and change frequency from one period to the next.",
+  "modules_description": "Group work into sub-project-like set-ups with their own leads and assignees.",
+  "views_description": "Save sorts, filters, and display options for later or share them.",
+  "pages_description": "Write anything like you write anything.",
+  "intake_description": "Stay in the loop on Issues you are subscribed to. Enable this to get notified.",
+  "time_tracking_description": "Track time spent on issues and projects.",
+  "work_management_description": "Manage your work and projects with ease.",
+  "documentation": "Documentation",
+  "message_support": "Message support",
+  "contact_sales": "Contact sales",
+  "hyper_mode": "Hyper Mode",
+  "keyboard_shortcuts": "Keyboard shortcuts",
+  "whats_new": "What's new?",
+  "version": "Version",
+  "we_are_having_trouble_fetching_the_updates": "We are having trouble fetching the updates.",
+  "our_changelogs": "our changelogs",
+  "for_the_latest_updates": "for the latest updates.",
+  "please_visit": "Please visit",
+  "docs": "Docs",
+  "full_changelog": "Full changelog",
+  "support": "Support",
+  "discord": "Discord",
+  "powered_by_plane_pages": "Powered by Plane Pages",
+  "please_select_at_least_one_invitation": "Please select at least one invitation.",
+  "please_select_at_least_one_invitation_description": "Please select at least one invitation to join the workspace.",
+  "we_see_that_someone_has_invited_you_to_join_a_workspace": "We see that someone has invited you to join a workspace",
+  "join_a_workspace": "Join a workspace",
+  "we_see_that_someone_has_invited_you_to_join_a_workspace_description": "We see that someone has invited you to join a workspace",
+  "join_a_workspace_description": "Join a workspace",
+  "accept_and_join": "Accept & Join",
+  "go_home": "Go Home",
+  "no_pending_invites": "No pending invites",
+  "you_can_see_here_if_someone_invites_you_to_a_workspace": "You can see here if someone invites you to a workspace",
+  "back_to_home": "Back to home",
+  "workspace_name": "workspace-name",
+  "deactivate_your_account": "Deactivate your account",
+  "deactivate_your_account_description": "Once deactivated, you can't be assigned issues and be billed for your workspace. To reactivate your account, you will need an invite to a workspace at this email address.",
+  "deactivating": "Deactivating",
+  "confirm": "Confirm",
+  "draft_created": "Draft created",
+  "issue_created_successfully": "Issue created successfully",
+  "draft_creation_failed": "Draft creation failed",
+  "issue_creation_failed": "Issue creation failed",
+  "draft_issue": "Draft issue",
+  "issue_updated_successfully": "Issue updated successfully",
+  "issue_could_not_be_updated": "Issue could not be updated",
+  "create_a_draft": "Create a draft",
+  "save_to_drafts": "Save to Drafts",
+  "save": "Save",
+  "updating": "Updating",
+  "create_new_issue": "Create new issue",
+  "editor_is_not_ready_to_discard_changes": "Editor is not ready to discard changes",
+  "failed_to_move_issue_to_project": "Failed to move issue to project",
+  "create_more": "Create more",
+  "add_to_project": "Add to project",
+  "discard": "Discard",
+  "duplicate_issue_found": "Duplicate issue found",
+  "duplicate_issues_found": "Duplicate issues found",
+  "no_matching_results": "No matching results",
+  "title_is_required": "Title is required",
+  "title": "Title",
+  "state": "State",
+  "priority": "Priority",
+  "none": "None",
+  "urgent": "Urgent",
+  "high": "High",
+  "medium": "Medium",
+  "low": "Low",
+  "members": "Members",
+  "assignee": "Assignee",
+  "assignees": "Assignees",
+  "you": "You",
+  "labels": "Labels",
+  "create_new_label": "Create new label",
+  "start_date": "Start date",
+  "due_date": "Due date",
+  "cycle": "Cycle",
+  "estimate": "Estimate",
+  "change_parent_issue": "Change parent issue",
+  "remove_parent_issue": "Remove parent issue",
+  "add_parent": "Add parent",
+  "loading_members": "Loading members...",
+  "good": "Good",
+  "morning": "morning",
+  "afternoon": "afternoon",
+  "evening": "evening",
+  "issues_assigned": "Issues assigned",
+  "issues_overdue": "Issues overdue",
+  "issues_created": "Issues created",
+  "issues_completed": "Issues completed",
+  "assigned_to_you": "Assigned to you",
+  "created_by_you": "Created by you",
+  "assigned_by_state": "Assigned by state",
+  "assigned_by_priority": "Assigned by priority",
+  "your_issue_activities": "Your issue activities",
+  "create_new_project": "Create new project",
+  "collaborators": "Collaborators",
+  "search_for_collaborators": "Search for collaborators",
+  "all-issues": "All issues",
+  "created_on": "Created on",
+  "updated_on": "Updated on",
+  "link": "Link",
+  "attachment_count": "Attachment",
+  "sub_issue_count": "Sub-issue",
+  "trip_reference_number": "Trip Ref Number",
+  "reference_number": "Reference Number",
+  "hub_code": "Hub Code",
+  "hub_name": "Hub Name",
+  "customer_code": "Customer Code",
+  "customer_name": "Customer Name",
+  "vendor_name": "Vendor Name",
+  "vendor_code": "Vendor Code",
+  "worker_code": "Worker Code",
+  "worker_name": "Worker Name",
+  "business_type": "Business Type",
+  "filters": "Filters",
+  "key": "ID",
+  "issue_type": "Issue Type",
+  "Press '/' for commands...": "Press '/' for commands...",
+  "Click to add description": "Click to add description",
+  "properties": "Properties",
+  "parent": "Parent",
+  "sub_issue": "Sub-issue",
+  "target_date": "Target Date",
+  "order_by": "Order by",
+  "add_sub_issue": "Add sub-issue",
+  "add_relation": "Add relation",
+  "add_link": "Add link",
+  "attach": "Attach",
+  "links": "Links",
+  "relations": "Relations",
+  "attachments": "Attachments",
+  "display": "Display",
+  "add_view": "Add View",
+  "module": "Module",
+  "state_group": "State Group",
+  "mention": "Mention",
+  "created_by": "Created by",
+  "label": "Label",
+  "issue_grouping": "Issue Grouping",
+  "no_matches_found": "No matches found",
+  "view_more": "View More",
+  "today": "Today",
+  "Month layout": "Month layout",
+  "Week layout": "Week layout",
+  "show_weekends": "Show weekends",
+  "week": "Week",
+  "month": "Month",
+  "quarter": "Quarter",
+  "update_view": "Update View",
+  "create_view": "Create View",
+  "Type a command or search...": "Type a command or search...",
+  "expand": "Expand",
+  "hide": "Hide",
+  "comment": "Comment",
+  "created_issue": " created the issue.",
+  "deleted_issue": " deleted an issue.",
+  "set_state_to": "set the state to",
+  "set_name_to": "set the name to",
+  "updated_description": "updated the description",
+  "of": "of",
+  "added_assignee": "added a new assignee ",
+  "removed_assignee": "removed the assignee ",
+  "from": "from",
+  "set_priority_to": "set the priority to",
+  "for": "for",
+  "set_estimate_point_to": "set the estimate point to ",
+  "removed_estimate_point": "removed the estimate point ",
+  "to": "to",
+  "set_parent_to": "set the parent to ",
+  "removed_parent": "removed the parent ",
+  "marked_blocking_issue": "marked this issue is blocking issue ",
+  "removed_blocking_issue": "removed the blocking issue ",
+  "marked_blocked_by": "marked this issue is being blocked by ",
+  "removed_blocked_by": "removed this issue being blocked by issue ",
+  "marked_duplicate_of": "marked this issue as duplicate of ",
+  "removed_duplicate_of": "removed this issue as a duplicate of ",
+  "marked_relation_to": "marked that this issue relates to ",
+  "removed_relation_from": "removed the relation from ",
+  "set_start_date_to": "set the start date to ",
+  "removed_start_date": "removed the start date ",
+  "connector_for": " for ",
+  "connector_from": " from ",
+  "set_due_date_to": "set the due date to ",
+  "removed_due_date": "removed the due date ",
+  "added_issue_to_cycle": "added this issue to the cycle ",
+  "set_cycle_to": "set the cycle to ",
+  "removed_issue_from_cycle": "removed the issue from the cycle ",
+  "added_issue_to_module": "added this issue to the module ",
+  "set_module_to": "set the module to ",
+  "removed_issue_from_module": "removed the issue from the module ",
+  "added_label": "added a new label ",
+  "removed_label": "removed the label ",
+  "added": "added ",
+  "updated": "updated the ",
+  "removed": "removed this ",
+  "uploaded_new": "uploaded a new ",
+  "removed_attachment": "removed an attachment",
+  "attachment": "attachment",
+  "restored_issue": "restored the issue",
+  "archived_issue": "archived the issue",
+  "declined_issue_from_intake": "declined this issue from intake.",
+  "snoozed_issue": "snoozed this issue.",
+  "accepted_issue_from_intake": "accepted this issue from intake.",
+  "declined_issue_from_intake_duplicate": "declined this issue from intake by marking a duplicate issue.",
+  "updated_intake_issue_status": "updated intake issue status.",
+  "added_custom_property": "Added a Custom Property ",
+  "with_value": " with value",
+  "updated_custom_property_value": "Updated the value of ",
+  "options": "Options",
+  "add_issue": "Add Issue",
+  "Add Comment...": "Add Comment...",
+  "duration": "Duration",
+  "updates": "Updates",
+  "upcoming": "Upcoming",
+  "overdue": "Overdue",
+  "completed": "Completed",
+  "pending": "Pending",
+  "recent_projects": "Recent Projects",
+  "January": "January",
+  "February": "February",
+  "March": "March",
+  "April": "April",
+  "May": "May",
+  "June": "June",
+  "July": "July",
+  "August": "August",
+  "September": "September",
+  "October": "October",
+  "November": "November",
+  "December": "December",
+  "current": "Current",
+  "view_all": "View all",
+  "view_all_issues": "View all issues",
+  "assigned_to": "Assigned to",
+  "due_by": "Due by",
+  "blocked_by": "Blocked by",
+  "sub_issues": "Sub-issues"
+}
\ No newline at end of file
diff --git a/packages/i18n/src/locales/es/translations.json b/packages/i18n/src/locales/es/translations.json
new file mode 100644
index 00000000000..1170d3cf83d
--- /dev/null
+++ b/packages/i18n/src/locales/es/translations.json
@@ -0,0 +1,318 @@
+{
+  "submit": "Enviar",
+  "cancel": "Cancelar",
+  "loading": "Cargando",
+  "error": "Error",
+  "success": "Éxito",
+  "warning": "Advertencia",
+  "info": "Información",
+  "close": "Cerrar",
+  "yes": "Sí",
+  "no": "No",
+  "ok": "OK",
+  "name": "Nombre",
+  "description": "Descripción",
+  "search": "Buscar",
+  "add_member": "Agregar miembro",
+  "remove_member": "Eliminar miembro",
+  "add_members": "Agregar miembros",
+  "remove_members": "Eliminar miembros",
+  "add": "Agregar",
+  "remove": "Eliminar",
+  "add_new": "Agregar nuevo",
+  "remove_selected": "Eliminar seleccionados",
+  "first_name": "Nombre",
+  "last_name": "Apellido",
+  "email": "Correo electrónico",
+  "display_name": "Nombre para mostrar",
+  "role": "Rol",
+  "timezone": "Zona horaria",
+  "avatar": "Avatar",
+  "cover_image": "Imagen de portada",
+  "password": "Contraseña",
+  "change_cover": "Cambiar portada",
+  "language": "Idioma",
+  "saving": "Guardando...",
+  "save_changes": "Guardar cambios",
+  "deactivate_account": "Desactivar cuenta",
+  "deactivate_account_description": "Al desactivar una cuenta, todos los datos y recursos dentro de esa cuenta se eliminarán permanentemente y no se podrán recuperar.",
+  "profile_settings": "Configuración de perfil",
+  "your_account": "Tu cuenta",
+  "profile": "Perfil",
+  "security": "Seguridad",
+  "activity": "Actividad",
+  "appearance": "Apariencia",
+  "notifications": "Notificaciones",
+  "workspaces": "Espacios de trabajo",
+  "create_workspace": "Crear espacio de trabajo",
+  "invitations": "Invitaciones",
+  "summary": "Resumen",
+  "assigned": "Asignado",
+  "created": "Creado",
+  "subscribed": "Suscrito",
+  "you_do_not_have_the_permission_to_access_this_page": "No tienes permiso para acceder a esta página.",
+  "failed_to_sign_out_please_try_again": "Error al cerrar sesión. Por favor, inténtalo de nuevo.",
+  "password_changed_successfully": "Contraseña cambiada con éxito.",
+  "something_went_wrong_please_try_again": "Algo salió mal. Por favor, inténtalo de nuevo.",
+  "change_password": "Cambiar contraseña",
+  "passwords_dont_match": "Las contraseñas no coinciden",
+  "current_password": "Contraseña actual",
+  "new_password": "Nueva contraseña",
+  "confirm_password": "Confirmar contraseña",
+  "this_field_is_required": "Este campo es obligatorio",
+  "changing_password": "Cambiando contraseña",
+  "please_enter_your_password": "Por favor, introduce tu contraseña.",
+  "password_length_should_me_more_than_8_characters": "La longitud de la contraseña debe ser más de 8 caracteres.",
+  "password_is_weak": "La contraseña es débil.",
+  "password_is_strong": "La contraseña es fuerte.",
+  "load_more": "Cargar más",
+  "select_or_customize_your_interface_color_scheme": "Selecciona o personaliza el esquema de color de tu interfaz.",
+  "theme": "Tema",
+  "system_preference": "Preferencia del sistema",
+  "light": "Claro",
+  "dark": "Oscuro",
+  "light_contrast": "Alto contraste claro",
+  "dark_contrast": "Alto contraste oscuro",
+  "custom": "Tema personalizado",
+  "select_your_theme": "Selecciona tu tema",
+  "customize_your_theme": "Personaliza tu tema",
+  "background_color": "Color de fondo",
+  "text_color": "Color del texto",
+  "primary_color": "Color primario (Tema)",
+  "sidebar_background_color": "Color de fondo de la barra lateral",
+  "sidebar_text_color": "Color del texto de la barra lateral",
+  "set_theme": "Establecer tema",
+  "enter_a_valid_hex_code_of_6_characters": "Introduce un código hexadecimal válido de 6 caracteres",
+  "background_color_is_required": "El color de fondo es obligatorio",
+  "text_color_is_required": "El color del texto es obligatorio",
+  "primary_color_is_required": "El color primario es obligatorio",
+  "sidebar_background_color_is_required": "El color de fondo de la barra lateral es obligatorio",
+  "sidebar_text_color_is_required": "El color del texto de la barra lateral es obligatorio",
+  "updating_theme": "Actualizando tema",
+  "theme_updated_successfully": "Tema actualizado con éxito",
+  "failed_to_update_the_theme": "Error al actualizar el tema",
+  "email_notifications": "Notificaciones por correo electrónico",
+  "stay_in_the_loop_on_issues_you_are_subscribed_to_enable_this_to_get_notified": "Mantente al tanto de los problemas a los que estás suscrito. Activa esto para recibir notificaciones.",
+  "email_notification_setting_updated_successfully": "Configuración de notificaciones por correo electrónico actualizada con éxito",
+  "failed_to_update_email_notification_setting": "Error al actualizar la configuración de notificaciones por correo electrónico",
+  "notify_me_when": "Notifícame cuando",
+  "property_changes": "Cambios de propiedad",
+  "property_changes_description": "Notifícame cuando cambien las propiedades del problema como asignados, prioridad, estimaciones o cualquier otra cosa.",
+  "state_change": "Cambio de estado",
+  "state_change_description": "Notifícame cuando el problema se mueva a un estado diferente",
+  "issue_completed": "Problema completado",
+  "issue_completed_description": "Notifícame solo cuando un problema esté completado",
+  "comments": "Comentarios",
+  "comments_description": "Notifícame cuando alguien deje un comentario en el problema",
+  "mentions": "Menciones",
+  "mentions_description": "Notifícame solo cuando alguien me mencione en los comentarios o en la descripción",
+  "create_your_workspace": "Crea tu espacio de trabajo",
+  "only_your_instance_admin_can_create_workspaces": "Solo tu administrador de instancia puede crear espacios de trabajo",
+  "only_your_instance_admin_can_create_workspaces_description": "Si conoces el correo electrónico de tu administrador de instancia, haz clic en el botón de abajo para ponerte en contacto con él.",
+  "go_back": "Regresar",
+  "request_instance_admin": "Solicitar administrador de instancia",
+  "plane_logo": "Logo de Plane",
+  "workspace_creation_disabled": "Creación de espacio de trabajo deshabilitada",
+  "workspace_request_subject": "Solicitando un nuevo espacio de trabajo",
+  "workspace_request_body": "Hola administrador(es) de instancia,\n\nPor favor, crea un nuevo espacio de trabajo con la URL [/nombre-del-espacio-de-trabajo] para [propósito de crear el espacio de trabajo].\n\nGracias,\n{{firstName}} {{lastName}}\n{{email}}",
+  "creating_workspace": "Creando espacio de trabajo",
+  "workspace_created_successfully": "Espacio de trabajo creado con éxito",
+  "create_workspace_page": "Página de creación de espacio de trabajo",
+  "workspace_could_not_be_created_please_try_again": "No se pudo crear el espacio de trabajo. Por favor, inténtalo de nuevo.",
+  "workspace_could_not_be_created_please_try_again_description": "Ocurrió un error al crear el espacio de trabajo. Por favor, inténtalo de nuevo.",
+  "this_is_a_required_field": "Este es un campo obligatorio.",
+  "name_your_workspace": "Nombra tu espacio de trabajo",
+  "workspaces_names_can_contain_only_space_dash_and_alphanumeric_characters": "Los nombres de los espacios de trabajo solo pueden contener (' '), ('-'), ('_') y caracteres alfanuméricos.",
+  "limit_your_name_to_80_characters": "Limita tu nombre a 80 caracteres.",
+  "set_your_workspace_url": "Establece la URL de tu espacio de trabajo",
+  "limit_your_url_to_48_characters": "Limita tu URL a 48 caracteres.",
+  "how_many_people_will_use_this_workspace": "¿Cuántas personas usarán este espacio de trabajo?",
+  "how_many_people_will_use_this_workspace_description": "Esto nos ayudará a determinar el número de asientos que necesitas comprar.",
+  "select_a_range": "Selecciona un rango",
+  "urls_can_contain_only_dash_and_alphanumeric_characters": "Las URLs solo pueden contener ('-') y caracteres alfanuméricos.",
+  "something_familiar_and_recognizable_is_always_best": "Algo familiar y reconocible siempre es mejor.",
+  "workspace_url_is_already_taken": "¡La URL del espacio de trabajo ya está tomada!",
+  "old_password": "Contraseña antigua",
+  "general_settings": "Configuración general",
+  "sign_out": "Cerrar sesión",
+  "signing_out": "Cerrando sesión",
+  "active_cycles": "Ciclos activos",
+  "active_cycles_description": "Monitorea ciclos a través de proyectos, rastrea problemas de alta prioridad y enfócate en ciclos que necesitan atención.",
+  "on_demand_snapshots_of_all_your_cycles": "Instantáneas bajo demanda de todos tus ciclos",
+  "upgrade": "Actualizar",
+  "10000_feet_view": "Vista de 10,000 pies de todos los ciclos activos.",
+  "10000_feet_view_description": "Amplía para ver ciclos en ejecución en todos tus proyectos a la vez en lugar de ir de ciclo en ciclo en cada proyecto.",
+  "get_snapshot_of_each_active_cycle": "Obtén una instantánea de cada ciclo activo.",
+  "get_snapshot_of_each_active_cycle_description": "Rastrea métricas de alto nivel para todos los ciclos activos, ve su estado de progreso y obtén una idea del alcance frente a los plazos.",
+  "compare_burndowns": "Compara burndowns.",
+  "compare_burndowns_description": "Monitorea cómo se están desempeñando cada uno de tus equipos con un vistazo al informe de burndown de cada ciclo.",
+  "quickly_see_make_or_break_issues": "Ve rápidamente problemas críticos.",
+  "quickly_see_make_or_break_issues_description": "Previsualiza problemas de alta prioridad para cada ciclo contra fechas de vencimiento. Vélos todos por ciclo en un clic.",
+  "zoom_into_cycles_that_need_attention": "Enfócate en ciclos que necesitan atención.",
+  "zoom_into_cycles_that_need_attention_description": "Investiga el estado de cualquier ciclo que no cumpla con las expectativas en un clic.",
+  "stay_ahead_of_blockers": "Anticípate a los bloqueadores.",
+  "stay_ahead_of_blockers_description": "Detecta desafíos de un proyecto a otro y ve dependencias entre ciclos que no son obvias desde ninguna otra vista.",
+  "analytics": "Analítica",
+  "workspace_invites": "Invitaciones al espacio de trabajo",
+  "workspace_settings": "Configuración del espacio de trabajo",
+  "enter_god_mode": "Entrar en modo dios",
+  "workspace_logo": "Logo del espacio de trabajo",
+  "new_issue": "Nuevo problema",
+  "home": "Inicio",
+  "your_work": "Tu trabajo",
+  "drafts": "Borradores",
+  "projects": "Proyectos",
+  "views": "Vistas",
+  "workspace": "Espacio de trabajo",
+  "archives": "Archivos",
+  "settings": "Configuración",
+  "failed_to_move_favorite": "Error al mover favorito",
+  "your_favorites": "Tus favoritos",
+  "no_favorites_yet": "Aún no hay favoritos",
+  "create_folder": "Crear carpeta",
+  "new_folder": "Nueva carpeta",
+  "favorite_updated_successfully": "Favorito actualizado con éxito",
+  "favorite_created_successfully": "Favorito creado con éxito",
+  "folder_already_exists": "La carpeta ya existe",
+  "folder_name_cannot_be_empty": "El nombre de la carpeta no puede estar vacío",
+  "something_went_wrong": "Algo salió mal",
+  "failed_to_reorder_favorite": "Error al reordenar favorito",
+  "favorite_removed_successfully": "Favorito eliminado con éxito",
+  "failed_to_create_favorite": "Error al crear favorito",
+  "failed_to_rename_favorite": "Error al renombrar favorito",
+  "project_link_copied_to_clipboard": "Enlace del proyecto copiado al portapapeles",
+  "link_copied": "Enlace copiado",
+  "your_projects": "Tus proyectos",
+  "add_project": "Agregar proyecto",
+  "create_project": "Crear proyecto",
+  "failed_to_remove_project_from_favorites": "No se pudo eliminar el proyecto de favoritos. Por favor, inténtalo de nuevo.",
+  "project_created_successfully": "Proyecto creado con éxito",
+  "project_created_successfully_description": "Proyecto creado con éxito. Ahora puedes comenzar a agregar problemas a él.",
+  "project_cover_image_alt": "Imagen de portada del proyecto",
+  "name_is_required": "El nombre es obligatorio",
+  "title_should_be_less_than_255_characters": "El título debe tener menos de 255 caracteres",
+  "project_name": "Nombre del proyecto",
+  "project_id_must_be_at_least_1_character": "El ID del proyecto debe tener al menos 1 carácter",
+  "project_id_must_be_at_most_5_characters": "El ID del proyecto debe tener como máximo 5 caracteres",
+  "project_id": "ID del proyecto",
+  "project_id_tooltip_content": "Te ayuda a identificar problemas en el proyecto de manera única. Máximo 5 caracteres.",
+  "description_placeholder": "Descripción...",
+  "only_alphanumeric_non_latin_characters_allowed": "Solo se permiten caracteres alfanuméricos y no latinos.",
+  "project_id_is_required": "El ID del proyecto es obligatorio",
+  "select_network": "Seleccionar red",
+  "lead": "Líder",
+  "private": "Privado",
+  "public": "Público",
+  "accessible_only_by_invite": "Accesible solo por invitación",
+  "anyone_in_the_workspace_except_guests_can_join": "Cualquiera en el espacio de trabajo excepto invitados puede unirse",
+  "creating": "Creando",
+  "creating_project": "Creando proyecto",
+  "adding_project_to_favorites": "Agregando proyecto a favoritos",
+  "project_added_to_favorites": "Proyecto agregado a favoritos",
+  "couldnt_add_the_project_to_favorites": "No se pudo agregar el proyecto a favoritos. Por favor, inténtalo de nuevo.",
+  "removing_project_from_favorites": "Eliminando proyecto de favoritos",
+  "project_removed_from_favorites": "Proyecto eliminado de favoritos",
+  "couldnt_remove_the_project_from_favorites": "No se pudo eliminar el proyecto de favoritos. Por favor, inténtalo de nuevo.",
+  "add_to_favorites": "Agregar a favoritos",
+  "remove_from_favorites": "Eliminar de favoritos",
+  "publish_settings": "Configuración de publicación",
+  "publish": "Publicar",
+  "copy_link": "Copiar enlace",
+  "leave_project": "Abandonar proyecto",
+  "join_the_project_to_rearrange": "Únete al proyecto para reordenar",
+  "drag_to_rearrange": "Arrastra para reordenar",
+  "congrats": "¡Felicitaciones!",
+  "project": "Proyecto",
+  "open_project": "Abrir proyecto",
+  "issues": "Problemas",
+  "cycles": "Ciclos",
+  "modules": "Módulos",
+  "pages": "Páginas",
+  "intake": "Entrada",
+  "time_tracking": "Seguimiento de tiempo",
+  "work_management": "Gestión del trabajo",
+  "projects_and_issues": "Proyectos y problemas",
+  "projects_and_issues_description": "Activa o desactiva estos en este proyecto.",
+  "cycles_description": "Organiza el trabajo como mejor te parezca por proyecto y cambia la frecuencia de un período a otro.",
+  "modules_description": "Agrupa el trabajo en configuraciones similares a subproyectos con sus propios líderes y asignados.",
+  "views_description": "Guarda ordenamientos, filtros y opciones de visualización para más tarde o compártelos.",
+  "pages_description": "Escribe cualquier cosa como escribes cualquier cosa.",
+  "intake_description": "Mantente al tanto de los problemas a los que estás suscrito. Activa esto para recibir notificaciones.",
+  "time_tracking_description": "Rastrea el tiempo dedicado a problemas y proyectos.",
+  "work_management_description": "Gestiona tu trabajo y proyectos con facilidad.",
+  "documentation": "Documentación",
+  "message_support": "Mensaje al soporte",
+  "contact_sales": "Contactar ventas",
+  "hyper_mode": "Modo Hyper",
+  "keyboard_shortcuts": "Atajos de teclado",
+  "whats_new": "¿Qué hay de nuevo?",
+  "version": "Versión",
+  "we_are_having_trouble_fetching_the_updates": "Estamos teniendo problemas para obtener las actualizaciones.",
+  "our_changelogs": "nuestros registros de cambios",
+  "for_the_latest_updates": "para las últimas actualizaciones.",
+  "please_visit": "Por favor, visita",
+  "docs": "Documentos",
+  "full_changelog": "Registro de cambios completo",
+  "support": "Soporte",
+  "discord": "Discord",
+  "powered_by_plane_pages": "Desarrollado por Plane Pages",
+  "please_select_at_least_one_invitation": "Por favor, selecciona al menos una invitación.",
+  "please_select_at_least_one_invitation_description": "Por favor, selecciona al menos una invitación para unirte al espacio de trabajo.",
+  "we_see_that_someone_has_invited_you_to_join_a_workspace": "Vemos que alguien te ha invitado a unirte a un espacio de trabajo",
+  "join_a_workspace": "Unirse a un espacio de trabajo",
+  "we_see_that_someone_has_invited_you_to_join_a_workspace_description": "Vemos que alguien te ha invitado a unirte a un espacio de trabajo",
+  "join_a_workspace_description": "Unirse a un espacio de trabajo",
+  "accept_and_join": "Aceptar y unirse",
+  "go_home": "Ir a inicio",
+  "no_pending_invites": "No hay invitaciones pendientes",
+  "you_can_see_here_if_someone_invites_you_to_a_workspace": "Puedes ver aquí si alguien te invita a un espacio de trabajo",
+  "back_to_home": "Volver al inicio",
+  "workspace_name": "nombre-del-espacio-de-trabajo",
+  "deactivate_your_account": "Desactivar tu cuenta",
+  "deactivate_your_account_description": "Una vez desactivada, no podrás ser asignado a problemas ni se te facturará por tu espacio de trabajo. Para reactivar tu cuenta, necesitarás una invitación a un espacio de trabajo con esta dirección de correo electrónico.",
+  "deactivating": "Desactivando",
+  "confirm": "Confirmar",
+  "draft_created": "Borrador creado",
+  "issue_created_successfully": "Problema creado con éxito",
+  "draft_creation_failed": "Creación del borrador fallida",
+  "issue_creation_failed": "Creación del problema fallida",
+  "draft_issue": "Borrador de problema",
+  "issue_updated_successfully": "Problema actualizado con éxito",
+  "issue_could_not_be_updated": "No se pudo actualizar el problema",
+  "create_a_draft": "Crear un borrador",
+  "save_to_drafts": "Guardar en borradores",
+  "save": "Guardar",
+  "updating": "Actualizando",
+  "create_new_issue": "Crear nuevo problema",
+  "editor_is_not_ready_to_discard_changes": "El editor no está listo para descartar los cambios",
+  "failed_to_move_issue_to_project": "Error al mover el problema al proyecto",
+  "create_more": "Crear más",
+  "add_to_project": "Agregar al proyecto",
+  "discard": "Descartar",
+  "duplicate_issue_found": "Problema duplicado encontrado",
+  "duplicate_issues_found": "Problemas duplicados encontrados",
+  "no_matching_results": "No hay resultados coincidentes",
+  "title_is_required": "El título es obligatorio",
+  "title": "Título",
+  "state": "Estado",
+  "priority": "Prioridad",
+  "none": "Ninguno",
+  "urgent": "Urgente",
+  "high": "Alta",
+  "medium": "Media",
+  "low": "Baja",
+  "members": "Miembros",
+  "assignee": "Asignado",
+  "assignees": "Asignados",
+  "you": "Tú",
+  "labels": "Etiquetas",
+  "create_new_label": "Crear nueva etiqueta",
+  "start_date": "Fecha de inicio",
+  "due_date": "Fecha de vencimiento",
+  "cycle": "Ciclo",
+  "estimate": "Estimación",
+  "change_parent_issue": "Cambiar problema padre",
+  "remove_parent_issue": "Eliminar problema padre",
+  "add_parent": "Agregar padre",
+  "loading_members": "Cargando miembros..."
+}
\ No newline at end of file
diff --git a/packages/i18n/src/locales/fr/translations.json b/packages/i18n/src/locales/fr/translations.json
new file mode 100644
index 00000000000..44c915ab61c
--- /dev/null
+++ b/packages/i18n/src/locales/fr/translations.json
@@ -0,0 +1,318 @@
+{
+  "submit": "Soumettre",
+  "cancel": "Annuler",
+  "loading": "Chargement",
+  "error": "Erreur",
+  "success": "Succès",
+  "warning": "Avertissement",
+  "info": "Info",
+  "close": "Fermer",
+  "yes": "Oui",
+  "no": "Non",
+  "ok": "OK",
+  "name": "Nom",
+  "description": "Description",
+  "search": "Rechercher",
+  "add_member": "Ajouter un membre",
+  "remove_member": "Supprimer un membre",
+  "add_members": "Ajouter des membres",
+  "remove_members": "Supprimer des membres",
+  "add": "Ajouter",
+  "remove": "Supprimer",
+  "add_new": "Ajouter nouveau",
+  "remove_selected": "Supprimer la sélection",
+  "first_name": "Prénom",
+  "last_name": "Nom de famille",
+  "email": "Email",
+  "display_name": "Nom d'affichage",
+  "role": "Rôle",
+  "timezone": "Fuseau horaire",
+  "avatar": "Avatar",
+  "cover_image": "Image de couverture",
+  "password": "Mot de passe",
+  "change_cover": "Modifier la couverture",
+  "language": "Langue",
+  "saving": "Enregistrement...",
+  "save_changes": "Enregistrer les modifications",
+  "deactivate_account": "Désactiver le compte",
+  "deactivate_account_description": "Lors de la désactivation d'un compte, toutes les données et ressources de ce compte seront définitivement supprimées et ne pourront pas être récupérées.",
+  "profile_settings": "Paramètres du profil",
+  "your_account": "Votre compte",
+  "profile": "Profil",
+  "security": " Sécurité",
+  "activity": "Activité",
+  "appearance": "Apparence",
+  "notifications": "Notifications",
+  "workspaces": "Workspaces",
+  "create_workspace": "Créer un workspace",
+  "invitations": "Invitations",
+  "summary": "Résumé",
+  "assigned": "Assigné",
+  "created": "Créé",
+  "subscribed": "Souscrit",
+  "you_do_not_have_the_permission_to_access_this_page": "Vous n'avez pas les permissions pour accéder à cette page.",
+  "failed_to_sign_out_please_try_again": "Impossible de se déconnecter. Veuillez réessayer.",
+  "password_changed_successfully": "Mot de passe changé avec succès.",
+  "something_went_wrong_please_try_again": "Quelque chose s'est mal passé. Veuillez réessayer.",
+  "change_password": "Changer le mot de passe",
+  "changing_password": "Changement de mot de passe",
+  "current_password": "Mot de passe actuel",
+  "new_password": "Nouveau mot de passe",
+  "confirm_password": "Confirmer le mot de passe",
+  "this_field_is_required": "Ce champ est requis",
+  "passwords_dont_match": "Les mots de passe ne correspondent pas",
+  "please_enter_your_password": "Veuillez entrer votre mot de passe.",
+  "password_length_should_me_more_than_8_characters": "La longueur du mot de passe doit être supérieure à 8 caractères.",
+  "password_is_weak": "Le mot de passe est faible.",
+  "password_is_strong": "Le mot de passe est fort.",
+  "load_more": "Charger plus",
+  "select_or_customize_your_interface_color_scheme": "Sélectionnez ou personnalisez votre schéma de couleurs de l'interface.",
+  "theme": "Thème",
+  "system_preference": "Préférence du système",
+  "light": "Clair",
+  "dark": "Foncé",
+  "light_contrast": "Clair de haut contraste",
+  "dark_contrast": "Foncé de haut contraste",
+  "custom": "Thème personnalisé",
+  "select_your_theme": "Sélectionnez votre thème",
+  "customize_your_theme": "Personnalisez votre thème",
+  "background_color": "Couleur de fond",
+  "text_color": "Couleur de texte",
+  "primary_color": "Couleur primaire (thème)",
+  "sidebar_background_color": "Couleur de fond du sidebar",
+  "sidebar_text_color": "Couleur de texte du sidebar",
+  "set_theme": "Définir le thème",
+  "enter_a_valid_hex_code_of_6_characters": "Entrez un code hexadécimal valide de 6 caractères",
+  "background_color_is_required": "La couleur de fond est requise",
+  "text_color_is_required": "La couleur de texte est requise",
+  "primary_color_is_required": "La couleur primaire est requise",
+  "sidebar_background_color_is_required": "La couleur de fond du sidebar est requise",
+  "sidebar_text_color_is_required": "La couleur de texte du sidebar est requise",
+  "updating_theme": "Mise à jour du thème",
+  "theme_updated_successfully": "Thème mis à jour avec succès",
+  "failed_to_update_the_theme": "Impossible de mettre à jour le thème",
+  "email_notifications": "Notifications par email",
+  "stay_in_the_loop_on_issues_you_are_subscribed_to_enable_this_to_get_notified": "Restez dans la boucle sur les problèmes auxquels vous êtes abonné. Activez cela pour être notifié.",
+  "email_notification_setting_updated_successfully": "Paramètres de notification par email mis à jour avec succès",
+  "failed_to_update_email_notification_setting": "Impossible de mettre à jour les paramètres de notification par email",
+  "notify_me_when": "Me notifier lorsque",
+  "property_changes": "Changements de propriété",
+  "property_changes_description": "Me notifier lorsque les propriétés du problème comme les assignés, la priorité, les estimations ou tout autre chose changent.",
+  "state_change": "Changement d'état",
+  "state_change_description": "Me notifier lorsque le problème passe à un autre état",
+  "issue_completed": "Problème terminé",
+  "issue_completed_description": "Me notifier uniquement lorsqu'un problème est terminé",
+  "comments": "Commentaires",
+  "comments_description": "Me notifier lorsqu'un utilisateur commente un problème",
+  "mentions": "Mention",
+  "mentions_description": "Me notifier uniquement lorsqu'un utilisateur mentionne un problème",
+  "create_your_workspace": "Créer votre workspace",
+  "only_your_instance_admin_can_create_workspaces": "Seuls les administrateurs de votre instance peuvent créer des workspaces",
+  "only_your_instance_admin_can_create_workspaces_description": "Si vous connaissez l'adresse email de votre administrateur d'instance, cliquez sur le bouton ci-dessous pour les contacter.",
+  "go_back": "Retour",
+  "request_instance_admin": "Demander à l'administrateur de l'instance",
+  "plane_logo": "Logo de Plane",
+  "workspace_creation_disabled": "Création d'espace de travail désactivée",
+  "workspace_request_subject": "Demande de création d'un espace de travail",
+  "workspace_request_body": "Bonjour administrateur(s) de l'instance,\n\nVeuillez créer un nouveau espace de travail avec l'URL [/workspace-name] pour [raison de la création de l'espace de travail].\n\nMerci,\n{{firstName}} {{lastName}}\n{{email}}",
+  "creating_workspace": "Création de l'espace de travail",
+  "workspace_created_successfully": "Espace de travail créé avec succès",
+  "create_workspace_page": "Page de création d'espace de travail",
+  "workspace_could_not_be_created_please_try_again": "L'espace de travail ne peut pas être créé. Veuillez réessayer.",
+  "workspace_could_not_be_created_please_try_again_description": "Une erreur est survenue lors de la création de l'espace de travail. Veuillez réessayer.",
+  "this_is_a_required_field": "Ce champ est requis.",
+  "name_your_workspace": "Nommez votre espace de travail",
+  "workspaces_names_can_contain_only_space_dash_and_alphanumeric_characters": "Les noms des espaces de travail peuvent contenir uniquement des espaces, des tirets et des caractères alphanumériques.",
+  "limit_your_name_to_80_characters": "Limitez votre nom à 80 caractères.",
+  "set_your_workspace_url": "Définir l'URL de votre espace de travail",
+  "limit_your_url_to_48_characters": "Limitez votre URL à 48 caractères.",
+  "how_many_people_will_use_this_workspace": "Combien de personnes utiliseront cet espace de travail ?",
+  "how_many_people_will_use_this_workspace_description": "Cela nous aidera à déterminer le nombre de sièges que vous devez acheter.",
+  "select_a_range": "Sélectionner une plage",
+  "urls_can_contain_only_dash_and_alphanumeric_characters": "Les URLs peuvent contenir uniquement des tirets et des caractères alphanumériques.",
+  "something_familiar_and_recognizable_is_always_best": "Ce qui est familier et reconnaissable est toujours le meilleur.",
+  "workspace_url_is_already_taken": "L'URL de l'espace de travail est déjà utilisée !",
+  "old_password": "Mot de passe actuel",
+  "general_settings": "Paramètres généraux",
+  "sign_out": "Déconnexion",
+  "signing_out": "Déconnexion",
+  "active_cycles": "Cycles actifs",
+  "active_cycles_description": "Surveillez les cycles dans les projets, suivez les issues de haute priorité et zoomez sur les cycles qui nécessitent attention.",
+  "on_demand_snapshots_of_all_your_cycles": "Captures instantanées sur demande de tous vos cycles",
+  "upgrade": "Mettre à niveau",
+  "10000_feet_view": "Vue d'ensemble de tous les cycles actifs",
+  "10000_feet_view_description": "Prenez du recul pour voir les cycles en cours dans tous vos projets en même temps au lieu de passer d'un cycle à l'autre dans chaque projet.",
+  "get_snapshot_of_each_active_cycle": "Obtenez un aperçu de chaque cycle actif",
+  "get_snapshot_of_each_active_cycle_description": "Suivez les métriques de haut niveau pour tous les cycles actifs, observez leur état d'avancement et évaluez leur portée par rapport aux échéances.",
+  "compare_burndowns": "Comparez les graphiques d'avancement",
+  "compare_burndowns_description": "Surveillez les performances de chacune de vos équipes en consultant le rapport d'avancement de chaque cycle.",
+  "quickly_see_make_or_break_issues": "Identifiez rapidement les problèmes critiques",
+  "quickly_see_make_or_break_issues_description": "Visualisez les problèmes hautement prioritaires de chaque cycle par rapport aux dates d'échéance. Consultez-les tous par cycle en un seul clic.",
+  "zoom_into_cycles_that_need_attention": "Concentrez-vous sur les cycles nécessitant attention",
+  "zoom_into_cycles_that_need_attention_description": "Examinez en un clic l'état de tout cycle qui ne répond pas aux attentes.",
+  "stay_ahead_of_blockers": "Anticipez les blocages",
+  "stay_ahead_of_blockers_description": "Repérez les défis d'un projet à l'autre et identifiez les dépendances entre cycles qui ne sont pas évidentes depuis d'autres vues.",
+  "analytics": "Analyse",
+  "workspace_invites": "Invitations de l'espace de travail",
+  "workspace_settings": "Paramètres de l'espace de travail",
+  "enter_god_mode": "Entrer en mode dieu",
+  "workspace_logo": "Logo de l'espace de travail",
+  "new_issue": "Nouveau problème",
+  "home": "Accueil",
+  "your_work": "Votre travail",
+  "drafts": "Brouillons",
+  "projects": "Projets",
+  "views": "Vues",
+  "workspace": "Espace de travail",
+  "archives": "Archives",
+  "settings": "Paramètres",
+  "failed_to_move_favorite": "Impossible de déplacer le favori",
+  "your_favorites": "Vos favoris",
+  "no_favorites_yet": "Aucun favori pour le moment",
+  "create_folder": "Créer un dossier",
+  "new_folder": "Nouveau dossier",
+  "favorite_updated_successfully": "Favori mis à jour avec succès",
+  "favorite_created_successfully": "Favori créé avec succès",
+  "folder_already_exists": "Le dossier existe déjà",
+  "folder_name_cannot_be_empty": "Le nom du dossier ne peut pas être vide",
+  "something_went_wrong": "Quelque chose s'est mal passé",
+  "failed_to_reorder_favorite": "Impossible de réordonner le favori",
+  "favorite_removed_successfully": "Favori supprimé avec succès",
+  "failed_to_create_favorite": "Impossible de créer le favori",
+  "failed_to_rename_favorite": "Impossible de renommer le favori",
+  "project_link_copied_to_clipboard": "Lien du projet copié dans le presse-papiers",
+  "link_copied": "Lien copié",
+  "your_projects": "Vos projets",
+  "add_project": "Ajouter un projet",
+  "create_project": "Créer un projet",
+  "failed_to_remove_project_from_favorites": "Impossible de supprimer le projet des favoris. Veuillez réessayer.",
+  "project_created_successfully": "Projet créé avec succès",
+  "project_created_successfully_description": "Projet créé avec succès. Vous pouvez maintenant ajouter des issues à ce projet.",
+  "project_cover_image_alt": "Image de couverture du projet",
+  "name_is_required": "Le nom est requis",
+  "title_should_be_less_than_255_characters": "Le titre doit être inférieur à 255 caractères",
+  "project_name": "Nom du projet",
+  "project_id_must_be_at_least_1_character": "Le projet ID doit être au moins de 1 caractère",
+  "project_id_must_be_at_most_5_characters": "Le projet ID doit être au plus de 5 caractères",
+  "project_id": "ID du projet",
+  "project_id_tooltip_content": "Aide à identifier les issues du projet de manière unique. Max 5 caractères.",
+  "description_placeholder": "Description...",
+  "only_alphanumeric_non_latin_characters_allowed": "Seuls les caractères alphanumériques et non latins sont autorisés.",
+  "project_id_is_required": "Le projet ID est requis",
+  "select_network": "Sélectionner le réseau",
+  "lead": "Lead",
+  "private": "Privé",
+  "public": "Public",
+  "accessible_only_by_invite": "Accessible uniquement par invitation",
+  "anyone_in_the_workspace_except_guests_can_join": "Tout le monde dans l'espace de travail, sauf les invités, peut rejoindre",
+  "creating": "Création",
+  "creating_project": "Création du projet",
+  "adding_project_to_favorites": "Ajout du projet aux favoris",
+  "project_added_to_favorites": "Projet ajouté aux favoris",
+  "couldnt_add_the_project_to_favorites": "Impossible d'ajouter le projet aux favoris. Veuillez réessayer.",
+  "removing_project_from_favorites": "Suppression du projet des favoris",
+  "project_removed_from_favorites": "Projet supprimé des favoris",
+  "couldnt_remove_the_project_from_favorites": "Impossible de supprimer le projet des favoris. Veuillez réessayer.",
+  "add_to_favorites": "Ajouter aux favoris",
+  "remove_from_favorites": "Supprimer des favoris",
+  "publish_settings": "Paramètres de publication",
+  "publish": "Publier",
+  "copy_link": "Copier le lien",
+  "leave_project": "Quitter le projet",
+  "join_the_project_to_rearrange": "Rejoindre le projet pour réorganiser",
+  "drag_to_rearrange": "Glisser pour réorganiser",
+  "congrats": "Félicitations !",
+  "project": "Projet",
+  "open_project": "Ouvrir le projet",
+  "issues": "Problèmes",
+  "cycles": "Cycles",
+  "modules": "Modules",
+  "pages": "Pages",
+  "intake": "Intake",
+  "time_tracking": "Suivi du temps",
+  "work_management": "Gestion du travail",
+  "projects_and_issues": "Projets et problèmes",
+  "projects_and_issues_description": "Activer ou désactiver ces fonctionnalités pour ce projet.",
+  "cycles_description": "Organisez votre travail en périodes définies selon vos besoins par projet et modifiez la fréquence d'une période à l'autre.",
+  "modules_description": "Regroupez le travail en sous-projets avec leurs propres responsables et assignés.",
+  "views_description": "Enregistrez vos tris, filtres et options d'affichage pour plus tard ou partagez-les.",
+  "pages_description": "Rédigez tout type de contenu librement.",
+  "intake_description": "Restez informé des tickets auxquels vous êtes abonné. Activez cette option pour recevoir des notifications.",
+  "time_tracking_description": "Suivez le temps passé sur les tickets et les projets.",
+  "work_management_description": "Gérez votre travail et vos projets en toute simplicité.",
+  "documentation": "Documentation",
+  "message_support": "Contacter le support",
+  "contact_sales": "Contacter les ventes",
+  "hyper_mode": "Mode hyper",
+  "keyboard_shortcuts": "Raccourcis clavier",
+  "whats_new": "Nouveautés?",
+  "version": "Version",
+  "we_are_having_trouble_fetching_the_updates": "Nous avons des difficultés à récupérer les mises à jour.",
+  "our_changelogs": "nos changelogs",
+  "for_the_latest_updates": "pour les dernières mises à jour.",
+  "please_visit": "Veuillez visiter",
+  "docs": "Documentation",
+  "full_changelog": "Journal complet",
+  "support": "Support",
+  "discord": "Discord",
+  "powered_by_plane_pages": "Propulsé par Plane Pages",
+  "please_select_at_least_one_invitation": "Veuillez sélectionner au moins une invitation.",
+  "please_select_at_least_one_invitation_description": "Veuillez sélectionner au moins une invitation pour rejoindre l'espace de travail.",
+  "we_see_that_someone_has_invited_you_to_join_a_workspace": "Nous voyons que quelqu'un vous a invité à rejoindre un espace de travail",
+  "join_a_workspace": "Rejoindre un espace de travail",
+  "we_see_that_someone_has_invited_you_to_join_a_workspace_description": "Nous voyons que quelqu'un vous a invité à rejoindre un espace de travail",
+  "join_a_workspace_description": "Rejoindre un espace de travail",
+  "accept_and_join": "Accepter et rejoindre",
+  "go_home": "Retour à l'accueil",
+  "no_pending_invites": "Aucune invitation en attente",
+  "you_can_see_here_if_someone_invites_you_to_a_workspace": "Vous pouvez voir ici si quelqu'un vous invite à rejoindre un espace de travail",
+  "back_to_home": "Retour à l'accueil",
+  "workspace_name": "espace-de-travail",
+  "deactivate_your_account": "Désactiver votre compte",
+  "deactivate_your_account_description": "Une fois désactivé, vous ne pourrez pas être assigné à des problèmes et être facturé pour votre espace de travail. Pour réactiver votre compte, vous aurez besoin d'une invitation à un espace de travail à cette adresse email.",
+  "deactivating": "Désactivation",
+  "confirm": "Confirmer",
+  "draft_created": "Brouillon créé",
+  "issue_created_successfully": "Problème créé avec succès",
+  "draft_creation_failed": "Création du brouillon échouée",
+  "issue_creation_failed": "Création du problème échouée",
+  "draft_issue": "Problème en brouillon",
+  "issue_updated_successfully": "Problème mis à jour avec succès",
+  "issue_could_not_be_updated": "Le problème n'a pas pu être mis à jour",
+  "create_a_draft": "Créer un brouillon",
+  "save_to_drafts": "Enregistrer dans les brouillons",
+  "save": "Enregistrer",
+  "updating": "Mise à jour",
+  "create_new_issue": "Créer un nouveau problème",
+  "editor_is_not_ready_to_discard_changes": "L'éditeur n'est pas prêt à annuler les modifications",
+  "failed_to_move_issue_to_project": "Impossible de déplacer le problème vers le projet",
+  "create_more": "Créer plus",
+  "add_to_project": "Ajouter au projet",
+  "discard": "Annuler",
+  "duplicate_issue_found": "Problème en double trouvé",
+  "duplicate_issues_found": "Problèmes en double trouvés",
+  "no_matching_results": "Aucun résultat correspondant",
+  "title_is_required": "Le titre est requis",
+  "title": "Titre",
+  "state": "État",
+  "priority": "Priorité",
+  "none": "Aucune",
+  "urgent": "Urgent",
+  "high": "Haute",
+  "medium": "Moyenne",
+  "low": "Basse",
+  "members": "Membres",
+  "assignee": "Assigné",
+  "assignees": "Assignés",
+  "you": "Vous",
+  "labels": "Étiquettes",
+  "create_new_label": "Créer une nouvelle étiquette",
+  "start_date": "Date de début",
+  "due_date": "Date d'échéance",
+  "cycle": "Cycle",
+  "estimate": "Estimation",
+  "change_parent_issue": "Modifier le problème parent",
+  "remove_parent_issue": "Supprimer le problème parent",
+  "add_parent": "Ajouter un parent",
+  "loading_members": "Chargement des membres..."
+}
\ No newline at end of file
diff --git a/packages/i18n/src/locales/ja/translations.json b/packages/i18n/src/locales/ja/translations.json
new file mode 100644
index 00000000000..c83d4dfcb6c
--- /dev/null
+++ b/packages/i18n/src/locales/ja/translations.json
@@ -0,0 +1,318 @@
+{
+  "submit": "送信",
+  "cancel": "キャンセル",
+  "loading": "読み込み中",
+  "error": "エラー",
+  "success": "成功",
+  "warning": "警告",
+  "info": "情報",
+  "close": "閉じる",
+  "yes": "はい",
+  "no": "いいえ",
+  "ok": "OK",
+  "name": "名前",
+  "description": "説明",
+  "search": "検索",
+  "add_member": "メンバーを追加",
+  "remove_member": "メンバーを削除",
+  "add_members": "メンバーを追加",
+  "remove_members": "メンバーを削除",
+  "add": "追加",
+  "remove": "削除",
+  "add_new": "新規追加",
+  "remove_selected": "選択項目を削除",
+  "first_name": "名",
+  "last_name": "姓",
+  "email": "メールアドレス",
+  "display_name": "表示名",
+  "role": "役割",
+  "timezone": "タイムゾーン",
+  "avatar": "アバター",
+  "cover_image": "カバー画像",
+  "password": "パスワード",
+  "change_cover": "カバーを変更",
+  "language": "言語",
+  "saving": "保存中...",
+  "save_changes": "変更を保存",
+  "deactivate_account": "アカウントを無効化",
+  "deactivate_account_description": "アカウントを無効化すると、そのアカウント内のすべてのデータとリソースが完全に削除され、復元することはできません。",
+  "profile_settings": "プロフィール設定",
+  "your_account": "アカウント",
+  "profile": "プロフィール",
+  "security": "セキュリティ",
+  "activity": "アクティビティ",
+  "appearance": "アピアンス",
+  "notifications": "通知",
+  "workspaces": "ワークスペース",
+  "create_workspace": "ワークスペースを作成",
+  "invitations": "招待",
+  "summary": "概要",
+  "assigned": "割り当て済み",
+  "created": "作成済み",
+  "subscribed": "購読済み",
+  "you_do_not_have_the_permission_to_access_this_page": "このページにアクセスする権限がありません。",
+  "failed_to_sign_out_please_try_again": "サインアウトに失敗しました。もう一度お試しください。",
+  "password_changed_successfully": "パスワードが正常に変更されました。",
+  "something_went_wrong_please_try_again": "何かがうまくいきませんでした。もう一度お試しください。",
+  "change_password": "パスワードを変更",
+  "passwords_dont_match": "パスワードが一致しません",
+  "current_password": "現在のパスワード",
+  "new_password": "新しいパスワード",
+  "confirm_password": "パスワードを確認",
+  "this_field_is_required": "このフィールドは必須です",
+  "changing_password": "パスワードを変更中",
+  "please_enter_your_password": "パスワードを入力してください。",
+  "password_length_should_me_more_than_8_characters": "パスワードの長さは8文字以上である必要があります。",
+  "password_is_weak": "パスワードが弱いです。",
+  "password_is_strong": "パスワードが強いです。",
+  "load_more": "もっと読み込む",
+  "select_or_customize_your_interface_color_scheme": "インターフェースのカラースキームを選択またはカスタマイズしてください。",
+  "theme": "テーマ",
+  "system_preference": "システム設定",
+  "light": "ライト",
+  "dark": "ダーク",
+  "light_contrast": "ライト高コントラスト",
+  "dark_contrast": "ダーク高コントラスト",
+  "custom": "カスタムテーマ",
+  "select_your_theme": "テーマを選択",
+  "customize_your_theme": "テーマをカスタマイズ",
+  "background_color": "背景色",
+  "text_color": "テキスト色",
+  "primary_color": "プライマリ（テーマ）色",
+  "sidebar_background_color": "サイドバー背景色",
+  "sidebar_text_color": "サイドバーテキスト色",
+  "set_theme": "テーマを設定",
+  "enter_a_valid_hex_code_of_6_characters": "6文字の有効な16進コードを入力してください",
+  "background_color_is_required": "背景色は必須です",
+  "text_color_is_required": "テキスト色は必須です",
+  "primary_color_is_required": "プライマリ色は必須です",
+  "sidebar_background_color_is_required": "サイドバー背景色は必須です",
+  "sidebar_text_color_is_required": "サイドバーテキスト色は必須です",
+  "updating_theme": "テーマを更新中",
+  "theme_updated_successfully": "テーマが正常に更新されました",
+  "failed_to_update_the_theme": "テーマの更新に失敗しました",
+  "email_notifications": "メール通知",
+  "stay_in_the_loop_on_issues_you_are_subscribed_to_enable_this_to_get_notified": "購読している問題についての通知を受け取るには、これを有効にしてください。",
+  "email_notification_setting_updated_successfully": "メール通知設定が正常に更新されました",
+  "failed_to_update_email_notification_setting": "メール通知設定の更新に失敗しました",
+  "notify_me_when": "通知する条件",
+  "property_changes": "プロパティの変更",
+  "property_changes_description": "担当者、優先度、見積もりなどのプロパティが変更されたときに通知します。",
+  "state_change": "状態の変更",
+  "state_change_description": "問題が別の状態に移動したときに通知します",
+  "issue_completed": "問題が完了",
+  "issue_completed_description": "問題が完了したときのみ通知します",
+  "comments": "コメント",
+  "comments_description": "誰かが問題にコメントを残したときに通知します",
+  "mentions": "メンション",
+  "mentions_description": "コメントや説明で誰かが自分をメンションしたときのみ通知します",
+  "create_your_workspace": "ワークスペースを作成",
+  "only_your_instance_admin_can_create_workspaces": "ワークスペースを作成できるのはインスタンス管理者のみです",
+  "only_your_instance_admin_can_create_workspaces_description": "インスタンス管理者のメールアドレスを知っている場合は、以下のボタンをクリックして連絡を取ってください。",
+  "go_back": "戻る",
+  "request_instance_admin": "インスタンス管理者にリクエスト",
+  "plane_logo": "プレーンロゴ",
+  "workspace_creation_disabled": "ワークスペースの作成が無効化されています",
+  "workspace_request_subject": "新しいワークスペースのリクエスト",
+  "workspace_request_body": "インスタンス管理者様\n\nURL [/workspace-name] で新しいワークスペースを作成してください。[ワークスペース作成の目的]\n\nありがとうございます。\n{{firstName}} {{lastName}}\n{{email}}",
+  "creating_workspace": "ワークスペースを作成中",
+  "workspace_created_successfully": "ワークスペースが正常に作成されました",
+  "create_workspace_page": "ワークスペース作成ページ",
+  "workspace_could_not_be_created_please_try_again": "ワークスペースを作成できませんでした。もう一度お試しください。",
+  "workspace_could_not_be_created_please_try_again_description": "ワークスペースの作成中にエラーが発生しました。もう一度お試しください。",
+  "this_is_a_required_field": "これは必須フィールドです。",
+  "name_your_workspace": "ワークスペースに名前を付ける",
+  "workspaces_names_can_contain_only_space_dash_and_alphanumeric_characters": "ワークスペース名にはスペース、ダッシュ、アンダースコア、英数字のみを含めることができます。",
+  "limit_your_name_to_80_characters": "名前は80文字以内にしてください。",
+  "set_your_workspace_url": "ワークスペースのURLを設定",
+  "limit_your_url_to_48_characters": "URLは48文字以内にしてください。",
+  "how_many_people_will_use_this_workspace": "このワークスペースを使用する人数は？",
+  "how_many_people_will_use_this_workspace_description": "購入するシート数を決定するのに役立ちます。",
+  "select_a_range": "範囲を選択",
+  "urls_can_contain_only_dash_and_alphanumeric_characters": "URLにはダッシュと英数字のみを含めることができます。",
+  "something_familiar_and_recognizable_is_always_best": "親しみやすく認識しやすいものが常に最適です。",
+  "workspace_url_is_already_taken": "ワークスペースのURLは既に使用されています！",
+  "old_password": "古いパスワード",
+  "general_settings": "一般設定",
+  "sign_out": "サインアウト",
+  "signing_out": "サインアウト中",
+  "active_cycles": "アクティブサイクル",
+  "active_cycles_description": "プロジェクト全体のサイクルを監視し、高優先度の問題を追跡し、注意が必要なサイクルにズームインします。",
+  "on_demand_snapshots_of_all_your_cycles": "すべてのサイクルのオンデマンドスナップショット",
+  "upgrade": "アップグレード",
+  "10000_feet_view": "すべてのアクティブサイクルの10,000フィートビュー。",
+  "10000_feet_view_description": "各プロジェクトのサイクルを個別に見るのではなく、すべてのプロジェクトのサイクルを一度に見るためにズームアウトします。",
+  "get_snapshot_of_each_active_cycle": "各アクティブサイクルのスナップショットを取得します。",
+  "get_snapshot_of_each_active_cycle_description": "すべてのアクティブサイクルの高レベルのメトリクスを追跡し、進捗状況を確認し、期限に対するスコープの感覚を得ます。",
+  "compare_burndowns": "バーンダウンを比較します。",
+  "compare_burndowns_description": "各チームのパフォーマンスを監視し、各サイクルのバーンダウンレポートを覗き見します。",
+  "quickly_see_make_or_break_issues": "重要な問題をすばやく確認します。",
+  "quickly_see_make_or_break_issues_description": "各サイクルの期限に対する高優先度の問題をプレビューします。1クリックでサイクルごとにすべてを確認できます。",
+  "zoom_into_cycles_that_need_attention": "注意が必要なサイクルにズームインします。",
+  "zoom_into_cycles_that_need_attention_description": "期待に沿わないサイクルの状態を1クリックで調査します。",
+  "stay_ahead_of_blockers": "ブロッカーを先取りします。",
+  "stay_ahead_of_blockers_description": "プロジェクト間の課題を見つけ、他のビューからは明らかでないサイクル間の依存関係を確認します。",
+  "analytics": "分析",
+  "workspace_invites": "ワークスペースの招待",
+  "workspace_settings": "ワークスペース設定",
+  "enter_god_mode": "ゴッドモードに入る",
+  "workspace_logo": "ワークスペースロゴ",
+  "new_issue": "新しい問題",
+  "home": "ホーム",
+  "your_work": "あなたの作業",
+  "drafts": "下書き",
+  "projects": "プロジェクト",
+  "views": "ビュー",
+  "workspace": "ワークスペース",
+  "archives": "アーカイブ",
+  "settings": "設定",
+  "failed_to_move_favorite": "お気に入りの移動に失敗しました",
+  "your_favorites": "あなたのお気に入り",
+  "no_favorites_yet": "まだお気に入りはありません",
+  "create_folder": "フォルダーを作成",
+  "new_folder": "新しいフォルダー",
+  "favorite_updated_successfully": "お気に入りが正常に更新されました",
+  "favorite_created_successfully": "お気に入りが正常に作成されました",
+  "folder_already_exists": "フォルダーは既に存在します",
+  "folder_name_cannot_be_empty": "フォルダー名を空にすることはできません",
+  "something_went_wrong": "何かがうまくいきませんでした",
+  "failed_to_reorder_favorite": "お気に入りの並べ替えに失敗しました",
+  "favorite_removed_successfully": "お気に入りが正常に削除されました",
+  "failed_to_create_favorite": "お気に入りの作成に失敗しました",
+  "failed_to_rename_favorite": "お気に入りの名前変更に失敗しました",
+  "project_link_copied_to_clipboard": "プロジェクトリンクがクリップボードにコピーされました",
+  "link_copied": "リンクがコピーされました",
+  "your_projects": "あなたのプロジェクト",
+  "add_project": "プロジェクトを追加",
+  "create_project": "プロジェクトを作成",
+  "failed_to_remove_project_from_favorites": "お気に入りからプロジェクトを削除できませんでした。もう一度お試しください。",
+  "project_created_successfully": "プロジェクトが正常に作成されました",
+  "project_created_successfully_description": "プロジェクトが正常に作成されました。今すぐ問題を追加し始めることができます。",
+  "project_cover_image_alt": "プロジェクトカバー画像",
+  "name_is_required": "名前は必須です",
+  "title_should_be_less_than_255_characters": "タイトルは255文字未満である必要があります",
+  "project_name": "プロジェクト名",
+  "project_id_must_be_at_least_1_character": "プロジェクトIDは少なくとも1文字である必要があります",
+  "project_id_must_be_at_most_5_characters": "プロジェクトIDは最大5文字である必要があります",
+  "project_id": "プロジェクトID",
+  "project_id_tooltip_content": "プロジェクト内の問題を一意に識別するのに役立ちます。最大5文字。",
+  "description_placeholder": "説明...",
+  "only_alphanumeric_non_latin_characters_allowed": "英数字と非ラテン文字のみが許可されます。",
+  "project_id_is_required": "プロジェクトIDは必須です",
+  "select_network": "ネットワークを選択",
+  "lead": "リード",
+  "private": "プライベート",
+  "public": "パブリック",
+  "accessible_only_by_invite": "招待によってのみアクセス可能",
+  "anyone_in_the_workspace_except_guests_can_join": "ゲストを除くワークスペース内の誰でも参加できます",
+  "creating": "作成中",
+  "creating_project": "プロジェクトを作成中",
+  "adding_project_to_favorites": "プロジェクトをお気に入りに追加中",
+  "project_added_to_favorites": "プロジェクトがお気に入りに追加されました",
+  "couldnt_add_the_project_to_favorites": "プロジェクトをお気に入りに追加できませんでした。もう一度お試しください。",
+  "removing_project_from_favorites": "お気に入りからプロジェクトを削除中",
+  "project_removed_from_favorites": "プロジェクトがお気に入りから削除されました",
+  "couldnt_remove_the_project_from_favorites": "お気に入りからプロジェクトを削除できませんでした。もう一度お試しください。",
+  "add_to_favorites": "お気に入りに追加",
+  "remove_from_favorites": "お気に入りから削除",
+  "publish_settings": "公開設定",
+  "publish": "公開",
+  "copy_link": "リンクをコピー",
+  "leave_project": "プロジェクトを離れる",
+  "join_the_project_to_rearrange": "プロジェクトに参加して並べ替え",
+  "drag_to_rearrange": "ドラッグして並べ替え",
+  "congrats": "おめでとうございます！",
+  "project": "プロジェクト",
+  "open_project": "プロジェクトを開く",
+  "issues": "問題",
+  "cycles": "サイクル",
+  "modules": "モジュール",
+  "pages": "ページ",
+  "intake": "インテーク",
+  "time_tracking": "時間追跡",
+  "work_management": "作業管理",
+  "projects_and_issues": "プロジェクトと問題",
+  "projects_and_issues_description": "このプロジェクトでオンまたはオフに切り替えます。",
+  "cycles_description": "プロジェクトごとに作業をタイムボックス化し、期間ごとに頻度を変更します。",
+  "modules_description": "独自のリードと担当者を持つサブプロジェクトのようなセットアップに作業をグループ化します。",
+  "views_description": "後で使用するために、または共有するためにソート、フィルター、表示オプションを保存します。",
+  "pages_description": "何かを書くように何かを書く。",
+  "intake_description": "購読している問題についての通知を受け取るには、これを有効にしてください。",
+  "time_tracking_description": "問題とプロジェクトに費やした時間を追跡します。",
+  "work_management_description": "作業とプロジェクトを簡単に管理します。",
+  "documentation": "ドキュメント",
+  "message_support": "サポートにメッセージを送る",
+  "contact_sales": "営業に連絡",
+  "hyper_mode": "ハイパーモード",
+  "keyboard_shortcuts": "キーボードショートカット",
+  "whats_new": "新着情報",
+  "version": "バージョン",
+  "we_are_having_trouble_fetching_the_updates": "更新の取得に問題が発生しています。",
+  "our_changelogs": "私たちの変更履歴",
+  "for_the_latest_updates": "最新の更新情報については",
+  "please_visit": "訪問してください",
+  "docs": "ドキュメント",
+  "full_changelog": "完全な変更履歴",
+  "support": "サポート",
+  "discord": "ディスコード",
+  "powered_by_plane_pages": "Plane Pagesによって提供されています",
+  "please_select_at_least_one_invitation": "少なくとも1つの招待を選択してください。",
+  "please_select_at_least_one_invitation_description": "ワークスペースに参加するために少なくとも1つの招待を選択してください。",
+  "we_see_that_someone_has_invited_you_to_join_a_workspace": "誰かがワークスペースに参加するようにあなたを招待したことがわかります",
+  "join_a_workspace": "ワークスペースに参加",
+  "we_see_that_someone_has_invited_you_to_join_a_workspace_description": "誰かがワークスペースに参加するようにあなたを招待したことがわかります",
+  "join_a_workspace_description": "ワークスペースに参加",
+  "accept_and_join": "受け入れて参加",
+  "go_home": "ホームに戻る",
+  "no_pending_invites": "保留中の招待はありません",
+  "you_can_see_here_if_someone_invites_you_to_a_workspace": "誰かがワークスペースに招待した場合、ここで確認できます",
+  "back_to_home": "ホームに戻る",
+  "workspace_name": "ワークスペース名",
+  "deactivate_your_account": "アカウントを無効化",
+  "deactivate_your_account_description": "無効化すると、問題を割り当てられなくなり、ワークスペースの請求もされなくなります。アカウントを再有効化するには、このメールアドレスに招待されたワークスペースが必要です。",
+  "deactivating": "無効化中",
+  "confirm": "確認",
+  "draft_created": "下書きが作成されました",
+  "issue_created_successfully": "問題が正常に作成されました",
+  "draft_creation_failed": "下書き作成に失敗しました",
+  "issue_creation_failed": "問題作成に失敗しました",
+  "draft_issue": "下書き問題",
+  "issue_updated_successfully": "問題が正常に更新されました",
+  "issue_could_not_be_updated": "問題を更新できませんでした",
+  "create_a_draft": "下書きを作成",
+  "save_to_drafts": "下書きに保存",
+  "save": "保存",
+  "updating": "更新中",
+  "create_new_issue": "新しい問題を作成",
+  "editor_is_not_ready_to_discard_changes": "エディターは変更を破棄する準備ができていません",
+  "failed_to_move_issue_to_project": "問題をプロジェクトに移動できませんでした",
+  "create_more": "作成する",
+  "add_to_project": "プロジェクトに追加",
+  "discard": "破棄",
+  "duplicate_issue_found": "重複問題が見つかりました",
+  "duplicate_issues_found": "重複問題が見つかりました",
+  "no_matching_results": "一致する結果はありません",
+  "title_is_required": "タイトルは必須です",
+  "title": "タイトル",
+  "state": "ステータス",
+  "priority": "優先度",
+  "none": "なし",
+  "urgent": "緊急",
+  "high": "高",
+  "medium": "中",
+  "low": "低",
+  "members": "メンバー",
+  "assignee": "アサイン者",
+  "assignees": "アサイン者",
+  "you": "あなた",
+  "labels": "ラベル",
+  "create_new_label": "新しいラベルを作成",
+  "start_date": "開始日",
+  "due_date": "期限日",
+  "cycle": "サイクル",
+  "estimate": "見積もり",
+  "change_parent_issue": "親問題を変更",
+  "remove_parent_issue": "親問題を削除",
+  "add_parent": "親問題を追加",
+  "loading_members": "メンバーを読み込んでいます..."
+}
\ No newline at end of file
diff --git a/packages/i18n/src/locales/pt/translations.json b/packages/i18n/src/locales/pt/translations.json
new file mode 100644
index 00000000000..8bb2fc4d917
--- /dev/null
+++ b/packages/i18n/src/locales/pt/translations.json
@@ -0,0 +1,555 @@
+{
+  "submit": "Enviar",
+  "cancel": "Cancelar",
+  "loading": "Carregando",
+  "error": "Erro",
+  "success": "Sucesso",
+  "warning": "Aviso",
+  "info": "Informações",
+  "close": "Fechar",
+  "yes": "Sim",
+  "no": "Não",
+  "ok": "OK",
+  "name": "Nome",
+  "description": "Descrição",
+  "search": "Busca",
+  "Search": "Busca",
+  "add_member": "Adicionar membro",
+  "remove_member": "Remover membro",
+  "add_members": "Adicionar membros",
+  "remove_members": "Remover membros",
+  "add": "Adicionar",
+  "remove": "Remover",
+  "add_new": "Adicionar novo",
+  "remove_selected": "Remover selecionado",
+  "first_name": "Primeiro nome",
+  "last_name": "Sobrenome",
+  "email": "E-mail",
+  "display_name": "Nome de exibição",
+  "role": "Papel",
+  "timezone": "Fuso horário",
+  "avatar": "avatar",
+  "cover_image": "Imagem da capa",
+  "password": "Senha",
+  "change_cover": "Alterar capa",
+  "language": "Linguagem",
+  "saving": "Salvando...",
+  "save_changes": "Salvar alterações",
+  "deactivate_account": "Desativar conta",
+  "deactivate_account_description": "Ao desativar uma conta",
+  "profile_settings": "Configurações de perfil",
+  "your_account": "Sua conta",
+  "profile": "Perfil",
+  "security": "Segurança",
+  "activity": "Atividade",
+  "appearance": "Aparência",
+  "notifications": "Notificações",
+  "workspaces": "Espaços de trabalho",
+  "create_workspace": "Criar espaço de trabalho",
+  "invitations": "Convites",
+  "summary": "Resumo",
+  "assigned": "Atribuído",
+  "created": "Criado",
+  "subscribed": "Inscrito",
+  "you_do_not_have_the_permission_to_access_this_page": "Você não tem permissão para acessar esta página.",
+  "failed_to_sign_out_please_try_again": "Falha ao sair. Por favor, tente novamente.",
+  "password_changed_successfully": "Senha alterada com sucesso.",
+  "something_went_wrong_please_try_again": "Algo deu errado. Por favor, tente novamente.",
+  "change_password": "Alterar a senha",
+  "passwords_dont_match": "As senhas não coincidem",
+  "current_password": "Senha atual",
+  "new_password": "Nova Senha",
+  "confirm_password": "Confirme sua senha",
+  "this_field_is_required": "Este campo é obrigatório",
+  "changing_password": "Alterando senha",
+  "please_enter_your_password": "Por favor, digite sua senha.",
+  "password_length_should_me_more_than_8_characters": "O comprimento da senha deve ter mais de 8 caracteres.",
+  "password_is_weak": "A senha é fraca.",
+  "password_is_strong": "A senha é forte.",
+  "load_more": "Carregar mais",
+  "select_or_customize_your_interface_color_scheme": "Selecione ou personalize o esquema de cores da sua interface.",
+  "theme": "Tema",
+  "system_preference": "Preferência do sistema",
+  "light": "Luz",
+  "dark": "Escuro",
+  "light_contrast": "Alto contraste claro",
+  "dark_contrast": "Alto contraste escuro",
+  "custom": "Customizado",
+  "select_your_theme": "Selecione seu tema",
+  "customize_your_theme": "Personalize seu tema",
+  "background_color": "Cor de fundo",
+  "text_color": "Cor do texto",
+  "primary_color": "Cor primária (tema)",
+  "sidebar_background_color": "Cor de fundo da barra lateral",
+  "sidebar_text_color": "Cor do texto da barra lateral",
+  "set_theme": "Definir tema",
+  "enter_a_valid_hex_code_of_6_characters": "Insira um código hexadecimal válido de 6 caracteres",
+  "background_color_is_required": "A cor de fundo é obrigatória",
+  "text_color_is_required": "A cor do texto é obrigatória",
+  "primary_color_is_required": "A cor primária é obrigatória",
+  "sidebar_background_color_is_required": "A cor de fundo da barra lateral é obrigatória",
+  "sidebar_text_color_is_required": "A cor do texto da barra lateral é obrigatória",
+  "updating_theme": "Atualizando tema",
+  "theme_updated_successfully": "Tema atualizado com sucesso",
+  "failed_to_update_the_theme": "Falha ao atualizar o tema",
+  "email_notifications": "Notificações por e-mail",
+  "stay_in_the_loop_on_issues_you_are_subscribed_to_enable_this_to_get_notified": "Fique por dentro dos tickets nos quais você está inscrito. Habilite isto para ser notificado.",
+  "email_notification_setting_updated_successfully": "Configuração de notificação por e-mail atualizada com sucesso",
+  "failed_to_update_email_notification_setting": "Falha ao atualizar a configuração de notificação por e-mail",
+  "notify_me_when": "Avise-me quando",
+  "property_changes": "Mudanças de propriedade",
+  "property_changes_description": "Notificar-me quando as propriedades do ticket, como cessionários",
+  "state_change": "Mudança de estado",
+  "state_change_description": "Notificar-me quando os tickets passarem para um estado diferente",
+  "issue_completed": "Ticket concluído",
+  "issue_completed_description": "Notificar-me apenas quando um ticket for concluído",
+  "comments": "Comentários",
+  "comments_description": "Notificar-me quando alguém deixar um comentário sobre o assunto",
+  "mentions": "Menções",
+  "Mentions": "Menções",
+  "mentions_description": "Notifique-me apenas quando alguém me mencionar nos comentários ou na descrição",
+  "create_your_workspace": "Crie seu espaço de trabalho",
+  "only_your_instance_admin_can_create_workspaces": "Somente o administrador da sua instância pode criar espaços de trabalho",
+  "only_your_instance_admin_can_create_workspaces_description": "Se você souber o endereço de e-mail do administrador da sua instância",
+  "go_back": "Volte",
+  "request_instance_admin": "Solicitar administrador da instância",
+  "plane_logo": "Logotipo do avião",
+  "workspace_creation_disabled": "Criação de espaço de trabalho desativada",
+  "workspace_request_subject": "Solicitando um novo espaço de trabalho",
+  "workspace_request_body": "Olá, administradores da instância",
+  "creating_workspace": "Criando espaço de trabalho",
+  "workspace_created_successfully": "Espaço de trabalho criado com sucesso",
+  "create_workspace_page": "Criar página do espaço de trabalho",
+  "workspace_could_not_be_created_please_try_again": "Não foi possível criar o espaço de trabalho. Por favor, tente novamente.",
+  "workspace_could_not_be_created_please_try_again_description": "Ocorreu algum erro ao criar o espaço de trabalho. Por favor, tente novamente.",
+  "this_is_a_required_field": "Este é um campo obrigatório.",
+  "name_your_workspace": "Dê um nome ao seu espaço de trabalho",
+  "workspaces_names_can_contain_only_space_dash_and_alphanumeric_characters": "Os nomes dos espaços de trabalho podem conter apenas (' ')",
+  "limit_your_name_to_80_characters": "Limite seu nome a 80 caracteres.",
+  "set_your_workspace_url": "Defina o URL do seu espaço de trabalho",
+  "limit_your_url_to_48_characters": "Limite seu URL a 48 caracteres.",
+  "how_many_people_will_use_this_workspace": "Quantas pessoas usarão este espaço de trabalho?",
+  "how_many_people_will_use_this_workspace_description": "Isso nos ajudará a determinar o número de assentos que você precisa comprar.",
+  "select_a_range": "Selecione um intervalo",
+  "urls_can_contain_only_dash_and_alphanumeric_characters": "URLs podem conter apenas caracteres ('-') e alfanuméricos.",
+  "something_familiar_and_recognizable_is_always_best": "Algo familiar e reconhecível é sempre melhor.",
+  "workspace_url_is_already_taken": "O URL do espaço de trabalho já está em uso!",
+  "old_password": "Senha Antiga",
+  "general_settings": "Configurações gerais",
+  "sign_out": "sair",
+  "signing_out": "Saindo",
+  "active_cycles": "Ciclos ativos",
+  "active_cycles_description": "Monitore os ciclos entre os projetos",
+  "on_demand_snapshots_of_all_your_cycles": "Instantâneos sob demanda de todos os seus ciclos",
+  "upgrade": "Atualizar",
+  "10000_feet_view": "10",
+  "10000_feet_view_description": "Diminua o zoom para ver os ciclos em execução em todos os seus projetos de uma só vez, em vez de passar de ciclo em ciclo em cada projeto.",
+  "get_snapshot_of_each_active_cycle": "Obtenha um instantâneo de cada ciclo ativo.",
+  "get_snapshot_of_each_active_cycle_description": "Acompanhe métricas de alto nível para todos os ciclos ativos",
+  "compare_burndowns": "Compare os burndowns.",
+  "compare_burndowns_description": "Monitore o desempenho de cada uma de suas equipes dando uma olhada no relatório de burndown de cada ciclo.",
+  "quickly_see_make_or_break_issues": "Veja rapidamente os tickets decisivos.",
+  "quickly_see_make_or_break_issues_description": "Visualize tickets de alta prioridade para cada ciclo em relação às datas de vencimento. Veja todos eles por ciclo com um clique.",
+  "zoom_into_cycles_that_need_attention": "Amplie os ciclos que precisam de atenção.",
+  "zoom_into_cycles_that_need_attention_description": "Investigue o estado de qualquer ciclo que não esteja de acordo com as expectativas com um clique.",
+  "stay_ahead_of_blockers": "Fique à frente dos bloqueadores.",
+  "stay_ahead_of_blockers_description": "Identifique desafios de um projeto para outro e veja dependências entre ciclos que não são óbvias de qualquer outra visão.",
+  "analytics": "Análise",
+  "workspace_invites": "Convites para espaços de trabalho",
+  "workspace_settings": "Configurações do espaço de trabalho",
+  "enter_god_mode": "Entre no modo deus",
+  "workspace_logo": "Logotipo do espaço de trabalho",
+  "new_issue": "Novo Ticket",
+  "home": "Inicío",
+  "Home": "Inicío",
+  "your_work": "Seu trabalho",
+  "drafts": "Rascunhos",
+  "projects": "Projetos",
+  "views": "Visualizações",
+  "Views": "Visualizações",
+  "workspace": "Espaço de trabalho",
+  "archives": "Arquivos",
+  "settings": "Configurações",
+  "failed_to_move_favorite": "Falha ao mover favorito",
+  "your_favorites": "Seus favoritos",
+  "no_favorites_yet": "Ainda não há favoritos",
+  "create_folder": "Criar pasta",
+  "new_folder": "Nova pasta",
+  "favorite_updated_successfully": "Favorito atualizado com sucesso",
+  "favorite_created_successfully": "Favorito criado com sucesso",
+  "folder_already_exists": "A pasta já existe",
+  "folder_name_cannot_be_empty": "O nome da pasta não pode ficar vazio",
+  "something_went_wrong": "Algo deu errado",
+  "failed_to_reorder_favorite": "Falha ao reordenar favorito",
+  "favorite_removed_successfully": "Favorito removido com sucesso",
+  "failed_to_create_favorite": "Falha ao criar favorito",
+  "failed_to_rename_favorite": "Falha ao renomear favorito",
+  "project_link_copied_to_clipboard": "Link do projeto copiado para a área de transferência",
+  "link_copied": "Link copiado",
+  "your_projects": "Seus projetos",
+  "add_project": "Adicionar projeto",
+  "create_project": "Criar projeto",
+  "failed_to_remove_project_from_favorites": "Não foi possível remover o projeto dos favoritos. Por favor, tente novamente.",
+  "project_created_successfully": "Projeto criado com sucesso",
+  "project_created_successfully_description": "Projeto criado com sucesso. Agora você pode começar a adicionar tickets a ele.",
+  "project_cover_image_alt": "Imagem de capa do projeto",
+  "name_is_required": "O nome é obrigatório",
+  "title_should_be_less_than_255_characters": "O título deve ter menos de 255 caracteres",
+  "project_name": "Nome do projeto",
+  "project_id_must_be_at_least_1_character": "O ID do projeto deve ter pelo menos 1 caractere",
+  "project_id_must_be_at_most_5_characters": "O ID do projeto deve ter no máximo cinco caracteres",
+  "project_id": "ID do projeto",
+  "project_id_tooltip_content": "Ajuda a identificar tickets no projeto de maneira exclusiva. Máximo de 5 caracteres.",
+  "description_placeholder": "Descrição...",
+  "only_alphanumeric_non_latin_characters_allowed": "Somente caracteres alfanuméricos e não latinos são permitidos.",
+  "project_id_is_required": "O ID do projeto é obrigatório",
+  "select_network": "Selecione a rede",
+  "lead": "Liderar",
+  "private": "Privado",
+  "public": "Público",
+  "accessible_only_by_invite": "Acessível apenas por convite",
+  "anyone_in_the_workspace_except_guests_can_join": "Qualquer pessoa no espaço de trabalho, exceto convidados, pode participar",
+  "creating": "Criando",
+  "creating_project": "Criando projeto",
+  "adding_project_to_favorites": "Adicionando projeto aos favoritos",
+  "project_added_to_favorites": "Projeto adicionado aos favoritos",
+  "couldnt_add_the_project_to_favorites": "Não foi possível adicionar o projeto aos favoritos. Por favor, tente novamente.",
+  "removing_project_from_favorites": "Removendo projeto dos favoritos",
+  "project_removed_from_favorites": "Projeto removido dos favoritos",
+  "couldnt_remove_the_project_from_favorites": "Não foi possível remover o projeto dos favoritos. Por favor, tente novamente.",
+  "add_to_favorites": "Adicionar aos favoritos",
+  "remove_from_favorites": "Remover dos favoritos",
+  "publish_settings": "Publicar configurações",
+  "publish": "Publicar",
+  "copy_link": "Copiar link",
+  "leave_project": "Sair do projeto",
+  "join_the_project_to_rearrange": "Junte-se ao projeto para reorganizar",
+  "drag_to_rearrange": "Arraste para reorganizar",
+  "congrats": "Parabéns!",
+  "project": "Projeto",
+  "open_project": "Abrir projeto",
+  "issues": "Tickets",
+  "cycles": "Ciclos",
+  "modules": "Módulos",
+  "pages": "Páginas",
+  "intake": "Ingestão",
+  "time_tracking": "Controle de tempo",
+  "work_management": "Gestão do trabalho",
+  "projects_and_issues": "Projetos e questões",
+  "projects_and_issues_description": "Ative ou desative estas opções neste projeto.",
+  "cycles_description": "O Timebox funciona conforme você achar adequado por projeto e muda a frequência de um período para o outro.",
+  "modules_description": "Agrupe o trabalho em configurações semelhantes a subprojetos com seus próprios líderes e responsáveis.",
+  "views_description": "Salvar classificações",
+  "pages_description": "Escreva qualquer coisa como você escreve qualquer coisa.",
+  "intake_description": "Fique por dentro dos tickets nos quais você está inscrito. Habilite isto para ser notificado.",
+  "time_tracking_description": "Acompanhe o tempo gasto em tickets e projetos.",
+  "work_management_description": "Gerencie seu trabalho e projetos com facilidade.",
+  "documentation": "Documentação",
+  "message_support": "Suporte de mensagens",
+  "contact_sales": "Entre em contato com vendas",
+  "hyper_mode": "Modo Hiper",
+  "keyboard_shortcuts": "Atalhos de teclado",
+  "whats_new": "O que há de novo?",
+  "version": "Versão",
+  "we_are_having_trouble_fetching_the_updates": "Estamos tendo problemas para buscar as atualizações.",
+  "our_changelogs": "nossos registros de alterações",
+  "for_the_latest_updates": "para obter as atualizações mais recentes.",
+  "please_visit": "Por favor visite",
+  "docs": "Documentos",
+  "full_changelog": "Registro de alterações completo",
+  "support": "Apoiar",
+  "discord": "Discórdia",
+  "powered_by_plane_pages": "Desenvolvido por páginas de avião",
+  "please_select_at_least_one_invitation": "Selecione pelo menos um convite.",
+  "please_select_at_least_one_invitation_description": "Selecione pelo menos um convite para ingressar no espaço de trabalho.",
+  "we_see_that_someone_has_invited_you_to_join_a_workspace": "Vemos que alguém convidou você para participar de um espaço de trabalho",
+  "join_a_workspace": "Participe de um espaço de trabalho",
+  "we_see_that_someone_has_invited_you_to_join_a_workspace_description": "Vemos que alguém convidou você para participar de um espaço de trabalho",
+  "join_a_workspace_description": "Participe de um espaço de trabalho",
+  "accept_and_join": "Aceite e participe",
+  "go_home": "Ir para casa",
+  "no_pending_invites": "Nenhum convite pendente",
+  "you_can_see_here_if_someone_invites_you_to_a_workspace": "Você pode ver aqui se alguém convida você para um espaço de trabalho",
+  "back_to_home": "De volta para casa",
+  "workspace_name": "nome do espaço de trabalho",
+  "deactivate_your_account": "Desative sua conta",
+  "deactivate_your_account_description": "Uma vez desativado",
+  "deactivating": "Desativando",
+  "confirm": "Confirmar",
+  "draft_created": "Rascunho criado",
+  "issue_created_successfully": "Ticket criado com sucesso",
+  "draft_creation_failed": "Falha na criação do rascunho",
+  "issue_creation_failed": "Falha na criação do ticket",
+  "draft_issue": "Ticket de rascunho",
+  "issue_updated_successfully": "Ticket atualizado com sucesso",
+  "issue_could_not_be_updated": "Não foi possível atualizar o ticket",
+  "create_a_draft": "Crie um rascunho",
+  "save_to_drafts": "Salvar em rascunhos",
+  "save": "Salvar",
+  "updating": "Atualizando",
+  "create_new_issue": "Criar novo ticket",
+  "editor_is_not_ready_to_discard_changes": "O editor não está pronto para descartar alterações",
+  "failed_to_move_issue_to_project": "Falha ao mover o ticket para o projeto",
+  "create_more": "Crie mais",
+  "add_to_project": "Adicionar ao projeto",
+  "discard": "Descartar",
+  "duplicate_issue_found": "Ticket duplicado encontrado",
+  "duplicate_issues_found": "Tickets duplicados encontrados",
+  "no_matching_results": "Nenhum resultado correspondente",
+  "title_is_required": "O título é obrigatório",
+  "title": "Título",
+  "state": "Estado",
+  "priority": "Prioridade",
+  "Priority": "Prioridade",
+  "None": "Nenhum",
+  "Urgent": "Urgente",
+  "High": "Alto",
+  "Medium": "Médio",
+  "Low": "Baixo",
+  "none": "Nenhum",
+  "urgent": "Urgente",
+  "high": "Alto",
+  "medium": "Médio",
+  "low": "Baixo",
+  "members": "Membros",
+  "assignee": "Atribuído",
+  "assignees": "Atribuído",
+  "you": "Você",
+  "labels": "Etiquetas",
+  "create_new_label": "Criar novo rótulo",
+  "start_date": "Data de criação",
+  "due_date": "Data de vencimento",
+  "cycle": "Ciclo",
+  "estimate": "Estimativa",
+  "change_parent_issue": "Alterar ticket pai",
+  "remove_parent_issue": "Remover ticket pai",
+  "add_parent": "Adicionar pai",
+  "loading_members": "Carregando membros...",
+  "good": "Bom",
+  "morning": "dia",
+  "afternoon": "tarde",
+  "evening": "noite",
+  "issues_assigned": "Tickets Atribuídos",
+  "Issues assigned": "Tickets Atribuídos",
+  "issues_overdue": "Tickets Atrasados",
+  "Issues overdue": "Tickets Atrasados",
+  "issues_created": "Tickets Criados",
+  "Issues created": "Tickets Criados",
+  "issues_completed": "Tickets Concluídos",
+  "Issues completed": "Tickets Concluídos",
+  "assigned_to_you": "Atribuídas a você",
+  "created_by_you": "Criadas por você",
+  "assigned_by_state": "Atribuídas por status",
+  "assigned_by_priority": "Atribuídas por prioridade",
+  "your_issue_activities": "Suas atividades de tickets",
+  "create_new_project": "Criar novo projeto",
+  "collaborators": "Colaboradores",
+  "search_for_collaborators": "Buscar colaboradores",
+  "all-issues": "Todos os Tickets",
+  "created_on": "Criado em",
+  "updated_on": "Atualizado em",
+  "link": "Link",
+  "attachment_count": "Anexos",
+  "sub_issue_count": "Subtarefas",
+  "trip_reference_number": "Número de referência da viagem",
+  "reference_number": "Número de referência",
+  "hub_code": "Cód. Cervejaria",
+  "hub_name": "Nome Cervejaria",
+  "customer_code": "Código do cliente",
+  "customer_name": "Nome do cliente",
+  "vendor_name": "Nome do fornecedor",
+  "vendor_code": "Código do fornecedor",
+  "worker_code": "Código do trabalhador",
+  "worker_name": "Nome do trabalhador",
+  "filters": "Filtros",
+  "key": "ID",
+  "issue_type": "Tipo de issue",
+  "Press '/' for commands...": "Pressione '/' para comandos...",
+  "Click to add description": "Clique para adicionar descrição",
+  "properties": "Propriedades",
+  "parent": "Pai",
+  "sub_issue": "Subtarefa",
+  "target_date": "Data alvo",
+  "module": "Módulo",
+  "order_by": "Encomendar Por",
+  "add_sub_issue": "Adicionar subticket",
+  "add_relation": "Adicionar relação",
+  "add_link": "Adicionar link",
+  "attach": "Anexar",
+  "links": "Links",
+  "relations": "Relações",
+  "attachments": "Anexos",
+  "display": "Exibir",
+  "add_view": "Adicionar Visualização",
+  "state_group": "Grupo de status",
+  "mention": "Mencionar",
+  "created_by": "Criado por",
+  "label": "Etiqueta",
+  "issue_grouping": "Grupo de Tickets",
+  "no_matches_found": "Nenhum resultado encontrado",
+  "view_more": "Ver Mais",
+  "today": "Hoje",
+  "Month layout": "Layout do Mês",
+  "Week layout": "Layout da Semana",
+  "show_weekends": "Mostrar Fins de Semana",
+  "week": "Semana",
+  "month": "Mês",
+  "quarter": "Trimestre",
+  "update_view": "Atualizar Visão",
+  "create_view": "Criar Visão",
+  "Type a command or search...": "Digite um comando ou pesquise...",
+  "expand": "Expandir",
+  "hide": "Ocultar",
+  "comment": "Comentário",
+  "created_issue": "criou a tarefa.",
+  "deleted_issue": "excluiu uma tarefa.",
+  "set_state_to": "definiu o estado como",
+  "set_name_to": "definiu o nome como",
+  "updated_description": "atualizou a descrição",
+  "of": "de",
+  "added_assignee": "adicionou um novo responsável",
+  "removed_assignee": "removeu o responsável",
+  "from": "de",
+  "set_priority_to": "definiu a prioridade como",
+  "for": "para",
+  "set_estimate_point_to": "definiu os pontos de estimativa como",
+  "removed_estimate_point": "removeu os pontos de estimativa",
+  "to": "para",
+  "set_parent_to": "definiu o item pai como",
+  "removed_parent": "removeu o item pai",
+  "marked_blocking_issue": "marcou esta tarefa como bloqueadora de",
+  "removed_blocking_issue": "removeu a tarefa bloqueadora",
+  "marked_blocked_by": "marcou esta tarefa como bloqueada por",
+  "removed_blocked_by": "removeu esta tarefa como sendo bloqueada por",
+  "marked_duplicate_of": "marcou esta tarefa como duplicada de",
+  "removed_duplicate_of": "removeu esta tarefa como duplicata de",
+  "marked_relation_to": "marcou que esta tarefa se relaciona com",
+  "removed_relation_from": "removeu a relação com",
+  "set_start_date_to": "definiu a data de início como",
+  "removed_start_date": "removeu a data de início",
+  "connector_for": " para ",
+  "connector_from": " de ",
+  "set_due_date_to": "definiu a data de entrega como",
+  "removed_due_date": "removeu a data de entrega",
+  "added_issue_to_cycle": "adicionou esta tarefa ao ciclo",
+  "set_cycle_to": "definiu o ciclo como",
+  "removed_issue_from_cycle": "removeu a tarefa do ciclo",
+  "added_issue_to_module": "adicionou esta tarefa ao módulo",
+  "set_module_to": "definiu o módulo como",
+  "removed_issue_from_module": "removeu a tarefa do módulo",
+  "added_label": "adicionou um novo rótulo",
+  "removed_label": "removeu o rótulo",
+  "added": "adicionou",
+  "updated": "atualizou o(a)",
+  "removed": "removeu este(a)",
+  "uploaded_new": "enviou um novo(a)",
+  "removed_attachment": "removeu um anexo",
+  "attachment": "anexo",
+  "restored_issue": "restaurou a tarefa",
+  "archived_issue": "arquivou a tarefa",
+  "declined_issue_from_intake": "recusou esta tarefa da triagem.",
+  "snoozed_issue": "adiou esta tarefa.",
+  "accepted_issue_from_intake": "aceitou esta tarefa da triagem.",
+  "declined_issue_from_intake_duplicate": "recusou esta tarefa da triagem marcando como duplicada.",
+  "updated_intake_issue_status": "atualizou o status da tarefa da triagem.",
+  "added_custom_property": "Adicionou uma Propriedade Personalizada",
+  "with_value": " com valor",
+  "updated_custom_property_value": "Atualizou o valor de ",
+  "options": "opções",
+  "add_issue": "Adicionar ticket",
+  "Add Comment...": "Adicionar comentário...",
+  "duration": "Duração",
+  "updates": "Atualizações",
+  "upcoming": "Próximos",
+  "overdue": "Vencido",
+  "Completed": "Concluído",
+  "completed": "Concluído",
+  "pending": "Pendente",
+  "recent_projects": "Projetos Recentes",
+  "January": "Janeiro",
+  "February": "Fevereiro",
+  "March": "Março",
+  "April": "Abril",
+  "May": "Maio",
+  "June": "Junho",
+  "July": "Julho",
+  "August": "Agosto",
+  "September": "Setembro",
+  "October": "Outubro",
+  "November": "Novembro",
+  "December": "Dezembro",
+  "current": "Atual",
+  "view_all": "Ver tudo",
+  "view_all_issues": "Ver todos os tickets",
+  "assigned_to": "Atribuído a",
+  "due_by": "Devido até",
+  "blocked_by": "Bloqueado por",
+  "sub_issues": "Subproblemas",
+  "business_type": "Tipo de Negócio",
+  "1 week from now": "1 semana atrás",
+  "2 weeks from now": "2 semanas atrás",
+  "1 month from now": "1 mês atrás",
+  "2 months from now": "2 mês atrás",
+  "your-work": "Seu trabalho",
+  "Overview": "Resumo",
+  "Backlog": "Pendente",
+  "backlog": "Pendente",
+  "Not started": "Não Iniciado",
+  "Working on": "Em tratativa",
+  "Canceled": "Cancelado",
+  "canceled": "Cancelado",
+  "cancelled": "Cancelado",
+  "Issues by Priority" : "Tickets por prioridade",
+  "Issues by state": "Tickets por status",
+  "Recent activity": "Atividade recente",
+  "issues_subscribed": "Tickets Inscritos",
+  "Issues subscribed": "Tickets Inscritos",
+  "All": "Tudo",
+  "all": "Tudo",
+  "Mark all as read":"Marcar como Lido",
+  "refresh": "Atualizar",
+  "Inbox Filters": "Filtros da Caixa de entrada",
+  "Assigned to me": "Atribuídos a mim",
+  "Created by me":"Criados por mim",
+  "Subscribed by me": "Incritos para mim",
+  "Show unread": "Mostrar Não Lidos",
+  "Show archived": "Mostrar Arquivado",
+  "Show snoozed":"Mostrar adiado",
+  "inbox": "caixa de entrada",
+  "Inbox": "caixa de entrada",
+  "status": "status",
+  "states": "Status",
+  "unstarted":"Não Iniciado",
+  "started":"Iniciado",
+  "Unstarted":"Não Iniciado",
+  "Started":"Iniciado",
+  "Active Issues": "Todos Tickets",
+  "Backlog Issues": "Todos Tickets",
+  "Analytics_for_tickets": "Análise de tickets",
+  "Scope and Demand": "Escopo e demanda",
+  "Custom Analytics": "Análise Customizada",
+  "Total open tasks": "Total de tickets abertos",
+  "Pending issues": "Tickets pendentes",
+  "Unassigned": "Não atribuído:",
+  "Most issues created": "Mais tickets criados",
+  "Most issues closed": "Mais tickets fechados",
+  "issues_closed_in_a_year": "Tickets fechados no ano",
+  "Mon": "Segunda-feira",
+  "Tue": "Terça-feira",
+  "Wed": "Quarta-feira",
+  "Thu": "Quinta-feira",
+  "Fri": "Sexta-feira",
+  "Sat": "Sábado",
+  "Sun": "Domingo",
+  "Monday": "Segunda-feira",
+  "Tuesday": "Terça-feira",
+  "Wednesday": "Quarta-feira",
+  "Thursday": "Quinta-feira",
+  "Friday": "Sexta-feira",
+  "Saturday": "Sábado",
+  "Sunday": "Domingo",
+  "Workload": "Carga de trabalho",
+  "Good morning": "Bom dia",
+  "Good afternoon": "Boa tarde",
+  "Good evening": "Boa noite"
+}
diff --git a/packages/i18n/tsconfig.json b/packages/i18n/tsconfig.json
new file mode 100644
index 00000000000..6599e6e82aa
--- /dev/null
+++ b/packages/i18n/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "@plane/typescript-config/react-library.json",
+  "compilerOptions": {
+    "jsx": "react",
+    "lib": ["esnext", "dom"],
+    "resolveJsonModule": true
+  },
+  "include": ["./src"],
+  "exclude": ["dist", "build", "node_modules"]
+}
diff --git a/packages/types/src/issues/issue.d.ts b/packages/types/src/issues/issue.d.ts
index ae4a98d63f0..65d58d5a3a7 100644
--- a/packages/types/src/issues/issue.d.ts
+++ b/packages/types/src/issues/issue.d.ts
@@ -58,10 +58,19 @@ export type TIssue = TBaseIssue & {
   issue_link?: TIssueLink[];
   issue_relation?: IssueRelation[];
   issue_related?: IssueRelation[];
+  custom_properties?: Record<string, any>;
+  hub_code?: string[] | null;
+  worker_code?: string[] | null;
+  customer_code?: string[] | null;
+  trip_reference_number?: string[] | null;
+  reference_number?: string[] | null;
+  vendor_code?: string[] | null;
+  business_type?: string[] | null;
   // tempId is used for optimistic updates. It is not a part of the API response.
   tempId?: string;
   // sourceIssueId is used to store the original issue id when creating a copy of an issue. Used in cloning property values. It is not a part of the API response.
   sourceIssueId?: string;
+  [key: string]: any;
 };
 
 export type TIssueMap = {
diff --git a/packages/types/src/users.d.ts b/packages/types/src/users.d.ts
index 0440ff05f93..4d5875fce19 100644
--- a/packages/types/src/users.d.ts
+++ b/packages/types/src/users.d.ts
@@ -28,6 +28,8 @@ export interface IUser extends IUserLite {
   username: string;
   last_login_medium: TLoginMediums;
   theme: IUserTheme;
+  cover_image: string;
+  cover_image_asset: any;
 }
 
 export interface IUserAccount {
@@ -59,6 +61,7 @@ export type TUserProfile = {
   billing_address_country: string | undefined;
   billing_address: string | undefined;
   has_billing_address: boolean;
+  language: string;
   created_at: Date | string;
   updated_at: Date | string;
 };
diff --git a/packages/types/src/view-props.d.ts b/packages/types/src/view-props.d.ts
index 0c543241eef..15e91536740 100644
--- a/packages/types/src/view-props.d.ts
+++ b/packages/types/src/view-props.d.ts
@@ -49,7 +49,30 @@ export type TIssueOrderByOptions =
   | "attachment_count"
   | "-attachment_count"
   | "sub_issues_count"
-  | "-sub_issues_count";
+  | "-sub_issues_count"
+  | "trip_reference_number"
+  | "-trip_reference_number"
+  | "reference_number"
+  | "-reference_number"
+  | "hub_code"
+  | "-hub_code"
+  | "hub_name"
+  | "-hub_name"
+  | "customer_code"
+  | "-customer_code"
+  | "customer_name"
+  | "-customer_name"
+  | "vendor_name"
+  | "-vendor_name"
+  | "vendor_code"
+  | "-vendor_code"
+  | "worker_code"
+  | "-worker_code"
+  | "worker_name"
+  | "-worker_name"
+  | "business_type"
+  | "-business_type"
+  | string;
 
 export type TIssueGroupingFilters = "active" | "backlog" | null;
 
@@ -79,7 +102,19 @@ export type TIssueParams =
   | "per_page"
   | "issue_type"
   | "layout"
-  | "expand";
+  | "expand"
+  | "customer_code"
+  | "customer_name"
+  | "worker_code"
+  | "worker_name"
+  | "trip_reference_number"
+  | "reference_number"
+  | "vendor_code"
+  | "vendor_name"
+  | "custom_properties"
+  | "hub_code"
+  | "hub_name"
+  | "business_type"
 
 export type TCalendarLayouts = "month" | "week";
 
@@ -98,6 +133,18 @@ export interface IIssueFilterOptions {
   subscriber?: string[] | null;
   target_date?: string[] | null;
   issue_type?: string[] | null;
+  hub_code?: string[] | null;
+  hub_name?: string[] | null;
+  customer_code?: string[] | null;
+  customer_name?: string[] | null;
+  worker_code?: string[] | null;
+  worker_name?: string[] | null;
+  trip_reference_number?: string[] | null;
+  reference_number?: string[] | null;
+  vendor_code?: string[] | null;
+  vendor_name?: string[] | null;
+  business_type?: string[] | null;
+  custom_properties?: string[] | null;
 }
 
 export interface IIssueDisplayFilterOptions {
@@ -130,6 +177,19 @@ export interface IIssueDisplayProperties {
   modules?: boolean;
   cycle?: boolean;
   issue_type?: boolean;
+  trip_reference_number?: boolean;
+  reference_number?: boolean;
+  hub_code?: boolean;
+  hub_name?: boolean;
+  customer_code?: boolean;
+  customer_name?: boolean;
+  vendor_name?: boolean;
+  vendor_code?: boolean;
+  worker_code?: boolean;
+  worker_name?: boolean;
+  business_type?: boolean;
+  custom_properties?: Record<string, boolean>;
+  [key: string]: boolean;
 }
 
 export type TIssueKanbanFilters = {
diff --git a/space/core/components/editor/toolbar.tsx b/space/core/components/editor/toolbar.tsx
index beccc8cb763..66f6f5a2b2d 100644
--- a/space/core/components/editor/toolbar.tsx
+++ b/space/core/components/editor/toolbar.tsx
@@ -3,6 +3,7 @@
 import React, { useEffect, useState, useCallback } from "react";
 // editor
 import { EditorRefApi, TEditorCommands, TNonColorEditorCommands } from "@plane/editor";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { Button, Tooltip } from "@plane/ui";
 // constants
@@ -23,6 +24,7 @@ const toolbarItems = TOOLBAR_ITEMS.lite;
 
 export const IssueCommentToolbar: React.FC<Props> = (props) => {
   const { executeCommand, handleSubmit, isCommentEmpty, editorRef, isSubmitting, showSubmitButton } = props;
+  const { t } = useTranslation();
   // states
   const [activeStates, setActiveStates] = useState<Record<string, boolean>>({});
 
@@ -103,7 +105,7 @@ export const IssueCommentToolbar: React.FC<Props> = (props) => {
               disabled={isCommentEmpty}
               loading={isSubmitting}
             >
-              Comment
+              {t("comment")}
             </Button>
           </div>
         )}
diff --git a/space/core/components/issues/filters/priority.tsx b/space/core/components/issues/filters/priority.tsx
index 51c1a751990..bcae7997dc5 100644
--- a/space/core/components/issues/filters/priority.tsx
+++ b/space/core/components/issues/filters/priority.tsx
@@ -2,6 +2,7 @@
 
 import React, { useState } from "react";
 import { observer } from "mobx-react";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { PriorityIcon } from "@plane/ui";
 // components
@@ -17,6 +18,7 @@ type Props = {
 
 export const FilterPriority: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, searchQuery } = props;
+  const { t } = useTranslation();
 
   const [previewEnabled, setPreviewEnabled] = useState(true);
 
@@ -27,7 +29,7 @@ export const FilterPriority: React.FC<Props> = observer((props) => {
   return (
     <>
       <FilterHeader
-        title={`Priority${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("Priority")}${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -40,11 +42,11 @@ export const FilterPriority: React.FC<Props> = observer((props) => {
                 isChecked={appliedFilters?.includes(priority.key) ? true : false}
                 onClick={() => handleUpdate(priority.key)}
                 icon={<PriorityIcon priority={priority.key} className="h-3.5 w-3.5" />}
-                title={priority.title}
+                title={t(priority.title)}
               />
             ))
           ) : (
-            <p className="text-xs italic text-custom-text-400">No matches found</p>
+            <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
           )}
         </div>
       )}
diff --git a/space/core/components/issues/filters/root.tsx b/space/core/components/issues/filters/root.tsx
index 641cf007c0e..52b31fbe08c 100644
--- a/space/core/components/issues/filters/root.tsx
+++ b/space/core/components/issues/filters/root.tsx
@@ -4,6 +4,7 @@ import { FC, useCallback } from "react";
 import cloneDeep from "lodash/cloneDeep";
 import { observer } from "mobx-react";
 import { useRouter } from "next/navigation";
+import { useTranslation } from "@plane/i18n";
 // components
 import { FiltersDropdown } from "@/components/issues/filters/helpers/dropdown";
 import { FilterSelection } from "@/components/issues/filters/selection";
@@ -22,6 +23,7 @@ type IssueFiltersDropdownProps = {
 
 export const IssueFiltersDropdown: FC<IssueFiltersDropdownProps> = observer((props) => {
   const { anchor } = props;
+  const { t } = useTranslation();
   // router
   const router = useRouter();
   // hooks
@@ -59,7 +61,7 @@ export const IssueFiltersDropdown: FC<IssueFiltersDropdownProps> = observer((pro
 
   return (
     <div className="z-10 flex h-full w-full flex-col">
-      <FiltersDropdown title="Filters" placement="bottom-end">
+      <FiltersDropdown title={t("filters")} placement="bottom-end">
         <FilterSelection
           filters={issueFilters?.filters ?? {}}
           handleFilters={handleFilters as any}
diff --git a/space/core/components/issues/peek-overview/comment/add-comment.tsx b/space/core/components/issues/peek-overview/comment/add-comment.tsx
index f6c8a452b52..288c1120bd1 100644
--- a/space/core/components/issues/peek-overview/comment/add-comment.tsx
+++ b/space/core/components/issues/peek-overview/comment/add-comment.tsx
@@ -5,6 +5,7 @@ import { observer } from "mobx-react";
 import { useForm, Controller } from "react-hook-form";
 // editor
 import { EditorRefApi } from "@plane/editor";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { TOAST_TYPE, setToast } from "@plane/ui";
 // editor components
@@ -28,6 +29,7 @@ type Props = {
 
 export const AddComment: React.FC<Props> = observer((props) => {
   const { anchor } = props;
+  const { t } = useTranslation();
   // states
   const [uploadedAssetIds, setUploadAssetIds] = useState<string[]>([]);
   // refs
@@ -91,7 +93,7 @@ export const AddComment: React.FC<Props> = observer((props) => {
               }
               onChange={(comment_json, comment_html) => onChange(comment_html)}
               isSubmitting={isSubmitting}
-              placeholder="Add Comment..."
+              placeholder={t("Add Comment...")}
               uploadFile={async (file) => {
                 const { asset_id } = await uploadCommentAsset(file, anchor);
                 setUploadAssetIds((prev) => [...prev, asset_id]);
diff --git a/space/core/store/profile.store.ts b/space/core/store/profile.store.ts
index d0332805890..5e001a875e8 100644
--- a/space/core/store/profile.store.ts
+++ b/space/core/store/profile.store.ts
@@ -54,6 +54,7 @@ export class ProfileStore implements IProfileStore {
     has_billing_address: false,
     created_at: "",
     updated_at: "",
+    language: "",
   };
 
   // services
diff --git a/space/core/types/issue.d.ts b/space/core/types/issue.d.ts
index 3041a188d04..8d00ab73422 100644
--- a/space/core/types/issue.d.ts
+++ b/space/core/types/issue.d.ts
@@ -57,6 +57,17 @@ export interface IIssue
     | "sub_issues_count"
     | "link_count"
     | "estimate_point"
+    | "trip_reference_number"
+    | "reference_number"
+    | "hub_code"
+    | "hub_name"
+    | "customer_code"
+    | "customer_name"
+    | "vendor_name"
+    | "vendor_code"
+    | "worker_code"
+    | "worker_name"
+    | "business_type"
   > {
   comments: Comment[];
   reaction_items: IIssueReaction[];
diff --git a/space/next.config.js b/space/next.config.js
index d18ce805f4d..de3afceb17c 100644
--- a/space/next.config.js
+++ b/space/next.config.js
@@ -13,7 +13,7 @@ const nextConfig = {
     return [
       {
         source: "/",
-        headers: [{ key: "X-Frame-Options", value: "SAMEORIGIN" }], // clickjacking protection
+        headers: [{ key: "X-Frame-Options", value: "ALLOWALL" }], // clickjacking protection
       },
     ];
   },
diff --git a/web/.eslintignore b/web/.eslintignore
index 84f01402dd5..c6c5cb3a389 100644
--- a/web/.eslintignore
+++ b/web/.eslintignore
@@ -1,3 +1,5 @@
 .next/*
 out/*
-public/*
\ No newline at end of file
+public/*
+app/*
+core/*
\ No newline at end of file
diff --git a/web/Dockerfile.web b/web/Dockerfile.web
index d7d924d7a47..eb67cbbc486 100644
--- a/web/Dockerfile.web
+++ b/web/Dockerfile.web
@@ -101,4 +101,7 @@ ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 ENV NEXT_TELEMETRY_DISABLED 1
 ENV TURBO_TELEMETRY_DISABLED 1
 
+
 EXPOSE 3000
+
+CMD node web/server.js web
diff --git a/web/app/[workspaceSlug]/(projects)/active-cycles/header.tsx b/web/app/[workspaceSlug]/(projects)/active-cycles/header.tsx
index 4edf41bbdba..4c39da81a02 100644
--- a/web/app/[workspaceSlug]/(projects)/active-cycles/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/active-cycles/header.tsx
@@ -1,6 +1,6 @@
 "use client";
-
 import { observer } from "mobx-react";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { Breadcrumbs, ContrastIcon, Header } from "@plane/ui";
 // components
@@ -8,15 +8,17 @@ import { BreadcrumbLink } from "@/components/common";
 // plane web components
 import { UpgradeBadge } from "@/plane-web/components/workspace";
 
-export const WorkspaceActiveCycleHeader = observer(() => (
-  <Header>
-    <Header.LeftItem>
-      <Breadcrumbs>
+export const WorkspaceActiveCycleHeader = observer(() => {
+  const { t } = useTranslation();
+  return (
+    <Header>
+      <Header.LeftItem>
+        <Breadcrumbs>
         <Breadcrumbs.BreadcrumbItem
           type="text"
           link={
             <BreadcrumbLink
-              label="Active cycles"
+              label={t("active_cycles")}
               icon={<ContrastIcon className="h-4 w-4 text-custom-text-300 rotate-180" />}
             />
           }
@@ -25,4 +27,5 @@ export const WorkspaceActiveCycleHeader = observer(() => (
       <UpgradeBadge size="md" />
     </Header.LeftItem>
   </Header>
-));
+  );
+});
\ No newline at end of file
diff --git a/web/app/[workspaceSlug]/(projects)/analytics/header.tsx b/web/app/[workspaceSlug]/(projects)/analytics/header.tsx
index 4aa66e2a433..28fc008a7cc 100644
--- a/web/app/[workspaceSlug]/(projects)/analytics/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/analytics/header.tsx
@@ -3,8 +3,8 @@
 import { useEffect } from "react";
 import { observer } from "mobx-react";
 import { useSearchParams } from "next/navigation";
-// icons
 import { BarChart2, PanelRight } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { Breadcrumbs, Header } from "@plane/ui";
 // components
@@ -13,8 +13,8 @@ import { BreadcrumbLink } from "@/components/common";
 import { cn } from "@/helpers/common.helper";
 // hooks
 import { useAppTheme } from "@/hooks/store";
-
 export const WorkspaceAnalyticsHeader = observer(() => {
+  const { t } = useTranslation();
   const searchParams = useSearchParams();
   const analytics_tab = searchParams.get("analytics_tab");
   // store hooks
@@ -41,7 +41,7 @@ export const WorkspaceAnalyticsHeader = observer(() => {
         <Breadcrumbs>
           <Breadcrumbs.BreadcrumbItem
             type="text"
-            link={<BreadcrumbLink label="Analytics" icon={<BarChart2 className="h-4 w-4 text-custom-text-300" />} />}
+            link={<BreadcrumbLink label={t("analytics")} icon={<BarChart2 className="h-4 w-4 text-custom-text-300" />} />}
           />
         </Breadcrumbs>
         {analytics_tab === "custom" ? (
@@ -64,4 +64,4 @@ export const WorkspaceAnalyticsHeader = observer(() => {
       </Header.LeftItem>
     </Header>
   );
-});
+});
\ No newline at end of file
diff --git a/web/app/[workspaceSlug]/(projects)/analytics/page.tsx b/web/app/[workspaceSlug]/(projects)/analytics/page.tsx
index b66c0d19ee7..f96c5511318 100644
--- a/web/app/[workspaceSlug]/(projects)/analytics/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/analytics/page.tsx
@@ -4,6 +4,7 @@ import React, { Fragment } from "react";
 import { observer } from "mobx-react";
 import { useSearchParams } from "next/navigation";
 import { Tab } from "@headlessui/react";
+import { useTranslation } from "@plane/i18n";
 // components
 import { Header, EHeaderVariant } from "@plane/ui";
 import { CustomAnalytics, ScopeAndDemand } from "@/components/analytics";
@@ -16,6 +17,7 @@ import { EmptyStateType } from "@/constants/empty-state";
 import { useCommandPalette, useEventTracker, useProject, useWorkspace } from "@/hooks/store";
 
 const AnalyticsPage = observer(() => {
+  const { t } = useTranslation();
   const searchParams = useSearchParams();
   const analytics_tab = searchParams.get("analytics_tab");
   // store hooks
@@ -45,7 +47,7 @@ const AnalyticsPage = observer(() => {
                               selected ? "text-custom-primary-100 " : "hover:text-custom-text-200"
                             }`}
                           >
-                            {tab.title}
+                            {t(tab.title)}
                             <div
                               className={`border absolute bottom-0 right-0 left-0 rounded-t-md ${selected ? "border-custom-primary-100" : "border-transparent group-hover:border-custom-border-200"}`}
                             />
diff --git a/web/app/[workspaceSlug]/(projects)/header.tsx b/web/app/[workspaceSlug]/(projects)/header.tsx
index a7a19afe6b0..0d6a3e451db 100644
--- a/web/app/[workspaceSlug]/(projects)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/header.tsx
@@ -1,17 +1,17 @@
 "use client";
 
-import Image from "next/image";
+// import Image from "next/image";
 import { useTheme } from "next-themes";
 import { Home } from "lucide-react";
 // images
-import githubBlackImage from "/public/logos/github-black.png";
-import githubWhiteImage from "/public/logos/github-white.png";
+// import githubBlackImage from "/public/logos/github-black.png";
+// import githubWhiteImage from "/public/logos/github-white.png";
 // ui
 import { Breadcrumbs, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common";
 // constants
-import { GITHUB_REDIRECTED } from "@/constants/event-tracker";
+// import { GITHUB_REDIRECTED } from "@/constants/event-tracker";
 // hooks
 import { useEventTracker } from "@/hooks/store";
 
@@ -33,27 +33,6 @@ export const WorkspaceDashboardHeader = () => {
             </Breadcrumbs>
           </div>
         </Header.LeftItem>
-        <Header.RightItem>
-          <a
-            onClick={() =>
-              captureEvent(GITHUB_REDIRECTED, {
-                element: "navbar",
-              })
-            }
-            className="flex flex-shrink-0 items-center gap-1.5 rounded bg-custom-background-80 px-3 py-1.5"
-            href="https://github.com/makeplane/plane"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            <Image
-              src={resolvedTheme === "dark" ? githubWhiteImage : githubBlackImage}
-              height={16}
-              width={16}
-              alt="GitHub Logo"
-            />
-            <span className="hidden text-xs font-medium sm:hidden md:block">Star us on GitHub</span>
-          </a>
-        </Header.RightItem>
       </Header>
     </>
   );
diff --git a/web/app/[workspaceSlug]/(projects)/profile/[userId]/activity/page.tsx b/web/app/[workspaceSlug]/(projects)/profile/[userId]/activity/page.tsx
index bf1f88d15b4..85bdb197c95 100644
--- a/web/app/[workspaceSlug]/(projects)/profile/[userId]/activity/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/profile/[userId]/activity/page.tsx
@@ -2,6 +2,7 @@
 
 import { useState } from "react";
 import { observer } from "mobx-react";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { Button } from "@plane/ui";
 // components
@@ -15,6 +16,7 @@ import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/u
 const PER_PAGE = 100;
 
 const ProfileActivityPage = observer(() => {
+  const { t } = useTranslation();
   // states
   const [pageCount, setPageCount] = useState(1);
   const [totalPages, setTotalPages] = useState(0);
@@ -50,7 +52,7 @@ const ProfileActivityPage = observer(() => {
       <PageHead title="Profile - Activity" />
       <div className="flex h-full w-full flex-col overflow-hidden py-5">
         <div className="flex items-center justify-between gap-2 px-5 md:px-9">
-          <h3 className="text-lg font-medium">Recent activity</h3>
+          <h3 className="text-lg font-medium">{t("Recent activity")}</h3>
           {canDownloadActivity && <DownloadActivityButton />}
         </div>
         <div className="vertical-scrollbar scrollbar-md flex h-full flex-col overflow-y-auto px-5 md:px-9">
diff --git a/web/app/[workspaceSlug]/(projects)/profile/[userId]/header.tsx b/web/app/[workspaceSlug]/(projects)/profile/[userId]/header.tsx
index 13a944c8819..261d305c760 100644
--- a/web/app/[workspaceSlug]/(projects)/profile/[userId]/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/profile/[userId]/header.tsx
@@ -7,6 +7,7 @@ import Link from "next/link";
 import { useParams } from "next/navigation";
 import { ChevronDown, PanelRight } from "lucide-react";
 import { IUserProfileProjectSegregation } from "@plane/types";
+import { useTranslation } from "@plane/i18n";
 import { Breadcrumbs, Header, CustomMenu, UserActivityIcon } from "@plane/ui";
 import { BreadcrumbLink } from "@/components/common";
 // components
@@ -24,6 +25,7 @@ type TUserProfileHeader = {
 
 export const UserProfileHeader: FC<TUserProfileHeader> = observer((props) => {
   const { userProjectsData, type = undefined, showProfileIssuesFilter } = props;
+  const { t } = useTranslation();
   // router
   const { workspaceSlug, userId } = useParams();
   // store hooks
@@ -86,7 +88,7 @@ export const UserProfileHeader: FC<TUserProfileHeader> = observer((props) => {
                   href={`/${workspaceSlug}/profile/${userId}/${tab.route}`}
                   className="w-full text-custom-text-300"
                 >
-                  {tab.label}
+                  {tab.key ? t(tab.key) : null}
                 </Link>
               </CustomMenu.MenuItem>
             ))}
diff --git a/web/app/[workspaceSlug]/(projects)/profile/[userId]/layout.tsx b/web/app/[workspaceSlug]/(projects)/profile/[userId]/layout.tsx
index f31ff959dce..1daa63e6ee5 100644
--- a/web/app/[workspaceSlug]/(projects)/profile/[userId]/layout.tsx
+++ b/web/app/[workspaceSlug]/(projects)/profile/[userId]/layout.tsx
@@ -4,6 +4,7 @@ import { observer } from "mobx-react";
 import { useParams, usePathname } from "next/navigation";
 import useSWR from "swr";
 // components
+import { useTranslation } from "@plane/i18n";
 import { AppHeader, ContentWrapper } from "@/components/core";
 import { ProfileSidebar } from "@/components/profile";
 // constants
@@ -32,6 +33,7 @@ const UseProfileLayout: React.FC<Props> = observer((props) => {
   const pathname = usePathname();
   // store hooks
   const { allowPermissions } = useUserPermissions();
+  const { t } = useTranslation();
   // derived values
   const isAuthorized = allowPermissions(
     [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
@@ -79,7 +81,7 @@ const UseProfileLayout: React.FC<Props> = observer((props) => {
                   <div className={`w-full overflow-hidden h-full`}>{children}</div>
                 ) : (
                   <div className="grid h-full w-full place-items-center text-custom-text-200">
-                    You do not have the permission to access this page.
+                    {t("you_do_not_have_the_permission_to_access_this_page")}
                   </div>
                 )}
               </div>
@@ -93,4 +95,4 @@ const UseProfileLayout: React.FC<Props> = observer((props) => {
   );
 });
 
-export default UseProfileLayout;
+export default UseProfileLayout;
\ No newline at end of file
diff --git a/web/app/[workspaceSlug]/(projects)/profile/[userId]/mobile-header.tsx b/web/app/[workspaceSlug]/(projects)/profile/[userId]/mobile-header.tsx
index b963ca147c9..a453d615218 100644
--- a/web/app/[workspaceSlug]/(projects)/profile/[userId]/mobile-header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/profile/[userId]/mobile-header.tsx
@@ -8,6 +8,7 @@ import { ChevronDown } from "lucide-react";
 // types
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, TIssueLayouts } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { CustomMenu } from "@plane/ui";
 // components
 import { DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues";
@@ -25,6 +26,7 @@ import { isIssueFilterActive } from "@/helpers/filter.helper";
 import { useIssues, useLabel } from "@/hooks/store";
 
 export const ProfileIssuesMobileHeader = observer(() => {
+  const { t } = useTranslation();
   // router
   const { workspaceSlug, userId } = useParams();
   // store hook
@@ -101,7 +103,7 @@ export const ProfileIssuesMobileHeader = observer(() => {
         workspaceSlug.toString(),
         undefined,
         EIssueFilterType.DISPLAY_PROPERTIES,
-        property,
+        property as IIssueDisplayProperties,
         userId.toString()
       );
     },
@@ -145,7 +147,7 @@ export const ProfileIssuesMobileHeader = observer(() => {
           placement="bottom-end"
           menuButton={
             <div className="flex flex-center text-sm text-custom-text-200">
-              Filters
+              {t("filters")}
               <ChevronDown className="ml-2  h-4 w-4 text-custom-text-200" strokeWidth={2} />
             </div>
           }
@@ -171,7 +173,7 @@ export const ProfileIssuesMobileHeader = observer(() => {
           placement="bottom-end"
           menuButton={
             <div className="flex flex-center text-sm text-custom-text-200">
-              Display
+              {t("display")}
               <ChevronDown className="ml-2 h-4 w-4 text-custom-text-200" strokeWidth={2} />
             </div>
           }
diff --git a/web/app/[workspaceSlug]/(projects)/profile/[userId]/navbar.tsx b/web/app/[workspaceSlug]/(projects)/profile/[userId]/navbar.tsx
index 4acb93217f6..b6195d6126a 100644
--- a/web/app/[workspaceSlug]/(projects)/profile/[userId]/navbar.tsx
+++ b/web/app/[workspaceSlug]/(projects)/profile/[userId]/navbar.tsx
@@ -2,6 +2,7 @@ import React from "react";
 
 import Link from "next/link";
 import { useParams, usePathname } from "next/navigation";
+import { useTranslation } from "@plane/i18n";
 
 // components
 // constants
@@ -14,7 +15,7 @@ type Props = {
 
 export const ProfileNavbar: React.FC<Props> = (props) => {
   const { isAuthorized } = props;
-
+  const { t } = useTranslation();
   const { workspaceSlug, userId } = useParams();
   const pathname = usePathname();
 
@@ -32,11 +33,11 @@ export const ProfileNavbar: React.FC<Props> = (props) => {
                   : "border-transparent"
               }`}
             >
-              {tab.label}
+              {tab.key ? t(tab.key) : null}
             </span>
           </Link>
         ))}
       </div>
     </Header>
   );
-};
+};
\ No newline at end of file
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx
index 902f15cde84..a5d23451575 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx
@@ -9,6 +9,7 @@ import { ArrowRight, PanelRight } from "lucide-react";
 // types
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Breadcrumbs, Button, ContrastIcon, CustomMenu, Tooltip, Header } from "@plane/ui";
 // components
 import { ProjectAnalyticsModal } from "@/components/analytics";
@@ -64,6 +65,7 @@ const CycleDropdownOption: React.FC<{ cycleId: string }> = ({ cycleId }) => {
 };
 
 export const CycleIssuesHeader: React.FC = observer(() => {
+  const { t } = useTranslation();
   // states
   const [analyticsModal, setAnalyticsModal] = useState(false);
   // router
@@ -139,7 +141,7 @@ export const CycleIssuesHeader: React.FC = observer(() => {
   const handleDisplayProperties = useCallback(
     (property: Partial<IIssueDisplayProperties>) => {
       if (!workspaceSlug || !projectId) return;
-      updateFilters(workspaceSlug, projectId, EIssueFilterType.DISPLAY_PROPERTIES, property, cycleId);
+      updateFilters(workspaceSlug, projectId, EIssueFilterType.DISPLAY_PROPERTIES, property as IIssueDisplayProperties, cycleId);
     },
     [workspaceSlug, projectId, cycleId, updateFilters]
   );
@@ -250,7 +252,7 @@ export const CycleIssuesHeader: React.FC = observer(() => {
               selectedLayout={activeLayout}
             />
             <FiltersDropdown
-              title="Filters"
+              title={t("filters")}
               placement="bottom-end"
               isFiltersApplied={isIssueFilterActive(issueFilters)}
             >
@@ -269,7 +271,7 @@ export const CycleIssuesHeader: React.FC = observer(() => {
                 moduleViewDisabled={!currentProjectDetails?.module_view}
               />
             </FiltersDropdown>
-            <FiltersDropdown title="Display" placement="bottom-end">
+            <FiltersDropdown title={t("display")} placement="bottom-end">
               <DisplayFiltersSelection
                 layoutDisplayFiltersOptions={
                   activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[activeLayout] : undefined
@@ -287,7 +289,7 @@ export const CycleIssuesHeader: React.FC = observer(() => {
             {canUserCreateIssue && (
               <>
                 <Button onClick={() => setAnalyticsModal(true)} variant="neutral-primary" size="sm">
-                  Analytics
+                  {t("analytics")}
                 </Button>
                 {!isCompletedCycle && (
                   <Button
@@ -298,7 +300,7 @@ export const CycleIssuesHeader: React.FC = observer(() => {
                     }}
                     size="sm"
                   >
-                    Add issue
+                    {t("add_issue")}
                   </Button>
                 )}
               </>
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/mobile-header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/mobile-header.tsx
index aa81ae5816a..33bf64b816a 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/mobile-header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/mobile-header.tsx
@@ -7,6 +7,7 @@ import { Calendar, ChevronDown, Kanban, List } from "lucide-react";
 // types
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { CustomMenu } from "@plane/ui";
 // components
 import { ProjectAnalyticsModal } from "@/components/analytics";
@@ -25,6 +26,7 @@ import { isIssueFilterActive } from "@/helpers/filter.helper";
 import { useIssues, useCycle, useProjectState, useLabel, useMember, useProject } from "@/hooks/store";
 
 export const CycleIssuesMobileHeader = () => {
+  const { t } = useTranslation();
   const [analyticsModal, setAnalyticsModal] = useState(false);
   const { getCycleById } = useCycle();
   const layouts = [
@@ -108,7 +110,7 @@ export const CycleIssuesMobileHeader = () => {
         workspaceSlug.toString(),
         projectId.toString(),
         EIssueFilterType.DISPLAY_PROPERTIES,
-        property,
+        property as IIssueDisplayProperties,
         cycleId.toString()
       );
     },
@@ -150,7 +152,7 @@ export const CycleIssuesMobileHeader = () => {
             placement="bottom-end"
             menuButton={
               <span className="flex items-center text-custom-text-200 text-sm">
-                Filters
+                {t("filters")}
                 <ChevronDown className="text-custom-text-200  h-4 w-4 ml-2" />
               </span>
             }
@@ -178,7 +180,7 @@ export const CycleIssuesMobileHeader = () => {
             placement="bottom-end"
             menuButton={
               <span className="flex items-center text-custom-text-200 text-sm">
-                Display
+                {t("display")}
                 <ChevronDown className="text-custom-text-200 h-4 w-4 ml-2" />
               </span>
             }
@@ -202,7 +204,7 @@ export const CycleIssuesMobileHeader = () => {
           onClick={() => setAnalyticsModal(true)}
           className="flex flex-grow justify-center text-custom-text-200 text-sm border-l border-custom-border-200"
         >
-          Analytics
+          {t("analytics")}
         </span>
       </div>
     </>
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx
index 49816bad741..5c7df0fea8a 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx
@@ -6,6 +6,7 @@ import { useParams } from "next/navigation";
 // types
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Breadcrumbs, LayersIcon, Tooltip } from "@plane/ui";
 // components
 import { BreadcrumbLink, Logo } from "@/components/common";
@@ -24,6 +25,7 @@ import { useIssues, useLabel, useMember, useProject, useProjectState } from "@/h
 import { usePlatformOS } from "@/hooks/use-platform-os";
 
 export const ProjectDraftIssueHeader: FC = observer(() => {
+  const { t } = useTranslation();
   // router
   const { workspaceSlug, projectId } = useParams() as { workspaceSlug: string; projectId: string };
   // store hooks
@@ -79,7 +81,7 @@ export const ProjectDraftIssueHeader: FC = observer(() => {
   const handleDisplayProperties = useCallback(
     (property: Partial<IIssueDisplayProperties>) => {
       if (!workspaceSlug || !projectId) return;
-      updateFilters(workspaceSlug, projectId, EIssueFilterType.DISPLAY_PROPERTIES, property);
+      updateFilters(workspaceSlug, projectId, EIssueFilterType.DISPLAY_PROPERTIES, property as IIssueDisplayProperties);
     },
     [workspaceSlug, projectId, updateFilters]
   );
@@ -138,7 +140,7 @@ export const ProjectDraftIssueHeader: FC = observer(() => {
             onChange={(layout) => handleLayoutChange(layout)}
             selectedLayout={activeLayout}
           />
-          <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}>
+          <FiltersDropdown title={t("filters")} placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}>
             <FilterSelection
               filters={issueFilters?.filters ?? {}}
               handleFiltersUpdate={handleFiltersUpdate}
@@ -154,7 +156,7 @@ export const ProjectDraftIssueHeader: FC = observer(() => {
               moduleViewDisabled={!currentProjectDetails?.module_view}
             />
           </FiltersDropdown>
-          <FiltersDropdown title="Display" placement="bottom-end">
+          <FiltersDropdown title={t("display")} placement="bottom-end">
             <DisplayFiltersSelection
               layoutDisplayFiltersOptions={
                 activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[activeLayout] : undefined
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsx
index e61b9fefdfd..2a854b29966 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsx
@@ -5,6 +5,7 @@ import { useParams } from "next/navigation";
 // icons
 import { Briefcase, Circle, ExternalLink } from "lucide-react";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Breadcrumbs, Button, LayersIcon, Tooltip, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink, CountChip, Logo } from "@/components/common";
@@ -21,6 +22,7 @@ import { usePlatformOS } from "@/hooks/use-platform-os";
 import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
 
 export const ProjectIssuesHeader = observer(() => {
+  const { t } = useTranslation();
   // router
   const router = useAppRouter();
   const { workspaceSlug, projectId } = useParams() as { workspaceSlug: string; projectId: string };
@@ -120,7 +122,7 @@ export const ProjectIssuesHeader = observer(() => {
             }}
             size="sm"
           >
-            <div className="hidden sm:block">Add</div> Issue
+            <div className="hidden sm:block">{t("add")}</div> {t("issues")}
           </Button>
         ) : (
           <></>
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/mobile-header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/mobile-header.tsx
index 025c9fab04f..eebc0ecde41 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/mobile-header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/mobile-header.tsx
@@ -8,6 +8,7 @@ import { Calendar, ChevronDown, Kanban, List } from "lucide-react";
 // types
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { CustomMenu } from "@plane/ui";
 // components
 import { ProjectAnalyticsModal } from "@/components/analytics";
@@ -26,6 +27,7 @@ import { isIssueFilterActive } from "@/helpers/filter.helper";
 import { useIssues, useLabel, useMember, useProject, useProjectState } from "@/hooks/store";
 
 export const ProjectIssuesMobileHeader = observer(() => {
+  const { t } = useTranslation();
   const layouts = [
     { key: "list", title: "List", icon: List },
     { key: "kanban", title: "Board", icon: Kanban },
@@ -89,7 +91,7 @@ export const ProjectIssuesMobileHeader = observer(() => {
   const handleDisplayProperties = useCallback(
     (property: Partial<IIssueDisplayProperties>) => {
       if (!workspaceSlug || !projectId) return;
-      updateFilters(workspaceSlug, projectId, EIssueFilterType.DISPLAY_PROPERTIES, property);
+      updateFilters(workspaceSlug, projectId, EIssueFilterType.DISPLAY_PROPERTIES, property as IIssueDisplayProperties);
     },
     [workspaceSlug, projectId, updateFilters]
   );
@@ -134,7 +136,7 @@ export const ProjectIssuesMobileHeader = observer(() => {
             placement="bottom-end"
             menuButton={
               <span className="flex items-center text-sm text-custom-text-200">
-                Filters
+                {t("filters")}
                 <ChevronDown className="ml-2  h-4 w-4 text-custom-text-200" />
               </span>
             }
@@ -162,7 +164,7 @@ export const ProjectIssuesMobileHeader = observer(() => {
             placement="bottom-end"
             menuButton={
               <span className="flex items-center text-sm text-custom-text-200">
-                Display
+                {t("display")}
                 <ChevronDown className="ml-2 h-4 w-4 text-custom-text-200" />
               </span>
             }
@@ -185,7 +187,7 @@ export const ProjectIssuesMobileHeader = observer(() => {
           onClick={() => setAnalyticsModal(true)}
           className="flex flex-grow justify-center border-l border-custom-border-200 text-sm text-custom-text-200"
         >
-          Analytics
+          {t("analytics")}
         </button>
       </div>
     </>
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx
index 59dcae31b90..4c5e867f40a 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx
@@ -9,6 +9,7 @@ import { ArrowRight, PanelRight } from "lucide-react";
 // types
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Breadcrumbs, Button, CustomMenu, DiceIcon, Tooltip, Header } from "@plane/ui";
 // components
 import { ProjectAnalyticsModal } from "@/components/analytics";
@@ -44,6 +45,7 @@ import { usePlatformOS } from "@/hooks/use-platform-os";
 import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
 
 const ModuleDropdownOption: React.FC<{ moduleId: string }> = ({ moduleId }) => {
+  const { t } = useTranslation();
   // router
   const { workspaceSlug, projectId } = useParams();
   // store hooks
@@ -67,6 +69,7 @@ const ModuleDropdownOption: React.FC<{ moduleId: string }> = ({ moduleId }) => {
 };
 
 export const ModuleIssuesHeader: React.FC = observer(() => {
+  const { t } = useTranslation();
   // states
   const [analyticsModal, setAnalyticsModal] = useState(false);
   // router
@@ -140,7 +143,7 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
   const handleDisplayProperties = useCallback(
     (property: Partial<IIssueDisplayProperties>) => {
       if (!projectId) return;
-      updateFilters(projectId.toString(), EIssueFilterType.DISPLAY_PROPERTIES, property);
+      updateFilters(projectId.toString(), EIssueFilterType.DISPLAY_PROPERTIES, property as IIssueDisplayProperties);
     },
     [projectId, updateFilters]
   );
@@ -248,7 +251,7 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
               selectedLayout={activeLayout}
             />
             <FiltersDropdown
-              title="Filters"
+              title={t("filters")}
               placement="bottom-end"
               isFiltersApplied={isIssueFilterActive(issueFilters)}
             >
@@ -267,7 +270,7 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
                 moduleViewDisabled={!currentProjectDetails?.module_view}
               />
             </FiltersDropdown>
-            <FiltersDropdown title="Display" placement="bottom-end">
+            <FiltersDropdown title={t("display")} placement="bottom-end">
               <DisplayFiltersSelection
                 layoutDisplayFiltersOptions={
                   activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[activeLayout] : undefined
@@ -291,7 +294,7 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
                 variant="neutral-primary"
                 size="sm"
               >
-                Analytics
+                {t("analytics")}
               </Button>
               <Button
                 className="hidden sm:flex"
@@ -301,7 +304,7 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
                 }}
                 size="sm"
               >
-                Add issue
+                {t("add_issue")}
               </Button>
             </>
           ) : (
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/mobile-header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/mobile-header.tsx
index 0edfa2b5a2b..afed25108a0 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/mobile-header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/mobile-header.tsx
@@ -8,6 +8,7 @@ import { Calendar, ChevronDown, Kanban, List } from "lucide-react";
 // types
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { CustomMenu } from "@plane/ui";
 // components
 import { ProjectAnalyticsModal } from "@/components/analytics";
@@ -26,6 +27,7 @@ import { isIssueFilterActive } from "@/helpers/filter.helper";
 import { useIssues, useLabel, useMember, useModule, useProject, useProjectState } from "@/hooks/store";
 
 export const ModuleIssuesMobileHeader = observer(() => {
+  const { t } = useTranslation();
   const [analyticsModal, setAnalyticsModal] = useState(false);
   const { currentProjectDetails } = useProject();
   const { getModuleById } = useModule();
@@ -91,7 +93,7 @@ export const ModuleIssuesMobileHeader = observer(() => {
   const handleDisplayProperties = useCallback(
     (property: Partial<IIssueDisplayProperties>) => {
       if (!workspaceSlug || !projectId) return;
-      updateFilters(workspaceSlug, projectId, EIssueFilterType.DISPLAY_PROPERTIES, property, moduleId);
+      updateFilters(workspaceSlug, projectId, EIssueFilterType.DISPLAY_PROPERTIES, property as IIssueDisplayProperties, moduleId);
     },
     [workspaceSlug, projectId, moduleId, updateFilters]
   );
@@ -131,7 +133,7 @@ export const ModuleIssuesMobileHeader = observer(() => {
             placement="bottom-end"
             menuButton={
               <span className="flex items-center text-sm text-custom-text-200">
-                Filters
+                {t("filters")}
                 <ChevronDown className="ml-2  h-4 w-4 text-custom-text-200" />
               </span>
             }
@@ -159,7 +161,7 @@ export const ModuleIssuesMobileHeader = observer(() => {
             placement="bottom-end"
             menuButton={
               <span className="flex items-center text-sm text-custom-text-200">
-                Display
+                {t("display")}
                 <ChevronDown className="ml-2 h-4 w-4 text-custom-text-200" />
               </span>
             }
@@ -183,7 +185,7 @@ export const ModuleIssuesMobileHeader = observer(() => {
           onClick={() => setAnalyticsModal(true)}
           className="flex flex-grow justify-center border-l border-custom-border-200 text-sm text-custom-text-200"
         >
-          Analytics
+          {t("analytics")}
         </button>
       </div>
     </div>
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx
index 71f2d8df425..46b8ebb7009 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx
@@ -8,6 +8,7 @@ import { Layers, Lock } from "lucide-react";
 // types
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Breadcrumbs, Button, CustomMenu, Tooltip, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink, Logo } from "@/components/common";
@@ -39,6 +40,7 @@ import {
 import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
 
 export const ProjectViewIssuesHeader: React.FC = observer(() => {
+  const { t } = useTranslation();
   // router
   const { workspaceSlug, projectId, viewId } = useParams();
   // store hooks
@@ -121,7 +123,7 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
         workspaceSlug.toString(),
         projectId.toString(),
         EIssueFilterType.DISPLAY_PROPERTIES,
-        property,
+        property as IIssueDisplayProperties,
         viewId.toString()
       );
     },
@@ -145,7 +147,7 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
             link={
               <BreadcrumbLink
                 href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/issues`}
-                label={currentProjectDetails?.name ?? "Project"}
+                label={currentProjectDetails?.name ?? t("project")}
                 icon={
                   currentProjectDetails && (
                     <span className="grid h-4 w-4 flex-shrink-0 place-items-center">
@@ -161,7 +163,7 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
             link={
               <BreadcrumbLink
                 href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/views`}
-                label="Views"
+                label={t("views")}
                 icon={<Layers className="h-4 w-4 text-custom-text-300" />}
               />
             }
@@ -249,7 +251,7 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
             />
 
             <FiltersDropdown
-              title="Filters"
+              title={t("filters")}
               placement="bottom-end"
               disabled={!canUserCreateIssue}
               isFiltersApplied={isIssueFilterActive(issueFilters)}
@@ -269,7 +271,7 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
                 moduleViewDisabled={!currentProjectDetails?.module_view}
               />
             </FiltersDropdown>
-            <FiltersDropdown title="Display" placement="bottom-end">
+            <FiltersDropdown title={t("display")} placement="bottom-end">
               <DisplayFiltersSelection
                 layoutDisplayFiltersOptions={
                   activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[activeLayout] : undefined
@@ -294,7 +296,7 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
             }}
             size="sm"
           >
-            Add issue
+            {t("add_issue")}
           </Button>
         ) : (
           <></>
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx
index 2fd2d652479..98cf18279d5 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx
@@ -4,6 +4,7 @@ import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { Layers } from "lucide-react";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Breadcrumbs, Button, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink, Logo } from "@/components/common";
@@ -12,6 +13,7 @@ import { ViewListHeader } from "@/components/views";
 import { useCommandPalette, useProject } from "@/hooks/store";
 
 export const ProjectViewsHeader = observer(() => {
+  const { t } = useTranslation();
   // router
   const { workspaceSlug } = useParams();
   // store hooks
@@ -41,7 +43,7 @@ export const ProjectViewsHeader = observer(() => {
             />
             <Breadcrumbs.BreadcrumbItem
               type="text"
-              link={<BreadcrumbLink label="Views" icon={<Layers className="h-4 w-4 text-custom-text-300" />} />}
+              link={<BreadcrumbLink label={t("Views")} icon={<Layers className="h-4 w-4 text-custom-text-300" />} />}
             />
           </Breadcrumbs>
         </Header.LeftItem>
@@ -49,7 +51,7 @@ export const ProjectViewsHeader = observer(() => {
           <ViewListHeader />
           <div>
             <Button variant="primary" size="sm" onClick={() => toggleCreateViewModal(true)}>
-              Add view
+              {t("add_view")}
             </Button>
           </div>
         </Header.RightItem>
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/mobile-header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/mobile-header.tsx
index 608ed5dff17..b7859b319ff 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/mobile-header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/mobile-header.tsx
@@ -4,6 +4,7 @@ import { observer } from "mobx-react";
 // icons
 import { ChevronDown, ListFilter } from "lucide-react";
 // components
+import { useTranslation } from "@plane/i18n";
 import { Row } from "@plane/ui";
 import { FiltersDropdown } from "@/components/issues/issue-layouts";
 import { ViewFiltersSelection } from "@/components/views/filters/filter-selection";
@@ -12,6 +13,7 @@ import { ViewOrderByDropdown } from "@/components/views/filters/order-by";
 import { useMember, useProjectView } from "@/hooks/store";
 
 export const ViewMobileHeader = observer(() => {
+  const { t } = useTranslation();
   // store hooks
   const { filters, updateFilters } = useProjectView();
   const {
@@ -40,7 +42,7 @@ export const ViewMobileHeader = observer(() => {
             isFiltersApplied={false}
             menuButton={
               <Row className="flex items-center text-sm text-custom-text-200">
-                Filters
+                {t("filters")}
                 <ChevronDown className="ml-2 h-4 w-4 text-custom-text-200" strokeWidth={2} />
               </Row>
             }
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/page.tsx
index 92fedb453e6..ffd161b7457 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/page.tsx
@@ -17,16 +17,18 @@ import { EViewAccess } from "@/constants/views";
 import { calculateTotalFilters } from "@/helpers/filter.helper";
 // hooks
 import { useProject, useProjectView } from "@/hooks/store";
+import { useTranslation } from "@plane/i18n";
 
 const ProjectViewsPage = observer(() => {
   // router
   const { workspaceSlug, projectId } = useParams();
+  const { t } = useTranslation();
   // store
   const { getProjectById, currentProjectDetails } = useProject();
   const { filters, updateFilters, clearAllFilters } = useProjectView();
   // derived values
   const project = projectId ? getProjectById(projectId.toString()) : undefined;
-  const pageTitle = project?.name ? `${project?.name} - Views` : undefined;
+  const pageTitle = project?.name ? `${project?.name} - ${t("views")}` : undefined;
 
   if (!workspaceSlug || !projectId) return <></>;
 
@@ -66,8 +68,19 @@ const ProjectViewsPage = observer(() => {
         <Header variant={EHeaderVariant.TERNARY}>
           <ViewAppliedFiltersList
             appliedFilters={filters.filters ?? {}}
-            handleClearAllFilters={clearAllFilters}
-            handleRemoveFilter={handleRemoveFilter}
+            handleClearAllFilters={() => {
+              const ownedBy = filters.filters?.owned_by;
+              clearAllFilters();
+              if (ownedBy) {
+                updateFilters("filters", { owned_by: ownedBy });
+              }
+            }}
+            handleRemoveFilter={(key, value) => {
+              if (key === "owned_by") {
+                return;
+              }
+              handleRemoveFilter(key, value);
+            }}
             alwaysAllowEditing
           />
         </Header>
diff --git a/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx b/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
index 3eec4b02764..4c1fba76815 100644
--- a/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
@@ -10,16 +10,18 @@ import { GlobalViewsHeader } from "@/components/workspace";
 import { DEFAULT_GLOBAL_VIEWS_LIST } from "@/constants/workspace";
 // hooks
 import { useWorkspace } from "@/hooks/store";
+import { useTranslation } from "@plane/i18n";
 
 const GlobalViewIssuesPage = observer(() => {
   // router
   const { globalViewId } = useParams();
   // store hooks
   const { currentWorkspace } = useWorkspace();
+  const { t } = useTranslation();
 
   // derived values
   const defaultView = DEFAULT_GLOBAL_VIEWS_LIST.find((view) => view.key === globalViewId);
-  const pageTitle = currentWorkspace?.name ? `${currentWorkspace?.name} - All Views` : undefined;
+  const pageTitle = currentWorkspace?.name ? `${currentWorkspace?.name} - All ${t("views")}` : undefined;
 
   return (
     <>
diff --git a/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx b/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx
index 500d23ed701..92200ac721a 100644
--- a/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx
@@ -7,6 +7,7 @@ import { useParams } from "next/navigation";
 import { Layers } from "lucide-react";
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Breadcrumbs, Button, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common";
@@ -20,6 +21,7 @@ import { isIssueFilterActive } from "@/helpers/filter.helper";
 import { useLabel, useMember, useIssues, useGlobalView } from "@/hooks/store";
 
 export const GlobalIssuesHeader = observer(() => {
+  const { t } = useTranslation();
   // states
   const [createViewModal, setCreateViewModal] = useState(false);
   // router
@@ -86,7 +88,7 @@ export const GlobalIssuesHeader = observer(() => {
         workspaceSlug.toString(),
         undefined,
         EIssueFilterType.DISPLAY_PROPERTIES,
-        property,
+        property as IIssueDisplayProperties,
         globalViewId.toString()
       );
     },
@@ -103,7 +105,7 @@ export const GlobalIssuesHeader = observer(() => {
           <Breadcrumbs>
             <Breadcrumbs.BreadcrumbItem
               type="text"
-              link={<BreadcrumbLink label={`Views`} icon={<Layers className="h-4 w-4 text-custom-text-300" />} />}
+              link={<BreadcrumbLink label={t("views")} icon={<Layers className="h-4 w-4 text-custom-text-300" />} />}
             />
           </Breadcrumbs>
         </Header.LeftItem>
@@ -112,7 +114,7 @@ export const GlobalIssuesHeader = observer(() => {
           {!isLocked ? (
             <>
               <FiltersDropdown
-                title="Filters"
+                title={t("filters")}
                 placement="bottom-end"
                 isFiltersApplied={isIssueFilterActive(issueFilters)}
               >
@@ -126,7 +128,7 @@ export const GlobalIssuesHeader = observer(() => {
                   memberIds={workspaceMemberIds ?? undefined}
                 />
               </FiltersDropdown>
-              <FiltersDropdown title="Display" placement="bottom-end">
+              <FiltersDropdown title={t("display")} placement="bottom-end">
                 <DisplayFiltersSelection
                   layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.my_issues.spreadsheet}
                   displayFilters={issueFilters?.displayFilters ?? {}}
@@ -141,7 +143,7 @@ export const GlobalIssuesHeader = observer(() => {
           )}
 
           <Button variant="primary" size="sm" onClick={() => setCreateViewModal(true)}>
-            Add view
+          {t("add_view")}
           </Button>
         </Header.RightItem>
       </Header>
diff --git a/web/app/[workspaceSlug]/(projects)/workspace-views/page.tsx b/web/app/[workspaceSlug]/(projects)/workspace-views/page.tsx
index 7de44258473..3981228b9b6 100644
--- a/web/app/[workspaceSlug]/(projects)/workspace-views/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/workspace-views/page.tsx
@@ -5,6 +5,7 @@ import { observer } from "mobx-react";
 // icons
 import { Search } from "lucide-react";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Input } from "@plane/ui";
 // components
 import { PageHead } from "@/components/core";
@@ -16,10 +17,11 @@ import { useWorkspace } from "@/hooks/store";
 
 const WorkspaceViewsPage = observer(() => {
   const [query, setQuery] = useState("");
+  const { t } = useTranslation();
   // store
   const { currentWorkspace } = useWorkspace();
   // derived values
-  const pageTitle = currentWorkspace?.name ? `${currentWorkspace?.name} - All Views` : undefined;
+  const pageTitle = currentWorkspace?.name ? `${currentWorkspace?.name} - All ${t("views")}` : undefined;
 
   return (
     <>
diff --git a/web/app/create-workspace/page.tsx b/web/app/create-workspace/page.tsx
index 1a5625ad646..ee1c909f982 100644
--- a/web/app/create-workspace/page.tsx
+++ b/web/app/create-workspace/page.tsx
@@ -5,6 +5,7 @@ import { observer } from "mobx-react";
 import Image from "next/image";
 import Link from "next/link";
 import { useTheme } from "next-themes";
+import { useTranslation } from "@plane/i18n";
 import { IWorkspace } from "@plane/types";
 // components
 import { CreateWorkspaceForm } from "@/components/workspace";
@@ -18,6 +19,7 @@ import BlackHorizontalLogo from "@/public/plane-logos/black-horizontal-with-blue
 import WhiteHorizontalLogo from "@/public/plane-logos/white-horizontal-with-blue-logo.png";
 
 const CreateWorkspacePage = observer(() => {
+  const { t } = useTranslation();
   // router
   const router = useAppRouter();
   // store hooks
@@ -48,7 +50,7 @@ const CreateWorkspacePage = observer(() => {
             href="/"
           >
             <div className="h-[30px] w-[133px]">
-              <Image src={logo} alt="Plane logo" />
+              <Image src={logo} alt={t("plane_logo")} />
             </div>
           </Link>
           <div className="absolute right-4 top-1/4 -translate-y-1/2 text-sm text-custom-text-100 sm:fixed sm:right-16 sm:top-12 sm:translate-y-0 sm:py-5">
@@ -72,4 +74,4 @@ const CreateWorkspacePage = observer(() => {
   );
 });
 
-export default CreateWorkspacePage;
+export default CreateWorkspacePage;
\ No newline at end of file
diff --git a/web/app/invitations/page.tsx b/web/app/invitations/page.tsx
index 580896bb569..a6df6b51c33 100644
--- a/web/app/invitations/page.tsx
+++ b/web/app/invitations/page.tsx
@@ -7,8 +7,8 @@ import Link from "next/link";
 
 import { useTheme } from "next-themes";
 import useSWR, { mutate } from "swr";
-// icons
 import { CheckCircle2 } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 // types
 import type { IWorkspaceMemberInvitation } from "@plane/types";
 // ui
@@ -45,6 +45,7 @@ const UserInvitationsPage = observer(() => {
   // router
   const router = useAppRouter();
   // store hooks
+  const { t } = useTranslation();
   const { captureEvent, joinWorkspaceMetricGroup } = useEventTracker();
   const { data: currentUser } = useUser();
   const { updateUserProfile } = useUserProfile();
@@ -72,8 +73,8 @@ const UserInvitationsPage = observer(() => {
     if (invitationsRespond.length === 0) {
       setToast({
         type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: "Please select at least one invitation.",
+        title: t("error"),
+        message: t("please_select_at_least_one_invitation"),
       });
       return;
     }
@@ -107,8 +108,8 @@ const UserInvitationsPage = observer(() => {
           .catch(() => {
             setToast({
               type: TOAST_TYPE.ERROR,
-              title: "Error!",
-              message: "Something went wrong, Please try again.",
+              title: t("error"),
+              message: t("something_went_wrong_please_try_again"),
             });
             setIsJoiningWorkspaces(false);
           });
@@ -122,8 +123,8 @@ const UserInvitationsPage = observer(() => {
         });
         setToast({
           type: TOAST_TYPE.ERROR,
-          title: "Error!",
-          message: "Something went wrong, Please try again.",
+          title: t("error"),
+          message: t("something_went_wrong_please_try_again"),
         });
         setIsJoiningWorkspaces(false);
       });
@@ -149,8 +150,8 @@ const UserInvitationsPage = observer(() => {
           invitations.length > 0 ? (
             <div className="relative flex h-full justify-center px-8 pb-8 sm:w-10/12 sm:items-center sm:justify-start sm:p-0 sm:pr-[8.33%] md:w-9/12 lg:w-4/5">
               <div className="w-full space-y-10">
-                <h5 className="text-lg">We see that someone has invited you to</h5>
-                <h4 className="text-2xl font-semibold">Join a workspace</h4>
+                <h5 className="text-lg">{t("we_see_that_someone_has_invited_you_to_join_a_workspace")}</h5>
+                <h4 className="text-2xl font-semibold">{t("join_a_workspace")}</h4>
                 <div className="max-h-[37vh] space-y-4 overflow-y-auto md:w-3/5">
                   {invitations.map((invitation) => {
                     const isSelected = invitationsRespond.includes(invitation.id);
@@ -204,12 +205,12 @@ const UserInvitationsPage = observer(() => {
                     disabled={isJoiningWorkspaces || invitationsRespond.length === 0}
                     loading={isJoiningWorkspaces}
                   >
-                    Accept & Join
+                    {t("accept_and_join")}
                   </Button>
                   <Link href={`/${redirectWorkspaceSlug}`}>
                     <span>
                       <Button variant="neutral-primary" size="md">
-                        Go Home
+                        {t("go_home")}
                       </Button>
                     </span>
                   </Link>
@@ -219,11 +220,11 @@ const UserInvitationsPage = observer(() => {
           ) : (
             <div className="fixed left-0 top-0 grid h-full w-full place-items-center">
               <EmptyState
-                title="No pending invites"
-                description="You can see here if someone invites you to a workspace."
+                title={t("no_pending_invites")}
+                description={t("you_can_see_here_if_someone_invites_you_to_a_workspace")}
                 image={emptyInvitation}
                 primaryButton={{
-                  text: "Back to home",
+                  text: t("back_to_home"),
                   onClick: () => router.push("/"),
                 }}
               />
@@ -235,4 +236,4 @@ const UserInvitationsPage = observer(() => {
   );
 });
 
-export default UserInvitationsPage;
+export default UserInvitationsPage;
\ No newline at end of file
diff --git a/web/app/profile/activity/page.tsx b/web/app/profile/activity/page.tsx
index afc9b29bf8d..b3bfeede629 100644
--- a/web/app/profile/activity/page.tsx
+++ b/web/app/profile/activity/page.tsx
@@ -2,6 +2,7 @@
 
 import { useState } from "react";
 import { observer } from "mobx-react";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { Button } from "@plane/ui";
 // components
@@ -18,6 +19,7 @@ import { EmptyStateType } from "@/constants/empty-state";
 const PER_PAGE = 100;
 
 const ProfileActivityPage = observer(() => {
+  const { t } = useTranslation();
   // states
   const [pageCount, setPageCount] = useState(1);
   const [totalPages, setTotalPages] = useState(0);
@@ -55,12 +57,12 @@ const ProfileActivityPage = observer(() => {
     <>
       <PageHead title="Profile - Activity" />
       <ProfileSettingContentWrapper>
-        <ProfileSettingContentHeader title="Activity" />
+        <ProfileSettingContentHeader title={t("activity")} />
         {activityPages}
         {isLoadMoreVisible && (
           <div className="flex w-full items-center justify-center text-xs">
             <Button variant="accent-primary" size="sm" onClick={handleLoadMore}>
-              Load more
+              {t("load_more")}
             </Button>
           </div>
         )}
@@ -69,4 +71,4 @@ const ProfileActivityPage = observer(() => {
   );
 });
 
-export default ProfileActivityPage;
+export default ProfileActivityPage;
\ No newline at end of file
diff --git a/web/app/profile/appearance/page.tsx b/web/app/profile/appearance/page.tsx
index 775ff637b04..61130b33345 100644
--- a/web/app/profile/appearance/page.tsx
+++ b/web/app/profile/appearance/page.tsx
@@ -3,6 +3,7 @@
 import { useEffect, useState } from "react";
 import { observer } from "mobx-react";
 import { useTheme } from "next-themes";
+import { useTranslation } from "@plane/i18n";
 import { IUserTheme } from "@plane/types";
 import { setPromiseToast } from "@plane/ui";
 // components
@@ -15,8 +16,8 @@ import { I_THEME_OPTION, THEME_OPTIONS } from "@/constants/themes";
 import { applyTheme, unsetCustomCssVariables } from "@/helpers/theme.helper";
 // hooks
 import { useUserProfile } from "@/hooks/store";
-
 const ProfileAppearancePage = observer(() => {
+  const { t } = useTranslation();
   const { setTheme } = useTheme();
   // states
   const [currentTheme, setCurrentTheme] = useState<I_THEME_OPTION | null>(null);
@@ -62,11 +63,11 @@ const ProfileAppearancePage = observer(() => {
       <PageHead title="Profile - Appearance" />
       {userProfile ? (
         <ProfileSettingContentWrapper>
-          <ProfileSettingContentHeader title="Appearance" />
+          <ProfileSettingContentHeader title={t("appearance")} />
           <div className="grid grid-cols-12 gap-4 py-6 sm:gap-16">
             <div className="col-span-12 sm:col-span-6">
-              <h4 className="text-lg font-semibold text-custom-text-100">Theme</h4>
-              <p className="text-sm text-custom-text-200">Select or customize your interface color scheme.</p>
+              <h4 className="text-lg font-semibold text-custom-text-100">{t("theme")}</h4>
+              <p className="text-sm text-custom-text-200">{t("select_or_customize_your_interface_color_scheme")}</p>
             </div>
             <div className="col-span-12 sm:col-span-6">
               <ThemeSwitch value={currentTheme} onChange={handleThemeChange} />
@@ -83,4 +84,4 @@ const ProfileAppearancePage = observer(() => {
   );
 });
 
-export default ProfileAppearancePage;
+export default ProfileAppearancePage;
\ No newline at end of file
diff --git a/web/app/profile/notifications/page.tsx b/web/app/profile/notifications/page.tsx
index b39563378b1..d41e2b8084b 100644
--- a/web/app/profile/notifications/page.tsx
+++ b/web/app/profile/notifications/page.tsx
@@ -2,6 +2,7 @@
 
 import useSWR from "swr";
 // components
+import { useTranslation } from "@plane/i18n";
 import { PageHead } from "@/components/core";
 import { ProfileSettingContentHeader, ProfileSettingContentWrapper } from "@/components/profile";
 import { EmailNotificationForm } from "@/components/profile/notification";
@@ -12,6 +13,7 @@ import { UserService } from "@/services/user.service";
 const userService = new UserService();
 
 export default function ProfileNotificationPage() {
+  const { t } = useTranslation();
   // fetching user email notification settings
   const { data, isLoading } = useSWR("CURRENT_USER_EMAIL_NOTIFICATION_SETTINGS", () =>
     userService.currentUserEmailNotificationSettings()
@@ -23,14 +25,14 @@ export default function ProfileNotificationPage() {
 
   return (
     <>
-      <PageHead title="Profile - Notifications" />
+      <PageHead title={`${t("profile")} - ${t("notifications")}`} />
       <ProfileSettingContentWrapper>
         <ProfileSettingContentHeader
-          title="Email notifications"
-          description="Stay in the loop on Issues you are subscribed to. Enable this to get notified."
+          title={t("email_notifications")}
+          description={t("stay_in_the_loop_on_issues_you_are_subscribed_to_enable_this_to_get_notified")}
         />
         <EmailNotificationForm data={data} />
       </ProfileSettingContentWrapper>
     </>
   );
-}
+}
\ No newline at end of file
diff --git a/web/app/profile/page.tsx b/web/app/profile/page.tsx
index 1ec755bd1e1..1948b336943 100644
--- a/web/app/profile/page.tsx
+++ b/web/app/profile/page.tsx
@@ -1,137 +1,18 @@
 "use client";
 
-import React, { useEffect, useState } from "react";
 import { observer } from "mobx-react";
-import { Controller, useForm } from "react-hook-form";
-import { ChevronDown, CircleUserRound } from "lucide-react";
-import { Disclosure, Transition } from "@headlessui/react";
-import type { IUser } from "@plane/types";
-import {
-  Button,
-  CustomSelect,
-  CustomSearchSelect,
-  Input,
-  TOAST_TYPE,
-  setPromiseToast,
-  setToast,
-  Tooltip,
-} from "@plane/ui";
+import { useTranslation } from "@plane/i18n";
 // components
-import { DeactivateAccountModal } from "@/components/account";
 import { LogoSpinner } from "@/components/common";
-import { ImagePickerPopover, UserImageUploadModal, PageHead } from "@/components/core";
-import { ProfileSettingContentWrapper } from "@/components/profile";
-// constants
-import { TIME_ZONES, TTimezone } from "@/constants/timezones";
-import { USER_ROLES } from "@/constants/workspace";
-// helpers
-import { getFileURL } from "@/helpers/file.helper";
+import { PageHead } from "@/components/core";
+import { ProfileSettingContentWrapper, ProfileForm } from "@/components/profile";
 // hooks
 import { useUser } from "@/hooks/store";
 
-const defaultValues: Partial<IUser> = {
-  avatar_url: "",
-  cover_image_url: "",
-  first_name: "",
-  last_name: "",
-  display_name: "",
-  email: "",
-  role: "Product / Project Manager",
-  user_timezone: "Asia/Kolkata",
-};
-
 const ProfileSettingsPage = observer(() => {
-  // states
-  const [isLoading, setIsLoading] = useState(false);
-  const [isImageUploadModalOpen, setIsImageUploadModalOpen] = useState(false);
-  const [deactivateAccountModal, setDeactivateAccountModal] = useState(false);
-  // form info
-  const {
-    handleSubmit,
-    reset,
-    watch,
-    control,
-    setValue,
-    formState: { errors },
-  } = useForm<IUser>({ defaultValues });
-  // derived values
-  const userAvatar = watch("avatar_url");
-  const userCover = watch("cover_image_url");
+  const { t } = useTranslation();
   // store hooks
-  const { data: currentUser, updateCurrentUser } = useUser();
-
-  useEffect(() => {
-    reset({ ...defaultValues, ...currentUser });
-  }, [currentUser, reset]);
-
-  const onSubmit = async (formData: IUser) => {
-    setIsLoading(true);
-    const payload: Partial<IUser> = {
-      first_name: formData.first_name,
-      last_name: formData.last_name,
-      avatar_url: formData.avatar_url,
-      cover_image_url: formData.cover_image_url,
-      role: formData.role,
-      display_name: formData?.display_name,
-      user_timezone: formData.user_timezone,
-    };
-
-    const updateCurrentUserDetail = updateCurrentUser(payload).finally(() => setIsLoading(false));
-    setPromiseToast(updateCurrentUserDetail, {
-      loading: "Updating...",
-      success: {
-        title: "Success!",
-        message: () => `Profile updated successfully.`,
-      },
-      error: {
-        title: "Error!",
-        message: () => `There was some error in updating your profile. Please try again.`,
-      },
-    });
-  };
-
-  const handleDelete = async (url: string | null | undefined) => {
-    if (!url) return;
-
-    await updateCurrentUser({
-      avatar_url: "",
-    })
-      .then(() => {
-        setToast({
-          type: TOAST_TYPE.SUCCESS,
-          title: "Success!",
-          message: "Profile picture deleted successfully.",
-        });
-        setValue("avatar_url", "");
-      })
-      .catch(() => {
-        setToast({
-          type: TOAST_TYPE.ERROR,
-          title: "Error!",
-          message: "There was some error in deleting your profile picture. Please try again.",
-        });
-      })
-      .finally(() => {
-        setIsImageUploadModalOpen(false);
-      });
-  };
-
-  const getTimeZoneLabel = (timezone: TTimezone | undefined) => {
-    if (!timezone) return undefined;
-    return (
-      <div className="flex gap-1.5">
-        <span className="text-custom-text-400">{timezone.gmtOffset}</span>
-        <span className="text-custom-text-200">{timezone.name}</span>
-      </div>
-    );
-  };
-
-  const timeZoneOptions = TIME_ZONES.map((timeZone) => ({
-    value: timeZone.value,
-    query: timeZone.name + " " + timeZone.gmtOffset + " " + timeZone.value,
-    content: getTimeZoneLabel(timeZone),
-  }));
-
+  const { data: currentUser, userProfile } = useUser();
   if (!currentUser)
     return (
       <div className="grid h-full w-full place-items-center px-4 sm:px-0">
@@ -141,317 +22,12 @@ const ProfileSettingsPage = observer(() => {
 
   return (
     <>
-      <PageHead title="Profile - General Settings" />
+      <PageHead title={`${t("profile")} - ${t("general_settings")}`} />
       <ProfileSettingContentWrapper>
-        <Controller
-          control={control}
-          name="avatar_url"
-          render={({ field: { onChange, value } }) => (
-            <UserImageUploadModal
-              isOpen={isImageUploadModalOpen}
-              onClose={() => setIsImageUploadModalOpen(false)}
-              handleRemove={async () => await handleDelete(currentUser?.avatar_url)}
-              onSuccess={(url) => {
-                onChange(url);
-                handleSubmit(onSubmit)();
-                setIsImageUploadModalOpen(false);
-              }}
-              value={value && value.trim() !== "" ? value : null}
-            />
-          )}
-        />
-        <DeactivateAccountModal isOpen={deactivateAccountModal} onClose={() => setDeactivateAccountModal(false)} />
-        <form onSubmit={handleSubmit(onSubmit)}>
-          <div className="flex w-full flex-col gap-6">
-            <div className="relative h-44 w-full">
-              <img
-                src={userCover ? getFileURL(userCover) : "https://images.unsplash.com/photo-1506383796573-caf02b4a79ab"}
-                className="h-44 w-full rounded-lg object-cover"
-                alt={currentUser?.first_name ?? "Cover image"}
-              />
-              <div className="absolute -bottom-6 left-6 flex items-end justify-between">
-                <div className="flex gap-3">
-                  <div className="flex h-16 w-16 items-center justify-center rounded-lg bg-custom-background-90">
-                    <button type="button" onClick={() => setIsImageUploadModalOpen(true)}>
-                      {!userAvatar || userAvatar === "" ? (
-                        <div className="h-16 w-16 rounded-md bg-custom-background-80 p-2">
-                          <CircleUserRound className="h-full w-full text-custom-text-200" />
-                        </div>
-                      ) : (
-                        <div className="relative h-16 w-16 overflow-hidden">
-                          <img
-                            src={getFileURL(userAvatar)}
-                            className="absolute left-0 top-0 h-full w-full rounded-lg object-cover"
-                            onClick={() => setIsImageUploadModalOpen(true)}
-                            alt={currentUser?.display_name}
-                            role="button"
-                          />
-                        </div>
-                      )}
-                    </button>
-                  </div>
-                </div>
-              </div>
-              <div className="absolute bottom-3 right-3 flex">
-                <Controller
-                  control={control}
-                  name="cover_image_url"
-                  render={({ field: { value, onChange } }) => (
-                    <ImagePickerPopover
-                      label={"Change cover"}
-                      onChange={(imageUrl) => onChange(imageUrl)}
-                      control={control}
-                      value={value ?? "https://images.unsplash.com/photo-1506383796573-caf02b4a79ab"}
-                      isProfileCover
-                    />
-                  )}
-                />
-              </div>
-            </div>
-            <div className="item-center mt-6 flex justify-between">
-              <div className="flex flex-col">
-                <div className="item-center flex text-lg font-medium text-custom-text-200">
-                  <span>{`${watch("first_name")} ${watch("last_name")}`}</span>
-                </div>
-                <span className="text-sm text-custom-text-300 tracking-tight">{watch("email")}</span>
-              </div>
-            </div>
-            <div className="flex flex-col gap-2">
-              <div className="grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-3 gap-x-6 gap-y-4">
-                <div className="flex flex-col gap-1">
-                  <h4 className="text-sm font-medium text-custom-text-200">
-                    First name<span className="text-red-500">*</span>
-                  </h4>
-                  <Controller
-                    control={control}
-                    name="first_name"
-                    rules={{
-                      required: "Please enter first name",
-                    }}
-                    render={({ field: { value, onChange, ref } }) => (
-                      <Input
-                        id="first_name"
-                        name="first_name"
-                        type="text"
-                        value={value}
-                        onChange={onChange}
-                        ref={ref}
-                        hasError={Boolean(errors.first_name)}
-                        placeholder="Enter your first name"
-                        className={`w-full rounded-md ${errors.first_name ? "border-red-500" : ""}`}
-                        maxLength={24}
-                        autoComplete="on"
-                      />
-                    )}
-                  />
-                  {errors.first_name && <span className="text-xs text-red-500">{errors.first_name.message}</span>}
-                </div>
-                <div className="flex flex-col gap-1">
-                  <h4 className="text-sm font-medium text-custom-text-200">Last name</h4>
-                  <Controller
-                    control={control}
-                    name="last_name"
-                    render={({ field: { value, onChange, ref } }) => (
-                      <Input
-                        id="last_name"
-                        name="last_name"
-                        type="text"
-                        value={value}
-                        onChange={onChange}
-                        ref={ref}
-                        hasError={Boolean(errors.last_name)}
-                        placeholder="Enter your last name"
-                        className="w-full rounded-md"
-                        maxLength={24}
-                        autoComplete="on"
-                      />
-                    )}
-                  />
-                </div>
-                <div className="flex flex-col gap-1">
-                  <h4 className="text-sm font-medium text-custom-text-200">
-                    Display name<span className="text-red-500">*</span>
-                  </h4>
-                  <Controller
-                    control={control}
-                    name="display_name"
-                    rules={{
-                      required: "Display name is required.",
-                      validate: (value) => {
-                        if (value.trim().length < 1) return "Display name can't be empty.";
-                        if (value.split("  ").length > 1) return "Display name can't have two consecutive spaces.";
-                        if (value.replace(/\s/g, "").length < 1)
-                          return "Display name must be at least 1 character long.";
-                        if (value.replace(/\s/g, "").length > 20)
-                          return "Display name must be less than 20 characters long.";
-                        return true;
-                      },
-                    }}
-                    render={({ field: { value, onChange, ref } }) => (
-                      <Input
-                        id="display_name"
-                        name="display_name"
-                        type="text"
-                        value={value}
-                        onChange={onChange}
-                        ref={ref}
-                        hasError={Boolean(errors?.display_name)}
-                        placeholder="Enter your display name"
-                        className={`w-full ${errors?.display_name ? "border-red-500" : ""}`}
-                        maxLength={24}
-                      />
-                    )}
-                  />
-                  {errors?.display_name && (
-                    <span className="text-xs text-red-500">{errors?.display_name?.message}</span>
-                  )}
-                </div>
-                <div className="flex flex-col gap-1">
-                  <h4 className="text-sm font-medium text-custom-text-200">
-                    Email<span className="text-red-500">*</span>
-                  </h4>
-                  <Controller
-                    control={control}
-                    name="email"
-                    rules={{
-                      required: "Email is required.",
-                    }}
-                    render={({ field: { value, ref } }) => (
-                      <Input
-                        id="email"
-                        name="email"
-                        type="email"
-                        value={value}
-                        ref={ref}
-                        hasError={Boolean(errors.email)}
-                        placeholder="Enter your email"
-                        className={`w-full cursor-not-allowed rounded-md !bg-custom-background-90 ${
-                          errors.email ? "border-red-500" : ""
-                        }`}
-                        autoComplete="on"
-                        disabled
-                      />
-                    )}
-                  />
-                </div>
-                <div className="flex flex-col gap-1">
-                  <h4 className="text-sm font-medium text-custom-text-200">
-                    Role<span className="text-red-500">*</span>
-                  </h4>
-                  <Controller
-                    name="role"
-                    control={control}
-                    rules={{ required: "Role is required." }}
-                    render={({ field: { value, onChange } }) => (
-                      <CustomSelect
-                        value={value}
-                        onChange={onChange}
-                        label={value ? value.toString() : "Select your role"}
-                        buttonClassName={errors.role ? "border-red-500" : "border-none"}
-                        className="rounded-md border-[0.5px] !border-custom-border-200"
-                        optionsClassName="w-full"
-                        input
-                      >
-                        {USER_ROLES.map((item) => (
-                          <CustomSelect.Option key={item.value} value={item.value}>
-                            {item.label}
-                          </CustomSelect.Option>
-                        ))}
-                      </CustomSelect>
-                    )}
-                  />
-                  {errors.role && <span className="text-xs text-red-500">Please select a role</span>}
-                </div>
-              </div>
-            </div>
-            <div className="flex flex-col gap-2 pt-4">
-              <div className="grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-3 gap-x-6 gap-y-4">
-                <div className="flex flex-col gap-1">
-                  <h4 className="text-sm font-medium text-custom-text-200">
-                    Timezone<span className="text-red-500">*</span>
-                  </h4>
-                  <Controller
-                    name="user_timezone"
-                    control={control}
-                    rules={{ required: "Please select a timezone" }}
-                    render={({ field: { value, onChange } }) => (
-                      <CustomSearchSelect
-                        value={value}
-                        label={
-                          value
-                            ? (getTimeZoneLabel(TIME_ZONES.find((t) => t.value === value)) ?? value)
-                            : "Select a timezone"
-                        }
-                        options={timeZoneOptions}
-                        onChange={onChange}
-                        buttonClassName={errors.user_timezone ? "border-red-500" : ""}
-                        className="rounded-md border-[0.5px] !border-custom-border-200"
-                        optionsClassName="w-72"
-                        input
-                      />
-                    )}
-                  />
-                  {errors.user_timezone && <span className="text-xs text-red-500">{errors.user_timezone.message}</span>}
-                </div>
-                <Tooltip tooltipContent="Coming soon" position="bottom">
-                  <div className="flex flex-col gap-1">
-                    <h4 className="text-sm font-medium text-custom-text-200">Language</h4>
-                    <CustomSearchSelect
-                      value="English (US)"
-                      label="English (US)"
-                      options={[]}
-                      onChange={() => {}}
-                      className="rounded-md bg-custom-background-90"
-                      input
-                      disabled
-                    />
-                  </div>
-                </Tooltip>
-              </div>
-              <div className="flex items-center justify-between pt-6 pb-8">
-                <Button variant="primary" type="submit" loading={isLoading}>
-                  {isLoading ? "Saving..." : "Save changes"}
-                </Button>
-              </div>
-            </div>
-          </div>
-        </form>
-        <Disclosure as="div" className="border-t border-custom-border-100">
-          {({ open }) => (
-            <>
-              <Disclosure.Button as="button" type="button" className="flex w-full items-center justify-between py-4">
-                <span className="text-lg font-medium tracking-tight">Deactivate account</span>
-                <ChevronDown className={`h-5 w-5 transition-all ${open ? "rotate-180" : ""}`} />
-              </Disclosure.Button>
-              <Transition
-                show={open}
-                enter="transition duration-100 ease-out"
-                enterFrom="transform opacity-0"
-                enterTo="transform opacity-100"
-                leave="transition duration-75 ease-out"
-                leaveFrom="transform opacity-100"
-                leaveTo="transform opacity-0"
-              >
-                <Disclosure.Panel>
-                  <div className="flex flex-col gap-8">
-                    <span className="text-sm tracking-tight">
-                      When deactivating an account, all of the data and resources within that account will be
-                      permanently removed and cannot be recovered.
-                    </span>
-                    <div>
-                      <Button variant="danger" onClick={() => setDeactivateAccountModal(true)}>
-                        Deactivate account
-                      </Button>
-                    </div>
-                  </div>
-                </Disclosure.Panel>
-              </Transition>
-            </>
-          )}
-        </Disclosure>
+        <ProfileForm user={currentUser} profile={userProfile.data} />
       </ProfileSettingContentWrapper>
     </>
   );
 });
 
-export default ProfileSettingsPage;
+export default ProfileSettingsPage;
\ No newline at end of file
diff --git a/web/app/profile/security/page.tsx b/web/app/profile/security/page.tsx
index 594816cc165..7d167d0e84d 100644
--- a/web/app/profile/security/page.tsx
+++ b/web/app/profile/security/page.tsx
@@ -4,6 +4,7 @@ import { useState } from "react";
 import { observer } from "mobx-react";
 import { Controller, useForm } from "react-hook-form";
 import { Eye, EyeOff } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { Button, Input, TOAST_TYPE, setToast } from "@plane/ui";
 // components
@@ -55,6 +56,8 @@ const SecurityPage = observer(() => {
   const oldPassword = watch("old_password");
   const password = watch("new_password");
   const confirmPassword = watch("confirm_password");
+  // i18n
+  const { t } = useTranslation();
 
   const isNewPasswordSameAsOldPassword = oldPassword !== "" && password !== "" && password === oldPassword;
 
@@ -76,8 +79,8 @@ const SecurityPage = observer(() => {
       setShowPassword(defaultShowPassword);
       setToast({
         type: TOAST_TYPE.SUCCESS,
-        title: "Success!",
-        message: "Password changed successfully.",
+        title: t("success"),
+        message: t("password_changed_successfully"),
       });
     } catch (err: any) {
       const errorInfo = authErrorHandler(err.error_code?.toString());
@@ -85,7 +88,7 @@ const SecurityPage = observer(() => {
         type: TOAST_TYPE.ERROR,
         title: errorInfo?.title ?? "Error!",
         message:
-          typeof errorInfo?.message === "string" ? errorInfo.message : "Something went wrong. Please try again 2.",
+          typeof errorInfo?.message === "string" ? errorInfo.message : t("something_went_wrong_please_try_again"),
       });
     }
   };
@@ -109,17 +112,17 @@ const SecurityPage = observer(() => {
     <>
       <PageHead title="Profile - Security" />
       <ProfileSettingContentWrapper>
-        <ProfileSettingContentHeader title="Change password" />
+        <ProfileSettingContentHeader title={t("change_password")} />
         <form onSubmit={handleSubmit(handleChangePassword)} className="flex flex-col gap-8 py-6">
           <div className="flex flex-col gap-10 w-full max-w-96">
             <div className="space-y-1">
-              <h4 className="text-sm">Current password</h4>
+              <h4 className="text-sm">{t("current_password")}</h4>
               <div className="relative flex items-center rounded-md">
                 <Controller
                   control={control}
                   name="old_password"
                   rules={{
-                    required: "This field is required",
+                    required: t("this_field_is_required"),
                   }}
                   render={({ field: { value, onChange } }) => (
                     <Input
@@ -127,7 +130,7 @@ const SecurityPage = observer(() => {
                       type={showPassword?.oldPassword ? "text" : "password"}
                       value={value}
                       onChange={onChange}
-                      placeholder="Old password"
+                      placeholder={t("old_password")}
                       className="w-full"
                       hasError={Boolean(errors.old_password)}
                     />
@@ -148,20 +151,20 @@ const SecurityPage = observer(() => {
               {errors.old_password && <span className="text-xs text-red-500">{errors.old_password.message}</span>}
             </div>
             <div className="space-y-1">
-              <h4 className="text-sm">New password</h4>
+              <h4 className="text-sm">{t("new_password")}</h4>
               <div className="relative flex items-center rounded-md">
                 <Controller
                   control={control}
                   name="new_password"
                   rules={{
-                    required: "This field is required",
+                    required: t("this_field_is_required"),
                   }}
                   render={({ field: { value, onChange } }) => (
                     <Input
                       id="new_password"
                       type={showPassword?.password ? "text" : "password"}
                       value={value}
-                      placeholder="New password"
+                      placeholder={t("new_password")}
                       onChange={onChange}
                       className="w-full"
                       hasError={Boolean(errors.new_password)}
@@ -184,23 +187,23 @@ const SecurityPage = observer(() => {
               </div>
               {passwordSupport}
               {isNewPasswordSameAsOldPassword && !isPasswordInputFocused && (
-                <span className="text-xs text-red-500">New password must be different from old password</span>
+                <span className="text-xs text-red-500">{t("new_password_must_be_different_from_old_password")}</span>
               )}
             </div>
             <div className="space-y-1">
-              <h4 className="text-sm">Confirm password</h4>
+              <h4 className="text-sm">{t("confirm_password")}</h4>
               <div className="relative flex items-center rounded-md">
                 <Controller
                   control={control}
                   name="confirm_password"
                   rules={{
-                    required: "This field is required",
+                    required: t("this_field_is_required"),
                   }}
                   render={({ field: { value, onChange } }) => (
                     <Input
                       id="confirm_password"
                       type={showPassword?.confirmPassword ? "text" : "password"}
-                      placeholder="Confirm password"
+                      placeholder={t("confirm_password")}
                       value={value}
                       onChange={onChange}
                       className="w-full"
@@ -223,14 +226,14 @@ const SecurityPage = observer(() => {
                 )}
               </div>
               {!!confirmPassword && password !== confirmPassword && renderPasswordMatchError && (
-                <span className="text-sm text-red-500">Passwords don{"'"}t match</span>
+                <span className="text-sm text-red-500">{t("passwords_dont_match")}</span>
               )}
             </div>
           </div>
 
           <div className="flex items-center justify-between py-2">
             <Button variant="primary" type="submit" loading={isSubmitting} disabled={isButtonDisabled}>
-              {isSubmitting ? "Changing password..." : "Change password"}
+              {isSubmitting ? `${t("changing_password")}...` : t("change_password")}
             </Button>
           </div>
         </form>
@@ -239,4 +242,4 @@ const SecurityPage = observer(() => {
   );
 });
 
-export default SecurityPage;
+export default SecurityPage;
\ No newline at end of file
diff --git a/web/app/profile/sidebar.tsx b/web/app/profile/sidebar.tsx
index aec3e24dcaa..146a76c585d 100644
--- a/web/app/profile/sidebar.tsx
+++ b/web/app/profile/sidebar.tsx
@@ -6,9 +6,9 @@ import Link from "next/link";
 import { usePathname } from "next/navigation";
 // icons
 import { ChevronLeft, LogOut, MoveLeft, Plus, UserPlus } from "lucide-react";
-// plane helpers
+// plane imports
 import { useOutsideClickDetector } from "@plane/helpers";
-// ui
+import { useTranslation } from "@plane/i18n";
 import { TOAST_TYPE, Tooltip, setToast } from "@plane/ui";
 // components
 import { SidebarNavItem } from "@/components/sidebar";
@@ -22,12 +22,12 @@ import { useAppTheme, useUser, useUserSettings, useWorkspace } from "@/hooks/sto
 import { usePlatformOS } from "@/hooks/use-platform-os";
 
 const WORKSPACE_ACTION_LINKS = [
-  {
-    key: "create-workspace",
-    Icon: Plus,
-    label: "Create workspace",
-    href: "/create-workspace",
-  },
+  // {
+  //   key: "create_workspace",
+  //   Icon: Plus,
+  //   label: "Create workspace",
+  //   href: "/create-workspace",
+  // },
   {
     key: "invitations",
     Icon: UserPlus,
@@ -47,6 +47,7 @@ export const ProfileLayoutSidebar = observer(() => {
   const { data: currentUserSettings } = useUserSettings();
   const { workspaces } = useWorkspace();
   const { isMobile } = usePlatformOS();
+  const { t } = useTranslation();
 
   const workspacesList = Object.values(workspaces ?? {});
 
@@ -91,8 +92,8 @@ export const ProfileLayoutSidebar = observer(() => {
       .catch(() =>
         setToast({
           type: TOAST_TYPE.ERROR,
-          title: "Error!",
-          message: "Failed to sign out. Please try again.",
+          title: t("error"),
+          message: t("failed_to_sign_out_please_try_again"),
         })
       )
       .finally(() => setIsSigningOut(false));
@@ -117,13 +118,13 @@ export const ProfileLayoutSidebar = observer(() => {
               <ChevronLeft className="h-5 w-5" strokeWidth={1} />
             </span>
             {!sidebarCollapsed && (
-              <h4 className="truncate text-lg font-semibold text-custom-text-200">Profile settings</h4>
+              <h4 className="truncate text-lg font-semibold text-custom-text-200">{t("profile_settings")}</h4>
             )}
           </div>
         </Link>
         <div className="flex flex-shrink-0 flex-col overflow-x-hidden">
           {!sidebarCollapsed && (
-            <h6 className="rounded px-6 text-sm font-semibold text-custom-sidebar-text-400">Your account</h6>
+            <h6 className="rounded px-6 text-sm font-semibold text-custom-sidebar-text-400">{t("your_account")}</h6>
           )}
           <div className="vertical-scrollbar scrollbar-sm mt-2 px-4 h-full space-y-1 overflow-y-auto">
             {PROFILE_ACTION_LINKS.map((link) => {
@@ -132,7 +133,7 @@ export const ProfileLayoutSidebar = observer(() => {
               return (
                 <Link key={link.key} href={link.href} className="block w-full" onClick={handleItemClick}>
                   <Tooltip
-                    tooltipContent={link.label}
+                    tooltipContent={t(link.key)}
                     position="right"
                     className="ml-2"
                     disabled={!sidebarCollapsed}
@@ -145,7 +146,7 @@ export const ProfileLayoutSidebar = observer(() => {
                     >
                       <div className="flex items-center gap-1.5 py-[1px]">
                         <link.Icon className="size-4" />
-                        {!sidebarCollapsed && <p className="text-sm leading-5 font-medium">{link.label}</p>}
+                        {!sidebarCollapsed && <p className="text-sm leading-5 font-medium">{t(link.key)}</p>}
                       </div>
                     </SidebarNavItem>
                   </Tooltip>
@@ -156,7 +157,7 @@ export const ProfileLayoutSidebar = observer(() => {
         </div>
         <div className="flex flex-col overflow-x-hidden">
           {!sidebarCollapsed && (
-            <h6 className="rounded px-6 text-sm font-semibold text-custom-sidebar-text-400">Workspaces</h6>
+            <h6 className="rounded px-6 text-sm font-semibold text-custom-sidebar-text-400">{t("workspaces")}</h6>
           )}
           {workspacesList && workspacesList.length > 0 && (
             <div
@@ -206,7 +207,7 @@ export const ProfileLayoutSidebar = observer(() => {
             {WORKSPACE_ACTION_LINKS.map((link) => (
               <Link className="block w-full" key={link.key} href={link.href} onClick={handleItemClick}>
                 <Tooltip
-                  tooltipContent={link.label}
+                  tooltipContent={t(link.key)}
                   position="right"
                   className="ml-2"
                   disabled={!sidebarCollapsed}
@@ -218,7 +219,7 @@ export const ProfileLayoutSidebar = observer(() => {
                     }`}
                   >
                     {<link.Icon className="h-4 w-4" />}
-                    {!sidebarCollapsed && link.label}
+                    {!sidebarCollapsed && t(link.key)}
                   </div>
                 </Tooltip>
               </Link>
@@ -238,7 +239,7 @@ export const ProfileLayoutSidebar = observer(() => {
               disabled={isSigningOut}
             >
               <LogOut className="h-3.5 w-3.5" />
-              {!sidebarCollapsed && <span>{isSigningOut ? "Signing out..." : "Sign out"}</span>}
+              {!sidebarCollapsed && <span>{isSigningOut ? `${t("signing_out")}...` : t("sign_out")}</span>}
             </button>
             <button
               type="button"
@@ -261,4 +262,4 @@ export const ProfileLayoutSidebar = observer(() => {
       </div>
     </div>
   );
-});
+});
\ No newline at end of file
diff --git a/web/app/provider.tsx b/web/app/provider.tsx
index dba975a6373..0513e9a6aec 100644
--- a/web/app/provider.tsx
+++ b/web/app/provider.tsx
@@ -1,15 +1,18 @@
 "use client";
 
-import { FC, ReactNode } from "react";
+import { FC, ReactNode, useEffect } from "react";
 import dynamic from "next/dynamic";
+import { usePathname } from "next/navigation";//ui
 import { useTheme, ThemeProvider } from "next-themes";
 import { SWRConfig } from "swr";
-// ui
-import { Toast } from "@plane/ui";
+import { TranslationProvider } from "@plane/i18n";
+import { Toast, setToast, TOAST_TYPE } from "@plane/ui";
+// Plane Imports
 // constants
 import { SWR_CONFIG } from "@/constants/swr-config";
 //helpers
 import { resolveGeneralTheme } from "@/helpers/theme.helper";
+import { useUser } from "@/hooks/store";
 // nprogress
 import { AppProgressBar } from "@/lib/n-progress";
 // polyfills
@@ -35,23 +38,60 @@ const ToastWithTheme = () => {
 export const AppProvider: FC<IAppProvider> = (props) => {
   const { children } = props;
   // themes
+
+  const pathname = usePathname();
+  const { signOut } = useUser();
+
+  const handleSignOut = async () => {
+    await signOut().catch(() =>
+      setToast({
+        type: TOAST_TYPE.ERROR,
+        title: "Error!",
+        message: "Failed to sign out. Please try again.",
+      })
+    );
+  };
+
+  useEffect(() => {
+    console.log(pathname, 'pathname');
+    window.parent.postMessage({ type: "ROUTE_CHANGE", path: pathname }, "*");
+  }, [pathname]);
+
+  useEffect(() => {
+    const onIncomingMessage = async (event: MessageEvent) => {
+      console.log('onIncomingMessage', event);
+      if (event.data.type === "PLANE_SIGN_OUT") {
+        try {
+          await handleSignOut();
+          window.parent.postMessage({ type: "PLANE_SIGN_OUT_SUCCESS", path: pathname }, "*");
+        } catch (err) {}
+      }
+    };
+    window.addEventListener('message', onIncomingMessage);
+    return () => {
+      window.removeEventListener("message", onIncomingMessage);
+    };
+  }, []);
+
   return (
     <>
       <AppProgressBar height="4px" color="#3F76FF" options={{ showSpinner: false }} shallowRouting />
       <StoreProvider>
         <ThemeProvider themes={["light", "dark", "light-contrast", "dark-contrast", "custom"]} defaultTheme="system">
           <ToastWithTheme />
-          <StoreWrapper>
-            <InstanceWrapper>
-              <IntercomProvider>
-                <PostHogProvider>
-                  <SWRConfig value={SWR_CONFIG}>{children}</SWRConfig>
-                </PostHogProvider>
-              </IntercomProvider>
-            </InstanceWrapper>
-          </StoreWrapper>
+          <TranslationProvider>
+            <StoreWrapper>
+              <InstanceWrapper>
+                <IntercomProvider>
+                  <PostHogProvider>
+                    <SWRConfig value={SWR_CONFIG}>{children}</SWRConfig>
+                  </PostHogProvider>
+                </IntercomProvider>
+              </InstanceWrapper>
+            </StoreWrapper>
+          </TranslationProvider>
         </ThemeProvider>
       </StoreProvider>
     </>
   );
-};
+};
\ No newline at end of file
diff --git a/web/app/workspace-invitations/page.tsx b/web/app/workspace-invitations/page.tsx
index a6829019892..a715a2f469f 100644
--- a/web/app/workspace-invitations/page.tsx
+++ b/web/app/workspace-invitations/page.tsx
@@ -4,7 +4,7 @@ import React from "react";
 import { observer } from "mobx-react";
 import { useSearchParams } from "next/navigation";
 import useSWR from "swr";
-import { Boxes, Check, Share2, Star, User2, X } from "lucide-react";
+import { Boxes, Check, Share2, User2, X } from "lucide-react";
 // components
 import { LogoSpinner } from "@/components/common";
 import { EmptySpace, EmptySpaceItem } from "@/components/ui/empty-space";
@@ -107,7 +107,6 @@ const WorkspaceInvitationPage = observer(() => {
               ) : (
                 <EmptySpaceItem Icon={Boxes} title="Continue to home" href="/" />
               )}
-              <EmptySpaceItem Icon={Star} title="Star us on GitHub" href="https://github.com/makeplane" />
               <EmptySpaceItem
                 Icon={Share2}
                 title="Join our community of active creators"
diff --git a/web/ce/components/active-cycles/workspace-active-cycles-upgrade.tsx b/web/ce/components/active-cycles/workspace-active-cycles-upgrade.tsx
index f19ffa809a0..f5f71786c51 100644
--- a/web/ce/components/active-cycles/workspace-active-cycles-upgrade.tsx
+++ b/web/ce/components/active-cycles/workspace-active-cycles-upgrade.tsx
@@ -3,6 +3,7 @@
 import React from "react";
 import { observer } from "mobx-react";
 import Image from "next/image";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { ContentWrapper, getButtonStyling } from "@plane/ui";
 // components
@@ -16,6 +17,7 @@ import { cn } from "@/helpers/common.helper";
 import { useUser } from "@/hooks/store";
 
 export const WorkspaceActiveCyclesUpgrade = observer(() => {
+  const { t } = useTranslation();
   // store hooks
   const {
     userProfile: { data: userProfile },
@@ -33,10 +35,8 @@ export const WorkspaceActiveCyclesUpgrade = observer(() => {
       >
         <div className="relative flex flex-col justify-center gap-7 px-14 lg:w-1/2">
           <div className="flex max-w-64 flex-col gap-2">
-            <h2 className="text-2xl font-semibold">On-demand snapshots of all your cycles</h2>
-            <p className="text-base font-medium text-custom-text-300">
-              Monitor cycles across projects, track high-priority issues, and zoom in cycles that need attention.
-            </p>
+            <h2 className="text-2xl font-semibold">{t("on_demand_snapshots_of_all_your_cycles")}</h2>
+            <p className="text-base font-medium text-custom-text-300">{t("active_cycles_description")}</p>
           </div>
           <div className="flex items-center gap-3">
             <a
@@ -46,7 +46,7 @@ export const WorkspaceActiveCyclesUpgrade = observer(() => {
               rel="noreferrer"
             >
               <ProIcon className="h-3.5 w-3.5 text-white" />
-              Upgrade
+              {t("upgrade")}
             </a>
           </div>
           <span className="absolute left-0 top-0">
@@ -81,14 +81,14 @@ export const WorkspaceActiveCyclesUpgrade = observer(() => {
       <div className="grid h-full grid-cols-1 gap-5 pb-8 lg:grid-cols-2 xl:grid-cols-3">
         {WORKSPACE_ACTIVE_CYCLES_DETAILS.map((item) => (
           <div key={item.title} className="flex min-h-32 w-full flex-col gap-2 rounded-md bg-custom-background-80 p-4">
-            <div className="flex items-center gap-2 justify-between">
-              <h3 className="font-medium">{item.title}</h3>
-              <item.icon className="h-4 w-4 text-blue-500" />
+            <div className="flex gap-2 justify-between">
+              <h3 className="font-medium">{t(item.key)}</h3>
+              <item.icon className="mt-1 h-4 w-4 text-blue-500" />
             </div>
-            <span className="text-sm text-custom-text-300">{item.description}</span>
+            <span className="text-sm text-custom-text-300">{t(`${item.key}_description`)}</span>
           </div>
         ))}
       </div>
     </ContentWrapper>
   );
-});
+});
\ No newline at end of file
diff --git a/web/ce/components/global/product-updates-header.tsx b/web/ce/components/global/product-updates-header.tsx
index a5965bb2d14..0ff31a92069 100644
--- a/web/ce/components/global/product-updates-header.tsx
+++ b/web/ce/components/global/product-updates-header.tsx
@@ -1,5 +1,6 @@
 import { observer } from "mobx-react";
 import Image from "next/image";
+import { useTranslation } from "@plane/i18n";
 // helpers
 import { cn } from "@/helpers/common.helper";
 // assets
@@ -7,20 +8,23 @@ import PlaneLogo from "@/public/plane-logos/blue-without-text.png";
 // package.json
 import packageJson from "package.json";
 
-export const ProductUpdatesHeader = observer(() => (
-  <div className="flex gap-2 mx-6 my-4 items-center justify-between flex-shrink-0">
-    <div className="flex w-full items-center">
-      <div className="flex gap-2 text-xl font-medium">What&apos;s new</div>
+export const ProductUpdatesHeader = observer(() => {
+  const { t } = useTranslation();
+  return (
+    <div className="flex gap-2 mx-6 my-4 items-center justify-between flex-shrink-0">
+      <div className="flex w-full items-center">
+        <div className="flex gap-2 text-xl font-medium">{t("whats_new")}</div>
       <div
-        className={cn(
-          "px-2 mx-2 py-0.5 text-center text-xs font-medium rounded-full bg-custom-primary-100/20 text-custom-primary-100"
-        )}
-      >
-        Version: v{packageJson.version}
+          className={cn(
+            "px-2 mx-2 py-0.5 text-center text-xs font-medium rounded-full bg-custom-primary-100/20 text-custom-primary-100"
+          )}
+        >
+          {t("version")}: v{packageJson.version}
+        </div>
+      </div>
+      <div className="flex flex-shrink-0 items-center gap-8">
+        <Image src={PlaneLogo} alt="Plane" width={24} height={24} />
       </div>
     </div>
-    <div className="flex flex-shrink-0 items-center gap-8">
-      <Image src={PlaneLogo} alt="Plane" width={24} height={24} />
-    </div>
-  </div>
-));
+  );
+});
\ No newline at end of file
diff --git a/web/ce/components/global/version-number.tsx b/web/ce/components/global/version-number.tsx
index 47ff380d371..2ce0a72649c 100644
--- a/web/ce/components/global/version-number.tsx
+++ b/web/ce/components/global/version-number.tsx
@@ -1,4 +1,8 @@
 // assets
+import { useTranslation } from "@plane/i18n";
 import packageJson from "package.json";
 
-export const PlaneVersionNumber: React.FC = () => <span>Version: v{packageJson.version}</span>;
+export const PlaneVersionNumber: React.FC = () => {
+  const { t } = useTranslation();
+  return <span>{t("version")}: v{packageJson.version}</span>;
+};
\ No newline at end of file
diff --git a/web/ce/components/issues/worklog/activity/filter-root.tsx b/web/ce/components/issues/worklog/activity/filter-root.tsx
index 2d11ae34148..0d4f5512799 100644
--- a/web/ce/components/issues/worklog/activity/filter-root.tsx
+++ b/web/ce/components/issues/worklog/activity/filter-root.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { FC } from "react";
+import { useTranslation } from "@plane/i18n";
 // components
 import { ActivityFilter } from "@/components/issues";
 // plane web constants
@@ -15,12 +16,13 @@ export type TActivityFilterRoot = {
 
 export const ActivityFilterRoot: FC<TActivityFilterRoot> = (props) => {
   const { selectedFilters, toggleFilter } = props;
+  const { t } = useTranslation();
 
   const filters: TActivityFilterOption[] = Object.entries(ACTIVITY_FILTER_TYPE_OPTIONS).map(([key, value]) => {
     const filterKey = key as TActivityFilters;
     return {
       key: filterKey,
-      label: value.label,
+      label: t(value.label),
       isSelected: selectedFilters.includes(filterKey),
       onClick: () => toggleFilter(filterKey),
     };
diff --git a/web/ce/components/projects/create/attributes.tsx b/web/ce/components/projects/create/attributes.tsx
index 178275641c4..ccbd2e09ebd 100644
--- a/web/ce/components/projects/create/attributes.tsx
+++ b/web/ce/components/projects/create/attributes.tsx
@@ -1,6 +1,7 @@
 "use client";
 import { FC } from "react";
 import { Controller, useFormContext } from "react-hook-form";
+import { useTranslation } from "@plane/i18n";
 import { IProject } from "@plane/types";
 // ui
 import { CustomSelect } from "@plane/ui";
@@ -18,6 +19,7 @@ type Props = {
 
 const ProjectAttributes: FC<Props> = (props) => {
   const { isMobile = false } = props;
+  const { t } = useTranslation();
   const { control } = useFormContext<IProject>();
   const { getIndex } = getTabIndex(ETabIndices.PROJECT_CREATE, isMobile);
   return (
@@ -41,7 +43,7 @@ const ProjectAttributes: FC<Props> = (props) => {
                         {currentNetwork.label}
                       </>
                     ) : (
-                      <span className="text-custom-text-400">Select network</span>
+                      <span className="text-custom-text-400">{t("select_network")}</span>
                     )}
                   </div>
                 }
@@ -77,7 +79,7 @@ const ProjectAttributes: FC<Props> = (props) => {
                 <MemberDropdown
                   value={value}
                   onChange={(lead) => onChange(lead === value ? null : lead)}
-                  placeholder="Lead"
+                  placeholder={t("lead")}
                   multiple={false}
                   buttonVariant="border-with-text"
                   tabIndex={5}
@@ -91,4 +93,4 @@ const ProjectAttributes: FC<Props> = (props) => {
   );
 };
 
-export default ProjectAttributes;
+export default ProjectAttributes;
\ No newline at end of file
diff --git a/web/ce/components/projects/create/root.tsx b/web/ce/components/projects/create/root.tsx
index 04c6dfc882f..5a7a1361323 100644
--- a/web/ce/components/projects/create/root.tsx
+++ b/web/ce/components/projects/create/root.tsx
@@ -3,6 +3,7 @@
 import { useState, FC } from "react";
 import { observer } from "mobx-react";
 import { FormProvider, useForm } from "react-hook-form";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { setToast, TOAST_TYPE } from "@plane/ui";
 // constants
@@ -47,6 +48,7 @@ const defaultValues: Partial<TProject> = {
 export const CreateProjectForm: FC<TCreateProjectFormProps> = observer((props) => {
   const { setToFavorite, workspaceSlug, onClose, handleNextStep, updateCoverImageStatus } = props;
   // store
+  const { t } = useTranslation();
   const { captureProjectEvent } = useEventTracker();
   const { addProjectToFavorites, createProject } = useProject();
   // states
@@ -64,8 +66,8 @@ export const CreateProjectForm: FC<TCreateProjectFormProps> = observer((props) =
     addProjectToFavorites(workspaceSlug.toString(), projectId).catch(() => {
       setToast({
         type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: "Couldn't remove the project from favorites. Please try again.",
+        title: t("error"),
+        message: t("failed_to_remove_project_from_favorites"),
       });
     });
   };
@@ -90,8 +92,8 @@ export const CreateProjectForm: FC<TCreateProjectFormProps> = observer((props) =
         });
         setToast({
           type: TOAST_TYPE.SUCCESS,
-          title: "Success!",
-          message: "Project created successfully.",
+          title: t("success"),
+          message: t("project_created_successfully"),
         });
         if (setToFavorite) {
           handleAddToFavorites(res.id);
@@ -102,7 +104,7 @@ export const CreateProjectForm: FC<TCreateProjectFormProps> = observer((props) =
         Object.keys(err.data).map((key) => {
           setToast({
             type: TOAST_TYPE.ERROR,
-            title: "Error!",
+            title: t("error"),
             message: err.data[key],
           });
           captureProjectEvent({
@@ -142,4 +144,4 @@ export const CreateProjectForm: FC<TCreateProjectFormProps> = observer((props) =
       </form>
     </FormProvider>
   );
-});
+});
\ No newline at end of file
diff --git a/web/ce/components/projects/mobile-header.tsx b/web/ce/components/projects/mobile-header.tsx
index 3804721600e..f07edbd3af3 100644
--- a/web/ce/components/projects/mobile-header.tsx
+++ b/web/ce/components/projects/mobile-header.tsx
@@ -4,6 +4,7 @@ import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // icons
 import { ChevronDown, ListFilter } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 // types
 import { TProjectFilters } from "@plane/types";
 // hooks
@@ -15,6 +16,7 @@ import { calculateTotalFilters } from "@/helpers/filter.helper";
 import { useMember, useProjectFilter } from "@/hooks/store";
 
 export const ProjectsListMobileHeader = observer(() => {
+  const { t } = useTranslation();
   // router
   const { workspaceSlug } = useParams();
   const {
@@ -68,7 +70,7 @@ export const ProjectsListMobileHeader = observer(() => {
           menuButton={
             <div className="flex text-sm items-center gap-2 neutral-primary text-custom-text-200">
               <ListFilter className="h-3 w-3" />
-              Filters
+                {t("filters")}
               <ChevronDown className="h-3 w-3" strokeWidth={2} />
             </div>
           }
diff --git a/web/ce/components/projects/settings/intake/header.tsx b/web/ce/components/projects/settings/intake/header.tsx
index e733317d2b3..bd48c80ba9f 100644
--- a/web/ce/components/projects/settings/intake/header.tsx
+++ b/web/ce/components/projects/settings/intake/header.tsx
@@ -4,6 +4,7 @@ import { FC, useState } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { RefreshCcw } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { Breadcrumbs, Button, Intake, Header } from "@plane/ui";
 // components
@@ -14,6 +15,7 @@ import { useProject, useProjectInbox, useUserPermissions } from "@/hooks/store";
 import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
 
 export const ProjectInboxHeader: FC = observer(() => {
+  const { t } = useTranslation();
   // states
   const [createIssueModal, setCreateIssueModal] = useState(false);
   // router
@@ -77,7 +79,7 @@ export const ProjectInboxHeader: FC = observer(() => {
             />
 
             <Button variant="primary" size="sm" onClick={() => setCreateIssueModal(true)}>
-              Add issue
+              {t("add_issue")}
             </Button>
           </div>
         ) : (
diff --git a/web/ce/components/workspace/edition-badge.tsx b/web/ce/components/workspace/edition-badge.tsx
index e1c3d1c1ddb..729ec6d236e 100644
--- a/web/ce/components/workspace/edition-badge.tsx
+++ b/web/ce/components/workspace/edition-badge.tsx
@@ -1,5 +1,6 @@
 import { useState } from "react";
 import { observer } from "mobx-react";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { Button, Tooltip } from "@plane/ui";
 // hooks
@@ -11,6 +12,7 @@ import { PaidPlanUpgradeModal } from "./upgrade";
 
 export const WorkspaceEditionBadge = observer(() => {
   const { isMobile } = usePlatformOS();
+  const { t } = useTranslation();
   // states
   const [isPaidPlanPurchaseModalOpen, setIsPaidPlanPurchaseModalOpen] = useState(false);
 
@@ -27,9 +29,9 @@ export const WorkspaceEditionBadge = observer(() => {
           className="w-fit min-w-24 cursor-pointer rounded-2xl px-2 py-1 text-center text-sm font-medium outline-none"
           onClick={() => setIsPaidPlanPurchaseModalOpen(true)}
         >
-          Upgrade
+          {t("upgrade")}
         </Button>
       </Tooltip>
     </>
   );
-});
+});
\ No newline at end of file
diff --git a/web/ce/constants/issues.ts b/web/ce/constants/issues.ts
index d30ec492e56..19728231294 100644
--- a/web/ce/constants/issues.ts
+++ b/web/ce/constants/issues.ts
@@ -9,10 +9,10 @@ export type TActivityFilters = EActivityFilterType;
 
 export const ACTIVITY_FILTER_TYPE_OPTIONS: Record<EActivityFilterType, { label: string }> = {
   [EActivityFilterType.ACTIVITY]: {
-    label: "Updates",
+    label: "updates",
   },
   [EActivityFilterType.COMMENT]: {
-    label: "Comments",
+    label: "comments",
   },
 };
 
diff --git a/web/ce/constants/project/settings/features.tsx b/web/ce/constants/project/settings/features.tsx
index b9b39700d68..52fd81590e1 100644
--- a/web/ce/constants/project/settings/features.tsx
+++ b/web/ce/constants/project/settings/features.tsx
@@ -4,6 +4,7 @@ import { IProject } from "@plane/types";
 import { ContrastIcon, DiceIcon, Intake } from "@plane/ui";
 
 export type TProperties = {
+  key: string;
   property: string;
   title: string;
   description: string;
@@ -22,6 +23,7 @@ export type TFeatureList = {
 
 export type TProjectFeatures = {
   [key: string]: {
+    key: string;
     title: string;
     description: string;
     featureList: TFeatureList;
@@ -30,10 +32,12 @@ export type TProjectFeatures = {
 
 export const PROJECT_FEATURES_LIST: TProjectFeatures = {
   project_features: {
+    key: "projects_and_issues",
     title: "Projects and issues",
     description: "Toggle these on or off this project.",
     featureList: {
       cycles: {
+        key: "cycles",
         property: "cycle_view",
         title: "Cycles",
         description: "Timebox work as you see fit per project and change frequency from one period to the next.",
@@ -42,6 +46,7 @@ export const PROJECT_FEATURES_LIST: TProjectFeatures = {
         isEnabled: true,
       },
       modules: {
+        key: "modules",
         property: "module_view",
         title: "Modules",
         description: "Group work into sub-project-like set-ups with their own leads and assignees.",
@@ -50,6 +55,7 @@ export const PROJECT_FEATURES_LIST: TProjectFeatures = {
         isEnabled: true,
       },
       views: {
+        key: "views",
         property: "issue_views_view",
         title: "Views",
         description: "Save sorts, filters, and display options for later or share them.",
@@ -58,6 +64,7 @@ export const PROJECT_FEATURES_LIST: TProjectFeatures = {
         isEnabled: true,
       },
       pages: {
+        key: "pages",
         property: "page_view",
         title: "Pages",
         description: "Write anything like you write anything.",
@@ -66,6 +73,7 @@ export const PROJECT_FEATURES_LIST: TProjectFeatures = {
         isEnabled: true,
       },
       inbox: {
+        key: "intake",
         property: "inbox_view",
         title: "Intake",
         description: "Consider and discuss issues before you add them to your project.",
@@ -76,17 +84,19 @@ export const PROJECT_FEATURES_LIST: TProjectFeatures = {
     },
   },
   project_others: {
+    key: "work_management",
     title: "Work management",
     description: "Available only on some plans as indicated by the label next to the feature below.",
     featureList: {
       is_time_tracking_enabled: {
+        key: "time_tracking",
         property: "is_time_tracking_enabled",
         title: "Time Tracking",
         description: "Log time, see timesheets, and download full CSVs for your entire workspace.",
         icon: <Timer className="h-5 w-5 flex-shrink-0 text-custom-text-300" />,
-        isPro: true,
-        isEnabled: false,
+        isPro: false,
+        isEnabled: true,
       },
     },
   },
-};
+};
\ No newline at end of file
diff --git a/web/core/components/account/deactivate-account-modal.tsx b/web/core/components/account/deactivate-account-modal.tsx
index aa27af4664c..a93cdf52e89 100644
--- a/web/core/components/account/deactivate-account-modal.tsx
+++ b/web/core/components/account/deactivate-account-modal.tsx
@@ -3,6 +3,7 @@
 import React, { useState } from "react";
 import { Trash2 } from "lucide-react";
 import { Dialog, Transition } from "@headlessui/react";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { Button, TOAST_TYPE, setToast } from "@plane/ui";
 // hooks
@@ -18,6 +19,7 @@ export const DeactivateAccountModal: React.FC<Props> = (props) => {
   const router = useAppRouter();
   const { isOpen, onClose } = props;
   // hooks
+  const { t } = useTranslation();
   const { deactivateAccount, signOut } = useUser();
 
   // states
@@ -90,11 +92,10 @@ export const DeactivateAccountModal: React.FC<Props> = (props) => {
                       </div>
                       <div>
                         <Dialog.Title as="h3" className="my-4 text-2xl font-medium leading-6 text-custom-text-100">
-                          Deactivate your account?
+                          {t("deactivate_your_account")}
                         </Dialog.Title>
                         <p className="mt-6 list-disc pr-4 text-base font-normal text-custom-text-200">
-                          Once deactivated, you can{"'"}t be assigned issues and be billed for your workspace.To
-                          reactivate your account, you will need an invite to a workspace at this email address.
+                          {t("deactivate_your_account_description")}
                         </p>
                       </div>
                     </div>
@@ -102,10 +103,10 @@ export const DeactivateAccountModal: React.FC<Props> = (props) => {
                 </div>
                 <div className="mb-2 flex items-center justify-end gap-2 p-4 sm:px-6">
                   <Button variant="neutral-primary" onClick={onClose}>
-                    Cancel
+                    {t("cancel")}
                   </Button>
                   <Button variant="danger" onClick={handleDeleteAccount}>
-                    {isDeactivating ? "Deactivating..." : "Confirm"}
+                    {isDeactivating ? t("deactivating") : t("confirm")}
                   </Button>
                 </div>
               </Dialog.Panel>
@@ -115,4 +116,4 @@ export const DeactivateAccountModal: React.FC<Props> = (props) => {
       </Dialog>
     </Transition.Root>
   );
-};
+};
\ No newline at end of file
diff --git a/web/core/components/account/password-strength-meter.tsx b/web/core/components/account/password-strength-meter.tsx
index 342f77efb70..f0d1c59d988 100644
--- a/web/core/components/account/password-strength-meter.tsx
+++ b/web/core/components/account/password-strength-meter.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { FC, useMemo } from "react";
+import { useTranslation } from "@plane/i18n";
 // import { CircleCheck } from "lucide-react";
 // helpers
 import { cn } from "@/helpers/common.helper";
@@ -17,6 +18,7 @@ type TPasswordStrengthMeter = {
 
 export const PasswordStrengthMeter: FC<TPasswordStrengthMeter> = (props) => {
   const { password, isFocused = false } = props;
+  const { t } = useTranslation();
   // derived values
   const strength = useMemo(() => getPasswordStrength(password), [password]);
   const strengthBars = useMemo(() => {
@@ -24,40 +26,40 @@ export const PasswordStrengthMeter: FC<TPasswordStrengthMeter> = (props) => {
       case E_PASSWORD_STRENGTH.EMPTY: {
         return {
           bars: [`bg-custom-text-100`, `bg-custom-text-100`, `bg-custom-text-100`],
-          text: "Please enter your password.",
+          text: t("please_enter_your_password"),
           textColor: "text-custom-text-100",
         };
       }
       case E_PASSWORD_STRENGTH.LENGTH_NOT_VALID: {
         return {
           bars: [`bg-red-500`, `bg-custom-text-100`, `bg-custom-text-100`],
-          text: "Password length should me more than 8 characters.",
+          text: t("password_length_should_me_more_than_8_characters"),
           textColor: "text-red-500",
         };
       }
       case E_PASSWORD_STRENGTH.STRENGTH_NOT_VALID: {
         return {
           bars: [`bg-red-500`, `bg-custom-text-100`, `bg-custom-text-100`],
-          text: "Password is weak.",
+          text: t("password_is_weak"),
           textColor: "text-red-500",
         };
       }
       case E_PASSWORD_STRENGTH.STRENGTH_VALID: {
         return {
           bars: [`bg-green-500`, `bg-green-500`, `bg-green-500`],
-          text: "Password is strong.",
+          text: t("password_is_strong"),
           textColor: "text-green-500",
         };
       }
       default: {
         return {
           bars: [`bg-custom-text-100`, `bg-custom-text-100`, `bg-custom-text-100`],
-          text: "Please enter your password.",
+          text: t("please_enter_your_password"),
           textColor: "text-custom-text-100",
         };
       }
     }
-  }, [strength]);
+  }, [strength,t]);
 
   const isPasswordMeterVisible = isFocused ? true : strength === E_PASSWORD_STRENGTH.STRENGTH_VALID ? false : true;
 
@@ -91,4 +93,4 @@ export const PasswordStrengthMeter: FC<TPasswordStrengthMeter> = (props) => {
       </div> */}
     </div>
   );
-};
+};
\ No newline at end of file
diff --git a/web/core/components/analytics/project-modal/header.tsx b/web/core/components/analytics/project-modal/header.tsx
index 79d63ce3c0f..2d19863f685 100644
--- a/web/core/components/analytics/project-modal/header.tsx
+++ b/web/core/components/analytics/project-modal/header.tsx
@@ -1,4 +1,5 @@
 import { observer } from "mobx-react";
+import { useTranslation } from "@plane/i18n";
 
 // icons
 import { Expand, Shrink, X } from "lucide-react";
@@ -12,10 +13,11 @@ type Props = {
 
 export const ProjectAnalyticsModalHeader: React.FC<Props> = observer((props) => {
   const { fullScreen, handleClose, setFullScreen, title } = props;
+  const { t } = useTranslation();
 
   return (
     <div className="flex items-center justify-between gap-4 bg-custom-background-100 px-5 py-4 text-sm">
-      <h3 className="break-words">Analytics for {title}</h3>
+      <h3 className="break-words">{t("Analytics for")} {title}</h3>
       <div className="flex items-center gap-2">
         <button
           type="button"
diff --git a/web/core/components/analytics/project-modal/main-content.tsx b/web/core/components/analytics/project-modal/main-content.tsx
index e912828018d..a740da76c08 100644
--- a/web/core/components/analytics/project-modal/main-content.tsx
+++ b/web/core/components/analytics/project-modal/main-content.tsx
@@ -2,6 +2,7 @@ import React, { Fragment } from "react";
 import { observer } from "mobx-react";
 import { Tab } from "@headlessui/react";
 import { ICycle, IModule, IProject } from "@plane/types";
+import { useTranslation } from "@plane/i18n";
 // components
 import { CustomAnalytics, ScopeAndDemand } from "@/components/analytics";
 // types
@@ -17,6 +18,7 @@ type Props = {
 
 export const ProjectAnalyticsModalMainContent: React.FC<Props> = observer((props) => {
   const { fullScreen, cycleDetails, moduleDetails } = props;
+  const { t } = useTranslation();
 
   return (
     <Tab.Group as={React.Fragment}>
@@ -29,7 +31,7 @@ export const ProjectAnalyticsModalMainContent: React.FC<Props> = observer((props
                   selected ? "text-custom-primary-100 " : "hover:text-custom-text-200"
                 }`}
               >
-                {tab.title}
+                {t(tab.title)}
                 <div
                   className={`border absolute bottom-0 right-0 left-0 rounded-t-md ${selected ? "border-custom-primary-100" : "border-transparent group-hover:border-custom-border-200"}`}
                 />
diff --git a/web/core/components/analytics/scope-and-demand/demand.tsx b/web/core/components/analytics/scope-and-demand/demand.tsx
index 39a04cf9bde..009afa8edaf 100644
--- a/web/core/components/analytics/scope-and-demand/demand.tsx
+++ b/web/core/components/analytics/scope-and-demand/demand.tsx
@@ -1,3 +1,4 @@
+import { useTranslation } from "@plane/i18n";
 // types
 import { IDefaultAnalyticsResponse, TStateGroups } from "@plane/types";
 // constants
@@ -8,45 +9,48 @@ type Props = {
   defaultAnalytics: IDefaultAnalyticsResponse;
 };
 
-export const AnalyticsDemand: React.FC<Props> = ({ defaultAnalytics }) => (
-  <Card>
-    <div>
-      <h4 className="text-base font-medium text-custom-text-100">Total open tasks</h4>
-      <h3 className="mt-1 text-xl font-semibold">{defaultAnalytics.open_issues}</h3>
-    </div>
-    <div className="space-y-6 pb-2">
-      {defaultAnalytics?.open_issues_classified.map((group) => {
-        const percentage = ((group.state_count / defaultAnalytics.total_issues) * 100).toFixed(0);
+export const AnalyticsDemand: React.FC<Props> = ({ defaultAnalytics }) => {
+  const { t } = useTranslation();
+  return (
+    <Card>
+      <div>
+        <h4 className="text-base font-medium text-custom-text-100">{t("Total open tasks")}</h4>
+        <h3 className="mt-1 text-xl font-semibold">{defaultAnalytics.open_issues}</h3>
+      </div>
+      <div className="space-y-6 pb-2">
+        {defaultAnalytics?.open_issues_classified.map((group) => {
+          const percentage = ((group.state_count / defaultAnalytics.total_issues) * 100).toFixed(0);
 
-        return (
-          <div key={group.state_group} className="space-y-2">
-            <div className="flex items-center justify-between gap-2 text-xs">
-              <div className="flex items-center gap-1">
-                <span
-                  className="h-2 w-2 rounded-full"
+          return (
+            <div key={group.state_group} className="space-y-2">
+              <div className="flex items-center justify-between gap-2 text-xs">
+                <div className="flex items-center gap-1">
+                  <span
+                    className="h-2 w-2 rounded-full"
+                    style={{
+                      backgroundColor: STATE_GROUPS[group.state_group as TStateGroups].color,
+                    }}
+                  />
+                  <h6 className="capitalize">{t(group.state_group)}</h6>
+                  <span className="ml-1 rounded-3xl bg-custom-background-80 px-2 py-0.5 text-[0.65rem] text-custom-text-200">
+                    {group.state_count}
+                  </span>
+                </div>
+                <p className="text-custom-text-200">{percentage}%</p>
+              </div>
+              <div className="bar relative h-1 w-full rounded bg-custom-background-80">
+                <div
+                  className="absolute left-0 top-0 h-1 rounded duration-300"
                   style={{
+                    width: `${percentage}%`,
                     backgroundColor: STATE_GROUPS[group.state_group as TStateGroups].color,
                   }}
                 />
-                <h6 className="capitalize">{group.state_group}</h6>
-                <span className="ml-1 rounded-3xl bg-custom-background-80 px-2 py-0.5 text-[0.65rem] text-custom-text-200">
-                  {group.state_count}
-                </span>
               </div>
-              <p className="text-custom-text-200">{percentage}%</p>
-            </div>
-            <div className="bar relative h-1 w-full rounded bg-custom-background-80">
-              <div
-                className="absolute left-0 top-0 h-1 rounded duration-300"
-                style={{
-                  width: `${percentage}%`,
-                  backgroundColor: STATE_GROUPS[group.state_group as TStateGroups].color,
-                }}
-              />
             </div>
-          </div>
-        );
-      })}
-    </div>
-  </Card>
-);
+          );
+        })}
+      </div>
+    </Card>
+  )
+};
diff --git a/web/core/components/analytics/scope-and-demand/scope-and-demand.tsx b/web/core/components/analytics/scope-and-demand/scope-and-demand.tsx
index 6aac07c6a29..124f64c13b0 100644
--- a/web/core/components/analytics/scope-and-demand/scope-and-demand.tsx
+++ b/web/core/components/analytics/scope-and-demand/scope-and-demand.tsx
@@ -1,6 +1,7 @@
 "use client";
 import { useParams } from "next/navigation";
 import useSWR from "swr";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { Button, ContentWrapper, Loader } from "@plane/ui";
 // components
@@ -19,6 +20,7 @@ const analyticsService = new AnalyticsService();
 
 export const ScopeAndDemand: React.FC<Props> = (props) => {
   const { fullScreen = true } = props;
+  const { t } = useTranslation();
 
   const { workspaceSlug, projectId, cycleId, moduleId } = useParams();
 
@@ -66,7 +68,7 @@ export const ScopeAndDemand: React.FC<Props> = (props) => {
                   count: user?.count,
                   id: user?.created_by__id,
                 }))}
-                title="Most issues created"
+                title={t("Most issues created")}
                 emptyStateMessage="Co-workers and the number of issues created by them appears here."
                 workspaceSlug={workspaceSlug?.toString() ?? ""}
               />
@@ -79,7 +81,7 @@ export const ScopeAndDemand: React.FC<Props> = (props) => {
                   count: user?.count,
                   id: user?.assignees__id,
                 }))}
-                title="Most issues closed"
+                title={t("Most issues closed")}
                 emptyStateMessage="Co-workers and the number of issues closed by them appears here."
                 workspaceSlug={workspaceSlug?.toString() ?? ""}
               />
diff --git a/web/core/components/analytics/scope-and-demand/scope.tsx b/web/core/components/analytics/scope-and-demand/scope.tsx
index 6711150975f..ec0322f0a1d 100644
--- a/web/core/components/analytics/scope-and-demand/scope.tsx
+++ b/web/core/components/analytics/scope-and-demand/scope.tsx
@@ -1,3 +1,4 @@
+import { useTranslation } from "@plane/i18n";
 // plane types
 import { IDefaultAnalyticsUser } from "@plane/types";
 // plane ui
@@ -14,82 +15,85 @@ type Props = {
   pendingAssignedIssues: IDefaultAnalyticsUser[];
 };
 
-export const AnalyticsScope: React.FC<Props> = ({ pendingUnAssignedIssuesUser, pendingAssignedIssues }) => (
-  <Card>
-    <div className="divide-y divide-custom-border-200">
-      <div>
-        <div className="flex items-center justify-between">
-          <h6 className="text-base font-medium">Pending issues</h6>
-          {pendingUnAssignedIssuesUser && (
-            <div className="relative flex items-center py-1 px-3 rounded-md gap-2  text-xs text-custom-primary-100  bg-custom-primary-100/10">
-              Unassigned: {pendingUnAssignedIssuesUser.count}
-            </div>
-          )}
-        </div>
+export const AnalyticsScope: React.FC<Props> = ({ pendingUnAssignedIssuesUser, pendingAssignedIssues }) => {
+  const { t } = useTranslation();
+  return (
+    <Card>
+      <div className="divide-y divide-custom-border-200">
+        <div>
+          <div className="flex items-center justify-between">
+            <h6 className="text-base font-medium">{t("Pending issues")}</h6>
+            {pendingUnAssignedIssuesUser && (
+              <div className="relative flex items-center py-1 px-3 rounded-md gap-2  text-xs text-custom-primary-100  bg-custom-primary-100/10">
+                {t("Unassigned")}: {pendingUnAssignedIssuesUser.count}
+              </div>
+            )}
+          </div>
 
-        {pendingAssignedIssues && pendingAssignedIssues.length > 0 ? (
-          <BarGraph
-            data={pendingAssignedIssues}
-            indexBy="assignees__id"
-            keys={["count"]}
-            height="250px"
-            colors={() => `#f97316`}
-            customYAxisTickValues={pendingAssignedIssues.map((d) => (d.count > 0 ? d.count : 50))}
-            tooltip={(datum) => {
-              const assignee = pendingAssignedIssues.find((a) => a.assignees__id === `${datum.indexValue}`);
+          {pendingAssignedIssues && pendingAssignedIssues.length > 0 ? (
+            <BarGraph
+              data={pendingAssignedIssues}
+              indexBy="assignees__id"
+              keys={["count"]}
+              height="250px"
+              colors={() => `#f97316`}
+              customYAxisTickValues={pendingAssignedIssues.map((d) => (d.count > 0 ? d.count : 50))}
+              tooltip={(datum) => {
+                const assignee = pendingAssignedIssues.find((a) => a.assignees__id === `${datum.indexValue}`);
 
-              return (
-                <div className="rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
-                  <span className="font-medium text-custom-text-200">
-                    {assignee ? assignee.assignees__display_name : "No assignee"}:{" "}
-                  </span>
-                  {datum.value}
-                </div>
-              );
-            }}
-            axisBottom={{
-              renderTick: (datum) => {
-                const assignee = pendingAssignedIssues[datum.tickIndex] ?? "";
+                return (
+                  <div className="rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
+                    <span className="font-medium text-custom-text-200">
+                      {assignee ? assignee.assignees__display_name : "No assignee"}:{" "}
+                    </span>
+                    {datum.value}
+                  </div>
+                );
+              }}
+              axisBottom={{
+                renderTick: (datum) => {
+                  const assignee = pendingAssignedIssues[datum.tickIndex] ?? "";
 
-                if (assignee && assignee?.assignees__avatar_url && assignee?.assignees__avatar_url !== "")
-                  return (
-                    <g transform={`translate(${datum.x},${datum.y})`}>
-                      <image
-                        x={-8}
-                        y={10}
-                        width={16}
-                        height={16}
-                        xlinkHref={getFileURL(assignee?.assignees__avatar_url)}
-                        style={{ clipPath: "circle(50%)" }}
-                      />
-                    </g>
-                  );
-                else
-                  return (
-                    <g transform={`translate(${datum.x},${datum.y})`}>
-                      <circle cy={18} r={8} fill="#374151" />
-                      <text x={0} y={21} textAnchor="middle" fontSize={9} fill="#ffffff">
-                        {datum.value ? `${assignee.assignees__display_name}`.toUpperCase()[0] : "?"}
-                      </text>
-                    </g>
-                  );
-              },
-            }}
-            margin={{ top: 20 }}
-            theme={{
-              axis: {},
-            }}
-          />
-        ) : (
-          <div className="px-7 py-4">
-            <ProfileEmptyState
-              title="No Data yet"
-              description="Analysis of pending issues by co-workers appears here."
-              image={emptyBarGraph}
+                  if (assignee && assignee?.assignees__avatar_url && assignee?.assignees__avatar_url !== "")
+                    return (
+                      <g transform={`translate(${datum.x},${datum.y})`}>
+                        <image
+                          x={-8}
+                          y={10}
+                          width={16}
+                          height={16}
+                          xlinkHref={getFileURL(assignee?.assignees__avatar_url)}
+                          style={{ clipPath: "circle(50%)" }}
+                        />
+                      </g>
+                    );
+                  else
+                    return (
+                      <g transform={`translate(${datum.x},${datum.y})`}>
+                        <circle cy={18} r={8} fill="#374151" />
+                        <text x={0} y={21} textAnchor="middle" fontSize={9} fill="#ffffff">
+                          {datum.value ? `${assignee.assignees__display_name}`.toUpperCase()[0] : "?"}
+                        </text>
+                      </g>
+                    );
+                },
+              }}
+              margin={{ top: 20 }}
+              theme={{
+                axis: {},
+              }}
             />
-          </div>
-        )}
+          ) : (
+            <div className="px-7 py-4">
+              <ProfileEmptyState
+                title="No Data yet"
+                description="Analysis of pending issues by co-workers appears here."
+                image={emptyBarGraph}
+              />
+            </div>
+          )}
+        </div>
       </div>
-    </div>
-  </Card>
-);
+    </Card>
+  )
+};
diff --git a/web/core/components/analytics/scope-and-demand/year-wise-issues.tsx b/web/core/components/analytics/scope-and-demand/year-wise-issues.tsx
index b2c5805dd7a..7a173dbbf7f 100644
--- a/web/core/components/analytics/scope-and-demand/year-wise-issues.tsx
+++ b/web/core/components/analytics/scope-and-demand/year-wise-issues.tsx
@@ -1,3 +1,4 @@
+import { useTranslation } from "@plane/i18n";
 // ui
 import { IDefaultAnalyticsResponse } from "@plane/types";
 import { Card } from "@plane/ui";
@@ -12,49 +13,52 @@ type Props = {
   defaultAnalytics: IDefaultAnalyticsResponse;
 };
 
-export const AnalyticsYearWiseIssues: React.FC<Props> = ({ defaultAnalytics }) => (
-  <Card>
-    <h1 className="py-3 text-base font-medium">Issues closed in a year</h1>
-    {defaultAnalytics.issue_completed_month_wise.length > 0 ? (
-      <LineGraph
-        data={[
-          {
-            id: "issues_closed",
-            color: "rgb(var(--color-primary-100))",
-            data: Object.entries(MONTHS_LIST).map(([index, month]) => ({
-              x: month.shortTitle,
-              y:
-                defaultAnalytics.issue_completed_month_wise.find((data) => data.month === parseInt(index, 10))?.count ||
-                0,
-            })),
-          },
-        ]}
-        customYAxisTickValues={defaultAnalytics.issue_completed_month_wise.map((data) => data.count)}
-        height="300px"
-        colors={(datum) => datum.color}
-        curve="monotoneX"
-        margin={{ top: 20 }}
-        enableSlices="x"
-        sliceTooltip={(datum) => (
-          <div className="rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
-            {datum.slice.points[0].data.yFormatted}
-            <span className="text-custom-text-200"> issues closed in </span>
-            {datum.slice.points[0].data.xFormatted}
-          </div>
-        )}
-        theme={{
-          background: "rgb(var(--color-background-100))",
-        }}
-        enableArea
-      />
-    ) : (
-      <div className="px-7 py-4">
-        <ProfileEmptyState
-          title="No Data yet"
-          description="Close issues to view analysis of the same in the form of a graph."
-          image={emptyGraph}
+export const AnalyticsYearWiseIssues: React.FC<Props> = ({ defaultAnalytics }) => {
+  const { t } = useTranslation();
+  return (
+    <Card>
+      <h1 className="py-3 text-base font-medium">{t("Issues closed in a year")}</h1>
+      {defaultAnalytics.issue_completed_month_wise.length > 0 ? (
+        <LineGraph
+          data={[
+            {
+              id: "issues_closed",
+              color: "rgb(var(--color-primary-100))",
+              data: Object.entries(MONTHS_LIST).map(([index, month]) => ({
+                x: month.shortTitle,
+                y:
+                  defaultAnalytics.issue_completed_month_wise.find((data) => data.month === parseInt(index, 10))?.count ||
+                  0,
+              })),
+            },
+          ]}
+          customYAxisTickValues={defaultAnalytics.issue_completed_month_wise.map((data) => data.count)}
+          height="300px"
+          colors={(datum) => datum.color}
+          curve="monotoneX"
+          margin={{ top: 20 }}
+          enableSlices="x"
+          sliceTooltip={(datum) => (
+            <div className="rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
+              {datum.slice.points[0].data.yFormatted}
+              <span className="text-custom-text-200"> issues closed in </span>
+              {datum.slice.points[0].data.xFormatted}
+            </div>
+          )}
+          theme={{
+            background: "rgb(var(--color-background-100))",
+          }}
+          enableArea
         />
-      </div>
-    )}
-  </Card>
-);
+      ) : (
+        <div className="px-7 py-4">
+          <ProfileEmptyState
+            title="No Data yet"
+            description="Close issues to view analysis of the same in the form of a graph."
+            image={emptyGraph}
+          />
+        </div>
+      )}
+    </Card>
+  )
+};
diff --git a/web/core/components/command-palette/actions/issue-actions/change-priority.tsx b/web/core/components/command-palette/actions/issue-actions/change-priority.tsx
index 5bd8ce850e1..7db4e4694d0 100644
--- a/web/core/components/command-palette/actions/issue-actions/change-priority.tsx
+++ b/web/core/components/command-palette/actions/issue-actions/change-priority.tsx
@@ -5,6 +5,7 @@ import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { Check } from "lucide-react";
 import { TIssue, TIssuePriorities } from "@plane/types";
+import { useTranslation } from "@plane/i18n";
 // mobx store
 import { PriorityIcon } from "@plane/ui";
 import { EIssuesStoreType, ISSUE_PRIORITIES } from "@/constants/issue";
@@ -22,6 +23,7 @@ export const ChangeIssuePriority: React.FC<Props> = observer((props) => {
   const { closePalette, issue } = props;
   // router params
   const { workspaceSlug, projectId } = useParams();
+  const { t } = useTranslation();
   const {
     issues: { updateIssue },
   } = useIssues(EIssuesStoreType.PROJECT);
@@ -46,7 +48,7 @@ export const ChangeIssuePriority: React.FC<Props> = observer((props) => {
         <Command.Item key={priority.key} onSelect={() => handleIssueState(priority.key)} className="focus:outline-none">
           <div className="flex items-center space-x-3">
             <PriorityIcon priority={priority.key} />
-            <span className="capitalize">{priority.title ?? "None"}</span>
+            <span className="capitalize">{t(priority.title)}</span>
           </div>
           <div>{priority.key === issue.priority && <Check className="h-3 w-3" />}</div>
         </Command.Item>
diff --git a/web/core/components/command-palette/actions/search-results.tsx b/web/core/components/command-palette/actions/search-results.tsx
index dba61ecc36f..cd9ebf9f448 100644
--- a/web/core/components/command-palette/actions/search-results.tsx
+++ b/web/core/components/command-palette/actions/search-results.tsx
@@ -8,6 +8,7 @@ import { IWorkspaceSearchResults } from "@plane/types";
 import { commandGroups } from "@/components/command-palette";
 // hooks
 import { useAppRouter } from "@/hooks/use-app-router";
+import { useTranslation } from "@plane/i18n";
 
 type Props = {
   closePalette: () => void;
@@ -19,6 +20,7 @@ export const CommandPaletteSearchResults: React.FC<Props> = (props) => {
   // router
   const router = useAppRouter();
   const { projectId: routerProjectId } = useParams();
+  const { t } = useTranslation();
   // derived values
   const projectId = routerProjectId?.toString();
 
@@ -30,7 +32,10 @@ export const CommandPaletteSearchResults: React.FC<Props> = (props) => {
 
         if (section.length > 0) {
           return (
-            <Command.Group key={key} heading={`${currentSection.title} search`}>
+            <Command.Group
+              key={key}
+              heading={`${key === "issue_view" ? t("views") : currentSection.title} search`}
+            >
               {section.map((item: any) => (
                 <Command.Item
                   key={item.id}
diff --git a/web/core/components/command-palette/command-modal.tsx b/web/core/components/command-palette/command-modal.tsx
index b80b0dfe145..259a6e3c083 100644
--- a/web/core/components/command-palette/command-modal.tsx
+++ b/web/core/components/command-palette/command-modal.tsx
@@ -10,6 +10,7 @@ import { Dialog, Transition } from "@headlessui/react";
 // types
 import { IWorkspaceSearchResults } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { LayersIcon, Loader, ToggleSwitch, Tooltip } from "@plane/ui";
 // components
 import {
@@ -47,6 +48,7 @@ const workspaceService = new WorkspaceService();
 const issueService = new IssueService();
 
 export const CommandModal: React.FC = observer(() => {
+  const { t } = useTranslation();
   // hooks
   const { workspaceProjectIds } = useProject();
   const { isMobile } = usePlatformOS();
@@ -245,7 +247,7 @@ export const CommandModal: React.FC = observer(() => {
                       />
                       <Command.Input
                         className="w-full border-0 border-b border-custom-border-200 bg-transparent p-4 pl-11 text-sm text-custom-text-100 outline-none placeholder:text-custom-text-400 focus:ring-0"
-                        placeholder={placeholder}
+                        placeholder={t(placeholder)}
                         value={searchTerm}
                         onValueChange={(e) => setSearchTerm(e)}
                         autoFocus
@@ -315,7 +317,7 @@ export const CommandModal: React.FC = observer(() => {
                                 >
                                   <div className="flex items-center gap-2 text-custom-text-200">
                                     <LayersIcon className="h-3.5 w-3.5" />
-                                    Create new issue
+                                    {t("create_new_issue")}
                                   </div>
                                   <kbd>C</kbd>
                                 </Command.Item>
@@ -333,7 +335,7 @@ export const CommandModal: React.FC = observer(() => {
                               >
                                 <div className="flex items-center gap-2 text-custom-text-200">
                                   <FolderPlus className="h-3.5 w-3.5" />
-                                  Create new project
+                                  {t("create_new_project")}
                                 </div>
                                 <kbd>P</kbd>
                               </Command.Item>
diff --git a/web/core/components/core/theme/custom-theme-selector.tsx b/web/core/components/core/theme/custom-theme-selector.tsx
index da903439307..cd08e3b389a 100644
--- a/web/core/components/core/theme/custom-theme-selector.tsx
+++ b/web/core/components/core/theme/custom-theme-selector.tsx
@@ -1,29 +1,16 @@
 "use client";
 
+import { useMemo } from "react";
 import { observer } from "mobx-react";
 import { Controller, useForm } from "react-hook-form";
 // types
+import { useTranslation } from "@plane/i18n";
 import { IUserTheme } from "@plane/types";
 // ui
 import { Button, InputColorPicker, setPromiseToast } from "@plane/ui";
 // hooks
 import { useUserProfile } from "@/hooks/store";
 
-const inputRules = {
-  minLength: {
-    value: 7,
-    message: "Enter a valid hex code of 6 characters",
-  },
-  maxLength: {
-    value: 7,
-    message: "Enter a valid hex code of 6 characters",
-  },
-  pattern: {
-    value: /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/,
-    message: "Enter a valid hex code of 6 characters",
-  },
-};
-
 type TCustomThemeSelector = {
   applyThemeChange: (theme: Partial<IUserTheme>) => void;
 };
@@ -32,7 +19,7 @@ export const CustomThemeSelector: React.FC<TCustomThemeSelector> = observer((pro
   const { applyThemeChange } = props;
   // hooks
   const { data: userProfile, updateUserTheme } = useUserProfile();
-
+  const { t } = useTranslation();
   const {
     control,
     formState: { errors, isSubmitting },
@@ -51,6 +38,24 @@ export const CustomThemeSelector: React.FC<TCustomThemeSelector> = observer((pro
     },
   });
 
+  const inputRules = useMemo(
+    () => ({
+      minLength: {
+        value: 7,
+        message: t("enter_a_valid_hex_code_of_6_characters"),
+      },
+      maxLength: {
+        value: 7,
+        message: t("enter_a_valid_hex_code_of_6_characters"),
+      },
+      pattern: {
+        value: /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/,
+        message: t("enter_a_valid_hex_code_of_6_characters"),
+      },
+    }),
+    [t] // Empty dependency array since these rules never change
+  );
+
   const handleUpdateTheme = async (formData: Partial<IUserTheme>) => {
     const payload: IUserTheme = {
       background: formData.background,
@@ -66,14 +71,14 @@ export const CustomThemeSelector: React.FC<TCustomThemeSelector> = observer((pro
 
     const updateCurrentUserThemePromise = updateUserTheme(payload);
     setPromiseToast(updateCurrentUserThemePromise, {
-      loading: "Updating theme...",
+      loading: t("updating_theme"),
       success: {
-        title: "Success!",
-        message: () => "Theme updated successfully!",
+        title: t("success"),
+        message: () => t("theme_updated_successfully"),
       },
       error: {
-        title: "Error!",
-        message: () => "Failed to Update the theme",
+        title: t("error"),
+        message: () => t("failed_to_update_the_theme"),
       },
     });
 
@@ -91,16 +96,16 @@ export const CustomThemeSelector: React.FC<TCustomThemeSelector> = observer((pro
   return (
     <form onSubmit={handleSubmit(handleUpdateTheme)}>
       <div className="space-y-5">
-        <h3 className="text-lg font-semibold text-custom-text-100">Customize your theme</h3>
+        <h3 className="text-lg font-semibold text-custom-text-100">{t("customize_your_theme")}</h3>
         <div className="space-y-4">
           <div className="grid grid-cols-1 gap-x-8 gap-y-4 sm:grid-cols-2 md:grid-cols-3">
             <div className="flex flex-col items-start gap-2">
-              <h3 className="text-left text-sm font-medium text-custom-text-200">Background color</h3>
+              <h3 className="text-left text-sm font-medium text-custom-text-200">{t("background_color")}</h3>
               <div className="w-full">
                 <Controller
                   control={control}
                   name="background"
-                  rules={{ ...inputRules, required: "Background color is required" }}
+                  rules={{ ...inputRules, required: t("background_color_is_required") }}
                   render={({ field: { value, onChange } }) => (
                     <InputColorPicker
                       name="background"
@@ -121,12 +126,12 @@ export const CustomThemeSelector: React.FC<TCustomThemeSelector> = observer((pro
             </div>
 
             <div className="flex flex-col items-start gap-2">
-              <h3 className="text-left text-sm font-medium text-custom-text-200">Text color</h3>
+              <h3 className="text-left text-sm font-medium text-custom-text-200">{t("text_color")}</h3>
               <div className="w-full">
                 <Controller
                   control={control}
                   name="text"
-                  rules={{ ...inputRules, required: "Text color is required" }}
+                  rules={{ ...inputRules, required: t("text_color_is_required") }}
                   render={({ field: { value, onChange } }) => (
                     <InputColorPicker
                       name="text"
@@ -147,12 +152,12 @@ export const CustomThemeSelector: React.FC<TCustomThemeSelector> = observer((pro
             </div>
 
             <div className="flex flex-col items-start gap-2">
-              <h3 className="text-left text-sm font-medium text-custom-text-200">Primary(Theme) color</h3>
+              <h3 className="text-left text-sm font-medium text-custom-text-200">{t("primary_color")}</h3>
               <div className="w-full">
                 <Controller
                   control={control}
                   name="primary"
-                  rules={{ ...inputRules, required: "Primary color is required" }}
+                  rules={{ ...inputRules, required: t("primary_color_is_required") }}
                   render={({ field: { value, onChange } }) => (
                     <InputColorPicker
                       name="primary"
@@ -173,12 +178,12 @@ export const CustomThemeSelector: React.FC<TCustomThemeSelector> = observer((pro
             </div>
 
             <div className="flex flex-col items-start gap-2">
-              <h3 className="text-left text-sm font-medium text-custom-text-200">Sidebar background color</h3>
+              <h3 className="text-left text-sm font-medium text-custom-text-200">{t("sidebar_background_color")}</h3>
               <div className="w-full">
                 <Controller
                   control={control}
                   name="sidebarBackground"
-                  rules={{ ...inputRules, required: "Sidebar background color is required" }}
+                  rules={{ ...inputRules, required: t("sidebar_background_color_is_required") }}
                   render={({ field: { value, onChange } }) => (
                     <InputColorPicker
                       name="sidebarBackground"
@@ -201,12 +206,12 @@ export const CustomThemeSelector: React.FC<TCustomThemeSelector> = observer((pro
             </div>
 
             <div className="flex flex-col items-start gap-2">
-              <h3 className="text-left text-sm font-medium text-custom-text-200">Sidebar text color</h3>
+              <h3 className="text-left text-sm font-medium text-custom-text-200">{t("sidebar_text_color")}</h3>
               <div className="w-full">
                 <Controller
                   control={control}
                   name="sidebarText"
-                  rules={{ ...inputRules, required: "Sidebar text color is required" }}
+                  rules={{ ...inputRules, required: t("sidebar_text_color_is_required") }}
                   render={({ field: { value, onChange } }) => (
                     <InputColorPicker
                       name="sidebarText"
@@ -230,9 +235,9 @@ export const CustomThemeSelector: React.FC<TCustomThemeSelector> = observer((pro
       </div>
       <div className="mt-5 flex justify-end gap-2">
         <Button variant="primary" type="submit" loading={isSubmitting}>
-          {isSubmitting ? "Creating Theme..." : "Set Theme"}
+          {isSubmitting ? t("creating_theme") : t("set_theme")}
         </Button>
       </div>
     </form>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/core/theme/theme-switch.tsx b/web/core/components/core/theme/theme-switch.tsx
index b79e2104eb2..6db67ef05c4 100644
--- a/web/core/components/core/theme/theme-switch.tsx
+++ b/web/core/components/core/theme/theme-switch.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { FC } from "react";
+import { useTranslation } from "@plane/i18n";
 // constants
 import { CustomSelect } from "@plane/ui";
 import { THEME_OPTIONS, I_THEME_OPTION } from "@/constants/themes";
@@ -13,7 +14,7 @@ type Props = {
 
 export const ThemeSwitch: FC<Props> = (props) => {
   const { value, onChange } = props;
-
+  const { t } = useTranslation();
   return (
     <CustomSelect
       value={value}
@@ -40,10 +41,10 @@ export const ThemeSwitch: FC<Props> = (props) => {
                 }}
               />
             </div>
-            {value.label}
+            {t(value.key)}
           </div>
         ) : (
-          "Select your theme"
+          t("select_your_theme")
         )
       }
       onChange={onChange}
@@ -72,10 +73,10 @@ export const ThemeSwitch: FC<Props> = (props) => {
                 }}
               />
             </div>
-            {themeOption.label}
+            {t(themeOption.key)}
           </div>
         </CustomSelect.Option>
       ))}
     </CustomSelect>
   );
-};
+};
\ No newline at end of file
diff --git a/web/core/components/cycles/applied-filters/date.tsx b/web/core/components/cycles/applied-filters/date.tsx
index 488eef12ce9..4e9121925f1 100644
--- a/web/core/components/cycles/applied-filters/date.tsx
+++ b/web/core/components/cycles/applied-filters/date.tsx
@@ -4,6 +4,7 @@ import { X } from "lucide-react";
 import { DATE_AFTER_FILTER_OPTIONS } from "@/constants/filters";
 import { renderFormattedDate } from "@/helpers/date-time.helper";
 import { capitalizeFirstLetter } from "@/helpers/string.helper";
+import { useTranslation } from "@plane/i18n";
 // constants
 
 type Props = {
@@ -14,13 +15,14 @@ type Props = {
 
 export const AppliedDateFilters: React.FC<Props> = observer((props) => {
   const { editable, handleRemove, values } = props;
+  const { t } = useTranslation();
 
   const getDateLabel = (value: string): string => {
     let dateLabel = "";
 
     const dateDetails = DATE_AFTER_FILTER_OPTIONS.find((d) => d.value === value);
 
-    if (dateDetails) dateLabel = dateDetails.name;
+    if (dateDetails) dateLabel = t(dateDetails.name);
     else {
       const dateParts = value.split(";");
 
diff --git a/web/core/components/cycles/dropdowns/filters/end-date.tsx b/web/core/components/cycles/dropdowns/filters/end-date.tsx
index e5b4a7a8639..40900846d74 100644
--- a/web/core/components/cycles/dropdowns/filters/end-date.tsx
+++ b/web/core/components/cycles/dropdowns/filters/end-date.tsx
@@ -8,6 +8,7 @@ import { FilterHeader, FilterOption } from "@/components/issues";
 import { DATE_AFTER_FILTER_OPTIONS } from "@/constants/filters";
 // helpers
 import { isInDateFormat } from "@/helpers/date-time.helper";
+import { useTranslation } from "@plane/i18n";
 
 type Props = {
   appliedFilters: string[] | null;
@@ -17,6 +18,7 @@ type Props = {
 
 export const FilterEndDate: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, searchQuery } = props;
+  const { t } = useTranslation();
 
   const [previewEnabled, setPreviewEnabled] = useState(true);
   const [isDateFilterModalOpen, setIsDateFilterModalOpen] = useState(false);
@@ -62,7 +64,7 @@ export const FilterEndDate: React.FC<Props> = observer((props) => {
                   key={option.value}
                   isChecked={appliedFilters?.includes(option.value) ? true : false}
                   onClick={() => handleUpdate(option.value)}
-                  title={option.name}
+                  title={t(option.name)}
                   multiple
                 />
               ))}
diff --git a/web/core/components/cycles/dropdowns/filters/start-date.tsx b/web/core/components/cycles/dropdowns/filters/start-date.tsx
index 9bfd8f2d8e2..466563976d3 100644
--- a/web/core/components/cycles/dropdowns/filters/start-date.tsx
+++ b/web/core/components/cycles/dropdowns/filters/start-date.tsx
@@ -8,6 +8,7 @@ import { FilterHeader, FilterOption } from "@/components/issues";
 import { DATE_AFTER_FILTER_OPTIONS } from "@/constants/filters";
 // helpers
 import { isInDateFormat } from "@/helpers/date-time.helper";
+import { useTranslation } from "@plane/i18n";
 
 type Props = {
   appliedFilters: string[] | null;
@@ -17,6 +18,7 @@ type Props = {
 
 export const FilterStartDate: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, searchQuery } = props;
+  const { t } = useTranslation();
 
   const [previewEnabled, setPreviewEnabled] = useState(true);
   const [isDateFilterModalOpen, setIsDateFilterModalOpen] = useState(false);
@@ -62,7 +64,7 @@ export const FilterStartDate: React.FC<Props> = observer((props) => {
                   key={option.value}
                   isChecked={appliedFilters?.includes(option.value) ? true : false}
                   onClick={() => handleUpdate(option.value)}
-                  title={option.name}
+                  title={t(option.name)}
                   multiple
                 />
               ))}
diff --git a/web/core/components/dashboard/home-dashboard-widgets.tsx b/web/core/components/dashboard/home-dashboard-widgets.tsx
index fe64278dc99..552244d9ee2 100644
--- a/web/core/components/dashboard/home-dashboard-widgets.tsx
+++ b/web/core/components/dashboard/home-dashboard-widgets.tsx
@@ -47,6 +47,8 @@ export const DashboardWidgets = observer(() => {
         const WidgetComponent = widget.component;
         // if the widget doesn't exist, return null
         if (!doesWidgetExist(key as TWidgetKeys)) return null;
+        // Disable recent_collaborators widget. Currently query to fetch this is not optimised
+        if (key === "recent_collaborators") return null;
         // if the widget is full width, return it in a 2 column grid
         if (widget.fullWidth)
           return (
diff --git a/web/core/components/dashboard/widgets/assigned-issues.tsx b/web/core/components/dashboard/widgets/assigned-issues.tsx
index 30bfbdad1b4..41ec71a948b 100644
--- a/web/core/components/dashboard/widgets/assigned-issues.tsx
+++ b/web/core/components/dashboard/widgets/assigned-issues.tsx
@@ -4,6 +4,7 @@ import Link from "next/link";
 import { Tab } from "@headlessui/react";
 import { TAssignedIssuesWidgetFilters, TAssignedIssuesWidgetResponse } from "@plane/types";
 // hooks
+import { useTranslation } from "@plane/i18n";
 import { Card } from "@plane/ui";
 import {
   DurationFilterDropdown,
@@ -25,6 +26,7 @@ const WIDGET_KEY = "assigned_issues";
 
 export const AssignedIssuesWidget: React.FC<WidgetProps> = observer((props) => {
   const { dashboardId, workspaceSlug } = props;
+  const { t } = useTranslation();
   // states
   const [fetching, setFetching] = useState(false);
   // store hooks
@@ -99,7 +101,7 @@ export const AssignedIssuesWidget: React.FC<WidgetProps> = observer((props) => {
                 href={`/${workspaceSlug}/workspace-views/assigned/${filterParams}`}
                 className="text-lg font-semibold text-custom-text-300 hover:underline"
               >
-                Assigned to you
+                {t("assigned_to_you")}
               </Link>
               <DurationFilterDropdown
                 customDates={selectedCustomDates}
diff --git a/web/core/components/dashboard/widgets/created-issues.tsx b/web/core/components/dashboard/widgets/created-issues.tsx
index 083318d3103..2ede7a520a1 100644
--- a/web/core/components/dashboard/widgets/created-issues.tsx
+++ b/web/core/components/dashboard/widgets/created-issues.tsx
@@ -3,6 +3,7 @@ import { observer } from "mobx-react";
 import Link from "next/link";
 import { Tab } from "@headlessui/react";
 import { TCreatedIssuesWidgetFilters, TCreatedIssuesWidgetResponse } from "@plane/types";
+import { useTranslation } from "@plane/i18n";
 // hooks
 import { Card } from "@plane/ui";
 import {
@@ -25,6 +26,7 @@ const WIDGET_KEY = "created_issues";
 
 export const CreatedIssuesWidget: React.FC<WidgetProps> = observer((props) => {
   const { dashboardId, workspaceSlug } = props;
+  const { t } = useTranslation();
   // states
   const [fetching, setFetching] = useState(false);
   // store hooks
@@ -96,7 +98,7 @@ export const CreatedIssuesWidget: React.FC<WidgetProps> = observer((props) => {
                 href={`/${workspaceSlug}/workspace-views/created/${filterParams}`}
                 className="text-lg font-semibold text-custom-text-300 hover:underline"
               >
-                Created by you
+                {t("created_by_you")}
               </Link>
               <DurationFilterDropdown
                 customDates={selectedCustomDates}
diff --git a/web/core/components/dashboard/widgets/issue-panels/issues-list.tsx b/web/core/components/dashboard/widgets/issue-panels/issues-list.tsx
index 2b31d8f27b3..d85b010de9b 100644
--- a/web/core/components/dashboard/widgets/issue-panels/issues-list.tsx
+++ b/web/core/components/dashboard/widgets/issue-panels/issues-list.tsx
@@ -4,6 +4,7 @@ import Link from "next/link";
 import { TAssignedIssuesWidgetResponse, TCreatedIssuesWidgetResponse, TIssue, TIssuesListTypes } from "@plane/types";
 // hooks
 // components
+import { useTranslation } from "@plane/i18n";
 import { Loader, getButtonStyling } from "@plane/ui";
 import {
   AssignedCompletedIssueListItem,
@@ -34,6 +35,7 @@ export type WidgetIssuesListProps = {
 
 export const WidgetIssuesList: React.FC<WidgetIssuesListProps> = (props) => {
   const { isLoading, tab, type, widgetStats, workspaceSlug } = props;
+  const { t } = useTranslation();
   // hooks
   const { isMobile } = usePlatformOS();
   const { handleRedirection } = useIssuePeekOverviewRedirection();
@@ -83,16 +85,16 @@ export const WidgetIssuesList: React.FC<WidgetIssuesListProps> = (props) => {
                   "col-span-9": type === "created" && tab === "completed",
                 })}
               >
-                Issues
+                {t("issues")}
                 <span className="flex-shrink-0 bg-custom-primary-100/20 text-custom-primary-100 text-xs font-medium rounded-xl px-2 flex items-center text-center justify-center">
                   {widgetStats.count}
                 </span>
               </h6>
-              <h6 className="text-center col-span-1">Priority</h6>
-              {["upcoming", "pending"].includes(tab) && <h6 className="text-center col-span-2">Due date</h6>}
-              {tab === "overdue" && <h6 className="text-center col-span-2">Due by</h6>}
-              {type === "assigned" && tab !== "completed" && <h6 className="text-center col-span-2">Blocked by</h6>}
-              {type === "created" && <h6 className="text-center col-span-2">Assigned to</h6>}
+              <h6 className="text-center col-span-1">{t("priority")}</h6>
+              {["upcoming", "pending"].includes(tab) && <h6 className="text-center col-span-2">{t("due_date")}</h6>}
+              {tab === "overdue" && <h6 className="text-center col-span-2">{t("due_by")}</h6>}
+              {type === "assigned" && tab !== "completed" && <h6 className="text-center col-span-2">{t("blocked_by")}</h6>}
+              {type === "created" && <h6 className="text-center col-span-2">{t("assigned_to")}</h6>}
             </div>
             <div className="pb-3 mt-2">
               {issuesList.map((issue) => {
@@ -126,7 +128,7 @@ export const WidgetIssuesList: React.FC<WidgetIssuesListProps> = (props) => {
             "w-min my-3 mx-auto py-1 px-2 text-xs hover:bg-custom-primary-100/20"
           )}
         >
-          View all issues
+          {t("view_all_issues")}
         </Link>
       )}
     </>
diff --git a/web/core/components/dashboard/widgets/issue-panels/tabs-list.tsx b/web/core/components/dashboard/widgets/issue-panels/tabs-list.tsx
index d2b7df8ed0f..f40e0bfa72f 100644
--- a/web/core/components/dashboard/widgets/issue-panels/tabs-list.tsx
+++ b/web/core/components/dashboard/widgets/issue-panels/tabs-list.tsx
@@ -6,6 +6,7 @@ import { EDurationFilters, FILTERED_ISSUES_TABS_LIST, UNFILTERED_ISSUES_TABS_LIS
 import { cn } from "@/helpers/common.helper";
 // types
 // constants
+import { useTranslation } from "@plane/i18n";
 
 type Props = {
   durationFilter: EDurationFilters;
@@ -13,6 +14,7 @@ type Props = {
 };
 
 export const TabsList: React.FC<Props> = observer((props) => {
+  const { t } = useTranslation();
   const { durationFilter, selectedTab } = props;
 
   const tabsList = durationFilter === "none" ? UNFILTERED_ISSUES_TABS_LIST : FILTERED_ISSUES_TABS_LIST;
@@ -53,7 +55,7 @@ export const TabsList: React.FC<Props> = observer((props) => {
             }
           )}
         >
-          <span className="scale-110">{tab.label}</span>
+          <span className="scale-110">{t(tab.key)}</span>
         </Tab>
       ))}
     </Tab.List>
diff --git a/web/core/components/dashboard/widgets/issues-by-priority.tsx b/web/core/components/dashboard/widgets/issues-by-priority.tsx
index 9da47bc8481..47fbaefeb70 100644
--- a/web/core/components/dashboard/widgets/issues-by-priority.tsx
+++ b/web/core/components/dashboard/widgets/issues-by-priority.tsx
@@ -3,6 +3,7 @@ import { observer } from "mobx-react";
 import Link from "next/link";
 // types
 import { TIssuesByPriorityWidgetFilters, TIssuesByPriorityWidgetResponse } from "@plane/types";
+import { useTranslation } from "@plane/i18n";
 // components
 import { Card } from "@plane/ui";
 import {
@@ -24,6 +25,7 @@ const WIDGET_KEY = "issues_by_priority";
 
 export const IssuesByPriorityWidget: React.FC<WidgetProps> = observer((props) => {
   const { dashboardId, workspaceSlug } = props;
+  const { t } = useTranslation();
   // router
   const router = useAppRouter();
   // store hooks
@@ -76,7 +78,7 @@ export const IssuesByPriorityWidget: React.FC<WidgetProps> = observer((props) =>
           href={`/${workspaceSlug}/workspace-views/assigned`}
           className="text-lg font-semibold text-custom-text-300 hover:underline"
         >
-          Assigned by priority
+          {t("assigned_by_priority")}
         </Link>
         <DurationFilterDropdown
           customDates={selectedCustomDates}
diff --git a/web/core/components/dashboard/widgets/issues-by-state-group.tsx b/web/core/components/dashboard/widgets/issues-by-state-group.tsx
index 53437ca1185..da836862b07 100644
--- a/web/core/components/dashboard/widgets/issues-by-state-group.tsx
+++ b/web/core/components/dashboard/widgets/issues-by-state-group.tsx
@@ -4,6 +4,7 @@ import Link from "next/link";
 // types
 import { TIssuesByStateGroupsWidgetFilters, TIssuesByStateGroupsWidgetResponse, TStateGroups } from "@plane/types";
 // components
+import { useTranslation } from "@plane/i18n";
 import { Card } from "@plane/ui";
 import {
   DurationFilterDropdown,
@@ -25,6 +26,7 @@ const WIDGET_KEY = "issues_by_state_groups";
 
 export const IssuesByStateGroupWidget: React.FC<WidgetProps> = observer((props) => {
   const { dashboardId, workspaceSlug } = props;
+  const { t } = useTranslation();
   // states
   const [defaultStateGroup, setDefaultStateGroup] = useState<TStateGroups | null>(null);
   const [activeStateGroup, setActiveStateGroup] = useState<TStateGroups | null>(null);
@@ -128,7 +130,7 @@ export const IssuesByStateGroupWidget: React.FC<WidgetProps> = observer((props)
           dominantBaseline="central"
           className="text-sm font-medium fill-custom-text-300 capitalize"
         >
-          {data?.id}
+          {data.id ? t(data.id) : ""}
         </text>
       </g>
     );
@@ -141,7 +143,7 @@ export const IssuesByStateGroupWidget: React.FC<WidgetProps> = observer((props)
           href={`/${workspaceSlug}/workspace-views/assigned`}
           className="text-lg font-semibold text-custom-text-300 hover:underline"
         >
-          Assigned by state
+          {t("assigned_by_state")}
         </Link>
         <DurationFilterDropdown
           customDates={selectedCustomDates}
@@ -203,7 +205,7 @@ export const IssuesByStateGroupWidget: React.FC<WidgetProps> = observer((props)
                         backgroundColor: item.color,
                       }}
                     />
-                    <span className="text-custom-text-300 text-sm font-medium capitalize">{item.label}</span>
+                    <span className="text-custom-text-300 text-sm font-medium capitalize">{t(item.label)}</span>
                   </div>
                   <span className="text-custom-text-400 text-sm">{item.value.toFixed(0)}%</span>
                 </div>
diff --git a/web/core/components/dashboard/widgets/overview-stats.tsx b/web/core/components/dashboard/widgets/overview-stats.tsx
index 62200102777..7c7e8d17329 100644
--- a/web/core/components/dashboard/widgets/overview-stats.tsx
+++ b/web/core/components/dashboard/widgets/overview-stats.tsx
@@ -3,6 +3,7 @@ import { observer } from "mobx-react";
 import Link from "next/link";
 import { TOverviewStatsWidgetResponse } from "@plane/types";
 // hooks
+import { useTranslation } from "@plane/i18n";
 import { Card, ECardSpacing } from "@plane/ui";
 import { WidgetLoader } from "@/components/dashboard/widgets";
 import { cn } from "@/helpers/common.helper";
@@ -21,6 +22,7 @@ const WIDGET_KEY = "overview_stats";
 
 export const OverviewStatsWidget: React.FC<WidgetProps> = observer((props) => {
   const { dashboardId, workspaceSlug } = props;
+  const { t } = useTranslation();
   // store hooks
   const { fetchWidgetStats, getWidgetStats } = useDashboard();
   // derived values
@@ -30,27 +32,27 @@ export const OverviewStatsWidget: React.FC<WidgetProps> = observer((props) => {
   const STATS_LIST = [
     {
       key: "assigned",
-      title: "Issues assigned",
+      title: t("issues_assigned"),
       count: widgetStats?.assigned_issues_count,
       link: `/${workspaceSlug}/workspace-views/assigned`,
     },
     {
       key: "overdue",
-      title: "Issues overdue",
+      title: t("issues_overdue"),
       count: widgetStats?.pending_issues_count,
       link: `/${workspaceSlug}/workspace-views/assigned/?state_group=backlog,unstarted,started&target_date=${today};before`,
     },
     {
       key: "created",
-      title: "Issues created",
+      title: t("issues_created"),
       count: widgetStats?.created_issues_count,
       link: `/${workspaceSlug}/workspace-views/created`,
     },
     {
       key: "completed",
-      title: "Issues completed",
+      title: t("issues_completed"),
       count: widgetStats?.completed_issues_count,
-      link: `/${workspaceSlug}/workspace-views/assigned?state_group=completed`,
+      link: `/${workspaceSlug}/workspace-views/completed`,
     },
   ];
 
diff --git a/web/core/components/dashboard/widgets/recent-activity.tsx b/web/core/components/dashboard/widgets/recent-activity.tsx
index dd21815ccce..3e94702d575 100644
--- a/web/core/components/dashboard/widgets/recent-activity.tsx
+++ b/web/core/components/dashboard/widgets/recent-activity.tsx
@@ -7,6 +7,7 @@ import { History } from "lucide-react";
 // types
 import { TRecentActivityWidgetResponse } from "@plane/types";
 // components
+import { useTranslation } from "@plane/i18n";
 import { Card, Avatar, getButtonStyling } from "@plane/ui";
 import { ActivityIcon, ActivityMessage, IssueLink } from "@/components/core";
 import { RecentActivityEmptyState, WidgetLoader, WidgetProps } from "@/components/dashboard/widgets";
@@ -21,6 +22,7 @@ const WIDGET_KEY = "recent_activity";
 
 export const RecentActivityWidget: React.FC<WidgetProps> = observer((props) => {
   const { dashboardId, workspaceSlug } = props;
+  const { t } = useTranslation();
   // store hooks
   const { data: currentUser } = useUser();
   // derived values
@@ -40,7 +42,7 @@ export const RecentActivityWidget: React.FC<WidgetProps> = observer((props) => {
   return (
     <Card>
       <Link href={redirectionLink} className="text-lg font-semibold text-custom-text-300 hover:underline mb-4">
-        Your issue activities
+        {t("your_issue_activities")}
       </Link>
       {widgetStats.length > 0 ? (
         <div className="mt-4 space-y-6">
@@ -96,7 +98,7 @@ export const RecentActivityWidget: React.FC<WidgetProps> = observer((props) => {
               "mx-auto w-min px-2 py-1 text-xs hover:bg-custom-primary-100/20"
             )}
           >
-            View all
+            {t("view_all")}
           </Link>
         </div>
       ) : (
diff --git a/web/core/components/dashboard/widgets/recent-collaborators/collaborators-list.tsx b/web/core/components/dashboard/widgets/recent-collaborators/collaborators-list.tsx
index 2dc1f0d3d99..a2d613a04c4 100644
--- a/web/core/components/dashboard/widgets/recent-collaborators/collaborators-list.tsx
+++ b/web/core/components/dashboard/widgets/recent-collaborators/collaborators-list.tsx
@@ -7,6 +7,7 @@ import useSWR from "swr";
 // types
 import { TRecentCollaboratorsWidgetResponse } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Avatar } from "@plane/ui";
 // helpers
 import { getFileURL } from "@/helpers/file.helper";
@@ -63,6 +64,7 @@ const WIDGET_KEY = "recent_collaborators";
 
 export const CollaboratorsList: React.FC<CollaboratorsListProps> = (props) => {
   const { dashboardId, searchQuery = "", workspaceSlug } = props;
+  const { t } = useTranslation();
 
   // state
   const [visibleItems, setVisibleItems] = useState(16);
@@ -146,7 +148,7 @@ export const CollaboratorsList: React.FC<CollaboratorsListProps> = (props) => {
       )}
       {isExpanded && (
         <div className="py-4 flex justify-center items-center text-sm font-medium" onClick={handleHide}>
-          <div className="text-custom-primary-90 hover:text-custom-primary-100 transition-all cursor-pointer">Hide</div>
+          <div className="text-custom-primary-90 hover:text-custom-primary-100 transition-all cursor-pointer">{t("hide")}</div>
         </div>
       )}
     </>
diff --git a/web/core/components/dashboard/widgets/recent-collaborators/root.tsx b/web/core/components/dashboard/widgets/recent-collaborators/root.tsx
index 4d30642071b..572362da3c4 100644
--- a/web/core/components/dashboard/widgets/recent-collaborators/root.tsx
+++ b/web/core/components/dashboard/widgets/recent-collaborators/root.tsx
@@ -1,6 +1,7 @@
 import { useState } from "react";
 import { Search } from "lucide-react";
 // types
+import { useTranslation } from "@plane/i18n";
 import { Card } from "@plane/ui";
 import { WidgetProps } from "@/components/dashboard/widgets";
 // components
@@ -8,6 +9,7 @@ import { CollaboratorsList } from "./collaborators-list";
 
 export const RecentCollaboratorsWidget: React.FC<WidgetProps> = (props) => {
   const { dashboardId, workspaceSlug } = props;
+  const { t } = useTranslation();
   // states
   const [searchQuery, setSearchQuery] = useState("");
 
@@ -15,7 +17,7 @@ export const RecentCollaboratorsWidget: React.FC<WidgetProps> = (props) => {
     <Card>
       <div className="flex flex-col sm:flex-row items-start justify-between mb-6">
         <div>
-          <h4 className="text-lg font-semibold text-custom-text-300">Collaborators</h4>
+          <h4 className="text-lg font-semibold text-custom-text-300">{t("collaborators")}</h4>
           <p className="mt-2 text-xs font-medium text-custom-text-300">
             View and find all members you collaborate with across projects
           </p>
@@ -24,7 +26,7 @@ export const RecentCollaboratorsWidget: React.FC<WidgetProps> = (props) => {
           <Search className="h-3.5 w-3.5 text-custom-text-400" />
           <input
             className="w-full border-none bg-transparent text-sm focus:outline-none"
-            placeholder="Search for collaborators"
+            placeholder={t("search_for_collaborators")}
             value={searchQuery}
             onChange={(e) => setSearchQuery(e.target.value)}
           />
diff --git a/web/core/components/dashboard/widgets/recent-projects.tsx b/web/core/components/dashboard/widgets/recent-projects.tsx
index 5255908717e..37a1f811b4c 100644
--- a/web/core/components/dashboard/widgets/recent-projects.tsx
+++ b/web/core/components/dashboard/widgets/recent-projects.tsx
@@ -3,10 +3,11 @@
 import { useEffect } from "react";
 import { observer } from "mobx-react";
 import Link from "next/link";
-import { Plus } from "lucide-react";
+// import { Plus } from "lucide-react";
 // plane types
 import { TRecentProjectsWidgetResponse } from "@plane/types";
 // plane ui
+import { useTranslation } from "@plane/i18n";
 import { Avatar, AvatarGroup, Card } from "@plane/ui";
 // components
 import { Logo } from "@/components/common";
@@ -68,6 +69,7 @@ const ProjectListItem: React.FC<ProjectListItemProps> = observer((props) => {
 
 export const RecentProjectsWidget: React.FC<WidgetProps> = observer((props) => {
   const { dashboardId, workspaceSlug } = props;
+  const { t } = useTranslation();
   // store hooks
   const { toggleCreateProjectModal } = useCommandPalette();
   const { setTrackElement } = useEventTracker();
@@ -95,10 +97,10 @@ export const RecentProjectsWidget: React.FC<WidgetProps> = observer((props) => {
         href={`/${workspaceSlug}/projects`}
         className="text-lg font-semibold text-custom-text-300 hover:underline mb-4"
       >
-        Recent projects
+        {t("recent_projects")}
       </Link>
       <div className="mt-4 space-y-8">
-        {canCreateProject && (
+        {/* {canCreateProject && (
           <button
             type="button"
             className="group flex items-center gap-8"
@@ -113,10 +115,10 @@ export const RecentProjectsWidget: React.FC<WidgetProps> = observer((props) => {
               <Plus className="h-6 w-6" />
             </div>
             <p className="text-sm font-medium text-custom-text-300 group-hover:text-custom-text-100 group-hover:underline">
-              Create new project
+              {t("create_new_project")}
             </p>
           </button>
-        )}
+        )} */}
         {widgetStats.map((projectId) => (
           <ProjectListItem key={projectId} projectId={projectId} workspaceSlug={workspaceSlug} />
         ))}
diff --git a/web/core/components/dropdowns/member/index.tsx b/web/core/components/dropdowns/member/index.tsx
index f905bc27b2a..b0b3e802902 100644
--- a/web/core/components/dropdowns/member/index.tsx
+++ b/web/core/components/dropdowns/member/index.tsx
@@ -1,6 +1,7 @@
 import { useRef, useState } from "react";
 import { observer } from "mobx-react";
 import { ChevronDown, LucideIcon } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { ComboDropDown } from "@plane/ui";
 // helpers
@@ -26,6 +27,7 @@ type Props = {
 } & MemberDropdownProps;
 
 export const MemberDropdown: React.FC<Props> = observer((props) => {
+  const { t } = useTranslation();
   const {
     button,
     buttonClassName,
@@ -40,7 +42,7 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
     multiple,
     onChange,
     onClose,
-    placeholder = "Members",
+    placeholder = t("members"),
     tooltipContent,
     placement,
     projectId,
@@ -86,7 +88,7 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
         if (value.length === 1) {
           return getUserDetails(value[0])?.display_name || placeholder;
         } else {
-          return showUserDetails ? `${value.length} members` : "";
+          return showUserDetails ? `${value.length} ${t("members").toLocaleLowerCase()}` : "";
         }
       } else {
         return placeholder;
@@ -131,7 +133,9 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
             className={cn("text-xs", buttonClassName)}
             isActive={isOpen}
             tooltipHeading={placeholder}
-            tooltipContent={tooltipContent ?? `${value?.length ?? 0} assignee${value?.length !== 1 ? "s" : ""}`}
+            tooltipContent={
+              tooltipContent ?? `${value?.length ?? 0} ${value?.length !== 1 ? t("assignees") : t("assignee")}`
+            }
             showTooltip={showTooltip}
             variant={buttonVariant}
             renderToolTipByDefault={renderByDefault}
@@ -174,4 +178,4 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
       )}
     </ComboDropDown>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/dropdowns/member/member-options.tsx b/web/core/components/dropdowns/member/member-options.tsx
index a2283fa4bc2..7b5b04fc4ca 100644
--- a/web/core/components/dropdowns/member/member-options.tsx
+++ b/web/core/components/dropdowns/member/member-options.tsx
@@ -8,6 +8,7 @@ import { createPortal } from "react-dom";
 import { usePopper } from "react-popper";
 import { Check, Search } from "lucide-react";
 import { Combobox } from "@headlessui/react";
+import { useTranslation } from "@plane/i18n";
 // plane ui
 import { Avatar } from "@plane/ui";
 // helpers
@@ -34,6 +35,7 @@ export const MemberOptions: React.FC<Props> = observer((props: Props) => {
   // refs
   const inputRef = useRef<HTMLInputElement | null>(null);
   // store hooks
+  const { t } = useTranslation();
   const { workspaceSlug } = useParams();
   const {
     getUserDetails,
@@ -85,7 +87,7 @@ export const MemberOptions: React.FC<Props> = observer((props: Props) => {
       content: (
         <div className="flex items-center gap-2">
           <Avatar name={userDetails?.display_name} src={getFileURL(userDetails?.avatar_url ?? "")} />
-          <span className="flex-grow truncate">{currentUser?.id === userId ? "You" : userDetails?.display_name}</span>
+          <span className="flex-grow truncate">{currentUser?.id === userId ? t("you") : userDetails?.display_name}</span>
         </div>
       ),
     };
@@ -115,7 +117,7 @@ export const MemberOptions: React.FC<Props> = observer((props: Props) => {
             className="w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none"
             value={query}
             onChange={(e) => setQuery(e.target.value)}
-            placeholder="Search"
+            placeholder={t("search")}
             displayValue={(assigned: any) => assigned?.name}
             onKeyDown={searchInputKeyDown}
           />
@@ -142,14 +144,14 @@ export const MemberOptions: React.FC<Props> = observer((props: Props) => {
                 </Combobox.Option>
               ))
             ) : (
-              <p className="px-1.5 py-1 italic text-custom-text-400">No matching results</p>
+              <p className="px-1.5 py-1 italic text-custom-text-400">{t("no_matching_results")}</p>
             )
           ) : (
-            <p className="px-1.5 py-1 italic text-custom-text-400">Loading...</p>
+            <p className="px-1.5 py-1 italic text-custom-text-400">{t("loading")}</p>
           )}
         </div>
       </div>
     </Combobox.Options>,
     document.body
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/dropdowns/priority.tsx b/web/core/components/dropdowns/priority.tsx
index ee11679156c..621bad38b95 100644
--- a/web/core/components/dropdowns/priority.tsx
+++ b/web/core/components/dropdowns/priority.tsx
@@ -5,6 +5,7 @@ import { useTheme } from "next-themes";
 import { usePopper } from "react-popper";
 import { Check, ChevronDown, Search, SignalHigh } from "lucide-react";
 import { Combobox } from "@headlessui/react";
+import { useTranslation } from "@plane/i18n";
 // types
 import { TIssuePriorities } from "@plane/types";
 // ui
@@ -71,11 +72,12 @@ const BorderButton = (props: ButtonProps) => {
   };
 
   const { isMobile } = usePlatformOS();
+  const { t } = useTranslation();
 
   return (
     <Tooltip
-      tooltipHeading="Priority"
-      tooltipContent={priorityDetails?.title ?? "None"}
+      tooltipHeading={t("priority")}
+      tooltipContent={t(priorityDetails?.key ?? "none")}
       disabled={!showTooltip}
       isMobile={isMobile}
       renderByDefault={renderToolTipByDefault}
@@ -119,7 +121,7 @@ const BorderButton = (props: ButtonProps) => {
           ) : (
             <SignalHigh className="size-3" />
           ))}
-        {!hideText && <span className="flex-grow truncate">{priorityDetails?.title ?? placeholder}</span>}
+        {!hideText && <span className="flex-grow truncate">{t(priorityDetails?.key ?? "priority") ?? placeholder}</span>}
         {dropdownArrow && (
           <ChevronDown className={cn("h-2.5 w-2.5 flex-shrink-0", dropdownArrowClassName)} aria-hidden="true" />
         )}
@@ -153,11 +155,12 @@ const BackgroundButton = (props: ButtonProps) => {
   };
 
   const { isMobile } = usePlatformOS();
+  const { t } = useTranslation();
 
   return (
     <Tooltip
-      tooltipHeading="Priority"
-      tooltipContent={priorityDetails?.title ?? "None"}
+      tooltipHeading={t("priority")}
+      tooltipContent={t(priorityDetails?.key ?? "none")}
       disabled={!showTooltip}
       isMobile={isMobile}
       renderByDefault={renderToolTipByDefault}
@@ -201,7 +204,7 @@ const BackgroundButton = (props: ButtonProps) => {
           ) : (
             <SignalHigh className="size-3" />
           ))}
-        {!hideText && <span className="flex-grow truncate">{priorityDetails?.title ?? placeholder}</span>}
+        {!hideText && <span className="flex-grow truncate">{t(priorityDetails?.key ?? "priority") ?? placeholder}</span>}
         {dropdownArrow && (
           <ChevronDown className={cn("h-2.5 w-2.5 flex-shrink-0", dropdownArrowClassName)} aria-hidden="true" />
         )}
@@ -236,11 +239,12 @@ const TransparentButton = (props: ButtonProps) => {
   };
 
   const { isMobile } = usePlatformOS();
+  const { t } = useTranslation();
 
   return (
     <Tooltip
-      tooltipHeading="Priority"
-      tooltipContent={priorityDetails?.title ?? "None"}
+      tooltipHeading={t("priority")}
+      tooltipContent={t(priorityDetails?.key ?? "none")}
       disabled={!showTooltip}
       isMobile={isMobile}
       renderByDefault={renderToolTipByDefault}
@@ -285,7 +289,7 @@ const TransparentButton = (props: ButtonProps) => {
           ) : (
             <SignalHigh className="size-3" />
           ))}
-        {!hideText && <span className="flex-grow truncate">{priorityDetails?.title ?? placeholder}</span>}
+        {!hideText && <span className="flex-grow truncate">{t(priorityDetails?.key ?? "priority") ?? placeholder}</span>}
         {dropdownArrow && (
           <ChevronDown className={cn("h-2.5 w-2.5 flex-shrink-0", dropdownArrowClassName)} aria-hidden="true" />
         )}
@@ -336,6 +340,8 @@ export const PriorityDropdown: React.FC<Props> = (props) => {
       },
     ],
   });
+  //hooks
+  const { t } = useTranslation();
   // next-themes
   // TODO: remove this after new theming implementation
   const { resolvedTheme } = useTheme();
@@ -346,7 +352,7 @@ export const PriorityDropdown: React.FC<Props> = (props) => {
     content: (
       <div className="flex items-center gap-2">
         <PriorityIcon priority={priority.key} size={14} withContainer />
-        <span className="flex-grow truncate">{priority.title}</span>
+        <span className="flex-grow truncate">{t(priority.key)}</span>
       </div>
     ),
   }));
@@ -456,7 +462,7 @@ export const PriorityDropdown: React.FC<Props> = (props) => {
                 className="w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none"
                 value={query}
                 onChange={(e) => setQuery(e.target.value)}
-                placeholder="Search"
+                placeholder={t("search")}
                 displayValue={(assigned: any) => assigned?.name}
                 onKeyDown={searchInputKeyDown}
               />
@@ -482,7 +488,7 @@ export const PriorityDropdown: React.FC<Props> = (props) => {
                   </Combobox.Option>
                 ))
               ) : (
-                <p className="text-custom-text-400 italic py-1 px-1.5">No matching results</p>
+                <p className="text-custom-text-400 italic py-1 px-1.5">{t("no_matching_results")}</p>
               )}
             </div>
           </div>
@@ -490,4 +496,4 @@ export const PriorityDropdown: React.FC<Props> = (props) => {
       )}
     </ComboDropDown>
   );
-};
+};
\ No newline at end of file
diff --git a/web/core/components/dropdowns/project.tsx b/web/core/components/dropdowns/project.tsx
index 3f973cd1618..2e8a38c45f4 100644
--- a/web/core/components/dropdowns/project.tsx
+++ b/web/core/components/dropdowns/project.tsx
@@ -4,6 +4,7 @@ import { usePopper } from "react-popper";
 import { Check, ChevronDown, Search } from "lucide-react";
 import { Combobox } from "@headlessui/react";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { ComboDropDown } from "@plane/ui";
 // components
 import { Logo } from "@/components/common";
@@ -76,7 +77,7 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {
   });
   // store hooks
   const { joinedProjectIds, getProjectById } = useProject();
-
+  const { t } = useTranslation();
   const options = joinedProjectIds?.map((projectId) => {
     const projectDetails = getProjectById(projectId);
     if (renderCondition && projectDetails && !renderCondition(projectDetails)) return;
@@ -198,7 +199,7 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {
                 className="w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none"
                 value={query}
                 onChange={(e) => setQuery(e.target.value)}
-                placeholder="Search"
+                placeholder={t("search")}
                 displayValue={(assigned: any) => assigned?.name}
                 onKeyDown={searchInputKeyDown}
               />
@@ -228,10 +229,10 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {
                     );
                   })
                 ) : (
-                  <p className="text-custom-text-400 italic py-1 px-1.5">No matching results</p>
+                  <p className="text-custom-text-400 italic py-1 px-1.5">{t("no_matching_results")}</p>
                 )
               ) : (
-                <p className="text-custom-text-400 italic py-1 px-1.5">Loading...</p>
+                <p className="text-custom-text-400 italic py-1 px-1.5">{t("loading")}</p>
               )}
             </div>
           </div>
@@ -239,4 +240,4 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {
       )}
     </ComboDropDown>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/dropdowns/state.tsx b/web/core/components/dropdowns/state.tsx
index c139d23c904..4713d75fe4e 100644
--- a/web/core/components/dropdowns/state.tsx
+++ b/web/core/components/dropdowns/state.tsx
@@ -6,6 +6,7 @@ import { useParams } from "next/navigation";
 import { usePopper } from "react-popper";
 import { Check, ChevronDown, Search } from "lucide-react";
 import { Combobox } from "@headlessui/react";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { ComboDropDown, Spinner, StateGroupIcon } from "@plane/ui";
 // helpers
@@ -76,6 +77,7 @@ export const StateDropdown: React.FC<Props> = observer((props) => {
     ],
   });
   // store hooks
+  const { t } = useTranslation();
   const { workspaceSlug } = useParams();
   const { fetchProjectStates, getProjectStates, getStateById } = useProjectState();
   const statesList = getProjectStates(projectId);
@@ -157,8 +159,8 @@ export const StateDropdown: React.FC<Props> = observer((props) => {
           <DropdownButton
             className={buttonClassName}
             isActive={isOpen}
-            tooltipHeading="State"
-            tooltipContent={selectedState?.name ?? "State"}
+            tooltipHeading={t("state")}
+            tooltipContent={selectedState?.name ?? t("state")}
             showTooltip={showTooltip}
             variant={buttonVariant}
             renderToolTipByDefault={renderByDefault}
@@ -175,7 +177,7 @@ export const StateDropdown: React.FC<Props> = observer((props) => {
                   />
                 )}
                 {BUTTON_VARIANTS_WITH_TEXT.includes(buttonVariant) && (
-                  <span className="flex-grow truncate">{selectedState?.name ?? "State"}</span>
+                  <span className="flex-grow truncate">{selectedState?.name ?? t("state")}</span>
                 )}
                 {dropdownArrow && (
                   <ChevronDown className={cn("h-2.5 w-2.5 flex-shrink-0", dropdownArrowClassName)} aria-hidden="true" />
@@ -244,10 +246,10 @@ export const StateDropdown: React.FC<Props> = observer((props) => {
                     </Combobox.Option>
                   ))
                 ) : (
-                  <p className="px-1.5 py-1 italic text-custom-text-400">No matches found</p>
+                  <p className="px-1.5 py-1 italic text-custom-text-400">{t("no_matching_results")}</p>
                 )
               ) : (
-                <p className="px-1.5 py-1 italic text-custom-text-400">Loading...</p>
+                <p className="px-1.5 py-1 italic text-custom-text-400">{t("loading")}</p>
               )}
             </div>
           </div>
@@ -255,4 +257,4 @@ export const StateDropdown: React.FC<Props> = observer((props) => {
       )}
     </ComboDropDown>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/editor/lite-text-editor/lite-text-editor.tsx b/web/core/components/editor/lite-text-editor/lite-text-editor.tsx
index 3e64e83a334..2292129fbb0 100644
--- a/web/core/components/editor/lite-text-editor/lite-text-editor.tsx
+++ b/web/core/components/editor/lite-text-editor/lite-text-editor.tsx
@@ -15,6 +15,7 @@ import { isCommentEmpty } from "@/helpers/string.helper";
 import { useMember, useMention, useUser } from "@/hooks/store";
 // plane web hooks
 import { useFileSize } from "@/plane-web/hooks/use-file-size";
+import { useTranslation } from "@plane/i18n";
 
 interface LiteTextEditorWrapperProps extends Omit<ILiteTextEditor, "fileHandler" | "mentionHandler"> {
   workspaceSlug: string;
@@ -29,6 +30,7 @@ interface LiteTextEditorWrapperProps extends Omit<ILiteTextEditor, "fileHandler"
 }
 
 export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapperProps>((props, ref) => {
+  const { t } = useTranslation();
   const {
     containerClassName,
     workspaceSlug,
@@ -39,10 +41,11 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp
     showAccessSpecifier = false,
     showSubmitButton = true,
     isSubmitting = false,
-    placeholder = "Add comment...",
+    placeholder = t("Add comment..."),
     uploadFile,
     ...rest
   } = props;
+  
   // store hooks
   const { data: currentUser } = useUser();
   const {
@@ -83,7 +86,7 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp
           highlights: mentionHighlights,
           suggestions: mentionSuggestions,
         }}
-        placeholder={placeholder}
+        placeholder= {placeholder}
         containerClassName={cn(containerClassName, "relative")}
         {...rest}
       />
diff --git a/web/core/components/editor/lite-text-editor/toolbar.tsx b/web/core/components/editor/lite-text-editor/toolbar.tsx
index ecf8c3283c8..2d85c19e846 100644
--- a/web/core/components/editor/lite-text-editor/toolbar.tsx
+++ b/web/core/components/editor/lite-text-editor/toolbar.tsx
@@ -5,6 +5,7 @@ import { Globe2, Lock, LucideIcon } from "lucide-react";
 // editor
 import { EditorRefApi, TEditorCommands, TNonColorEditorCommands } from "@plane/editor";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Button, Tooltip } from "@plane/ui";
 // constants
 import { TOOLBAR_ITEMS } from "@/constants/editor";
@@ -57,6 +58,7 @@ export const IssueCommentToolbar: React.FC<Props> = (props) => {
     showSubmitButton,
     editorRef,
   } = props;
+  const { t } = useTranslation();
 
   // State to manage active states of toolbar items
   const [activeStates, setActiveStates] = useState<Record<string, boolean>>({});
@@ -164,7 +166,7 @@ export const IssueCommentToolbar: React.FC<Props> = (props) => {
               disabled={isCommentEmpty}
               loading={isSubmitting}
             >
-              Comment
+              {t("comment")}
             </Button>
           </div>
         )}
diff --git a/web/core/components/gantt-chart/chart/header.tsx b/web/core/components/gantt-chart/chart/header.tsx
index 5a8f4bb65ad..c3e1106d910 100644
--- a/web/core/components/gantt-chart/chart/header.tsx
+++ b/web/core/components/gantt-chart/chart/header.tsx
@@ -1,6 +1,7 @@
 import { observer } from "mobx-react";
 import { Expand, Shrink } from "lucide-react";
 // plane
+import { useTranslation } from "@plane/i18n";
 import { Row } from "@plane/ui";
 // components
 import { VIEWS_LIST } from "@/components/gantt-chart/data";
@@ -25,6 +26,7 @@ type Props = {
 export const GanttChartHeader: React.FC<Props> = observer((props) => {
   const { blockIds, fullScreenMode, handleChartView, handleToday, loaderTitle, toggleFullScreenMode, showToday } =
     props;
+  const { t } = useTranslation();
   // chart hook
   const { currentView } = useTimeLineChartStore();
 
@@ -49,7 +51,7 @@ export const GanttChartHeader: React.FC<Props> = observer((props) => {
             })}
             onClick={() => handleChartView(chartView?.key)}
           >
-            {chartView?.title}
+            {t(chartView?.key)}
           </div>
         ))}
       </div>
@@ -60,7 +62,7 @@ export const GanttChartHeader: React.FC<Props> = observer((props) => {
           className="rounded-sm p-1 px-2 text-xs hover:bg-custom-background-80"
           onClick={handleToday}
         >
-          Today
+         {t("today")}
         </button>
       )}
 
diff --git a/web/core/components/gantt-chart/chart/views/month.tsx b/web/core/components/gantt-chart/chart/views/month.tsx
index 583d271de6c..4dc425894b2 100644
--- a/web/core/components/gantt-chart/chart/views/month.tsx
+++ b/web/core/components/gantt-chart/chart/views/month.tsx
@@ -9,8 +9,11 @@ import { useTimeLineChartStore } from "@/hooks/use-timeline-chart";
 // types
 import { IMonthView } from "../../views";
 import { getNumberOfDaysBetweenTwoDates } from "../../views/helpers";
+import { useTranslation } from "@plane/i18n";
+import { MONTHS_LIST } from "@/constants/calendar";
 
 export const MonthChartView: FC<any> = observer(() => {
+  const { t } = useTranslation();
   // chart hook
   const { currentViewData, renderView } = useTimeLineChartStore();
   const monthView: IMonthView = renderView;
@@ -49,10 +52,10 @@ export const MonthChartView: FC<any> = observer(() => {
                       left: `${SIDEBAR_WIDTH}px`,
                     }}
                   >
-                    {monthBlock?.title}
+                    {t(MONTHS_LIST[monthBlock?.month + 1].title)} {monthBlock?.year}
                     {monthBlock.today && (
                       <span className={cn("rounded ml-2 font-medium bg-custom-primary-100 px-1 text-2xs text-white")}>
-                        Current
+                        {t("current")}
                       </span>
                     )}
                   </div>
diff --git a/web/core/components/gantt-chart/sidebar/root.tsx b/web/core/components/gantt-chart/sidebar/root.tsx
index 31c9137cc5a..68f9974a5b5 100644
--- a/web/core/components/gantt-chart/sidebar/root.tsx
+++ b/web/core/components/gantt-chart/sidebar/root.tsx
@@ -1,6 +1,7 @@
 import { RefObject } from "react";
 import { observer } from "mobx-react";
 // components
+import { useTranslation } from "@plane/i18n";
 import { Row, ERowVariant } from "@plane/ui";
 import { MultipleSelectGroupAction } from "@/components/core";
 import { ChartDataType, IBlockUpdateData, IGanttBlock } from "@/components/gantt-chart";
@@ -39,6 +40,7 @@ export const GanttChartSidebar: React.FC<Props> = observer((props) => {
     quickAdd,
     selectionHelpers,
   } = props;
+  const { t } = useTranslation();
 
   const isGroupSelectionEmpty = selectionHelpers.isGroupSelected(GANTT_SELECT_GROUP) === "empty";
 
@@ -75,7 +77,7 @@ export const GanttChartSidebar: React.FC<Props> = observer((props) => {
           )}
           <h6>{title}</h6>
         </div>
-        <h6>Duration</h6>
+        <h6>{t("duration")}</h6>
       </Row>
 
       <Row variant={ERowVariant.HUGGING} className="min-h-full h-max bg-custom-background-100 overflow-hidden">
diff --git a/web/core/components/global/product-updates/footer.tsx b/web/core/components/global/product-updates/footer.tsx
index 6dd2638332b..c57d56123cc 100644
--- a/web/core/components/global/product-updates/footer.tsx
+++ b/web/core/components/global/product-updates/footer.tsx
@@ -1,4 +1,5 @@
 import Image from "next/image";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { getButtonStyling } from "@plane/ui";
 // helpers
@@ -6,38 +7,40 @@ import { cn } from "@/helpers/common.helper";
 // assets
 import PlaneLogo from "@/public/plane-logos/blue-without-text.png";
 
-export const ProductUpdatesFooter = () => (
-  <div className="flex items-center justify-between flex-shrink-0 gap-4 m-6 mb-4">
-    <div className="flex items-center gap-2">
-      <a
+export const ProductUpdatesFooter = () => {
+  const { t } = useTranslation();
+  return (
+    <div className="flex items-center justify-between flex-shrink-0 gap-4 m-6 mb-4">
+      <div className="flex items-center gap-2">
+        <a
         href="https://go.plane.so/p-docs"
         target="_blank"
         className="text-sm text-custom-text-200 hover:text-custom-text-100 hover:underline underline-offset-1 outline-none"
-      >
-        Docs
-      </a>
-      <svg viewBox="0 0 2 2" className="h-0.5 w-0.5 fill-current">
-        <circle cx={1} cy={1} r={1} />
+        >
+          {t("docs")}
+        </a>
+        <svg viewBox="0 0 2 2" className="h-0.5 w-0.5 fill-current">
+          <circle cx={1} cy={1} r={1} />
       </svg>
       <a
         href="https://go.plane.so/p-changelog"
         target="_blank"
         className="text-sm text-custom-text-200 hover:text-custom-text-100 hover:underline underline-offset-1 outline-none"
-      >
-        Full changelog
-      </a>
-      <svg viewBox="0 0 2 2" className="h-0.5 w-0.5 fill-current">
-        <circle cx={1} cy={1} r={1} />
+        >
+          {t("full_changelog")}
+        </a>
+        <svg viewBox="0 0 2 2" className="h-0.5 w-0.5 fill-current">
+          <circle cx={1} cy={1} r={1} />
       </svg>
       <a
         href="mailto:support@plane.so"
         target="_blank"
         className="text-sm text-custom-text-200 hover:text-custom-text-100 hover:underline underline-offset-1 outline-none"
-      >
-        Support
-      </a>
-      <svg viewBox="0 0 2 2" className="h-0.5 w-0.5 fill-current">
-        <circle cx={1} cy={1} r={1} />
+        >
+          {t("support")}
+        </a>
+        <svg viewBox="0 0 2 2" className="h-0.5 w-0.5 fill-current">
+          <circle cx={1} cy={1} r={1} />
       </svg>
       <a
         href="https://go.plane.so/p-discord"
@@ -55,8 +58,9 @@ export const ProductUpdatesFooter = () => (
         "flex gap-1.5 items-center text-center font-medium hover:underline underline-offset-2 outline-none"
       )}
     >
-      <Image src={PlaneLogo} alt="Plane" width={12} height={12} />
-      Powered by Plane Pages
-    </a>
-  </div>
-);
+        <Image src={PlaneLogo} alt="Plane" width={12} height={12} />
+        {t("powered_by_plane_pages")}
+      </a>
+    </div>
+  );
+};
\ No newline at end of file
diff --git a/web/core/components/global/product-updates/modal.tsx b/web/core/components/global/product-updates/modal.tsx
index 57beaa68109..1d573c63e66 100644
--- a/web/core/components/global/product-updates/modal.tsx
+++ b/web/core/components/global/product-updates/modal.tsx
@@ -1,5 +1,6 @@
 import { FC, useRef } from "react";
 import { observer } from "mobx-react-lite";
+import { useTranslation } from "@plane/i18n";
 import useSWR from "swr";
 // editor
 import { DocumentReadOnlyEditorWithRef, EditorRefApi } from "@plane/editor";
@@ -22,6 +23,7 @@ export type ProductUpdatesModalProps = {
 
 export const ProductUpdatesModal: FC<ProductUpdatesModalProps> = observer((props) => {
   const { isOpen, handleClose } = props;
+  const { t } = useTranslation();
   // refs
   const editorRef = useRef<EditorRefApi>(null);
   // swr
@@ -37,17 +39,17 @@ export const ProductUpdatesModal: FC<ProductUpdatesModalProps> = observer((props
       <div className="flex flex-col h-[60vh] vertical-scrollbar scrollbar-xs overflow-hidden overflow-y-scroll px-6 mx-0.5">
         {!isLoading && !!error ? (
           <div className="flex flex-col items-center justify-center w-full h-full mb-8">
-            <div className="text-lg font-medium">We are having trouble fetching the updates.</div>
+            <div className="text-lg font-medium">{t("we_are_having_trouble_fetching_the_updates")}</div>
             <div className="text-sm text-custom-text-200">
-              Please visit{" "}
+              {t("please_visit")} 
               <a
                 href="https://go.plane.so/p-changelog"
                 target="_blank"
                 className="text-sm text-custom-primary-100 font-medium hover:text-custom-primary-200 underline underline-offset-1 outline-none"
               >
-                our changelogs
+                {t("our_changelogs")}
               </a>{" "}
-              for the latest updates.
+              {t("for_the_latest_updates")}.
             </div>
           </div>
         ) : isLoading ? (
diff --git a/web/core/components/graphs/issues-by-priority.tsx b/web/core/components/graphs/issues-by-priority.tsx
index d0f63f60497..523bf32d0ab 100644
--- a/web/core/components/graphs/issues-by-priority.tsx
+++ b/web/core/components/graphs/issues-by-priority.tsx
@@ -1,5 +1,6 @@
 import { ComputedDatum } from "@nivo/bar";
 import { Theme } from "@nivo/core";
+import { useTranslation } from "@plane/i18n";
 // components
 import { TIssuePriorities } from "@plane/types";
 import { BarGraph } from "@/components/ui";
@@ -36,9 +37,11 @@ const PRIORITY_TEXT_COLORS = {
 
 export const IssuesByPriorityGraph: React.FC<Props> = (props) => {
   const { borderRadius = 8, data, height = 300, onBarClick, padding = 0.05, theme } = props;
+  const { t } = useTranslation();
 
   const chartData = data.map((priority) => ({
-    priority: capitalizeFirstLetter(priority.priority),
+    priorityKey: capitalizeFirstLetter(priority.priority),
+    priority: t(capitalizeFirstLetter(priority.priority)),
     value: priority.priority_count,
   }));
 
@@ -60,14 +63,14 @@ export const IssuesByPriorityGraph: React.FC<Props> = (props) => {
           <span
             className="h-3 w-3 rounded"
             style={{
-              backgroundColor: PRIORITY_TEXT_COLORS[`${datum.data.priority}`.toLowerCase() as TIssuePriorities],
+              backgroundColor: PRIORITY_TEXT_COLORS[`${datum.data.priorityKey}`.toLowerCase() as TIssuePriorities],
             }}
           />
           <span className="font-medium text-custom-text-200">{datum.data.priority}:</span>
           <span>{datum.value}</span>
         </div>
       )}
-      colors={({ data }) => `url(#gradient${data.priority})`}
+      colors={({ data }) => `url(#gradient${data.priorityKey})`}
       defs={PRIORITY_GRAPH_GRADIENTS}
       fill={ISSUE_PRIORITIES.map((p) => ({
         match: {
diff --git a/web/core/components/inbox/inbox-filter/applied-filters/priority.tsx b/web/core/components/inbox/inbox-filter/applied-filters/priority.tsx
index 08025090498..5d02bda73e9 100644
--- a/web/core/components/inbox/inbox-filter/applied-filters/priority.tsx
+++ b/web/core/components/inbox/inbox-filter/applied-filters/priority.tsx
@@ -4,6 +4,7 @@ import { FC } from "react";
 import { observer } from "mobx-react";
 import { X } from "lucide-react";
 import { TIssuePriorities } from "@plane/types";
+import { useTranslation } from "@plane/i18n";
 import { PriorityIcon, Tag } from "@plane/ui";
 // constants
 import { ISSUE_PRIORITIES } from "@/constants/issue";
@@ -12,6 +13,7 @@ import { useProjectInbox } from "@/hooks/store";
 
 export const InboxIssueAppliedFiltersPriority: FC = observer(() => {
   // hooks
+  const { t } = useTranslation();
   const { inboxFilters, handleInboxIssueFilters } = useProjectInbox();
   // derived values
   const filteredValues = inboxFilters?.priority || [];
@@ -26,7 +28,7 @@ export const InboxIssueAppliedFiltersPriority: FC = observer(() => {
   if (filteredValues.length === 0) return <></>;
   return (
     <Tag>
-      <div className="text-xs text-custom-text-200">Priority</div>
+      <div className="text-xs text-custom-text-200">{t("Priority")}</div>
       {filteredValues.map((value) => {
         const optionDetail = currentOptionDetail(value);
         if (!optionDetail) return <></>;
@@ -35,7 +37,7 @@ export const InboxIssueAppliedFiltersPriority: FC = observer(() => {
             <div className="w-3 h-3 flex-shrink-0 relative flex justify-center items-center overflow-hidden">
               <PriorityIcon priority={optionDetail.key} className="h-3 w-3" />
             </div>
-            <div className="text-xs truncate">{optionDetail?.title}</div>
+            <div className="text-xs truncate">{t(optionDetail?.title)}</div>
             <div
               className="w-3 h-3 flex-shrink-0 relative flex justify-center items-center overflow-hidden cursor-pointer text-custom-text-300 hover:text-custom-text-200 transition-all"
               onClick={() => handleInboxIssueFilters("priority", handleFilterValue(optionDetail?.key))}
diff --git a/web/core/components/inbox/inbox-filter/filters/priority.tsx b/web/core/components/inbox/inbox-filter/filters/priority.tsx
index 468e742ef5c..714b8017728 100644
--- a/web/core/components/inbox/inbox-filter/filters/priority.tsx
+++ b/web/core/components/inbox/inbox-filter/filters/priority.tsx
@@ -3,6 +3,7 @@
 import { FC, useState } from "react";
 import { observer } from "mobx-react";
 import { TIssuePriorities } from "@plane/types";
+import { useTranslation } from "@plane/i18n";
 import { PriorityIcon } from "@plane/ui";
 // components
 import { FilterHeader, FilterOption } from "@/components/issues";
@@ -18,6 +19,7 @@ type Props = {
 export const FilterPriority: FC<Props> = observer((props) => {
   const { searchQuery } = props;
   // hooks
+  const { t } = useTranslation();
   const { inboxFilters, handleInboxIssueFilters } = useProjectInbox();
   // states
   const [previewEnabled, setPreviewEnabled] = useState(true);
@@ -32,7 +34,7 @@ export const FilterPriority: FC<Props> = observer((props) => {
   return (
     <>
       <FilterHeader
-        title={`Priority${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("Priority")}${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -45,11 +47,11 @@ export const FilterPriority: FC<Props> = observer((props) => {
                 isChecked={filterValue?.includes(priority.key) ? true : false}
                 onClick={() => handleInboxIssueFilters("priority", handleFilterValue(priority.key))}
                 icon={<PriorityIcon priority={priority.key} className="h-3.5 w-3.5" />}
-                title={priority.title}
+                title={t(priority.title)}
               />
             ))
           ) : (
-            <p className="text-xs italic text-custom-text-400">No matches found</p>
+            <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
           )}
         </div>
       )}
diff --git a/web/core/components/inbox/inbox-filter/root.tsx b/web/core/components/inbox/inbox-filter/root.tsx
index 04761033106..22025110d7a 100644
--- a/web/core/components/inbox/inbox-filter/root.tsx
+++ b/web/core/components/inbox/inbox-filter/root.tsx
@@ -2,23 +2,26 @@ import { FC } from "react";
 import { ChevronDown, ListFilter } from "lucide-react";
 // components
 import { cn } from "@plane/editor";
+import { useTranslation } from "@plane/i18n";
 import { getButtonStyling } from "@plane/ui";
 import { InboxIssueFilterSelection, InboxIssueOrderByDropdown } from "@/components/inbox/inbox-filter";
 import { FiltersDropdown } from "@/components/issues";
 import useSize from "@/hooks/use-window-size";
 
-const smallButton = <ListFilter className="size-3 " />;
-
-const largeButton = (
-  <div className={cn(getButtonStyling("neutral-primary", "sm"), "px-2 text-custom-text-300")}>
-    <ListFilter className="size-3 " />
-    <span>Filters</span>
-    <ChevronDown className="size-3" strokeWidth={2} />
-  </div>
-);
 export const FiltersRoot: FC = () => {
+  const { t } = useTranslation();
   const windowSize = useSize();
 
+  const smallButton = <ListFilter className="size-3 " />;
+
+  const largeButton = (
+    <div className={cn(getButtonStyling("neutral-primary", "sm"), "px-2 text-custom-text-300")}>
+      <ListFilter className="size-3 " />
+      <span>{t("filters")}</span>
+      <ChevronDown className="size-3" strokeWidth={2} />
+    </div>
+  );
+
   return (
     <div className="relative flex items-center gap-2">
       <div>
diff --git a/web/core/components/integration/jira/give-details.tsx b/web/core/components/integration/jira/give-details.tsx
index 4e965655126..6f9131803c0 100644
--- a/web/core/components/integration/jira/give-details.tsx
+++ b/web/core/components/integration/jira/give-details.tsx
@@ -8,6 +8,7 @@ import { Plus } from "lucide-react";
 import { IJiraImporterForm } from "@plane/types";
 // hooks
 // components
+import { useTranslation } from "@plane/i18n";
 import { CustomSelect, Input } from "@plane/ui";
 // helpers
 import { checkEmailValidity } from "@/helpers/string.helper";
@@ -15,6 +16,7 @@ import { useCommandPalette, useEventTracker, useProject } from "@/hooks/store";
 // types
 
 export const JiraGetImportDetail: React.FC = observer(() => {
+  const { t } = useTranslation();
   // store hooks
   const { toggleCreateProjectModal } = useCommandPalette();
   const { setTrackElement } = useEventTracker();
@@ -208,7 +210,7 @@ export const JiraGetImportDetail: React.FC = observer(() => {
                     className="flex cursor-pointer select-none items-center space-x-2 truncate rounded px-1 py-1.5 text-custom-text-200"
                   >
                     <Plus className="h-4 w-4 text-custom-text-200" />
-                    <span>Create new project</span>
+                    <span>{t("create_new_project")}</span>
                   </button>
                 </div>
               </CustomSelect>
diff --git a/web/core/components/issues/archived-issues-header.tsx b/web/core/components/issues/archived-issues-header.tsx
index 3926f08720b..581599539be 100644
--- a/web/core/components/issues/archived-issues-header.tsx
+++ b/web/core/components/issues/archived-issues-header.tsx
@@ -12,8 +12,10 @@ import { EIssueFilterType, EIssuesStoreType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT } f
 import { isIssueFilterActive } from "@/helpers/filter.helper";
 // hooks
 import { useIssues, useLabel, useMember, useProject, useProjectState } from "@/hooks/store";
+import { useTranslation } from "@plane/i18n";
 
 export const ArchivedIssuesHeader: FC = observer(() => {
+  const { t } = useTranslation();
   // router
   const { workspaceSlug, projectId } = useParams();
   // store hooks
@@ -60,7 +62,7 @@ export const ArchivedIssuesHeader: FC = observer(() => {
   const handleDisplayPropertiesUpdate = (property: Partial<IIssueDisplayProperties>) => {
     if (!workspaceSlug || !projectId) return;
 
-    updateFilters(workspaceSlug.toString(), projectId.toString(), EIssueFilterType.DISPLAY_PROPERTIES, property);
+    updateFilters(workspaceSlug.toString(), projectId.toString(), EIssueFilterType.DISPLAY_PROPERTIES, property as IIssueDisplayProperties);
   };
 
   return (
@@ -70,7 +72,7 @@ export const ArchivedIssuesHeader: FC = observer(() => {
       </div>
       {/* filter options */}
       <div className="flex items-center gap-2 px-8">
-        <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}>
+        <FiltersDropdown title={t("filters")} placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}>
           <FilterSelection
             filters={issueFilters?.filters || {}}
             handleFiltersUpdate={handleFiltersUpdate}
@@ -84,7 +86,7 @@ export const ArchivedIssuesHeader: FC = observer(() => {
             states={projectStates}
           />
         </FiltersDropdown>
-        <FiltersDropdown title="Display" placement="bottom-end">
+        <FiltersDropdown title={t("display")} placement="bottom-end">
           <DisplayFiltersSelection
             displayFilters={issueFilters?.displayFilters || {}}
             displayProperties={issueFilters?.displayProperties || {}}
diff --git a/web/core/components/issues/custom-properties.tsx b/web/core/components/issues/custom-properties.tsx
new file mode 100644
index 00000000000..165778ff730
--- /dev/null
+++ b/web/core/components/issues/custom-properties.tsx
@@ -0,0 +1,303 @@
+import React, { useState, useEffect } from "react";
+import { Pencil } from "lucide-react";
+import axios from "axios";
+import { Input } from "@plane/ui";
+
+export type CustomProperty = {
+  key: string;
+  value: string;
+  issue_type_custom_property: string;
+  is_required: boolean;
+  name: string;
+  id: string;
+  data_type: string;
+  is_active: boolean;
+};
+
+type CustomPropertiesProps = {
+  customProperties?: CustomProperty[];
+  issue_type_id: string;
+  workspaceSlug: string;
+  updateCustomProperties: (updatedProperties: CustomProperty[]) => void;
+  issueId: string;
+  layout?: "quarter" | "two-fifths";
+};
+
+export const CustomProperties: React.FC<CustomPropertiesProps> = ({
+  customProperties,
+  issue_type_id,
+  workspaceSlug,
+  updateCustomProperties,
+  issueId,
+  layout = "quarter",
+}) => {
+  const [issueTypeCustomProperties, setissueTypeCustomProperties] = useState<CustomProperty[]>([]);
+  const [error, setError] = useState<string | null>(null);
+  const [editingPropertyKey, setEditingPropertyKey] = useState<string | null>(null);
+  const [localCustomProperties, setLocalCustomProperties] = useState<CustomProperty[]>([]);
+
+  useEffect(() => {
+    const getIssueTypeCustomProperties = async () => {
+      try {
+        const response = await axios.get(
+          `/api/v1/workspaces/${workspaceSlug}/issue-type/${issue_type_id}/custom-properties/`,
+          {
+            headers: {
+              'x-api-key': 'TEST_API_TOKEN',
+            }
+          }
+        );
+        setissueTypeCustomProperties(response.data);
+      } catch (error) {
+        setError("Failed to load custom properties.");
+      }
+    };
+
+    getIssueTypeCustomProperties();
+  }, [workspaceSlug, issue_type_id]);
+
+  useEffect(() => {
+    if (customProperties) {
+      setLocalCustomProperties(customProperties);
+    }
+  }, [customProperties]);
+
+  const mergedCustomProperties = issueTypeCustomProperties
+    .filter((customProp) => customProp.is_active)
+    .map((customProp) => {
+      const customProperty = localCustomProperties?.find((prop) => prop.key === customProp.name);
+
+      return {
+        key: customProp.name,
+        value: customProperty ? customProperty.value : "",
+        issue_type_custom_property: customProp.id,
+        is_required: customProp.is_required,
+        id: customProperty ? customProperty.id : "",
+        name: customProp.name,
+        data_type: customProp.data_type,
+        is_active: customProp.is_active,
+      };
+    });
+
+  if (error) {
+    return <div className="text-red-500 text-sm mt-1">{error}</div>;
+  }
+
+  if (!Array.isArray(mergedCustomProperties) || mergedCustomProperties.length === 0) {
+    return null;
+  }
+
+  const handlePropertyUpdate = async (updatedProperty: CustomProperty) => {
+    try {
+      setLocalCustomProperties(prev => {
+        const updatedProperties = [...(prev || [])];
+        const existingIndex = updatedProperties.findIndex(p => p.key === updatedProperty.key);
+        
+        if (existingIndex >= 0) {
+          updatedProperties[existingIndex] = {...updatedProperties[existingIndex], ...updatedProperty};
+        } else {
+          updatedProperties.push(updatedProperty);
+        }
+        
+        return updatedProperties;
+      });
+       
+      await updateCustomProperties([updatedProperty]);
+    } catch (error) {
+      console.error("Failed to update custom property:", error);
+    }
+  };
+
+  const EditableProperty: React.FC<{ property: CustomProperty }> = React.memo(({ property }) => {
+    const [value, setValue] = useState(property.value);
+    const [localError, setLocalError] = useState<string | null>(null);
+    // Local state for dropdown editing
+    const [dropdownLoading, setDropdownLoading] = useState<boolean>(false);
+    const [dropdownError, setDropdownError] = useState<string | null>(null);
+    const [dropdownOptions, setDropdownOptions] = useState<string[]>([]);
+
+    // Sync value when property changes
+    useEffect(() => {
+      setValue(property.value);
+    }, [property.value]);
+
+    // Fetch dropdown options when component mounts for dropdown type (no caching)
+    useEffect(() => {
+      if (property.data_type !== "dropdown") return;
+
+      const fetchOptions = async () => {
+        setDropdownLoading(true);
+        setDropdownError(null);
+        
+        try {
+          const url = `/api/workspaces/${workspaceSlug}/issues/${issueId}/custom-properties/${property.issue_type_custom_property}/dropdown-options/`;
+          const res = await axios.get(url);
+          
+          const arr = Array.isArray(res?.data) ? res.data : res?.data?.data;
+          if (!Array.isArray(arr)) throw new Error("Invalid options response");
+          
+          setDropdownOptions(arr.map(String));
+        } catch (error) {
+          setDropdownError("Failed to load options.");
+          console.error("Failed to fetch dropdown options:", error);
+        } finally {
+          setDropdownLoading(false);
+        }
+      };
+
+      fetchOptions();
+    }, [property.data_type, property.issue_type_custom_property, workspaceSlug, issue_type_id]);
+
+    const handleBlur = async () => {
+      if (property.is_required && value.trim() === "") {
+        setLocalError("This field is required and cannot be left empty or consist of spaces.");
+        setValue(property.value);
+        return;
+      }
+
+      if (value !== property.value) {
+        try {
+          const updatedProperty = { ...property, value };
+          await handlePropertyUpdate(updatedProperty);
+          setLocalError(null);
+        } catch (error) {
+          setLocalError("Failed to update custom property.");
+        }
+      }
+
+      setEditingPropertyKey(null);
+      setLocalError(null);
+    };
+
+    const handleChange = (e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>) => {
+      setValue(e.target.value);
+      setLocalError(null);
+    };
+
+    const inputComponents: Record<string, React.JSX.Element> = {
+      dropdown: (
+        <div className="w-full">
+          {dropdownLoading ? (
+            <div className="text-sm text-custom-text-400 py-1">Loading options…</div>
+          ) : dropdownError ? (
+            <div className="text-red-500 text-sm mt-1">{dropdownError}</div>
+          ) : (
+            <select
+              value={value}
+              onChange={handleChange}
+              onBlur={handleBlur}
+              autoFocus
+              className="text-sm w-full border rounded px-2 py-1 focus:outline-none focus:ring-2 focus:ring-custom-primary-100"
+            >
+              <option value="">{`Select ${property.key}`}</option>
+              {dropdownOptions.map((opt) => (
+                <option key={opt} value={opt}>
+                  {opt}
+                </option>
+              ))}
+            </select>
+          )}
+        </div>
+      ),
+      date: (
+        <Input
+          type="date"
+          value={value}
+          onChange={handleChange}
+          onBlur={handleBlur}
+          autoFocus
+          placeholder={`Add ${property.key}`}
+          className="text-sm w-full border rounded px-2 py-1 focus:outline-none focus:ring-2 focus:ring-custom-primary-100"
+        />
+      ),
+      boolean: (
+        <select
+          value={value}
+          onChange={handleChange}
+          onBlur={handleBlur}
+          autoFocus
+          className="text-sm w-full border rounded px-2 py-1 focus:outline-none focus:ring-2 focus:ring-custom-primary-100"
+        >
+          <option value="">Select {property.key}</option>
+          <option value="true">True</option>
+          <option value="false">False</option>
+        </select>
+      ),
+      number: (
+        <Input
+          type="number"
+          value={value}
+          onChange={handleChange}
+          onBlur={handleBlur}
+          autoFocus
+          placeholder={`Add ${property.key}`}
+          className="text-sm w-full border rounded px-2 py-1 focus:outline-none focus:ring-2 focus:ring-custom-primary-100"
+        />
+      ),
+      text: (
+        <Input
+          type="text"
+          value={value}
+          onChange={handleChange}
+          onBlur={handleBlur}
+          autoFocus
+          placeholder={`Add ${property.key}`}
+          className="text-sm w-full border rounded px-2 py-1 focus:outline-none focus:ring-2 focus:ring-custom-primary-100"
+        />
+      ),
+    };
+    
+    return (
+      <div>
+        {inputComponents[property?.data_type as keyof typeof inputComponents] || inputComponents.text}
+        {localError && (
+          <div className="text-red-500 text-sm mt-1">{localError}</div>
+        )}
+      </div>
+    );
+  });
+
+  const labelWidth = layout === "two-fifths" ? "w-2/5" : "w-1/4";
+  const valueWidth = layout === "two-fifths" ? "w-3/5" : "w-3/4";
+
+  return (
+    <div className="w-full">
+      <hr className="flex-shrink-0 border-custom-sidebar-border-300 h-[0.5px] w-full mx-auto my-1" />
+
+      <div className="space-y-2">
+        {mergedCustomProperties.map((element) => (
+          <div key={element.key} className="flex w-full items-center gap-3 min-h-8">
+            <div className={`flex items-center gap-1 ${labelWidth} flex-shrink-0 text-sm text-custom-text-300 truncate`}>
+              <span>
+                {element.key}
+                {element.is_required && <span className="text-red-500 ml-1">*</span>}
+              </span>
+            </div>
+            <div className={`${valueWidth} flex-grow group text-sm`}>
+              {editingPropertyKey === element.key ? (
+                <EditableProperty property={element} />
+              ) : (
+                <button
+                  type="button"
+                  className="group flex items-center justify-between gap-2 px-2 py-0.5 rounded outline-none w-full hover:bg-custom-background-80"
+                  onClick={() => setEditingPropertyKey(element.key)}
+                >
+                  {element.value ? (
+                    <span className="text-sm text-custom-text-500 whitespace-nowrap overflow-hidden text-ellipsis" title={element.value}>
+                      {element.value}
+                    </span>
+                  ) : (
+                    <span className="text-sm text-custom-text-400">Add {element.key}</span>
+                  )}
+                  <span className="p-1 flex-shrink-0 opacity-0 group-hover:opacity-100 text-custom-text-400">
+                    <Pencil className="h-2.5 w-2.5 flex-shrink-0" />
+                  </span>
+                </button>
+              )}
+            </div>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+};
\ No newline at end of file
diff --git a/web/core/components/issues/description-input.tsx b/web/core/components/issues/description-input.tsx
index 8c18618c506..3899d39093d 100644
--- a/web/core/components/issues/description-input.tsx
+++ b/web/core/components/issues/description-input.tsx
@@ -8,6 +8,7 @@ import { Controller, useForm } from "react-hook-form";
 import { TIssue } from "@plane/types";
 import { EFileAssetType } from "@plane/types/src/enums";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Loader } from "@plane/ui";
 // components
 import { RichTextEditor, RichTextReadOnlyEditor } from "@/components/editor";
@@ -46,6 +47,7 @@ export const IssueDescriptionInput: FC<IssueDescriptionInputProps> = observer((p
     setIsSubmitting,
     placeholder,
   } = props;
+  const { t } = useTranslation();
 
   const { handleSubmit, reset, control } = useForm<TIssue>({
     defaultValues: {
@@ -116,7 +118,7 @@ export const IssueDescriptionInput: FC<IssueDescriptionInputProps> = observer((p
                   debouncedFormSave();
                 }}
                 placeholder={
-                  placeholder ? placeholder : (isFocused, value) => getDescriptionPlaceholder(isFocused, value)
+                  placeholder ? placeholder : (isFocused, value) => t(getDescriptionPlaceholder(isFocused, value))
                 }
                 containerClassName={containerClassName}
                 uploadFile={async (file) => {
diff --git a/web/core/components/issues/filters.tsx b/web/core/components/issues/filters.tsx
index 4b80ba12f16..091ee09d18d 100644
--- a/web/core/components/issues/filters.tsx
+++ b/web/core/components/issues/filters.tsx
@@ -5,6 +5,7 @@ import { observer } from "mobx-react";
 // types
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Button } from "@plane/ui";
 
 import { DisplayFiltersSelection, FiltersDropdown, FilterSelection, LayoutSelection } from "@/components/issues";
@@ -31,6 +32,7 @@ type Props = {
   canUserCreateIssue: boolean | undefined;
 };
 const HeaderFilters = observer(({ currentProjectDetails, projectId, workspaceSlug, canUserCreateIssue }: Props) => {
+  const { t } = useTranslation();
   // states
   const [analyticsModal, setAnalyticsModal] = useState(false);
   // store hooks
@@ -84,7 +86,7 @@ const HeaderFilters = observer(({ currentProjectDetails, projectId, workspaceSlu
   const handleDisplayProperties = useCallback(
     (property: Partial<IIssueDisplayProperties>) => {
       if (!workspaceSlug || !projectId) return;
-      updateFilters(workspaceSlug, projectId, EIssueFilterType.DISPLAY_PROPERTIES, property);
+      updateFilters(workspaceSlug, projectId, EIssueFilterType.DISPLAY_PROPERTIES, property as IIssueDisplayProperties);
     },
     [workspaceSlug, projectId, updateFilters]
   );
@@ -107,7 +109,7 @@ const HeaderFilters = observer(({ currentProjectDetails, projectId, workspaceSlu
         onChange={(layout) => handleLayoutChange(layout)}
         selectedLayout={activeLayout}
       />
-      <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}>
+      <FiltersDropdown title={t("filters")} placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}>
         <FilterSelection
           filters={issueFilters?.filters ?? {}}
           handleFiltersUpdate={handleFiltersUpdate}
@@ -121,7 +123,7 @@ const HeaderFilters = observer(({ currentProjectDetails, projectId, workspaceSlu
           moduleViewDisabled={!currentProjectDetails?.module_view}
         />
       </FiltersDropdown>
-      <FiltersDropdown title="Display" placement="bottom-end">
+      <FiltersDropdown title={t("display")} placement="bottom-end">
         <DisplayFiltersSelection
           layoutDisplayFiltersOptions={activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[activeLayout] : undefined}
           displayFilters={issueFilters?.displayFilters ?? {}}
@@ -134,7 +136,7 @@ const HeaderFilters = observer(({ currentProjectDetails, projectId, workspaceSlu
       </FiltersDropdown>
       {canUserCreateIssue ? (
         <Button className="hidden md:block" onClick={() => setAnalyticsModal(true)} variant="neutral-primary" size="sm">
-          Analytics
+          {t("analytics")}
         </Button>
       ) : (
         <></>
diff --git a/web/core/components/issues/index.ts b/web/core/components/issues/index.ts
index 483d53da918..42114945798 100644
--- a/web/core/components/issues/index.ts
+++ b/web/core/components/issues/index.ts
@@ -12,6 +12,7 @@ export * from "./issue-update-status";
 export * from "./create-issue-toast-action-items";
 export * from "./relations";
 export * from "./issue-detail-widgets";
+export * from "./custom-properties";
 
 // issue details
 export * from "./issue-detail";
diff --git a/web/core/components/issues/issue-detail-widgets/action-buttons.tsx b/web/core/components/issues/issue-detail-widgets/action-buttons.tsx
index 18b6cc024ec..01001885439 100644
--- a/web/core/components/issues/issue-detail-widgets/action-buttons.tsx
+++ b/web/core/components/issues/issue-detail-widgets/action-buttons.tsx
@@ -9,6 +9,7 @@ import {
   SubIssuesActionButton,
   IssueDetailWidgetButton,
 } from "@/components/issues/issue-detail-widgets";
+import { useTranslation } from "@plane/i18n";
 
 type Props = {
   workspaceSlug: string;
@@ -19,13 +20,14 @@ type Props = {
 
 export const IssueDetailWidgetActionButtons: FC<Props> = (props) => {
   const { workspaceSlug, projectId, issueId, disabled } = props;
+  const { t } = useTranslation();
   return (
     <div className="flex items-center flex-wrap gap-2">
       <SubIssuesActionButton
         issueId={issueId}
         customButton={
           <IssueDetailWidgetButton
-            title="Add sub-issue"
+            title={t("add_sub_issue")}
             icon={<Layers className="h-3.5 w-3.5 flex-shrink-0" strokeWidth={2} />}
             disabled={disabled}
           />
@@ -36,7 +38,7 @@ export const IssueDetailWidgetActionButtons: FC<Props> = (props) => {
         issueId={issueId}
         customButton={
           <IssueDetailWidgetButton
-            title="Add relation"
+            title={t("add_relation")}
             icon={<Waypoints className="h-3.5 w-3.5 flex-shrink-0" strokeWidth={2} />}
             disabled={disabled}
           />
@@ -46,7 +48,7 @@ export const IssueDetailWidgetActionButtons: FC<Props> = (props) => {
       <IssueLinksActionButton
         customButton={
           <IssueDetailWidgetButton
-            title="Add link"
+            title={t("add_link")}
             icon={<Link className="h-3.5 w-3.5 flex-shrink-0" strokeWidth={2} />}
             disabled={disabled}
           />
@@ -59,7 +61,7 @@ export const IssueDetailWidgetActionButtons: FC<Props> = (props) => {
         issueId={issueId}
         customButton={
           <IssueDetailWidgetButton
-            title="Attach"
+            title={t("attach")}
             icon={<Paperclip className="h-3.5 w-3.5 flex-shrink-0" strokeWidth={2} />}
             disabled={disabled}
           />
diff --git a/web/core/components/issues/issue-detail-widgets/attachments/title.tsx b/web/core/components/issues/issue-detail-widgets/attachments/title.tsx
index ce83f6826df..0512037fd74 100644
--- a/web/core/components/issues/issue-detail-widgets/attachments/title.tsx
+++ b/web/core/components/issues/issue-detail-widgets/attachments/title.tsx
@@ -1,6 +1,7 @@
 "use client";
 import React, { FC, useMemo } from "react";
 import { observer } from "mobx-react";
+import { useTranslation } from "@plane/i18n";
 import { CollapsibleButton } from "@plane/ui";
 // components
 import { IssueAttachmentActionButton } from "@/components/issues/issue-detail-widgets";
@@ -17,6 +18,7 @@ type Props = {
 
 export const IssueAttachmentsCollapsibleTitle: FC<Props> = observer((props) => {
   const { isOpen, workspaceSlug, projectId, issueId, disabled } = props;
+  const { t } = useTranslation();
   // store hooks
   const {
     issue: { getIssueById },
@@ -39,7 +41,7 @@ export const IssueAttachmentsCollapsibleTitle: FC<Props> = observer((props) => {
   return (
     <CollapsibleButton
       isOpen={isOpen}
-      title="Attachments"
+      title={t("attachments")}
       indicatorElement={indicatorElement}
       actionItemElement={
         !disabled && (
diff --git a/web/core/components/issues/issue-detail-widgets/links/title.tsx b/web/core/components/issues/issue-detail-widgets/links/title.tsx
index 1e01ee19887..4138a68c60d 100644
--- a/web/core/components/issues/issue-detail-widgets/links/title.tsx
+++ b/web/core/components/issues/issue-detail-widgets/links/title.tsx
@@ -1,6 +1,7 @@
 "use client";
 import React, { FC, useMemo } from "react";
 import { observer } from "mobx-react";
+import { useTranslation } from "@plane/i18n";
 import { CollapsibleButton } from "@plane/ui";
 // components
 import { IssueLinksActionButton } from "@/components/issues/issue-detail-widgets";
@@ -15,6 +16,7 @@ type Props = {
 
 export const IssueLinksCollapsibleTitle: FC<Props> = observer((props) => {
   const { isOpen, issueId, disabled } = props;
+  const { t } = useTranslation();
   // store hooks
   const {
     issue: { getIssueById },
@@ -38,7 +40,7 @@ export const IssueLinksCollapsibleTitle: FC<Props> = observer((props) => {
   return (
     <CollapsibleButton
       isOpen={isOpen}
-      title="Links"
+      title={t("links")}
       indicatorElement={indicatorElement}
       actionItemElement={!disabled && <IssueLinksActionButton disabled={disabled} />}
     />
diff --git a/web/core/components/issues/issue-detail-widgets/relations/title.tsx b/web/core/components/issues/issue-detail-widgets/relations/title.tsx
index a288146d16d..f2f7d0294a5 100644
--- a/web/core/components/issues/issue-detail-widgets/relations/title.tsx
+++ b/web/core/components/issues/issue-detail-widgets/relations/title.tsx
@@ -1,6 +1,7 @@
 "use client";
 import React, { FC, useMemo } from "react";
 import { observer } from "mobx-react";
+import { useTranslation } from "@plane/i18n";
 import { CollapsibleButton } from "@plane/ui";
 // components
 import { RelationActionButton } from "@/components/issues/issue-detail-widgets";
@@ -15,6 +16,7 @@ type Props = {
 
 export const RelationsCollapsibleTitle: FC<Props> = observer((props) => {
   const { isOpen, issueId, disabled } = props;
+  const { t } = useTranslation();
   // store hook
   const {
     relation: { getRelationCountByIssueId },
@@ -36,7 +38,7 @@ export const RelationsCollapsibleTitle: FC<Props> = observer((props) => {
   return (
     <CollapsibleButton
       isOpen={isOpen}
-      title="Relations"
+      title={t("relations")}
       indicatorElement={indicatorElement}
       actionItemElement={!disabled && <RelationActionButton issueId={issueId} disabled={disabled} />}
     />
diff --git a/web/core/components/issues/issue-detail-widgets/sub-issues/title.tsx b/web/core/components/issues/issue-detail-widgets/sub-issues/title.tsx
index b3d9bf1fc15..55f605b0f3a 100644
--- a/web/core/components/issues/issue-detail-widgets/sub-issues/title.tsx
+++ b/web/core/components/issues/issue-detail-widgets/sub-issues/title.tsx
@@ -1,6 +1,7 @@
 "use client";
 import React, { FC, useMemo } from "react";
 import { observer } from "mobx-react";
+import { useTranslation } from "@plane/i18n";
 import { CircularProgressIndicator, CollapsibleButton } from "@plane/ui";
 // components
 import { SubIssuesActionButton } from "@/components/issues/issue-detail-widgets";
@@ -15,6 +16,7 @@ type Props = {
 
 export const SubIssuesCollapsibleTitle: FC<Props> = observer((props) => {
   const { isOpen, parentIssueId, disabled } = props;
+  const { t } = useTranslation();
   // store hooks
   const {
     subIssues: { subIssuesByIssueId, stateDistributionByIssueId },
@@ -48,7 +50,7 @@ export const SubIssuesCollapsibleTitle: FC<Props> = observer((props) => {
   return (
     <CollapsibleButton
       isOpen={isOpen}
-      title="Sub-issues"
+      title={t("sub_issues")}
       indicatorElement={indicatorElement}
       actionItemElement={!disabled && <SubIssuesActionButton issueId={parentIssueId} disabled={disabled} />}
     />
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity-filter.tsx b/web/core/components/issues/issue-detail/issue-activity/activity-filter.tsx
index 319058a017f..2e7a35da621 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity-filter.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity-filter.tsx
@@ -1,6 +1,7 @@
 import React, { FC } from "react";
 import { observer } from "mobx-react";
 import { Check, ListFilter } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 import { Button, PopoverMenu } from "@plane/ui";
 // helper
 import { cn } from "@/helpers/common.helper";
@@ -14,6 +15,7 @@ type TActivityFilter = {
 
 export const ActivityFilter: FC<TActivityFilter> = observer((props) => {
   const { selectedFilters = [], filterOptions } = props;
+  const { t } = useTranslation();
 
   return (
     <PopoverMenu
@@ -25,7 +27,7 @@ export const ActivityFilter: FC<TActivityFilter> = observer((props) => {
           prependIcon={<ListFilter className="h-3 w-3" />}
           className="relative"
         >
-          <span className="text-custom-text-200">Filters</span>
+          <span className="text-custom-text-200">{t("filters")}</span>
         </Button>
       }
       panelClassName="p-2 rounded-md border border-custom-border-200 bg-custom-background-100"
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/archived-at.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/archived-at.tsx
index b10482b3c5d..2cb74748148 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/archived-at.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/archived-at.tsx
@@ -4,6 +4,7 @@ import { FC } from "react";
 import { observer } from "mobx-react";
 import { RotateCcw } from "lucide-react";
 // hooks
+import { useTranslation } from "@plane/i18n";
 import { ArchiveIcon } from "@plane/ui";
 import { useIssueDetail } from "@/hooks/store";
 // components
@@ -14,6 +15,7 @@ type TIssueArchivedAtActivity = { activityId: string; ends: "top" | "bottom" | u
 
 export const IssueArchivedAtActivity: FC<TIssueArchivedAtActivity> = observer((props) => {
   const { activityId, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -36,7 +38,7 @@ export const IssueArchivedAtActivity: FC<TIssueArchivedAtActivity> = observer((p
       ends={ends}
       customUserName={activity.new_value === "archive" ? "Plane" : undefined}
     >
-      {activity.new_value === "restore" ? "restored the issue" : "archived the issue"}.
+      {activity.new_value === "restore" ? t("restored_issue") : t("archived_issue")}.
     </IssueActivityBlockComponent>
   );
 });
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/assignee.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/assignee.tsx
index 97f60581545..596361e10c0 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/assignee.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/assignee.tsx
@@ -6,11 +6,13 @@ import { Users } from "lucide-react";
 import { useIssueDetail } from "@/hooks/store";
 // components
 import { IssueActivityBlockComponent, IssueLink } from "./";
+import { useTranslation } from "@plane/i18n";
 
 type TIssueAssigneeActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
 export const IssueAssigneeActivity: FC<TIssueAssigneeActivity> = observer((props) => {
   const { activityId, ends, showIssue = true } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -26,7 +28,7 @@ export const IssueAssigneeActivity: FC<TIssueAssigneeActivity> = observer((props
       ends={ends}
     >
       <>
-        {activity.old_value === "" ? `added a new assignee ` : `removed the assignee `}
+        {activity.old_value === "" ? `${t("added_assignee")} ` : `${t("removed_assignee")} `}
         <a
           href={`/${activity.workspace_detail?.slug}/profile/${activity.new_identifier ?? activity.old_identifier}`}
           target="_blank"
@@ -35,7 +37,7 @@ export const IssueAssigneeActivity: FC<TIssueAssigneeActivity> = observer((props
         >
           {activity.new_value && activity.new_value !== "" ? activity.new_value : activity.old_value}
         </a>
-        {showIssue && (activity.old_value === "" ? ` to ` : ` from `)}
+        {showIssue && (activity.old_value === "" ? ` ${t("to")} ` : ` ${t("from")} `)}
         {showIssue && <IssueLink activityId={activityId} />}.
       </>
     </IssueActivityBlockComponent>
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/attachment.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/attachment.tsx
index 2e827dd0214..0bfee3f957d 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/attachment.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/attachment.tsx
@@ -5,11 +5,13 @@ import { Paperclip } from "lucide-react";
 import { useIssueDetail } from "@/hooks/store";
 // components
 import { IssueActivityBlockComponent, IssueLink } from "./";
+import { useTranslation } from "@plane/i18n";
 
 type TIssueAttachmentActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
 export const IssueAttachmentActivity: FC<TIssueAttachmentActivity> = observer((props) => {
   const { activityId, showIssue = true, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -25,7 +27,7 @@ export const IssueAttachmentActivity: FC<TIssueAttachmentActivity> = observer((p
       ends={ends}
     >
       <>
-        {activity.verb === "created" ? `uploaded a new ` : `removed an attachment`}
+        {activity.verb === "created" ? `${t("uploaded_new")} ` : `r${t("removed_attachment")}`}
         {activity.verb === "created" && (
           <a
             href={`${activity.new_value}`}
@@ -33,10 +35,10 @@ export const IssueAttachmentActivity: FC<TIssueAttachmentActivity> = observer((p
             rel="noopener noreferrer"
             className="inline-flex items-center gap-1 font-medium text-custom-text-100 hover:underline"
           >
-            attachment
+            {t("attachment")}
           </a>
         )}
-        {showIssue && (activity.verb === "created" ? ` to ` : ` from `)}
+        {showIssue && (activity.verb === "created" ? ` ${t("to")} ` : ` ${t("from")} `)}
         {showIssue && <IssueLink activityId={activityId} />}.
       </>
     </IssueActivityBlockComponent>
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/custom-properties.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/custom-properties.tsx
new file mode 100644
index 00000000000..d99b677d392
--- /dev/null
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/custom-properties.tsx
@@ -0,0 +1,47 @@
+"use client";
+
+import { FC } from "react";
+import { observer } from "mobx-react";
+// hooks
+import { useIssueDetail } from "@/hooks/store";
+// components
+import { IssueActivityBlockComponent, IssueLink } from "./";
+// icons
+import { useTranslation } from "@plane/i18n";
+import { DoubleCircleIcon } from "@plane/ui";
+
+type TIssueCustomPropertyActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
+
+export const IssueCustomPropertyActivity: FC<TIssueCustomPropertyActivity> = observer((props) => {
+  const { activityId, showIssue = true, ends } = props;
+  const { t } = useTranslation();
+  // hooks
+  const {
+    activity: { getActivityById },
+  } = useIssueDetail();
+
+  const activity = getActivityById(activityId);
+
+  if (!activity) return <></>;
+
+  const isNewProperty = !activity.old_value;
+  const customPropertyKey = activity?.field?.replace("Custom Property ", "");
+  const newValue = activity.new_value;
+  const oldValue = activity.old_value;
+
+  return (
+    <IssueActivityBlockComponent
+      icon={<DoubleCircleIcon className="h-4 w-4 flex-shrink-0 text-custom-text-200" />}
+      activityId={activityId}
+      ends={ends}
+    >
+      <>
+        {isNewProperty ? (
+          <>{t("added_custom_property")} <span className="font-medium text-custom-text-100">{customPropertyKey}</span> {t("with_value")} <span className="font-medium text-custom-text-100">{newValue}</span>.</>
+        ) : (
+          <>{t("updated_custom_property_value")} <span className="font-medium text-custom-text-100">{customPropertyKey}</span> from <span className="font-medium text-custom-text-100">{oldValue}</span> to <span className="font-medium text-custom-text-100">{newValue}</span>.</>
+        )}
+      </>
+    </IssueActivityBlockComponent>
+  );
+});
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/cycle.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/cycle.tsx
index 03ae246176f..9aed31d7ac6 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/cycle.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/cycle.tsx
@@ -3,6 +3,7 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 // hooks
+import { useTranslation } from "@plane/i18n";
 import { ContrastIcon } from "@plane/ui";
 import { useIssueDetail } from "@/hooks/store";
 // components
@@ -13,6 +14,7 @@ type TIssueCycleActivity = { activityId: string; ends: "top" | "bottom" | undefi
 
 export const IssueCycleActivity: FC<TIssueCycleActivity> = observer((props) => {
   const { activityId, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -30,7 +32,7 @@ export const IssueCycleActivity: FC<TIssueCycleActivity> = observer((props) => {
       <>
         {activity.verb === "created" ? (
           <>
-            <span>added this issue to the cycle </span>
+            <span>{t("added_issue_to_cycle")} </span>
             <a
               href={`/${activity.workspace_detail?.slug}/projects/${activity.project}/cycles/${activity.new_identifier}`}
               target="_blank"
@@ -42,7 +44,7 @@ export const IssueCycleActivity: FC<TIssueCycleActivity> = observer((props) => {
           </>
         ) : activity.verb === "updated" ? (
           <>
-            <span>set the cycle to </span>
+            <span>{t("set_cycle_to")} </span>
             <a
               href={`/${activity.workspace_detail?.slug}/projects/${activity.project}/cycles/${activity.new_identifier}`}
               target="_blank"
@@ -54,7 +56,7 @@ export const IssueCycleActivity: FC<TIssueCycleActivity> = observer((props) => {
           </>
         ) : (
           <>
-            <span>removed the issue from the cycle </span>
+            <span>{t("removed_issue_from_cycle")} </span>
             <a
               href={`/${activity.workspace_detail?.slug}/projects/${activity.project}/cycles/${activity.old_identifier}`}
               target="_blank"
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/default.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/default.tsx
index 2ce38306172..8b97a21717f 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/default.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/default.tsx
@@ -3,6 +3,7 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 // hooks
+import { useTranslation } from "@plane/i18n";
 import { LayersIcon } from "@plane/ui";
 import { useIssueDetail } from "@/hooks/store";
 // components
@@ -13,6 +14,7 @@ type TIssueDefaultActivity = { activityId: string; ends: "top" | "bottom" | unde
 
 export const IssueDefaultActivity: FC<TIssueDefaultActivity> = observer((props) => {
   const { activityId, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -27,7 +29,7 @@ export const IssueDefaultActivity: FC<TIssueDefaultActivity> = observer((props)
       icon={<LayersIcon width={14} height={14} className="text-custom-text-200" aria-hidden="true" />}
       ends={ends}
     >
-      <>{activity.verb === "created" ? " created the issue." : " deleted an issue."}</>
+      <>{activity.verb === "created" ? ` ${t("created_issue")} `: ` ${t("deleted_issue")}.`}</>
     </IssueActivityBlockComponent>
   );
 });
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/description.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/description.tsx
index b80d9470da0..cc787c0aed3 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/description.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/description.tsx
@@ -5,11 +5,13 @@ import { MessageSquare } from "lucide-react";
 import { useIssueDetail } from "@/hooks/store";
 // components
 import { IssueActivityBlockComponent, IssueLink } from "./";
+import { useTranslation } from "@plane/i18n";
 
 type TIssueDescriptionActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
 export const IssueDescriptionActivity: FC<TIssueDescriptionActivity> = observer((props) => {
   const { activityId, showIssue = true, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -25,8 +27,8 @@ export const IssueDescriptionActivity: FC<TIssueDescriptionActivity> = observer(
       ends={ends}
     >
       <>
-        updated the description
-        {showIssue ? ` of ` : ``}
+        {t("updated_description")}
+        {showIssue ? ` ${t("of")} ` : ``}
         {showIssue && <IssueLink activityId={activityId} />}.
       </>
     </IssueActivityBlockComponent>
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx
index e93c45a85b3..fa2e74dd86b 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx
@@ -5,11 +5,13 @@ import { Triangle } from "lucide-react";
 import { useIssueDetail } from "@/hooks/store";
 // components
 import { IssueActivityBlockComponent, IssueLink } from "./";
+import { useTranslation } from "@plane/i18n";
 
 type TIssueEstimateActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
 export const IssueEstimateActivity: FC<TIssueEstimateActivity> = observer((props) => {
   const { activityId, showIssue = true, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -26,9 +28,9 @@ export const IssueEstimateActivity: FC<TIssueEstimateActivity> = observer((props
       ends={ends}
     >
       <>
-        {activity.new_value ? `set the estimate point to ` : `removed the estimate point `}
+        {activity.new_value ? `${t("set_estimate_point_to")} ` : `${t("removed_estimate_point")} `}
         {activity.new_value ? activity.new_value : activity?.old_value || ""}
-        {showIssue && (activity.new_value ? ` to ` : ` from `)}
+        {showIssue && (activity.new_value ? ` ${t("to")} ` : ` ${t("from")} `)}
         {showIssue && <IssueLink activityId={activityId} />}.
       </>
     </IssueActivityBlockComponent>
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/inbox.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/inbox.tsx
index 129831c6a23..bd234dad628 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/inbox.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/inbox.tsx
@@ -1,6 +1,7 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 // hooks
+import { useTranslation } from "@plane/i18n";
 import { Intake } from "@plane/ui";
 import { useIssueDetail } from "@/hooks/store";
 // components
@@ -11,6 +12,7 @@ type TIssueInboxActivity = { activityId: string; ends: "top" | "bottom" | undefi
 
 export const IssueInboxActivity: FC<TIssueInboxActivity> = observer((props) => {
   const { activityId, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -21,15 +23,15 @@ export const IssueInboxActivity: FC<TIssueInboxActivity> = observer((props) => {
   const getInboxActivityMessage = () => {
     switch (activity?.verb) {
       case "-1":
-        return "declined this issue from intake.";
+        return t("declined_issue_from_intake");
       case "0":
-        return "snoozed this issue.";
+        return t("snoozed_issue");
       case "1":
-        return "accepted this issue from intake.";
+        return t("accepted_issue_from_intake");
       case "2":
-        return "declined this issue from intake by marking a duplicate issue.";
+        return t("declined_issue_from_intake_duplicate");
       default:
-        return "updated intake issue status.";
+        return t("updated_intake_issue_status");
     }
   };
 
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/index.ts b/web/core/components/issues/issue-detail/issue-activity/activity/actions/index.ts
index ea69163085a..f76b1c66549 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/index.ts
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/index.ts
@@ -17,6 +17,7 @@ export * from "./attachment";
 export * from "./archived-at";
 export * from "./inbox";
 export * from "./label-activity-chip";
+export * from "./custom-properties";
 
 // helpers
 export * from "./helpers/activity-block";
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/label.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/label.tsx
index 2864350a415..d0fe2e82c87 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/label.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/label.tsx
@@ -5,11 +5,13 @@ import { Tag } from "lucide-react";
 import { useIssueDetail, useLabel } from "@/hooks/store";
 // components
 import { IssueActivityBlockComponent, IssueLink, LabelActivityChip } from "./";
+import { useTranslation } from "@plane/i18n";
 
 type TIssueLabelActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
 export const IssueLabelActivity: FC<TIssueLabelActivity> = observer((props) => {
   const { activityId, showIssue = true, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -26,7 +28,7 @@ export const IssueLabelActivity: FC<TIssueLabelActivity> = observer((props) => {
       ends={ends}
     >
       <>
-        {activity.old_value === "" ? `added a new label ` : `removed the label `}
+        {activity.old_value === "" ? `${t("added_label")} ` : `${t("removed_label")} `}
         <LabelActivityChip
           name={activity.old_value === "" ? activity.new_value : activity.old_value}
           color={
@@ -35,7 +37,7 @@ export const IssueLabelActivity: FC<TIssueLabelActivity> = observer((props) => {
               : projectLabels?.find((l) => l.id === activity.old_identifier)?.color
           }
         />
-        {showIssue && (activity.old_value === "" ? ` to ` : ` from `)}
+        {showIssue && (activity.old_value === "" ? ` ${t("to")} ` : ` ${t("from")} `)}
         {showIssue && <IssueLink activityId={activityId} />}
       </>
     </IssueActivityBlockComponent>
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/link.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/link.tsx
index 9e130438936..5184cddfe11 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/link.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/link.tsx
@@ -5,11 +5,13 @@ import { MessageSquare } from "lucide-react";
 import { useIssueDetail } from "@/hooks/store";
 // components
 import { IssueActivityBlockComponent, IssueLink } from "./";
+import { useTranslation } from "@plane/i18n";
 
 type TIssueLinkActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
 export const IssueLinkActivity: FC<TIssueLinkActivity> = observer((props) => {
   const { activityId, showIssue = false, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -27,38 +29,38 @@ export const IssueLinkActivity: FC<TIssueLinkActivity> = observer((props) => {
       <>
         {activity.verb === "created" ? (
           <>
-            <span>added </span>
+            <span>{t("added")} </span>
             <a
               href={`${activity.new_value}`}
               target="_blank"
               rel="noopener noreferrer"
               className="inline-flex items-center gap-1 font-medium text-custom-text-100 hover:underline"
             >
-              link
+              {t("link")}
             </a>
           </>
         ) : activity.verb === "updated" ? (
           <>
-            <span>updated the </span>
+            <span>{t("updated")} </span>
             <a
               href={`${activity.old_value}`}
               target="_blank"
               rel="noopener noreferrer"
               className="inline-flex items-center gap-1 font-medium text-custom-text-100 hover:underline"
             >
-              link
+              {t("link")}
             </a>
           </>
         ) : (
           <>
-            <span>removed this </span>
+            <span>{t("removed")} </span>
             <a
               href={`${activity.old_value}`}
               target="_blank"
               rel="noopener noreferrer"
               className="inline-flex items-center gap-1 font-medium text-custom-text-100 hover:underline"
             >
-              link
+              {t("link")}
             </a>
           </>
         )}
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/module.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/module.tsx
index b3d61d3981f..d9ac05afd70 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/module.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/module.tsx
@@ -3,6 +3,7 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 // hooks
+import { useTranslation } from "@plane/i18n";
 import { DiceIcon } from "@plane/ui";
 import { useIssueDetail } from "@/hooks/store";
 // components
@@ -13,6 +14,7 @@ type TIssueModuleActivity = { activityId: string; ends: "top" | "bottom" | undef
 
 export const IssueModuleActivity: FC<TIssueModuleActivity> = observer((props) => {
   const { activityId, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -30,7 +32,7 @@ export const IssueModuleActivity: FC<TIssueModuleActivity> = observer((props) =>
       <>
         {activity.verb === "created" ? (
           <>
-            <span>added this issue to the module </span>
+            <span>{t("added_issue_to_module")} </span>
             <a
               href={`/${activity.workspace_detail?.slug}/projects/${activity.project}/modules/${activity.new_identifier}`}
               target="_blank"
@@ -42,7 +44,7 @@ export const IssueModuleActivity: FC<TIssueModuleActivity> = observer((props) =>
           </>
         ) : activity.verb === "updated" ? (
           <>
-            <span>set the module to </span>
+            <span>{t("set_module_to")} </span>
             <a
               href={`/${activity.workspace_detail?.slug}/projects/${activity.project}/modules/${activity.new_identifier}`}
               target="_blank"
@@ -54,7 +56,7 @@ export const IssueModuleActivity: FC<TIssueModuleActivity> = observer((props) =>
           </>
         ) : (
           <>
-            <span>removed the issue from the module </span>
+            <span>{t("removed_issue_from_module")} </span>
             <a
               href={`/${activity.workspace_detail?.slug}/projects/${activity.project}/modules/${activity.old_identifier}`}
               target="_blank"
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/name.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/name.tsx
index ac8d454cf63..de50ae9c841 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/name.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/name.tsx
@@ -5,11 +5,13 @@ import { MessageSquare } from "lucide-react";
 import { useIssueDetail } from "@/hooks/store";
 // components
 import { IssueActivityBlockComponent } from "./";
+import { useTranslation } from "@plane/i18n";
 
 type TIssueNameActivity = { activityId: string; ends: "top" | "bottom" | undefined };
 
 export const IssueNameActivity: FC<TIssueNameActivity> = observer((props) => {
   const { activityId, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -24,7 +26,7 @@ export const IssueNameActivity: FC<TIssueNameActivity> = observer((props) => {
       activityId={activityId}
       ends={ends}
     >
-      <>set the name to {activity.new_value}.</>
+      <>{t("set_name_to")} {activity.new_value}.</>
     </IssueActivityBlockComponent>
   );
 });
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/parent.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/parent.tsx
index 2a3256c624e..fa40f7a60ef 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/parent.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/parent.tsx
@@ -5,11 +5,13 @@ import { LayoutPanelTop } from "lucide-react";
 import { useIssueDetail } from "@/hooks/store";
 // components
 import { IssueActivityBlockComponent, IssueLink } from "./";
+import { useTranslation } from "@plane/i18n";
 
 type TIssueParentActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
 export const IssueParentActivity: FC<TIssueParentActivity> = observer((props) => {
   const { activityId, showIssue = true, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -25,13 +27,13 @@ export const IssueParentActivity: FC<TIssueParentActivity> = observer((props) =>
       ends={ends}
     >
       <>
-        {activity.new_value ? `set the parent to ` : `removed the parent `}
+        {activity.new_value ? `${t("set_parent_to")} ` : `${t("removed_parent")} `}
         {activity.new_value ? (
           <span className="font-medium text-custom-text-100">{activity.new_value}</span>
         ) : (
           <span className="font-medium text-custom-text-100">{activity.old_value}</span>
         )}
-        {showIssue && (activity.new_value ? ` for ` : ` from `)}
+        {showIssue && (activity.new_value ? ` ${t("for")} ` : ` ${t("from")} `)}
         {showIssue && <IssueLink activityId={activityId} />}.
       </>
     </IssueActivityBlockComponent>
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/priority.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/priority.tsx
index 8669cfe8326..c29058e9b66 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/priority.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/priority.tsx
@@ -5,11 +5,13 @@ import { Signal } from "lucide-react";
 import { useIssueDetail } from "@/hooks/store";
 // components
 import { IssueActivityBlockComponent, IssueLink } from "./";
+import { useTranslation } from "@plane/i18n";
 
 type TIssuePriorityActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
 export const IssuePriorityActivity: FC<TIssuePriorityActivity> = observer((props) => {
   const { activityId, showIssue = true, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -25,8 +27,8 @@ export const IssuePriorityActivity: FC<TIssuePriorityActivity> = observer((props
       ends={ends}
     >
       <>
-        set the priority to <span className="font-medium text-custom-text-100">{activity.new_value}</span>
-        {showIssue ? ` for ` : ``}
+        {t("set_priority_to")} <span className="font-medium text-custom-text-100">{activity.new_value}</span>
+        {showIssue ? ` ${t("for")} ` : ``}
         {showIssue && <IssueLink activityId={activityId} />}.
       </>
     </IssueActivityBlockComponent>
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/relation.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/relation.tsx
index cb6c07c9915..f290a7680d1 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/relation.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/relation.tsx
@@ -7,11 +7,13 @@ import { ISSUE_RELATION_OPTIONS } from "@/plane-web/components/relations";
 import { TIssueRelationTypes } from "@/plane-web/types";
 //
 import { IssueActivityBlockComponent } from "./";
+import { useTranslation } from "@plane/i18n";
 
 type TIssueRelationActivity = { activityId: string; ends: "top" | "bottom" | undefined };
 
 export const IssueRelationActivity: FC<TIssueRelationActivity> = observer((props) => {
   const { activityId, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -28,15 +30,15 @@ export const IssueRelationActivity: FC<TIssueRelationActivity> = observer((props
     >
       <>
         {activity.field === "blocking" &&
-          (activity.old_value === "" ? `marked this issue is blocking issue ` : `removed the blocking issue `)}
+          (activity.old_value === "" ? `${t("marked_blocking_issue")} ` : `${t("removed_blocking_issue")} `)}
         {activity.field === "blocked_by" &&
           (activity.old_value === ""
-            ? `marked this issue is being blocked by `
-            : `removed this issue being blocked by issue `)}
+            ? `${t("marked_blocked_by")} `
+            : `${t("removed_blocked_by")} `)}
         {activity.field === "duplicate" &&
-          (activity.old_value === "" ? `marked this issue as duplicate of ` : `removed this issue as a duplicate of `)}
+          (activity.old_value === "" ? `${t("marked_duplicate_of")} ` : `r${t("removed_duplicate_of")} `)}
         {activity.field === "relates_to" &&
-          (activity.old_value === "" ? `marked that this issue relates to ` : `removed the relation from `)}
+          (activity.old_value === "" ? `${t("marked_relation_to")} ` : `${t("removed_relation_from")} `)}
 
         {activity.old_value === "" ? (
           <span className="font-medium text-custom-text-100">{activity.new_value}.</span>
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/start_date.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/start_date.tsx
index b1e0ce03ca7..669c2bea8e6 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/start_date.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/start_date.tsx
@@ -7,11 +7,13 @@ import { useIssueDetail } from "@/hooks/store";
 // components
 import { IssueActivityBlockComponent, IssueLink } from "./";
 // helpers
+import { useTranslation } from "@plane/i18n";
 
 type TIssueStartDateActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
 export const IssueStartDateActivity: FC<TIssueStartDateActivity> = observer((props) => {
   const { activityId, showIssue = true, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -27,13 +29,13 @@ export const IssueStartDateActivity: FC<TIssueStartDateActivity> = observer((pro
       ends={ends}
     >
       <>
-        {activity.new_value ? `set the start date to ` : `removed the start date `}
+        {activity.new_value ? `${t("set_start_date_to")} ` : `${t("removed_start_date")} `}
         {activity.new_value && (
           <>
             <span className="font-medium text-custom-text-100">{renderFormattedDate(activity.new_value)}</span>
           </>
         )}
-        {showIssue && (activity.new_value ? ` for ` : ` from `)}
+        {showIssue && (activity.new_value ? ` ${t("for")} ` : ` ${t("from")} `)}
         {showIssue && <IssueLink activityId={activityId} />}.
       </>
     </IssueActivityBlockComponent>
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/state.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/state.tsx
index d5c3e8d5857..11a1c5f1405 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/state.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/state.tsx
@@ -3,6 +3,7 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 // hooks
+import { useTranslation } from "@plane/i18n";
 import { DoubleCircleIcon } from "@plane/ui";
 import { useIssueDetail } from "@/hooks/store";
 // components
@@ -13,6 +14,7 @@ type TIssueStateActivity = { activityId: string; showIssue?: boolean; ends: "top
 
 export const IssueStateActivity: FC<TIssueStateActivity> = observer((props) => {
   const { activityId, showIssue = true, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -28,8 +30,8 @@ export const IssueStateActivity: FC<TIssueStateActivity> = observer((props) => {
       ends={ends}
     >
       <>
-        set the state to <span className="font-medium text-custom-text-100">{activity.new_value}</span>
-        {showIssue ? ` for ` : ``}
+        {t("set_state_to")} <span className="font-medium text-custom-text-100">{activity.new_value}</span>
+        {showIssue ? ` ${t("for")} ` : ``}
         {showIssue && <IssueLink activityId={activityId} />}.
       </>
     </IssueActivityBlockComponent>
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/target_date.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/target_date.tsx
index 7d0367bd88e..bb039d56d15 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/target_date.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/target_date.tsx
@@ -7,11 +7,13 @@ import { useIssueDetail } from "@/hooks/store";
 // components
 import { IssueActivityBlockComponent, IssueLink } from "./";
 // helpers
+import { useTranslation } from "@plane/i18n";
 
 type TIssueTargetDateActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
 export const IssueTargetDateActivity: FC<TIssueTargetDateActivity> = observer((props) => {
   const { activityId, showIssue = true, ends } = props;
+  const { t } = useTranslation();
   // hooks
   const {
     activity: { getActivityById },
@@ -27,13 +29,13 @@ export const IssueTargetDateActivity: FC<TIssueTargetDateActivity> = observer((p
       ends={ends}
     >
       <>
-        {activity.new_value ? `set the due date to ` : `removed the due date `}
+        {activity.new_value ? `${t("set_due_date_to")} ` : `${t("removed_due_date")} `}
         {activity.new_value && (
           <>
             <span className="font-medium text-custom-text-100">{renderFormattedDate(activity.new_value)}</span>
           </>
         )}
-        {showIssue && (activity.new_value ? ` for ` : ` from `)}
+        {showIssue && (activity.new_value ? ` ${t("for")} ` : ` ${t("from")} `)}
         {showIssue && <IssueLink activityId={activityId} />}.
       </>
     </IssueActivityBlockComponent>
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/activity-list.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/activity-list.tsx
index 18cd3481fe9..6fc4e1e27c4 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/activity-list.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/activity-list.tsx
@@ -24,6 +24,7 @@ import {
   IssueAttachmentActivity,
   IssueArchivedAtActivity,
   IssueInboxActivity,
+  IssueCustomPropertyActivity,
 } from "./actions";
 
 type TIssueActivityItem = {
@@ -42,6 +43,11 @@ export const IssueActivityItem: FC<TIssueActivityItem> = observer((props) => {
   const componentDefaultProps = { activityId, ends };
 
   const activityField = getActivityById(activityId)?.field;
+
+  if (activityField && activityField.startsWith("Custom Property")) {
+    return <IssueCustomPropertyActivity {...componentDefaultProps} />;
+  }
+
   switch (activityField) {
     case null: // default issue creation
       return <IssueDefaultActivity {...componentDefaultProps} />;
diff --git a/web/core/components/issues/issue-detail/issue-activity/root.tsx b/web/core/components/issues/issue-detail/issue-activity/root.tsx
index da2fff694b1..cd5acf8ea7f 100644
--- a/web/core/components/issues/issue-detail/issue-activity/root.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/root.tsx
@@ -6,6 +6,7 @@ import { observer } from "mobx-react";
 import { TFileSignedURLResponse, TIssueComment } from "@plane/types";
 import { EFileAssetType } from "@plane/types/src/enums";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { TOAST_TYPE, setToast } from "@plane/ui";
 // components
 import { IssueCommentCreate } from "@/components/issues";
@@ -38,6 +39,7 @@ export type TActivityOperations = {
 
 export const IssueActivity: FC<TIssueActivity> = observer((props) => {
   const { workspaceSlug, projectId, issueId, disabled = false, isIntakeIssue = false } = props;
+  const { t } = useTranslation();
   // hooks
   const { createComment, updateComment, removeComment } = useIssueDetail();
   const { projectPermissionsByWorkspaceSlugAndProjectId } = useUserPermissions();
@@ -142,7 +144,7 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {
     <div className="space-y-4 pt-3">
       {/* header */}
       <div className="flex items-center justify-between">
-        <div className="text-lg text-custom-text-100">Activity</div>
+        <div className="text-lg text-custom-text-100">{t("activity")}</div>
         <div className="flex items-center gap-2">
           {isWorklogButtonEnabled && (
             <IssueActivityWorklogCreateButton
diff --git a/web/core/components/issues/issue-detail/sidebar.tsx b/web/core/components/issues/issue-detail/sidebar.tsx
index 102dc6e5a33..aacdbe41514 100644
--- a/web/core/components/issues/issue-detail/sidebar.tsx
+++ b/web/core/components/issues/issue-detail/sidebar.tsx
@@ -2,8 +2,10 @@
 
 import React from "react";
 import { observer } from "mobx-react";
-import { CalendarCheck2, CalendarClock, LayoutPanelTop, Signal, Tag, Triangle, UserCircle2, Users } from "lucide-react";
+import { CalendarCheck2, CalendarClock, LayoutPanelTop, Signal, Tag, Triangle, UserCircle2, Users, Info } from "lucide-react";
+import axios from "axios";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { ContrastIcon, DiceIcon, DoubleCircleIcon } from "@plane/ui";
 // components
 import {
@@ -14,7 +16,7 @@ import {
   StateDropdown,
 } from "@/components/dropdowns";
 import { ButtonAvatars } from "@/components/dropdowns/member/avatar";
-import { IssueCycleSelect, IssueLabel, IssueModuleSelect, IssueParentSelect } from "@/components/issues";
+import { IssueCycleSelect, IssueLabel, IssueModuleSelect, IssueParentSelect, CustomProperties } from "@/components/issues";
 // helpers
 import { cn } from "@/helpers/common.helper";
 import { getDate, renderFormattedPayloadDate } from "@/helpers/date-time.helper";
@@ -26,6 +28,8 @@ import { IssueAdditionalPropertyValuesUpdate } from "@/plane-web/components/issu
 import { IssueWorklogProperty } from "@/plane-web/components/issues";
 // components
 import type { TIssueOperations } from "./root";
+import { ISSUE_ADDITIONAL_PROPERTIES } from "@/constants/issue";
+import { CustomProperty } from "../custom-properties";
 
 type Props = {
   workspaceSlug: string;
@@ -37,6 +41,7 @@ type Props = {
 
 export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
   const { workspaceSlug, projectId, issueId, issueOperations, isEditable } = props;
+  const { t } = useTranslation();
   // store hooks
   const { getProjectById } = useProject();
   const { areEstimateEnabledByProjectId } = useProjectEstimates();
@@ -53,24 +58,63 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
   // derived values
   const projectDetails = getProjectById(issue.project_id);
   const stateDetails = getStateById(issue.state_id);
-
+  const customProperties = issue?.custom_properties || [];
+  const issue_type_id = issue?.type_id || "";
   const minDate = issue.start_date ? getDate(issue.start_date) : null;
   minDate?.setDate(minDate.getDate());
 
   const maxDate = issue.target_date ? getDate(issue.target_date) : null;
   maxDate?.setDate(maxDate.getDate());
 
+  const handleCustomPropertiesUpdate = async (updatedProperties: CustomProperty[]) => {
+    try {
+      const updateRequests = updatedProperties.map((property) => {
+        const customPropertyId = property?.id || "";
+        const apiUrl = `/api/workspaces/${workspaceSlug}/issues/${issueId}/custom-properties/`;
+        if (customPropertyId) {
+          return axios.patch(
+            `${apiUrl}${customPropertyId}/`, 
+            { value: property.value },
+            {
+              headers: {
+                'Content-Type': 'application/json'
+              }
+            }
+          );
+        } else {
+          return axios.post(
+            apiUrl, 
+            {
+              key: property.key,
+              value: property.value,
+              issue_type_custom_property: property.issue_type_custom_property,
+              data_type: property.data_type,
+            },
+            {
+              headers: {
+                'x-api-key': 'TEST_API_TOKEN',
+                'Content-Type': 'application/json'
+              }
+            }
+          );
+        }
+      });
+      await Promise.all(updateRequests);
+    } catch (error) {
+    }
+  };
+
   return (
     <>
       <div className="flex items-center h-full w-full flex-col divide-y-2 divide-custom-border-200 overflow-hidden">
         <div className="h-full w-full overflow-y-auto px-6">
-          <h5 className="mt-6 text-sm font-medium">Properties</h5>
+          <h5 className="mt-6 text-sm font-medium">{t("properties")}</h5>
           {/* TODO: render properties using a common component */}
           <div className={`mb-2 mt-3 space-y-2.5 ${!isEditable ? "opacity-60" : ""}`}>
             <div className="flex h-8 items-center gap-2">
               <div className="flex w-2/5 flex-shrink-0 items-center gap-1 text-sm text-custom-text-300">
                 <DoubleCircleIcon className="h-4 w-4 flex-shrink-0" />
-                <span>State</span>
+                <span>{t("state")}</span>
               </div>
               <StateDropdown
                 value={issue?.state_id}
@@ -89,7 +133,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
             <div className="flex h-8 items-center gap-2">
               <div className="flex w-2/5 flex-shrink-0 items-center gap-1 text-sm text-custom-text-300">
                 <Users className="h-4 w-4 flex-shrink-0" />
-                <span>Assignees</span>
+                <span>{t("assignees")}</span>
               </div>
               <MemberDropdown
                 value={issue?.assignee_ids ?? undefined}
@@ -113,7 +157,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
             <div className="flex h-8 items-center gap-2">
               <div className="flex w-2/5 flex-shrink-0 items-center gap-1 text-sm text-custom-text-300">
                 <Signal className="h-4 w-4 flex-shrink-0" />
-                <span>Priority</span>
+                <span>{t("priority")}</span>
               </div>
               <PriorityDropdown
                 value={issue?.priority}
@@ -130,7 +174,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
               <div className="flex h-8 items-center gap-2">
                 <div className="flex w-2/5 flex-shrink-0 items-center gap-1 text-sm text-custom-text-300">
                   <UserCircle2 className="h-4 w-4 flex-shrink-0" />
-                  <span>Created by</span>
+                  <span>{t("created_by")} by</span>
                 </div>
                 <div className="w-full h-full flex items-center gap-1.5 rounded px-2 py-0.5 text-sm justify-between cursor-not-allowed">
                   <ButtonAvatars showTooltip userIds={createdByDetails.id} />
@@ -142,7 +186,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
             <div className="flex h-8 items-center gap-2">
               <div className="flex w-2/5 flex-shrink-0 items-center gap-1 text-sm text-custom-text-300">
                 <CalendarClock className="h-4 w-4 flex-shrink-0" />
-                <span>Start date</span>
+                <span>{t("start_date")}</span>
               </div>
               <DateDropdown
                 placeholder="Add start date"
@@ -168,7 +212,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
             <div className="flex h-8 items-center gap-2">
               <div className="flex w-2/5 flex-shrink-0 items-center gap-1 text-sm text-custom-text-300">
                 <CalendarCheck2 className="h-4 w-4 flex-shrink-0" />
-                <span>Due date</span>
+                <span>{t("due_date")}</span>
               </div>
               <DateDropdown
                 placeholder="Add due date"
@@ -198,7 +242,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
               <div className="flex h-8 items-center gap-2">
                 <div className="flex w-2/5 flex-shrink-0 items-center gap-1 text-sm text-custom-text-300">
                   <Triangle className="h-4 w-4 flex-shrink-0" />
-                  <span>Estimate</span>
+                  <span>{t("estimate")}</span>
                 </div>
                 <EstimateDropdown
                   value={issue?.estimate_point ?? undefined}
@@ -223,7 +267,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
               <div className="flex min-h-8 gap-2">
                 <div className="flex w-2/5 flex-shrink-0 gap-1 pt-2 text-sm text-custom-text-300">
                   <DiceIcon className="h-4 w-4 flex-shrink-0" />
-                  <span>Modules</span>
+                  <span>{t("modules")}</span>
                 </div>
                 <IssueModuleSelect
                   className="w-3/5 flex-grow"
@@ -240,7 +284,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
               <div className="flex h-8 items-center gap-2">
                 <div className="flex w-2/5 flex-shrink-0 items-center gap-1 text-sm text-custom-text-300">
                   <ContrastIcon className="h-4 w-4 flex-shrink-0" />
-                  <span>Cycle</span>
+                  <span>{t("cycle")}</span>
                 </div>
                 <IssueCycleSelect
                   className="w-3/5 flex-grow"
@@ -256,7 +300,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
             <div className="flex h-8 items-center gap-2">
               <div className="flex w-2/5 flex-shrink-0 items-center gap-1 text-sm text-custom-text-300">
                 <LayoutPanelTop className="h-4 w-4 flex-shrink-0" />
-                <span>Parent</span>
+                <span>{t("parent")}</span>
               </div>
               <IssueParentSelect
                 className="h-full w-3/5 flex-grow"
@@ -271,7 +315,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
             <div className="flex min-h-8 gap-2">
               <div className="flex w-2/5 flex-shrink-0 gap-1 pt-2 text-sm text-custom-text-300">
                 <Tag className="h-4 w-4 flex-shrink-0" />
-                <span>Labels</span>
+                <span>{t("labels")}</span>
               </div>
               <div className="h-full min-h-8 w-3/5 flex-grow">
                 <IssueLabel
@@ -282,7 +326,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
                 />
               </div>
             </div>
-
+            
             <IssueWorklogProperty
               workspaceSlug={workspaceSlug}
               projectId={projectId}
@@ -299,6 +343,29 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
                 isDisabled={!isEditable}
               />
             )}
+
+            {ISSUE_ADDITIONAL_PROPERTIES.map((prop: any) =>
+              issue[prop.key] ? (
+                <div key={prop?.key} className="flex min-h-8 gap-2 align-items-center">
+                  <div className="flex w-2/5 flex-shrink-0 gap-1 pt-2 text-sm text-custom-text-300">
+                    <Info className="h-4 w-4 flex-shrink-0 mt-0.5" />
+                    <span>{t(prop?.key)}</span>
+                  </div>
+                  <div className="h-full min-h-8 w-3/5 mt-1 ml-5 flex-grow">
+                    <span className="text-sm">{issue[prop.key]}</span>
+                  </div>
+                </div>
+              ) : null
+            )}
+
+            <CustomProperties
+              customProperties={Array.isArray(customProperties) ? customProperties : []}
+              issue_type_id={issue_type_id}
+              workspaceSlug={workspaceSlug}
+              updateCustomProperties={handleCustomPropertiesUpdate}
+              issueId={issueId}
+              layout="two-fifths"
+            />
           </div>
         </div>
       </div>
diff --git a/web/core/components/issues/issue-layouts/calendar/dropdowns/options-dropdown.tsx b/web/core/components/issues/issue-layouts/calendar/dropdowns/options-dropdown.tsx
index 822f4248872..0bf9dd07656 100644
--- a/web/core/components/issues/issue-layouts/calendar/dropdowns/options-dropdown.tsx
+++ b/web/core/components/issues/issue-layouts/calendar/dropdowns/options-dropdown.tsx
@@ -16,6 +16,7 @@ import {
   TCalendarLayouts,
   TIssueKanbanFilters,
 } from "@plane/types";
+import { useTranslation } from "@plane/i18n";
 import { ToggleSwitch } from "@plane/ui";
 // types
 // constants
@@ -39,6 +40,7 @@ interface ICalendarHeader {
 
 export const CalendarOptionsDropdown: React.FC<ICalendarHeader> = observer((props) => {
   const { issuesFilterStore, updateFilters } = props;
+  const { t } = useTranslation();
 
   const { projectId } = useParams();
 
@@ -105,7 +107,7 @@ export const CalendarOptionsDropdown: React.FC<ICalendarHeader> = observer((prop
                   open ? "text-custom-text-100" : "text-custom-text-200"
                 }`}
               >
-                <div className="font-medium">Options</div>
+                <div className="font-medium">{t("options")}</div>
                 <div
                   className={`flex h-3.5 w-3.5 items-center justify-center transition-all ${open ? "" : "rotate-180"}`}
                 >
@@ -141,7 +143,7 @@ export const CalendarOptionsDropdown: React.FC<ICalendarHeader> = observer((prop
                       className="flex w-full items-center justify-between gap-2 rounded px-1 py-1.5 text-left text-xs hover:bg-custom-background-80"
                       onClick={() => handleLayoutChange(layoutDetails.key, closePopover)}
                     >
-                      {layoutDetails.title}
+                      {t(layoutDetails.title)}
                       {calendarLayout === layout && <Check size={12} strokeWidth={2} />}
                     </button>
                   ))}
@@ -150,7 +152,7 @@ export const CalendarOptionsDropdown: React.FC<ICalendarHeader> = observer((prop
                     className="flex w-full items-center justify-between gap-2 rounded px-1 py-1.5 text-left text-xs hover:bg-custom-background-80"
                     onClick={handleToggleWeekends}
                   >
-                    Show weekends
+                    {t("show_weekends")}
                     <ToggleSwitch
                       value={showWeekends}
                       onChange={() => {
diff --git a/web/core/components/issues/issue-layouts/calendar/header.tsx b/web/core/components/issues/issue-layouts/calendar/header.tsx
index c7e6232a053..f7cefd3c5a1 100644
--- a/web/core/components/issues/issue-layouts/calendar/header.tsx
+++ b/web/core/components/issues/issue-layouts/calendar/header.tsx
@@ -8,6 +8,7 @@ import {
   IIssueFilterOptions,
   TIssueKanbanFilters,
 } from "@plane/types";
+import { useTranslation } from "@plane/i18n";
 import { Row } from "@plane/ui";
 import { CalendarMonthsDropdown, CalendarOptionsDropdown } from "@/components/issues";
 // icons
@@ -30,6 +31,7 @@ interface ICalendarHeader {
 
 export const CalendarHeader: React.FC<ICalendarHeader> = observer((props) => {
   const { issuesFilterStore, updateFilters, setSelectedDate } = props;
+  const { t } = useTranslation();
 
   const issueCalendarView = useCalendarView();
 
@@ -113,7 +115,7 @@ export const CalendarHeader: React.FC<ICalendarHeader> = observer((props) => {
           className="rounded bg-custom-background-80 px-2.5 py-1 text-xs font-medium text-custom-text-200 hover:text-custom-text-100"
           onClick={handleToday}
         >
-          Today
+          {t("today")}
         </button>
         <CalendarOptionsDropdown issuesFilterStore={issuesFilterStore} updateFilters={updateFilters} />
       </div>
diff --git a/web/core/components/issues/issue-layouts/calendar/quick-add-issue-actions.tsx b/web/core/components/issues/issue-layouts/calendar/quick-add-issue-actions.tsx
index 5a1becee227..4b44f3a1249 100644
--- a/web/core/components/issues/issue-layouts/calendar/quick-add-issue-actions.tsx
+++ b/web/core/components/issues/issue-layouts/calendar/quick-add-issue-actions.tsx
@@ -8,6 +8,7 @@ import { PlusIcon } from "lucide-react";
 // types
 import { ISearchIssueResponse, TIssue } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { CustomMenu, setPromiseToast } from "@plane/ui";
 // components
 import { ExistingIssuesListModal } from "@/components/core";
@@ -27,6 +28,7 @@ type TCalendarQuickAddIssueActions = {
 
 export const CalendarQuickAddIssueActions: FC<TCalendarQuickAddIssueActions> = observer((props) => {
   const { prePopulatedData, quickAddCallback, addIssuesToView, onOpen } = props;
+  const { t } = useTranslation();
   // router
   const { workspaceSlug, projectId, moduleId } = useParams();
   // states
@@ -117,12 +119,12 @@ export const CalendarQuickAddIssueActions: FC<TCalendarQuickAddIssueActions> = o
               customButton={
                 <div className="flex w-full items-center gap-x-[6px] rounded-md px-2 py-1.5 text-custom-text-350 hover:text-custom-text-300">
                   <PlusIcon className="h-3.5 w-3.5 stroke-2 flex-shrink-0" />
-                  <span className="text-sm font-medium flex-shrink-0">New issue</span>
+                  <span className="text-sm font-medium flex-shrink-0">{t("new_issue")}</span>
                 </div>
               }
             >
-              <CustomMenu.MenuItem onClick={handleNewIssue}>New issue</CustomMenu.MenuItem>
-              <CustomMenu.MenuItem onClick={handleExistingIssue}>Add existing issue</CustomMenu.MenuItem>
+              <CustomMenu.MenuItem onClick={handleNewIssue}>{t("new_issue")}</CustomMenu.MenuItem>
+              <CustomMenu.MenuItem onClick={handleExistingIssue}>{t("add_existing_issue")}</CustomMenu.MenuItem>
             </CustomMenu>
           </div>
         }
diff --git a/web/core/components/issues/issue-layouts/calendar/week-header.tsx b/web/core/components/issues/issue-layouts/calendar/week-header.tsx
index df432491448..ed2281542cc 100644
--- a/web/core/components/issues/issue-layouts/calendar/week-header.tsx
+++ b/web/core/components/issues/issue-layouts/calendar/week-header.tsx
@@ -1,4 +1,5 @@
 import { observer } from "mobx-react";
+import { useTranslation } from "@plane/i18n";
 
 // constants
 import { DAYS_LIST } from "@/constants/calendar";
@@ -10,6 +11,7 @@ type Props = {
 
 export const CalendarWeekHeader: React.FC<Props> = observer((props) => {
   const { isLoading, showWeekends } = props;
+  const { t } = useTranslation();
 
   return (
     <div
@@ -28,7 +30,7 @@ export const CalendarWeekHeader: React.FC<Props> = observer((props) => {
             key={day.shortTitle}
             className="flex h-11 items-center justify-center md:justify-end bg-custom-background-90 px-4"
           >
-            {day.shortTitle}
+            {t(day.shortTitle)}
           </div>
         );
       })}
diff --git a/web/core/components/issues/issue-layouts/empty-states/project-view.tsx b/web/core/components/issues/issue-layouts/empty-states/project-view.tsx
index 160834ea71c..d1bd4c26fdc 100644
--- a/web/core/components/issues/issue-layouts/empty-states/project-view.tsx
+++ b/web/core/components/issues/issue-layouts/empty-states/project-view.tsx
@@ -9,8 +9,10 @@ import { useCommandPalette, useEventTracker, useUserPermissions } from "@/hooks/
 import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
 // assets
 import emptyIssue from "@/public/empty-state/issue.svg";
+import { useTranslation } from "@plane/i18n";
 
 export const ProjectViewEmptyState: React.FC = observer(() => {
+  const { t } = useTranslation();
   // store hooks
   const { toggleCreateIssueModal } = useCommandPalette();
   const { setTrackElement } = useEventTracker();
@@ -31,7 +33,7 @@ export const ProjectViewEmptyState: React.FC = observer(() => {
         primaryButton={
           isCreatingIssueAllowed
             ? {
-                text: "New issue",
+                text: t("new_issue"),
                 icon: <PlusIcon className="h-3 w-3" strokeWidth={2} />,
                 onClick: () => {
                   setTrackElement("View issue empty state");
diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/additional-properties.tsx b/web/core/components/issues/issue-layouts/filters/applied-filters/additional-properties.tsx
new file mode 100644
index 00000000000..c90a3533b16
--- /dev/null
+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/additional-properties.tsx
@@ -0,0 +1,33 @@
+"use client";
+
+import { observer } from "mobx-react";
+
+// icons
+import { X } from "lucide-react";
+
+type Props = {
+  handleRemove: (val: string) => void;
+  values: string[];
+  editable: boolean | undefined;
+};
+
+export const AppliedAdditionalPropertiesFilters: React.FC<Props> = observer((props) => {
+  const { handleRemove, values } = props;
+
+  return (
+    <>
+      {values.map((element) => (
+        <div key={element} className="flex items-center gap-1 rounded bg-custom-background-80 p-1 text-xs">
+          {element}
+          <button
+            type="button"
+            className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
+            onClick={() => handleRemove(element)}
+          >
+            <X size={10} strokeWidth={2} />
+          </button>
+        </div>
+      ))}
+    </>
+  );
+});
diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/date.tsx b/web/core/components/issues/issue-layouts/filters/applied-filters/date.tsx
index dcc6c15e56d..e89ebe2aa05 100644
--- a/web/core/components/issues/issue-layouts/filters/applied-filters/date.tsx
+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/date.tsx
@@ -5,6 +5,7 @@ import { X } from "lucide-react";
 import { DATE_AFTER_FILTER_OPTIONS } from "@/constants/filters";
 import { renderFormattedDate } from "@/helpers/date-time.helper";
 import { capitalizeFirstLetter } from "@/helpers/string.helper";
+import { useTranslation } from "@plane/i18n";
 // constants
 
 type Props = {
@@ -14,13 +15,14 @@ type Props = {
 
 export const AppliedDateFilters: React.FC<Props> = observer((props) => {
   const { handleRemove, values } = props;
+  const { t } = useTranslation();
 
   const getDateLabel = (value: string): string => {
     let dateLabel = "";
 
     const dateDetails = DATE_AFTER_FILTER_OPTIONS.find((d) => d.value === value);
 
-    if (dateDetails) dateLabel = dateDetails.name;
+    if (dateDetails) dateLabel = t(dateDetails.name);
     else {
       const dateParts = value.split(";");
 
diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx b/web/core/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx
index 268358efea2..4f1a5e52bc5 100644
--- a/web/core/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx
+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx
@@ -14,6 +14,7 @@ import {
   AppliedProjectFilters,
   AppliedStateFilters,
   AppliedStateGroupFilters,
+  AppliedAdditionalPropertiesFilters
 } from "@/components/issues";
 // constants
 // helpers
@@ -36,6 +37,7 @@ type Props = {
 
 const membersFilters = ["assignees", "mentions", "created_by", "subscriber"];
 const dateFilters = ["start_date", "target_date"];
+const additionalFilters = ["hub_code", "customer_code", "reference_number", "trip_reference_number", "vendor_code", "worker_code", "hub_name", "customer_name", "vendor_name", "worker_name", "business_type"];
 
 export const AppliedFiltersList: React.FC<Props> = observer((props) => {
   const {
@@ -134,6 +136,13 @@ export const AppliedFiltersList: React.FC<Props> = observer((props) => {
                 values={value}
               />
             )}
+            {additionalFilters?.includes(filterKey) && (
+              <AppliedAdditionalPropertiesFilters
+                editable={isEditingAllowed}
+                handleRemove={(val) => handleRemoveFilter(filterKey, val)}
+                values={value}
+              />
+            )}
             {isEditingAllowed && (
               <button
                 type="button"
diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/index.ts b/web/core/components/issues/issue-layouts/filters/applied-filters/index.ts
index ba074e84f8b..a26443969c3 100644
--- a/web/core/components/issues/issue-layouts/filters/applied-filters/index.ts
+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/index.ts
@@ -9,3 +9,4 @@ export * from "./module";
 export * from "./cycle";
 export * from "./state";
 export * from "./state-group";
+export * from "./additional-properties";
diff --git a/web/core/components/issues/issue-layouts/filters/header/display-filters/display-properties.tsx b/web/core/components/issues/issue-layouts/filters/header/display-filters/display-properties.tsx
index 1e607838229..d6abd921630 100644
--- a/web/core/components/issues/issue-layouts/filters/header/display-filters/display-properties.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/display-filters/display-properties.tsx
@@ -9,6 +9,8 @@ import { ISSUE_DISPLAY_PROPERTIES } from "@/constants/issue";
 import { shouldRenderDisplayProperty } from "@/plane-web/helpers/issue-filter.helper";
 // components
 import { FilterHeader } from "../helpers/filter-header";
+import { useTranslation } from "@plane/i18n";
+import { useUserPermissions } from "@/hooks/store";
 
 type Props = {
   displayProperties: IIssueDisplayProperties;
@@ -18,6 +20,11 @@ type Props = {
   moduleViewDisabled?: boolean;
 };
 
+type IProperty = {
+  key: keyof IIssueDisplayProperties | string;
+  title: string;
+};
+
 export const FilterDisplayProperties: React.FC<Props> = observer((props) => {
   const {
     displayProperties,
@@ -26,16 +33,33 @@ export const FilterDisplayProperties: React.FC<Props> = observer((props) => {
     cycleViewDisabled = false,
     moduleViewDisabled = false,
   } = props;
+  const { t } = useTranslation();
   // router
   const { workspaceSlug, projectId: routerProjectId } = useParams();
   // states
   const [previewEnabled, setPreviewEnabled] = React.useState(true);
   // derived values
   const projectId = !!routerProjectId ? routerProjectId?.toString() : undefined;
+  const { workspaceUserInfo } = useUserPermissions();
+
+  const customPropertiesForDisplay: IProperty[] = Object.keys(
+    workspaceUserInfo[workspaceSlug?.toString()]?.default_props?.display_properties?.custom_properties || {}
+  ).map((key) => ({
+    key,
+    title: key,
+  }));
+
+  const combinedPropertiesForDisplay: IProperty[] = [
+    ...ISSUE_DISPLAY_PROPERTIES,
+    ...customPropertiesForDisplay
+  ];
 
   // Filter out "cycle" and "module" keys if cycleViewDisabled or moduleViewDisabled is true
   // Also filter out display properties that should not be rendered
-  const filteredDisplayProperties = ISSUE_DISPLAY_PROPERTIES.filter((property) => {
+  const filteredDisplayProperties = combinedPropertiesForDisplay.filter((property) => {
+    if (customPropertiesForDisplay.some((customProperty) => customProperty.key === property.key)) {
+      return true;
+    }
     if (!displayPropertiesToRender.includes(property.key)) return false;
     switch (property.key) {
       case "cycle":
@@ -72,7 +96,7 @@ export const FilterDisplayProperties: React.FC<Props> = observer((props) => {
                   })
                 }
               >
-                {displayProperty.title}
+                {t(displayProperty.key as string)}
               </button>
             </>
           ))}
diff --git a/web/core/components/issues/issue-layouts/filters/header/display-filters/issue-grouping.tsx b/web/core/components/issues/issue-layouts/filters/header/display-filters/issue-grouping.tsx
index f3c0fdf1360..0fc33527ab6 100644
--- a/web/core/components/issues/issue-layouts/filters/header/display-filters/issue-grouping.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/display-filters/issue-grouping.tsx
@@ -7,6 +7,7 @@ import { FilterHeader, FilterOption } from "@/components/issues";
 // types
 import { ISSUE_FILTER_OPTIONS } from "@/constants/issue";
 // constants
+import { useTranslation } from "@plane/i18n";
 
 type Props = {
   selectedIssueType: TIssueGroupingFilters | undefined;
@@ -15,6 +16,7 @@ type Props = {
 
 export const FilterIssueGrouping: React.FC<Props> = observer((props) => {
   const { selectedIssueType, handleUpdate } = props;
+  const { t } = useTranslation();
 
   const [previewEnabled, setPreviewEnabled] = React.useState(true);
 
@@ -23,7 +25,7 @@ export const FilterIssueGrouping: React.FC<Props> = observer((props) => {
   return (
     <>
       <FilterHeader
-        title="Issue Grouping"
+        title={t("issue_grouping")}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -34,7 +36,7 @@ export const FilterIssueGrouping: React.FC<Props> = observer((props) => {
               key={issueType?.key}
               isChecked={activeIssueType === issueType?.key ? true : false}
               onClick={() => handleUpdate(issueType?.key)}
-              title={issueType.title}
+              title={t(issueType.title)}
               multiple={false}
             />
           ))}
diff --git a/web/core/components/issues/issue-layouts/filters/header/display-filters/order-by.tsx b/web/core/components/issues/issue-layouts/filters/header/display-filters/order-by.tsx
index a9ff00b3d0e..bc8f0a38e08 100644
--- a/web/core/components/issues/issue-layouts/filters/header/display-filters/order-by.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/display-filters/order-by.tsx
@@ -7,6 +7,7 @@ import { FilterHeader, FilterOption } from "@/components/issues";
 // types
 import { ISSUE_ORDER_BY_OPTIONS } from "@/constants/issue";
 // constants
+import { useTranslation } from "@plane/i18n";
 
 type Props = {
   selectedOrderBy: TIssueOrderByOptions | undefined;
@@ -16,6 +17,7 @@ type Props = {
 
 export const FilterOrderBy: React.FC<Props> = observer((props) => {
   const { selectedOrderBy, handleUpdate, orderByOptions } = props;
+  const { t } = useTranslation();
 
   const [previewEnabled, setPreviewEnabled] = useState(true);
 
@@ -24,7 +26,7 @@ export const FilterOrderBy: React.FC<Props> = observer((props) => {
   return (
     <>
       <FilterHeader
-        title="Order by"
+        title={t("order_by")}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/additional-properties.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/additional-properties.tsx
new file mode 100644
index 00000000000..6c5ae6e1769
--- /dev/null
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/additional-properties.tsx
@@ -0,0 +1,103 @@
+"use client";
+
+import React, { useState } from "react";
+import { observer } from "mobx-react";
+import { useParams } from "next/navigation";
+import { FilterHeader, FilterOption } from "@/components/issues";
+import { WorkspaceService } from "@/services/workspace.service";
+import { API_BASE_URL } from "@/helpers/common.helper";
+import { FilterSearch } from "./search-filters";
+import { useTranslation } from "@plane/i18n";
+
+type AdditionalPropertyProps = {
+  data: string[];
+  page?: number;
+  total_pages?: number;
+  total_results?: number;
+  searchQuery?: string;
+};
+
+type Props = {
+  appliedFilters: string[] | null;
+  handleUpdate: (val: string) => void;
+  additionalPropertyTitle: string | undefined;
+  additionalPropertyKey: string | undefined;
+  searchQuery: string;
+};
+
+export const FilterAdditionalProperties: React.FC<Props> = observer((props) => {
+  const { t } = useTranslation();
+  const { workspaceSlug } = useParams();
+  const { appliedFilters, handleUpdate, searchQuery, additionalPropertyTitle, additionalPropertyKey } = props;
+  const workspaceService = new WorkspaceService(API_BASE_URL);
+
+  const [options, setOptions] = useState<any>({});
+  const [previewEnabled, setPreviewEnabled] = useState(true);
+
+  const fetchOptions = async (query = '', page = 1) => {
+    try {
+      const response = await workspaceService.getIssueAdditionalProperties(workspaceSlug.toString(), additionalPropertyKey, query, page);
+      setOptions((options: any) => ({
+        ...response,
+        query,
+        data: page > 1 ? [...(options?.data || []), ...(response?.data || [])] : (response?.data || []),
+      }));
+
+    } catch (error) {
+      console.error(`Error fetching ${additionalPropertyKey} options:`, error);
+    }
+  };
+
+  const fetchNextPage = async () => {
+    const nextPage = options.page + 1;
+    await fetchOptions(
+      options.query,
+      nextPage
+    );
+  };
+
+  const handleSectionSearch = async (_groupKey: string, query: string) => {
+    await fetchOptions(query);
+  };
+
+  const filteredOptions = searchQuery
+    ? (options?.data || []).filter((option: any) => option?.toLowerCase().includes(searchQuery.toLowerCase()))
+    : (options?.data || []);
+
+  return (
+    <>
+      <FilterHeader
+        title={`${additionalPropertyTitle} ${appliedFilters?.length ? `(${appliedFilters.length})` : ""}`}
+        isPreviewEnabled={previewEnabled}
+        handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
+      />
+      {previewEnabled && (
+        <div>
+          <FilterSearch propertyKey={additionalPropertyKey ?? ""} handleSectionSearch={handleSectionSearch} />
+          {filteredOptions.length > 0 ? (
+            <>
+              {filteredOptions.map((option:any, index:any) => (
+                <FilterOption
+                  key={index}
+                  isChecked={appliedFilters?.includes(option) ?? false}
+                  onClick={() => handleUpdate(option)}
+                  title={option}
+                />
+              ))}
+              {options.page < options.total_pages && (
+                <button
+                  onClick={() => fetchNextPage()}
+                  className="ml-8 text-xs font-medium text-custom-primary-100 cursor-pointer"
+                >
+                  
+                </button>
+              )}
+            </>
+          ) : (
+            <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
+          )}
+        </div>
+      )}
+    </>
+  );
+});
\ No newline at end of file
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/assignee.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/assignee.tsx
index 553fd7d4184..ba784d8645b 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/assignee.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/assignee.tsx
@@ -4,6 +4,7 @@ import { useMemo, useState } from "react";
 import sortBy from "lodash/sortBy";
 import { observer } from "mobx-react";
 // plane ui
+import { useTranslation } from "@plane/i18n";
 import { Avatar, Loader } from "@plane/ui";
 // components
 import { FilterHeader, FilterOption } from "@/components/issues";
@@ -21,6 +22,7 @@ type Props = {
 
 export const FilterAssignees: React.FC<Props> = observer((props: Props) => {
   const { appliedFilters, handleUpdate, memberIds, searchQuery } = props;
+  const { t } = useTranslation();
   // states
   const [itemsToRender, setItemsToRender] = useState(5);
   const [previewEnabled, setPreviewEnabled] = useState(true);
@@ -53,7 +55,7 @@ export const FilterAssignees: React.FC<Props> = observer((props: Props) => {
   return (
     <>
       <FilterHeader
-        title={`Assignee${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("assignees")}${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -94,7 +96,7 @@ export const FilterAssignees: React.FC<Props> = observer((props: Props) => {
                 )}
               </>
             ) : (
-              <p className="text-xs italic text-custom-text-400">No matches found</p>
+              <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
             )
           ) : (
             <Loader className="space-y-2">
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/created-by.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/created-by.tsx
index 2fbcf6233cc..7b5a6d59770 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/created-by.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/created-by.tsx
@@ -4,6 +4,7 @@ import { useMemo, useState } from "react";
 import sortBy from "lodash/sortBy";
 import { observer } from "mobx-react";
 // plane ui
+import { useTranslation } from "@plane/i18n";
 import { Avatar, Loader } from "@plane/ui";
 // components
 import { FilterHeader, FilterOption } from "@/components/issues";
@@ -21,6 +22,7 @@ type Props = {
 
 export const FilterCreatedBy: React.FC<Props> = observer((props: Props) => {
   const { appliedFilters, handleUpdate, memberIds, searchQuery } = props;
+  const { t } = useTranslation();
   // states
   const [itemsToRender, setItemsToRender] = useState(5);
   const [previewEnabled, setPreviewEnabled] = useState(true);
@@ -53,7 +55,7 @@ export const FilterCreatedBy: React.FC<Props> = observer((props: Props) => {
   return (
     <>
       <FilterHeader
-        title={`Created by${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("created_by")}${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -87,7 +89,7 @@ export const FilterCreatedBy: React.FC<Props> = observer((props: Props) => {
                 )}
               </>
             ) : (
-              <p className="text-xs italic text-custom-text-400">No matches found</p>
+              <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
             )
           ) : (
             <Loader className="space-y-2">
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/custom-properties.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/custom-properties.tsx
new file mode 100644
index 00000000000..032be12a018
--- /dev/null
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/custom-properties.tsx
@@ -0,0 +1,220 @@
+"use client";
+
+import React, { useMemo, useState, useEffect, useCallback } from "react";
+import { observer } from "mobx-react";
+import { useParams } from "next/navigation";
+import { WorkspaceService } from "@/services/workspace.service";
+import { API_BASE_URL } from "@/helpers/common.helper";
+import { FilterHeader, FilterOption, FilterDate, FilterNumber } from "@/components/issues";
+import { FilterSearch } from "./search-filters";
+import { useTranslation } from "@plane/i18n";
+
+type CustomPropertySection = {
+  data: string[];
+  page?: number;
+  total_pages?: number;
+  total_results?: number;
+  query?: string;
+  data_type?: string | null;
+};
+
+type CustomPropertiesState = {
+  [key: string]: CustomPropertySection;
+};
+
+type Props = {
+  appliedFilters: string[] | null;
+  handleUpdate: (val: string) => void;
+  searchQuery: string;
+};
+
+export const FilterCustomProperty: React.FC<Props> = observer((props) => {
+  const { t } = useTranslation();
+  const { workspaceSlug } = useParams();
+  const workspaceService = new WorkspaceService(API_BASE_URL);
+  const { appliedFilters, handleUpdate, searchQuery } = props;
+
+  const [mainPreviewEnabled, setMainPreviewEnabled] = useState(true);
+  const [groupPreviewEnabled, setGroupPreviewEnabled] = useState<Record<string, boolean>>({});
+  const [customProperties, setCustomProperties] = useState<CustomPropertiesState>({});
+
+  const fetchCustomProperties = async (
+    groupKey?: string,
+    query?: string,
+    page?: number
+  ) => {
+    try {
+      const params = {
+        page: page || 1,
+        query: query || '',
+        key: groupKey || '',
+      };
+      const data = await workspaceService.getIssuesCustomProperties(workspaceSlug?.toString(), params) as any;
+
+      // If no specific section, initialize all sections
+      if (!groupKey) {
+        const initialState = Object.keys(data).reduce((acc, key) => {
+          const section = data[key] || {};
+          acc[key] = {
+            ...section,
+            query: '',
+            data_type: section.data_type ?? "text",
+          };
+          return acc;
+        }, {} as CustomPropertiesState);
+
+        setCustomProperties(initialState);
+
+        const initialGroupPreview = Object.keys(data).reduce((acc, key) => {
+          acc[key] = true;
+          return acc;
+        }, {} as Record<string, boolean>);
+        setGroupPreviewEnabled(initialGroupPreview);
+      } else {
+        setCustomProperties(prev => ({
+          ...prev,
+          [groupKey]: {
+            ...(data[groupKey] || {}),
+            data: (page ?? 0) > 1
+              ? [...(prev[groupKey]?.data || []), ...(data[groupKey]?.data || [])]
+              : (data[groupKey]?.data || []),
+            query: query || '',
+            data_type: data[groupKey]?.data_type ?? "text",
+          }
+        }));
+      }
+    } catch (error) {
+      console.error("Error fetching custom properties:", error);
+    }
+  };
+
+  const appliedFiltersCount = appliedFilters?.length ?? 0;
+
+  useEffect(() => {
+    fetchCustomProperties();
+  }, [workspaceSlug]);
+
+  const fetchNextPage = async (groupKey: string) => {
+    const currentSection = customProperties[groupKey];
+    const nextPage = (currentSection.page ?? 1) + 1;
+    await fetchCustomProperties(
+      groupKey,
+      currentSection.query || '',
+      nextPage
+    );
+  };
+
+  const handleSectionSearch = (async (groupKey: string, query: string) => {
+    await fetchCustomProperties(groupKey, query, 1);
+  });
+
+  const filteredGroupOptions = useMemo(() => {
+    return Object.keys(customProperties).reduce<Record<string, CustomPropertySection>>((acc, groupKey) => {
+      const properties: string[] = customProperties[groupKey]?.data || [];
+
+      const filteredValues = properties
+        .filter((property: string) => property?.toLowerCase()?.includes(searchQuery.toLowerCase()))
+
+      acc[groupKey] = {
+        ...customProperties[groupKey],
+        data: filteredValues,
+      };
+
+      return acc;
+    }, {});
+  }, [searchQuery, customProperties]);
+
+  const toggleGroupPreview = (groupKey: string) => {
+    setGroupPreviewEnabled((prev) => ({
+      ...prev,
+      [groupKey]: !prev[groupKey],
+    }));
+  };
+
+  return (
+    <>
+      <FilterHeader
+        title={`Custom Properties${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        isPreviewEnabled={mainPreviewEnabled}
+        handleIsPreviewEnabled={() => setMainPreviewEnabled(!mainPreviewEnabled)}
+      />
+      {mainPreviewEnabled && (
+        <>
+          {Object.keys(filteredGroupOptions).map((groupKey) => {
+            const groupedSection = filteredGroupOptions[groupKey];
+            const properties = filteredGroupOptions[groupKey].data || [];
+            if (groupedSection.data_type === "date") {
+              return (
+                <div key={groupKey}>
+                  <FilterDate
+                    groupKey={groupKey}
+                    onFilter={handleUpdate}
+                    title={groupKey}
+                    isPreviewEnabled={groupPreviewEnabled[groupKey]}
+                    handleIsPreviewEnabled={() => toggleGroupPreview(groupKey)}
+                  />
+                </div>
+              );
+            }
+            
+            // For number type
+            if (groupedSection.data_type === "number") {
+              return (
+                <div key={groupKey}>
+                  <FilterNumber
+                    groupKey={groupKey}
+                    onFilter={handleUpdate}
+                    title={groupKey}
+                    isPreviewEnabled={groupPreviewEnabled[groupKey]}
+                    handleIsPreviewEnabled={() => toggleGroupPreview(groupKey)}
+                  />
+                </div>
+              );
+            }
+            
+            // For text and boolean types
+            return (
+              <div key={groupKey}>
+                <FilterHeader
+                  title={groupKey}
+                  isPreviewEnabled={groupPreviewEnabled[groupKey]}
+                  handleIsPreviewEnabled={() => toggleGroupPreview(groupKey)}
+                />
+                {groupPreviewEnabled[groupKey] && (
+                  <div>
+                    <FilterSearch
+                      propertyKey={groupKey}
+                      handleSectionSearch={handleSectionSearch}
+                    />
+                    <>
+                      {properties.map(property => (
+                        <FilterOption
+                          key={`${groupKey}:${property}`}
+                          isChecked={appliedFilters?.includes(`${groupKey}:${property}`) ? true : false}
+                          onClick={() => handleUpdate(`${groupKey}:${property}`)}
+                          title={property}
+                        />
+                      ))}
+                      {(groupedSection.page ?? 1) < (groupedSection.total_pages ?? 1) && properties.length ? (
+                        <button
+                          onClick={() => fetchNextPage(groupKey)}
+                          className="ml-8 text-xs font-medium text-custom-primary-100 cursor-pointer"
+                        >
+                          {t("view_more")}
+                        </button>
+                      ) : null}
+                      {
+                        properties.length == 0 ?
+                        <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p> : null
+                      }
+                    </>
+                  </div>
+                )}
+              </div>
+            );
+          })}
+        </>
+      )}
+    </>
+  );
+});
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/cycle.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/cycle.tsx
index 8169b43c8b0..176ed5bf9aa 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/cycle.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/cycle.tsx
@@ -6,6 +6,7 @@ import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { TCycleGroups } from "@plane/types";
 // components
+import { useTranslation } from "@plane/i18n";
 import { Loader, CycleGroupIcon } from "@plane/ui";
 import { FilterHeader, FilterOption } from "@/components/issues";
 import { useCycle } from "@/hooks/store";
@@ -20,6 +21,7 @@ type Props = {
 
 export const FilterCycle: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, searchQuery } = props;
+  const { t } = useTranslation();
 
   // hooks
   const { projectId } = useParams();
@@ -58,7 +60,7 @@ export const FilterCycle: React.FC<Props> = observer((props) => {
   return (
     <>
       <FilterHeader
-        title={`Cycle ${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("cycle")} ${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -90,7 +92,7 @@ export const FilterCycle: React.FC<Props> = observer((props) => {
                 )}
               </>
             ) : (
-              <p className="text-xs italic text-custom-text-400">No matches found</p>
+              <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
             )
           ) : (
             <Loader className="space-y-2">
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/filters-selection.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/filters-selection.tsx
index 0bf180aefa7..30bb330a485 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/filters-selection.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/filters-selection.tsx
@@ -16,16 +16,19 @@ import {
   FilterState,
   FilterStateGroup,
   FilterTargetDate,
+  FilterAdditionalProperties,
   FilterCycle,
   FilterModule,
   FilterIssueGrouping,
 } from "@/components/issues";
 // constants
-import { ILayoutDisplayFiltersOptions } from "@/constants/issue";
+import { ILayoutDisplayFiltersOptions, ISSUE_ADDITIONAL_PROPERTIES } from "@/constants/issue";
 // hooks
 import { usePlatformOS } from "@/hooks/use-platform-os";
 // plane web components
 import { FilterIssueTypes } from "@/plane-web/components/issues";
+import { FilterCustomProperty } from "./custom-properties";
+import { useTranslation } from "@plane/i18n";
 
 type Props = {
   filters: IIssueFilterOptions;
@@ -53,6 +56,7 @@ export const FilterSelection: React.FC<Props> = observer((props) => {
     cycleViewDisabled = false,
     moduleViewDisabled = false,
   } = props;
+  const { t } = useTranslation();
   // hooks
   const { isMobile } = usePlatformOS();
   const { moduleId, cycleId } = useParams();
@@ -72,7 +76,7 @@ export const FilterSelection: React.FC<Props> = observer((props) => {
           <input
             type="text"
             className="w-full bg-custom-background-90 outline-none placeholder:text-custom-text-400"
-            placeholder="Search"
+            placeholder={t("search")}
             value={filtersSearchQuery}
             onChange={(e) => setFiltersSearchQuery(e.target.value)}
             autoFocus={!isMobile}
@@ -242,6 +246,30 @@ export const FilterSelection: React.FC<Props> = observer((props) => {
             />
           </div>
         )}
+
+          {ISSUE_ADDITIONAL_PROPERTIES.map((prop: any) => (
+            <div className="py-2">
+              <FilterAdditionalProperties
+                key={prop.key}
+                appliedFilters={filters[prop.key as keyof IIssueFilterOptions] ?? null} 
+                additionalPropertyTitle={t(prop.key)}
+                additionalPropertyKey={prop.key} 
+                handleUpdate={(val) => handleFiltersUpdate(prop.key as keyof IIssueFilterOptions, val)} 
+                searchQuery={filtersSearchQuery}
+              />
+            </div>
+          ))}
+
+        {/* custom_properties */}
+        {isFilterEnabled("custom_properties") && (
+          <div className="py-2">
+            <FilterCustomProperty
+              appliedFilters={filters.custom_properties ?? null}
+              handleUpdate={(val) => handleFiltersUpdate("custom_properties", val)}
+              searchQuery={filtersSearchQuery}
+            />
+          </div>
+        )}
       </div>
     </div>
   );
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/index.ts b/web/core/components/issues/issue-layouts/filters/header/filters/index.ts
index ab5756bf4d7..495020f9244 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/index.ts
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/index.ts
@@ -11,3 +11,4 @@ export * from "./state";
 export * from "./cycle";
 export * from "./module";
 export * from "./target-date";
+export * from "./additional-properties";
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/labels.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/labels.tsx
index 70800af0e80..aaba7a337a0 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/labels.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/labels.tsx
@@ -5,6 +5,7 @@ import sortBy from "lodash/sortBy";
 import { observer } from "mobx-react";
 import { IIssueLabel } from "@plane/types";
 // components
+import { useTranslation } from "@plane/i18n";
 import { Loader } from "@plane/ui";
 import { FilterHeader, FilterOption } from "@/components/issues";
 // ui
@@ -23,6 +24,7 @@ type Props = {
 
 export const FilterLabels: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, labels, searchQuery } = props;
+  const { t } = useTranslation();
 
   const [itemsToRender, setItemsToRender] = useState(5);
   const [previewEnabled, setPreviewEnabled] = useState(true);
@@ -51,7 +53,7 @@ export const FilterLabels: React.FC<Props> = observer((props) => {
   return (
     <>
       <FilterHeader
-        title={`Label${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("label")}${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -80,7 +82,7 @@ export const FilterLabels: React.FC<Props> = observer((props) => {
                 )}
               </>
             ) : (
-              <p className="text-xs italic text-custom-text-400">No matches found</p>
+              <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
             )
           ) : (
             <Loader className="space-y-2">
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/mentions.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/mentions.tsx
index e38f5794d8d..9251f7eba2e 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/mentions.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/mentions.tsx
@@ -4,6 +4,7 @@ import { useMemo, useState } from "react";
 import sortBy from "lodash/sortBy";
 import { observer } from "mobx-react";
 // plane ui
+import { useTranslation } from "@plane/i18n";
 import { Loader, Avatar } from "@plane/ui";
 // components
 import { FilterHeader, FilterOption } from "@/components/issues";
@@ -21,6 +22,7 @@ type Props = {
 
 export const FilterMentions: React.FC<Props> = observer((props: Props) => {
   const { appliedFilters, handleUpdate, memberIds, searchQuery } = props;
+  const { t } = useTranslation();
   // states
   const [itemsToRender, setItemsToRender] = useState(5);
   const [previewEnabled, setPreviewEnabled] = useState(true);
@@ -53,7 +55,7 @@ export const FilterMentions: React.FC<Props> = observer((props: Props) => {
   return (
     <>
       <FilterHeader
-        title={`Mention${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("mention")}${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -94,7 +96,7 @@ export const FilterMentions: React.FC<Props> = observer((props: Props) => {
                 )}
               </>
             ) : (
-              <p className="text-xs italic text-custom-text-400">No matches found</p>
+              <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
             )
           ) : (
             <Loader className="space-y-2">
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/module.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/module.tsx
index ea972db0325..1e415a5e416 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/module.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/module.tsx
@@ -5,6 +5,7 @@ import sortBy from "lodash/sortBy";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // components
+import { useTranslation } from "@plane/i18n";
 import { Loader, DiceIcon } from "@plane/ui";
 import { FilterHeader, FilterOption } from "@/components/issues";
 import { useModule } from "@/hooks/store";
@@ -18,6 +19,7 @@ type Props = {
 
 export const FilterModule: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, searchQuery } = props;
+  const { t } = useTranslation();
   // hooks
   const { projectId } = useParams();
   const { getModuleById, getProjectModuleIds } = useModule();
@@ -51,7 +53,7 @@ export const FilterModule: React.FC<Props> = observer((props) => {
   return (
     <>
       <FilterHeader
-        title={`Module ${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("module")} ${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -80,7 +82,7 @@ export const FilterModule: React.FC<Props> = observer((props) => {
                 )}
               </>
             ) : (
-              <p className="text-xs italic text-custom-text-400">No matches found</p>
+              <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
             )
           ) : (
             <Loader className="space-y-2">
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/priority.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/priority.tsx
index 609bb37f473..60d60f46e50 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/priority.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/priority.tsx
@@ -4,6 +4,7 @@ import React, { useState } from "react";
 import { observer } from "mobx-react";
 
 // ui
+import { useTranslation } from "@plane/i18n";
 import { PriorityIcon } from "@plane/ui";
 
 // components
@@ -20,6 +21,7 @@ type Props = {
 
 export const FilterPriority: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, searchQuery } = props;
+  const { t } = useTranslation();
 
   const [previewEnabled, setPreviewEnabled] = useState(true);
 
@@ -30,7 +32,7 @@ export const FilterPriority: React.FC<Props> = observer((props) => {
   return (
     <>
       <FilterHeader
-        title={`Priority${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("priority")}${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -43,11 +45,11 @@ export const FilterPriority: React.FC<Props> = observer((props) => {
                 isChecked={appliedFilters?.includes(priority.key) ? true : false}
                 onClick={() => handleUpdate(priority.key)}
                 icon={<PriorityIcon priority={priority.key} className="h-3.5 w-3.5" />}
-                title={priority.title}
+                title={t(priority.key)}
               />
             ))
           ) : (
-            <p className="text-xs italic text-custom-text-400">No matches found</p>
+            <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
           )}
         </div>
       )}
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/project.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/project.tsx
index 02fac50a3b6..94c08271b44 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/project.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/project.tsx
@@ -4,6 +4,7 @@ import React, { useMemo, useState } from "react";
 import sortBy from "lodash/sortBy";
 import { observer } from "mobx-react";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Loader } from "@plane/ui";
 // components
 import { Logo } from "@/components/common";
@@ -19,6 +20,7 @@ type Props = {
 
 export const FilterProjects: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, searchQuery } = props;
+  const { t } = useTranslation();
   // states
   const [itemsToRender, setItemsToRender] = useState(5);
   const [previewEnabled, setPreviewEnabled] = useState(true);
@@ -49,7 +51,7 @@ export const FilterProjects: React.FC<Props> = observer((props) => {
   return (
     <>
       <FilterHeader
-        title={`Project${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("project")}${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -82,7 +84,7 @@ export const FilterProjects: React.FC<Props> = observer((props) => {
                 )}
               </>
             ) : (
-              <p className="text-xs italic text-custom-text-400">No matches found</p>
+              <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
             )
           ) : (
             <Loader className="space-y-2">
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/search-filters.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/search-filters.tsx
new file mode 100644
index 00000000000..a9a2c5f2cff
--- /dev/null
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/search-filters.tsx
@@ -0,0 +1,39 @@
+"use client";
+
+import React, { useEffect, useState } from "react";
+import { observer } from "mobx-react";
+import useDebounce from "@/hooks/use-debounce";
+import { usePlatformOS } from "@/hooks/use-platform-os";
+import { Search } from "lucide-react";
+
+type Props = {
+	propertyKey: string;
+	handleSectionSearch: (groupKey: string, query: string) => void;
+};
+
+export const FilterSearch: React.FC<Props> = observer(({ propertyKey, handleSectionSearch }) => {
+	const { isMobile } = usePlatformOS();
+	const [filtersSearchQuery, setFiltersSearchQuery] = useState("");
+	const debouncedSearchQuery = useDebounce(filtersSearchQuery, 500);
+
+
+	useEffect(() => {
+		handleSectionSearch(propertyKey, debouncedSearchQuery);
+	}, [debouncedSearchQuery]);
+
+	return (
+		<div className="bg-custom-background-100 py-2 sticky top-[1em]">
+			<div className="flex items-center gap-1.5 rounded border-[0.5px] border-custom-border-200 bg-custom-background-90 px-1.5 py-1 text-xs">
+				<Search className="text-custom-text-400" size={12} strokeWidth={2} />
+				<input
+					type="text"
+					className="w-full bg-custom-background-90 outline-none placeholder:text-custom-text-400"
+					placeholder="Search"
+					value={filtersSearchQuery}
+					onChange={(e) => setFiltersSearchQuery(e.target.value)}
+					autoFocus={!isMobile}
+				/>
+			</div>
+		</div>
+	);
+});
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/start-date.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/start-date.tsx
index c9f4ae22e65..5f43b54685a 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/start-date.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/start-date.tsx
@@ -6,6 +6,7 @@ import { DateFilterModal } from "@/components/core";
 import { FilterHeader, FilterOption } from "@/components/issues";
 // constants
 import { DATE_AFTER_FILTER_OPTIONS } from "@/constants/filters";
+import { useTranslation } from "@plane/i18n";
 
 type Props = {
   appliedFilters: string[] | null;
@@ -15,6 +16,7 @@ type Props = {
 
 export const FilterStartDate: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, searchQuery } = props;
+  const { t } = useTranslation();
 
   const [previewEnabled, setPreviewEnabled] = useState(true);
   const [isDateFilterModalOpen, setIsDateFilterModalOpen] = useState(false);
@@ -47,7 +49,7 @@ export const FilterStartDate: React.FC<Props> = observer((props) => {
         />
       )}
       <FilterHeader
-        title={`Start date${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("start_date")}${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -60,14 +62,14 @@ export const FilterStartDate: React.FC<Props> = observer((props) => {
                   key={option.value}
                   isChecked={appliedFilters?.includes(option.value) ? true : false}
                   onClick={() => handleUpdate(option.value)}
-                  title={option.name}
+                  title={t(option.name)}
                   multiple
                 />
               ))}
               <FilterOption isChecked={isCustomDateSelected()} onClick={handleCustomDate} title="Custom" multiple />
             </>
           ) : (
-            <p className="text-xs italic text-custom-text-400">No matches found</p>
+            <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
           )}
         </div>
       )}
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/state-group.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/state-group.tsx
index 1ca11eec629..122927ac015 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/state-group.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/state-group.tsx
@@ -3,6 +3,7 @@
 import React, { useState } from "react";
 import { observer } from "mobx-react";
 // components
+import { useTranslation } from "@plane/i18n";
 import { StateGroupIcon } from "@plane/ui";
 import { FilterHeader, FilterOption } from "@/components/issues";
 // icons
@@ -17,6 +18,7 @@ type Props = {
 
 export const FilterStateGroup: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, searchQuery } = props;
+  const { t } = useTranslation();
 
   const [itemsToRender, setItemsToRender] = useState(5);
   const [previewEnabled, setPreviewEnabled] = useState(true);
@@ -35,7 +37,7 @@ export const FilterStateGroup: React.FC<Props> = observer((props) => {
   return (
     <>
       <FilterHeader
-        title={`State group${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("state_group")}${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -63,7 +65,7 @@ export const FilterStateGroup: React.FC<Props> = observer((props) => {
               )}
             </>
           ) : (
-            <p className="text-xs italic text-custom-text-400">No matches found</p>
+            <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
           )}
         </div>
       )}
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/state.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/state.tsx
index aeffcee4144..0a11f564278 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/state.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/state.tsx
@@ -5,6 +5,7 @@ import sortBy from "lodash/sortBy";
 import { observer } from "mobx-react";
 import { IState } from "@plane/types";
 // components
+import { useTranslation } from "@plane/i18n";
 import { Loader, StateGroupIcon } from "@plane/ui";
 import { FilterHeader, FilterOption } from "@/components/issues";
 // ui
@@ -19,6 +20,7 @@ type Props = {
 
 export const FilterState: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, searchQuery, states } = props;
+  const { t } = useTranslation();
 
   const [itemsToRender, setItemsToRender] = useState(5);
   const [previewEnabled, setPreviewEnabled] = useState(true);
@@ -42,7 +44,7 @@ export const FilterState: React.FC<Props> = observer((props) => {
   return (
     <>
       <FilterHeader
-        title={`State${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("state")}${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -71,7 +73,7 @@ export const FilterState: React.FC<Props> = observer((props) => {
                 )}
               </>
             ) : (
-              <p className="text-xs italic text-custom-text-400">No matches found</p>
+              <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
             )
           ) : (
             <Loader className="space-y-2">
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/target-date.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/target-date.tsx
index d4ef89584e4..6776e2711e8 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/target-date.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/target-date.tsx
@@ -6,6 +6,7 @@ import { DateFilterModal } from "@/components/core";
 import { FilterHeader, FilterOption } from "@/components/issues";
 // constants
 import { DATE_AFTER_FILTER_OPTIONS } from "@/constants/filters";
+import { useTranslation } from "@plane/i18n";
 
 type Props = {
   appliedFilters: string[] | null;
@@ -15,6 +16,7 @@ type Props = {
 
 export const FilterTargetDate: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, searchQuery } = props;
+  const { t } = useTranslation();
 
   const [previewEnabled, setPreviewEnabled] = useState(true);
   const [isDateFilterModalOpen, setIsDateFilterModalOpen] = useState(false);
@@ -47,7 +49,7 @@ export const FilterTargetDate: React.FC<Props> = observer((props) => {
         />
       )}
       <FilterHeader
-        title={`Target date${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        title={`${t("target_date")}${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
         isPreviewEnabled={previewEnabled}
         handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
       />
@@ -60,14 +62,14 @@ export const FilterTargetDate: React.FC<Props> = observer((props) => {
                   key={option.value}
                   isChecked={appliedFilters?.includes(option.value) ? true : false}
                   onClick={() => handleUpdate(option.value)}
-                  title={option.name}
+                  title={t(option.name)}
                   multiple
                 />
               ))}
               <FilterOption isChecked={isCustomDateSelected()} onClick={handleCustomDate} title="Custom" multiple />
             </>
           ) : (
-            <p className="text-xs italic text-custom-text-400">No matches found</p>
+            <p className="text-xs italic text-custom-text-400">{t("no_matches_found")}</p>
           )}
         </div>
       )}
diff --git a/web/core/components/issues/issue-layouts/filters/header/helpers/filter-date.tsx b/web/core/components/issues/issue-layouts/filters/header/helpers/filter-date.tsx
new file mode 100644
index 00000000000..e3496a45ab3
--- /dev/null
+++ b/web/core/components/issues/issue-layouts/filters/header/helpers/filter-date.tsx
@@ -0,0 +1,134 @@
+import React, { useState } from "react";
+import { FilterHeader } from "@/components/issues";
+import { Input  } from "@plane/ui";
+
+type FilterDateProps = {
+  groupKey: string;
+  onFilter: (filter: string) => void;
+  title: string;
+  isPreviewEnabled: boolean;
+  handleIsPreviewEnabled: () => void;
+};
+
+export const FilterDate: React.FC<FilterDateProps> = ({
+  groupKey,
+  onFilter,
+  title,
+  isPreviewEnabled,
+  handleIsPreviewEnabled,
+}) => {
+  const [operator, setOperator] = useState<"gt" | "lt" | "eq" | "ne" | "isbetween" | "isnull" | "isnotnull">("gt");
+  const [from, setFrom] = useState<string>("");
+  const [to, setTo] = useState<string>("");
+
+  const apply = () => {
+    let payload: string;
+    switch (operator) {
+      case "gt":
+      case "lt":
+        if (!from) return;
+        payload = `${groupKey}__${operator}:${from}`;
+        break;
+
+      case "eq":
+        if (!from) return;
+        payload = `${groupKey}:${from}`;
+        break;
+
+      case "ne":
+        if (!from) return;
+        payload = `${groupKey}__ne:${from}`;
+        break;
+
+      case "isbetween":
+        if (!from || !to) return;
+        payload = `${groupKey}__isbetween:${from}^${to}`;
+        break;
+
+      case "isnull":
+        payload = `${groupKey}__isnull:`;
+        break;
+
+      case "isnotnull":
+        payload = `${groupKey}__isnotnull:`;
+        break;
+
+      default:
+        return;
+    }
+    onFilter(payload);
+  };
+
+  return (
+    <div className="w-full">
+      <div className="flex justify-between items-center">
+        <FilterHeader
+          title={title}
+          isPreviewEnabled={isPreviewEnabled}
+          handleIsPreviewEnabled={handleIsPreviewEnabled}
+        />
+
+        {isPreviewEnabled && (
+          <div className="flex items-center">
+            <select
+              value={operator}
+              onChange={(e) => setOperator(e.target.value as any)}
+              className="text-xs text-custom-primary-100"
+            >
+              <option value="gt">Is after</option>
+              <option value="lt">Is before</option>
+              <option value="eq">Is on</option>
+              <option value="ne">Is not on</option>
+              <option value="isbetween">Is between</option>
+              <option value="isnull">Is null</option>
+              <option value="isnotnull">Is not null</option>
+            </select>
+          </div>
+        )}
+      </div>
+
+      {isPreviewEnabled && (
+        <div className="mt-2 w-full">
+          <div className="flex items-center space-x-2">
+            {["gt", "lt", "eq", "ne"].includes(operator) && (
+              <Input
+                type="date"
+                value={from}
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => setFrom(e.target.value)}
+                className="border rounded p-1 text-xs flex-grow"
+              />
+            )}
+
+            {operator === "isbetween" && (
+              <>
+                <Input
+                  type="date"
+                  value={from}
+                  onChange={(e: React.ChangeEvent<HTMLInputElement>) => setFrom(e.target.value)}
+                  className="border rounded p-1 text-xs flex-grow"
+                />
+                <Input
+                  type="date"
+                  value={to}
+                  onChange={(e: React.ChangeEvent<HTMLInputElement>) => setTo(e.target.value)}
+                  className="border rounded p-1 text-xs flex-grow"
+                />
+              </>
+            )}
+            <div className="flex justify-end flex-grow">
+              {["gt", "lt", "eq", "ne", "isbetween", "isnull", "isnotnull"].includes(operator) && (
+                <button
+                  type="button"
+                  className="text-xs font-medium text-custom-primary-100 hover:text-custom-primary-200 cursor-pointer p-1"
+                  onClick={apply}
+                >
+                  Apply
+                </button>
+              )}
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/web/core/components/issues/issue-layouts/filters/header/helpers/filter-number.tsx b/web/core/components/issues/issue-layouts/filters/header/helpers/filter-number.tsx
new file mode 100644
index 00000000000..0a93a0e7268
--- /dev/null
+++ b/web/core/components/issues/issue-layouts/filters/header/helpers/filter-number.tsx
@@ -0,0 +1,145 @@
+import React, { useState } from "react";
+import { FilterHeader } from "@/components/issues";
+import { Input  } from "@plane/ui";
+
+type FilterNumberProps = {
+  groupKey: string;
+  onFilter: (filter: string) => void;
+  title: string;
+  isPreviewEnabled: boolean;
+  handleIsPreviewEnabled: () => void;
+};
+
+export const FilterNumber: React.FC<FilterNumberProps> = ({
+  groupKey,
+  onFilter,
+  title,
+  isPreviewEnabled,
+  handleIsPreviewEnabled,
+}) => {
+  const [operator, setOperator] = useState<"gt" | "lt" | "eq" | "ne" | "isbetween" | "isnull" | "isnotnull">("gt");
+  const [from, setFrom] = useState<number | null>(null);
+  const [to, setTo] = useState<number | null>(null);
+
+  const apply = () => {
+    let payload: string;
+    switch (operator) {
+      case "gt":
+      case "lt":
+        if (from === null) return;
+        payload = `${groupKey}__${operator}:${from}`;
+        break;
+
+      case "eq":
+        if (from === null) return;
+        payload = `${groupKey}:${from}`;
+        break;
+
+      case "ne":
+        if (from === null) return;
+        payload = `${groupKey}__ne:${from}`;
+        break;
+
+      case "isbetween":
+        if (from === null || to === null) return;
+        payload = `${groupKey}__isbetween:${from}^${to}`;
+        break;
+
+      case "isnull":
+        payload = `${groupKey}__isnull:`;
+        break;
+
+      case "isnotnull":
+        payload = `${groupKey}__isnotnull:`;
+        break;
+
+      default:
+        return;
+    }
+    onFilter(payload);
+  };
+
+  return (
+    <div className="w-full">
+      <div className="flex justify-between items-center">
+        <FilterHeader
+          title={title}
+          isPreviewEnabled={isPreviewEnabled}
+          handleIsPreviewEnabled={handleIsPreviewEnabled}
+        />
+
+        {isPreviewEnabled && (
+          <div className="flex items-center">
+            <select
+              value={operator}
+              onChange={(e) => setOperator(e.target.value as any)}
+              className="text-xs text-custom-primary-100"
+            >
+              <option value="gt">Is greater than</option>
+              <option value="lt">Is less than</option>
+              <option value="eq">Is equal to</option>
+              <option value="ne">Is not equal to</option>
+              <option value="isbetween">Is between</option>
+              <option value="isnull">Is null</option>
+              <option value="isnotnull">Is not null</option>
+            </select>
+          </div>
+        )}
+      </div>
+
+      {isPreviewEnabled && (
+        <div className="mt-2 w-full">
+          <div className="flex items-center space-x-2">
+            {/* single-value operators */}
+            {["gt", "lt", "eq", "ne"].includes(operator) && (
+              <Input
+                type="number"
+                value={from === null ? "" : from}
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                  setFrom(e.target.value ? +e.target.value : null)
+                }
+                className="border rounded p-1 text-xs flex-grow"
+                placeholder="Enter value"
+              />
+            )}
+
+            {/* between needs two values */}
+            {operator === "isbetween" && (
+              <>
+                <Input
+                  type="number"
+                  value={from === null ? "" : from}
+                  onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                    setFrom(e.target.value ? +e.target.value : null)
+                  }
+                  className="border rounded p-1 text-xs w-28"
+                  placeholder="Min"
+                />
+                <Input
+                  type="number"
+                  value={to === null ? "" : to}
+                  onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                    setTo(e.target.value ? +e.target.value : null)
+                  }
+                  className="border rounded p-1 text-xs w-28"
+                  placeholder="Max"
+                />
+              </>
+            )}
+            <div className="flex justify-end flex-grow">
+              {["gt", "lt", "eq", "ne", "isbetween", "isnull", "isnotnull"].includes(operator) && (
+                <button
+                  type="button"
+                  className="text-xs font-medium text-custom-primary-100 hover:text-custom-primary-200 cursor-pointer p-1"
+                  onClick={apply}
+                >
+                  Apply
+                </button>
+              )}
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/web/core/components/issues/issue-layouts/filters/header/helpers/index.ts b/web/core/components/issues/issue-layouts/filters/header/helpers/index.ts
index ef38d9884d5..4538ed51627 100644
--- a/web/core/components/issues/issue-layouts/filters/header/helpers/index.ts
+++ b/web/core/components/issues/issue-layouts/filters/header/helpers/index.ts
@@ -1,3 +1,6 @@
 export * from "./dropdown";
 export * from "./filter-header";
 export * from "./filter-option";
+export * from "./filter-date";
+export * from "./filter-number";
+
diff --git a/web/core/components/issues/issue-layouts/quick-add/button/gantt.tsx b/web/core/components/issues/issue-layouts/quick-add/button/gantt.tsx
index eb9dd35a85d..b413064cf17 100644
--- a/web/core/components/issues/issue-layouts/quick-add/button/gantt.tsx
+++ b/web/core/components/issues/issue-layouts/quick-add/button/gantt.tsx
@@ -1,11 +1,13 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 import { PlusIcon } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 import { Row } from "@plane/ui";
 import { TQuickAddIssueButton } from "../root";
 
 export const GanttQuickAddIssueButton: FC<TQuickAddIssueButton> = observer((props) => {
   const { onClick } = props;
+  const { t } = useTranslation();
 
   return (
     <button
@@ -15,7 +17,7 @@ export const GanttQuickAddIssueButton: FC<TQuickAddIssueButton> = observer((prop
     >
       <Row className="flex py-2 gap-2">
         <PlusIcon className="h-3.5 w-3.5 stroke-2 my-auto" />
-        <span className="text-sm font-medium">New Issue</span>
+        <span className="text-sm font-medium">{t("new_issue")}</span>
       </Row>
     </button>
   );
diff --git a/web/core/components/issues/issue-layouts/quick-add/button/kanban.tsx b/web/core/components/issues/issue-layouts/quick-add/button/kanban.tsx
index 5338cba9df8..abb0e5af0d1 100644
--- a/web/core/components/issues/issue-layouts/quick-add/button/kanban.tsx
+++ b/web/core/components/issues/issue-layouts/quick-add/button/kanban.tsx
@@ -2,9 +2,11 @@ import { FC } from "react";
 import { observer } from "mobx-react";
 import { PlusIcon } from "lucide-react";
 import { TQuickAddIssueButton } from "../root";
+import { useTranslation } from "@plane/i18n";
 
 export const KanbanQuickAddIssueButton: FC<TQuickAddIssueButton> = observer((props) => {
   const { onClick } = props;
+  const { t } = useTranslation();
 
   return (
     <div
@@ -12,7 +14,7 @@ export const KanbanQuickAddIssueButton: FC<TQuickAddIssueButton> = observer((pro
       onClick={onClick}
     >
       <PlusIcon className="h-3.5 w-3.5 stroke-2" />
-      <span className="text-sm font-medium">New Issue</span>
+      <span className="text-sm font-medium">{t("new_issue")}</span>
     </div>
   );
 });
diff --git a/web/core/components/issues/issue-layouts/quick-add/button/list.tsx b/web/core/components/issues/issue-layouts/quick-add/button/list.tsx
index 09b90dbf46f..fed1edc0b93 100644
--- a/web/core/components/issues/issue-layouts/quick-add/button/list.tsx
+++ b/web/core/components/issues/issue-layouts/quick-add/button/list.tsx
@@ -1,11 +1,13 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 import { PlusIcon } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 import { Row } from "@plane/ui";
 import { TQuickAddIssueButton } from "../root";
 
 export const ListQuickAddIssueButton: FC<TQuickAddIssueButton> = observer((props) => {
   const { onClick } = props;
+  const { t } = useTranslation();
 
   return (
     <Row
@@ -13,7 +15,7 @@ export const ListQuickAddIssueButton: FC<TQuickAddIssueButton> = observer((props
       onClick={onClick}
     >
       <PlusIcon className="h-3.5 w-3.5 stroke-2" />
-      <span className="text-sm font-medium">New Issue</span>
+      <span className="text-sm font-medium">{t("new_issue")}</span>
     </Row>
   );
 });
diff --git a/web/core/components/issues/issue-layouts/quick-add/button/spreadsheet.tsx b/web/core/components/issues/issue-layouts/quick-add/button/spreadsheet.tsx
index b5663bb5699..b882fc72fd6 100644
--- a/web/core/components/issues/issue-layouts/quick-add/button/spreadsheet.tsx
+++ b/web/core/components/issues/issue-layouts/quick-add/button/spreadsheet.tsx
@@ -2,9 +2,11 @@ import { FC } from "react";
 import { observer } from "mobx-react";
 import { PlusIcon } from "lucide-react";
 import { TQuickAddIssueButton } from "../root";
+import { useTranslation } from "@plane/i18n";
 
 export const SpreadsheetAddIssueButton: FC<TQuickAddIssueButton> = observer((props) => {
   const { onClick } = props;
+  const { t } = useTranslation();
 
   return (
     <div className="flex items-center">
@@ -14,7 +16,7 @@ export const SpreadsheetAddIssueButton: FC<TQuickAddIssueButton> = observer((pro
         onClick={onClick}
       >
         <PlusIcon className="h-3.5 w-3.5 stroke-2" />
-        <span className="text-sm font-medium">New Issue</span>
+        <span className="text-sm font-medium">{t("new_issue")}</span>
       </button>
     </div>
   );
diff --git a/web/core/components/issues/issue-layouts/quick-add/root.tsx b/web/core/components/issues/issue-layouts/quick-add/root.tsx
index 4cdf2e8c092..c7c34e4e071 100644
--- a/web/core/components/issues/issue-layouts/quick-add/root.tsx
+++ b/web/core/components/issues/issue-layouts/quick-add/root.tsx
@@ -8,6 +8,7 @@ import { PlusIcon } from "lucide-react";
 // types
 import { IProject, TIssue } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { setPromiseToast } from "@plane/ui";
 // components
 import { CreateIssueToastActionItems } from "@/components/issues";
@@ -61,6 +62,7 @@ export const QuickAddIssueRoot: FC<TQuickAddIssueRoot> = observer((props) => {
     setIsQuickAddOpen,
     quickAddCallback,
   } = props;
+  const { t } = useTranslation();
   // router
   const { workspaceSlug, projectId } = useParams();
   const pathname = usePathname();
@@ -175,7 +177,7 @@ export const QuickAddIssueRoot: FC<TQuickAddIssueRoot> = observer((props) => {
               onClick={() => handleIsOpen(true)}
             >
               <PlusIcon className="h-3.5 w-3.5 stroke-2" />
-              <span className="text-sm font-medium">New Issue</span>
+              <span className="text-sm font-medium">{t("new_issue")}</span>
             </div>
           )}
         </>
diff --git a/web/core/components/issues/issue-layouts/spreadsheet/columns/custom-property-column.tsx b/web/core/components/issues/issue-layouts/spreadsheet/columns/custom-property-column.tsx
new file mode 100644
index 00000000000..6adfeb0f115
--- /dev/null
+++ b/web/core/components/issues/issue-layouts/spreadsheet/columns/custom-property-column.tsx
@@ -0,0 +1,28 @@
+import React from "react";
+import { observer } from "mobx-react";
+// types
+import { TIssue } from "@plane/types";
+import { Row, Tooltip } from "@plane/ui";
+
+type Props = {
+  issue: TIssue;
+  property: string;
+};
+
+type TCustomProperty = {
+  [key: string]: string;
+};
+
+export const SpreadsheetCustomPropertiesColumn: React.FC<Props> = observer((props) => {
+  const { issue, property } = props;
+  const customProperties: TCustomProperty[] = issue?.custom_propertiess ?? [];
+  const propertyValue = customProperties.find((item: TCustomProperty) => item.hasOwnProperty(property))?.[property] ?? "N/A";
+
+  return (
+    <Tooltip tooltipContent={propertyValue !== "N/A" ? propertyValue : "No data available"}>
+      <Row className="h-11 truncate border-b-[0.5px] border-custom-border-200 pt-[1.25em] text-xs hover:bg-custom-background-80">
+        {propertyValue}
+      </Row>
+    </Tooltip>
+  );
+});
diff --git a/web/core/components/issues/issue-layouts/spreadsheet/columns/header-column.tsx b/web/core/components/issues/issue-layouts/spreadsheet/columns/header-column.tsx
index 5cf0e3d202a..a861950a10a 100644
--- a/web/core/components/issues/issue-layouts/spreadsheet/columns/header-column.tsx
+++ b/web/core/components/issues/issue-layouts/spreadsheet/columns/header-column.tsx
@@ -3,12 +3,17 @@
 //ui
 import { ArrowDownWideNarrow, ArrowUpNarrowWide, CheckIcon, ChevronDownIcon, Eraser, MoveRight } from "lucide-react";
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, TIssueOrderByOptions } from "@plane/types";
+import { useTranslation } from "@plane/i18n";
 import { CustomMenu, Row } from "@plane/ui";
 //hooks
 import { SPREADSHEET_PROPERTY_DETAILS } from "@/constants/spreadsheet";
 import useLocalStorage from "@/hooks/use-local-storage";
 //types
 //constants
+import { useParams } from "next/navigation";
+import { Tags } from "lucide-react";
+import { SpreadsheetCustomPropertiesColumn } from "@/components/issues/issue-layouts/spreadsheet";
+import { useUserPermissions } from "@/hooks/store";
 
 interface Props {
   property: keyof IIssueDisplayProperties;
@@ -19,6 +24,9 @@ interface Props {
 
 export const HeaderColumn = (props: Props) => {
   const { displayFilters, handleDisplayFilterUpdate, property, onClose } = props;
+  const { t } = useTranslation();
+  const { workspaceSlug } = useParams();
+  const { workspaceUserInfo } = useUserPermissions();
 
   const { storedValue: selectedMenuItem, setValue: setSelectedMenuItem } = useLocalStorage(
     "spreadsheetViewSorting",
@@ -28,7 +36,28 @@ export const HeaderColumn = (props: Props) => {
     "spreadsheetViewActiveSortingProperty",
     ""
   );
-  const propertyDetails = SPREADSHEET_PROPERTY_DETAILS[property];
+
+  const combinedPropertyDetails = {
+    ...SPREADSHEET_PROPERTY_DETAILS
+  };
+
+  const customPropertiesForSpreadsheet = Object.keys(
+    workspaceUserInfo[workspaceSlug?.toString()]?.default_props?.display_properties?.custom_properties || {}
+  );
+  
+  customPropertiesForSpreadsheet.forEach((propertyName) => {
+    combinedPropertyDetails[propertyName] = {
+      title: propertyName,
+      ascendingOrderKey: propertyName,
+      ascendingOrderTitle: "A",
+      descendingOrderKey: `-${propertyName}`,
+      descendingOrderTitle: "Z",
+      icon: Tags,
+      Column: SpreadsheetCustomPropertiesColumn,
+    };
+  });
+
+  const propertyDetails = combinedPropertyDetails[property];
 
   const handleOrderBy = (order: TIssueOrderByOptions, itemKey: string) => {
     handleDisplayFilterUpdate({ order_by: order });
@@ -46,7 +75,7 @@ export const HeaderColumn = (props: Props) => {
         <Row className="flex w-full cursor-pointer items-center justify-between gap-1.5 py-2 text-sm text-custom-text-200 hover:text-custom-text-100">
           <div className="flex items-center gap-1.5">
             {<propertyDetails.icon className="h-4 w-4 text-custom-text-400" />}
-            {propertyDetails.title}
+            {t(propertyDetails.title)}
           </div>
           <div className="ml-3 flex">
             {activeSortingProperty === property && (
@@ -66,7 +95,7 @@ export const HeaderColumn = (props: Props) => {
       placement="bottom-start"
       closeOnSelect
     >
-      <CustomMenu.MenuItem onClick={() => handleOrderBy(propertyDetails.ascendingOrderKey, property)}>
+      <CustomMenu.MenuItem onClick={() => handleOrderBy(propertyDetails.ascendingOrderKey, property as string)}>
         <div
           className={`flex items-center justify-between gap-1.5 px-1 ${
             selectedMenuItem === `${propertyDetails.ascendingOrderKey}_${property}`
@@ -84,7 +113,7 @@ export const HeaderColumn = (props: Props) => {
           {selectedMenuItem === `${propertyDetails.ascendingOrderKey}_${property}` && <CheckIcon className="h-3 w-3" />}
         </div>
       </CustomMenu.MenuItem>
-      <CustomMenu.MenuItem onClick={() => handleOrderBy(propertyDetails.descendingOrderKey, property)}>
+      <CustomMenu.MenuItem onClick={() => handleOrderBy(propertyDetails.descendingOrderKey, property as string)}>
         <div
           className={`flex items-center justify-between gap-1.5 px-1 ${
             selectedMenuItem === `${propertyDetails.descendingOrderKey}_${property}`
@@ -107,11 +136,11 @@ export const HeaderColumn = (props: Props) => {
       {selectedMenuItem &&
         selectedMenuItem !== "" &&
         displayFilters?.order_by !== "-created_at" &&
-        selectedMenuItem.includes(property) && (
+        selectedMenuItem.includes(property as string) && (
           <CustomMenu.MenuItem
             className={`mt-0.5 ${selectedMenuItem === `-created_at_${property}` ? "bg-custom-background-80" : ""}`}
             key={property}
-            onClick={() => handleOrderBy("-created_at", property)}
+            onClick={() => handleOrderBy("-created_at", property as string)}
           >
             <div className="flex items-center gap-2 px-1">
               <Eraser className="h-3 w-3" />
diff --git a/web/core/components/issues/issue-layouts/spreadsheet/columns/index.ts b/web/core/components/issues/issue-layouts/spreadsheet/columns/index.ts
index 3439d398b41..d90f64e54e5 100644
--- a/web/core/components/issues/issue-layouts/spreadsheet/columns/index.ts
+++ b/web/core/components/issues/issue-layouts/spreadsheet/columns/index.ts
@@ -12,3 +12,5 @@ export * from "./sub-issue-column";
 export * from "./updated-on-column";
 export * from "./module-column";
 export * from "./cycle-column";
+export * from "./standard-property-column";
+export * from "./custom-property-column";
diff --git a/web/core/components/issues/issue-layouts/spreadsheet/columns/standard-property-column.tsx b/web/core/components/issues/issue-layouts/spreadsheet/columns/standard-property-column.tsx
new file mode 100644
index 00000000000..72fda6f46f0
--- /dev/null
+++ b/web/core/components/issues/issue-layouts/spreadsheet/columns/standard-property-column.tsx
@@ -0,0 +1,22 @@
+import React from "react";
+import { observer } from "mobx-react";
+// types
+import { TIssue } from "@plane/types";
+import { Row, Tooltip } from "@plane/ui";
+
+type Props = {
+  issue: TIssue;
+  property: string;
+};
+
+export const SpreadsheetStandardPropertyColumn: React.FC<Props> = observer((props) => {
+  const { issue, property } = props;
+
+  return (
+    <Tooltip tooltipContent={issue && property ? issue[property] : "No data available"}>
+  <Row className="h-11 truncate border-b-[0.5px] border-custom-border-200 pt-[1.25em] text-xs hover:bg-custom-background-80">
+    {issue && property ? issue[property] : "N/A"}
+  </Row>
+</Tooltip>
+  );
+});
diff --git a/web/core/components/issues/issue-layouts/spreadsheet/issue-column.tsx b/web/core/components/issues/issue-layouts/spreadsheet/issue-column.tsx
index dcd8773a0f1..0859fde101c 100644
--- a/web/core/components/issues/issue-layouts/spreadsheet/issue-column.tsx
+++ b/web/core/components/issues/issue-layouts/spreadsheet/issue-column.tsx
@@ -6,9 +6,12 @@ import { IIssueDisplayProperties, TIssue } from "@plane/types";
 // constants
 import { SPREADSHEET_PROPERTY_DETAILS } from "@/constants/spreadsheet";
 // hooks
-import { useEventTracker } from "@/hooks/store";
+import { useEventTracker, useUserPermissions } from "@/hooks/store";
 // components
 import { WithDisplayPropertiesHOC } from "../properties/with-display-properties-HOC";
+import { useParams } from "next/navigation";
+import { Tags } from "lucide-react";
+import { SpreadsheetCustomPropertiesColumn } from "@/components/issues/issue-layouts/spreadsheet";
 
 type Props = {
   displayProperties: IIssueDisplayProperties;
@@ -25,10 +28,32 @@ export const IssueColumn = observer((props: Props) => {
   const pathname = usePathname();
   const tableCellRef = useRef<HTMLTableCellElement | null>(null);
   const { captureIssueEvent } = useEventTracker();
+  const { workspaceSlug } = useParams();
+  const { workspaceUserInfo } = useUserPermissions();
 
   const shouldRenderProperty = property === "estimate" ? isEstimateEnabled : true;
 
-  const { Column } = SPREADSHEET_PROPERTY_DETAILS[property];
+  const combinedPropertyDetails = {
+    ...SPREADSHEET_PROPERTY_DETAILS
+  };
+  
+  const customPropertiesForSpreadsheet = Object.keys(
+    workspaceUserInfo[workspaceSlug?.toString()]?.default_props?.display_properties?.custom_properties || {}
+  );
+  
+  customPropertiesForSpreadsheet.forEach((propertyName) => {
+    combinedPropertyDetails[propertyName] = {
+      title: propertyName,
+      ascendingOrderKey: propertyName,
+      ascendingOrderTitle: "A",
+      descendingOrderKey: `-${propertyName}`,
+      descendingOrderTitle: "Z",
+      icon: Tags,
+      Column: SpreadsheetCustomPropertiesColumn,
+    };
+  });
+
+  const { Column } = combinedPropertyDetails[property];
 
   return (
     <WithDisplayPropertiesHOC
@@ -38,11 +63,12 @@ export const IssueColumn = observer((props: Props) => {
     >
       <td
         tabIndex={0}
-        className="h-11 w-full min-w-36 max-w-48 text-sm after:absolute after:w-full after:bottom-[-1px] after:border after:border-custom-border-100 border-r-[1px] border-custom-border-100"
+        className="h-11 w-full min-w-36 max-w-64 text-sm after:absolute after:w-full after:bottom-[-1px] after:border after:border-custom-border-100 border-r-[1px] border-custom-border-100"
         ref={tableCellRef}
       >
         <Column
           issue={issueDetail}
+          property={property as string}
           onChange={(issue: TIssue, data: Partial<TIssue>, updates: any) =>
             updateIssue &&
             updateIssue(issue.project_id, issue.id, data).then(() => {
diff --git a/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-header-column.tsx b/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-header-column.tsx
index e66fe74df53..844edfd7bf4 100644
--- a/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-header-column.tsx
+++ b/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-header-column.tsx
@@ -28,7 +28,7 @@ export const SpreadsheetHeaderColumn = observer((props: Props) => {
       shouldRenderProperty={() => shouldRenderProperty}
     >
       <th
-        className="h-11 w-full min-w-36 max-w-48 items-center bg-custom-background-90 text-sm font-medium py-1 border border-b-0 border-t-0 border-custom-border-100"
+        className="h-11 w-full min-w-36 max-w-64 items-center bg-custom-background-90 text-sm font-medium py-1 border border-b-0 border-t-0 border-custom-border-100"
         ref={tableHeaderCellRef}
         tabIndex={0}
       >
diff --git a/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx b/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx
index 167aa46f42f..70a484feab1 100644
--- a/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx
+++ b/web/core/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx
@@ -18,6 +18,8 @@ import { useBulkOperationStatus } from "@/plane-web/hooks/use-bulk-operation-sta
 // types
 import { TRenderQuickActions } from "../list/list-view-types";
 import { SpreadsheetTable } from "./spreadsheet-table";
+import { useParams } from "next/navigation";
+import { useUserPermissions } from "@/hooks/store";
 
 type Props = {
   displayProperties: IIssueDisplayProperties;
@@ -59,6 +61,8 @@ export const SpreadsheetView: React.FC<Props> = observer((props) => {
   const { currentProjectDetails } = useProject();
   // plane web hooks
   const isBulkOperationsEnabled = useBulkOperationStatus();
+  const { workspaceSlug } = useParams();
+  const { workspaceUserInfo } = useUserPermissions();
 
   const isEstimateEnabled: boolean = currentProjectDetails?.estimate !== null;
 
@@ -70,6 +74,12 @@ export const SpreadsheetView: React.FC<Props> = observer((props) => {
         return true;
       });
 
+  const customPropertiesForSpreadsheet = Object.keys(
+    workspaceUserInfo[workspaceSlug?.toString()]?.default_props?.display_properties?.custom_properties || {}
+  );
+
+  const combinedSpreadsheetColumnsList = [...spreadsheetColumnsList, ...customPropertiesForSpreadsheet];
+
   if (!issueIds || issueIds.length === 0)
     return (
       <div className="grid h-full w-full place-items-center">
@@ -103,7 +113,7 @@ export const SpreadsheetView: React.FC<Props> = observer((props) => {
                 containerRef={containerRef}
                 canLoadMoreIssues={canLoadMoreIssues}
                 loadMoreIssues={loadMoreIssues}
-                spreadsheetColumnsList={spreadsheetColumnsList}
+                spreadsheetColumnsList={combinedSpreadsheetColumnsList}
                 selectionHelpers={helpers}
               />
             </div>
diff --git a/web/core/components/issues/issue-modal/base.tsx b/web/core/components/issues/issue-modal/base.tsx
index 02ef23bd014..2b293216563 100644
--- a/web/core/components/issues/issue-modal/base.tsx
+++ b/web/core/components/issues/issue-modal/base.tsx
@@ -3,6 +3,7 @@
 import React, { useEffect, useRef, useState } from "react";
 import { observer } from "mobx-react";
 import { useParams, usePathname } from "next/navigation";
+import { useTranslation } from "@plane/i18n";
 // types
 import type { TBaseIssue, TIssue } from "@plane/types";
 // ui
@@ -51,6 +52,7 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
   const [uploadedAssetIds, setUploadedAssetIds] = useState<string[]>([]);
   const [isDuplicateModalOpen, setIsDuplicateModalOpen] = useState(false);
   // store hooks
+  const { t } = useTranslation();
   const { captureIssueEvent } = useEventTracker();
   const { workspaceSlug, projectId: routerProjectId, cycleId, moduleId } = useParams();
   const { projectsWithCreatePermissions } = useUser();
@@ -212,8 +214,8 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
 
       setToast({
         type: TOAST_TYPE.SUCCESS,
-        title: "Success!",
-        message: `${is_draft_issue ? "Draft created." : "Issue created successfully."} `,
+        title: t("success"),
+        message: `${is_draft_issue ? t("draft_created") : t("issue_created_successfully")} `,
         actionItems: !is_draft_issue && response?.project_id && (
           <CreateIssueToastActionItems
             workspaceSlug={workspaceSlug.toString()}
@@ -235,8 +237,8 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
     } catch (error) {
       setToast({
         type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: `${is_draft_issue ? "Draft issue" : "Issue"} could not be created. Please try again.`,
+        title: t("error"),
+        message: t(is_draft_issue ? "draft_creation_failed" : "issue_creation_failed"),
       });
       captureIssueEvent({
         eventName: ISSUE_CREATED,
@@ -281,8 +283,8 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
 
       setToast({
         type: TOAST_TYPE.SUCCESS,
-        title: "Success!",
-        message: "Issue updated successfully.",
+        title: t("success"),
+        message: t("issue_updated_successfully"),
       });
       captureIssueEvent({
         eventName: ISSUE_UPDATED,
@@ -294,8 +296,8 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
       console.error(error);
       setToast({
         type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: "Issue could not be updated. Please try again.",
+        title: t("error"),
+        message: t("issue_could_not_be_updated"),
       });
       captureIssueEvent({
         eventName: ISSUE_UPDATED,
@@ -387,4 +389,4 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
       )}
     </ModalCore>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/issues/issue-modal/components/default-properties.tsx b/web/core/components/issues/issue-modal/components/default-properties.tsx
index 5177382ce61..60bad075675 100644
--- a/web/core/components/issues/issue-modal/components/default-properties.tsx
+++ b/web/core/components/issues/issue-modal/components/default-properties.tsx
@@ -4,6 +4,7 @@ import React, { useState } from "react";
 import { observer } from "mobx-react";
 import { Control, Controller } from "react-hook-form";
 import { LayoutPanelTop } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 // types
 import { ISearchIssueResponse, TIssue } from "@plane/types";
 // ui
@@ -65,6 +66,7 @@ export const IssueDefaultProperties: React.FC<TIssueDefaultPropertiesProps> = ob
   // states
   const [parentIssueListModalOpen, setParentIssueListModalOpen] = useState(false);
   // store hooks
+  const { t } = useTranslation();
   const { areEstimateEnabledByProjectId } = useProjectEstimates();
   const { getProjectById } = useProject();
   const { isMobile } = usePlatformOS();
@@ -133,7 +135,7 @@ export const IssueDefaultProperties: React.FC<TIssueDefaultPropertiesProps> = ob
               }}
               buttonVariant={value?.length > 0 ? "transparent-without-text" : "border-with-text"}
               buttonClassName={value?.length > 0 ? "hover:bg-transparent" : ""}
-              placeholder="Assignees"
+              placeholder={t("assignees")}
               multiple
               tabIndex={getIndex("assignee_ids")}
             />
@@ -172,7 +174,7 @@ export const IssueDefaultProperties: React.FC<TIssueDefaultPropertiesProps> = ob
               }}
               buttonVariant="border-with-text"
               maxDate={maxDate ?? undefined}
-              placeholder="Start date"
+              placeholder={t("start_date")}
               tabIndex={getIndex("start_date")}
             />
           </div>
@@ -191,7 +193,7 @@ export const IssueDefaultProperties: React.FC<TIssueDefaultPropertiesProps> = ob
               }}
               buttonVariant="border-with-text"
               minDate={minDate ?? undefined}
-              placeholder="Due date"
+              placeholder={t("due_date")}
               tabIndex={getIndex("target_date")}
             />
           </div>
@@ -209,7 +211,7 @@ export const IssueDefaultProperties: React.FC<TIssueDefaultPropertiesProps> = ob
                   onChange(cycleId);
                   handleFormChange();
                 }}
-                placeholder="Cycle"
+                placeholder={t("cycle")}
                 value={value}
                 buttonVariant="border-with-text"
                 tabIndex={getIndex("cycle_id")}
@@ -231,7 +233,7 @@ export const IssueDefaultProperties: React.FC<TIssueDefaultPropertiesProps> = ob
                   onChange(moduleIds);
                   handleFormChange();
                 }}
-                placeholder="Modules"
+                placeholder={t("modules")}
                 buttonVariant="border-with-text"
                 tabIndex={getIndex("module_ids")}
                 multiple
@@ -256,64 +258,68 @@ export const IssueDefaultProperties: React.FC<TIssueDefaultPropertiesProps> = ob
                 projectId={projectId}
                 buttonVariant="border-with-text"
                 tabIndex={getIndex("estimate_point")}
-                placeholder="Estimate"
+                placeholder={t("estimate")}
               />
             </div>
           )}
         />
       )}
-      {parentId ? (
-        <CustomMenu
-          customButton={
-            <button
-              type="button"
-              className="flex cursor-pointer items-center justify-between gap-1 rounded border-[0.5px] border-custom-border-300 px-2 py-1.5 text-xs hover:bg-custom-background-80"
-            >
-              {selectedParentIssue?.project_id && (
-                <IssueIdentifier
-                  projectId={selectedParentIssue.project_id}
-                  issueTypeId={selectedParentIssue.type_id}
-                  projectIdentifier={selectedParentIssue?.project__identifier}
-                  issueSequenceId={selectedParentIssue.sequence_id}
-                  textContainerClassName="text-xs"
-                />
-              )}
-            </button>
-          }
-          placement="bottom-start"
-          tabIndex={getIndex("parent_id")}
-        >
-          <>
-            <CustomMenu.MenuItem className="!p-1" onClick={() => setParentIssueListModalOpen(true)}>
-              Change parent issue
-            </CustomMenu.MenuItem>
-            <Controller
-              control={control}
-              name="parent_id"
-              render={({ field: { onChange } }) => (
-                <CustomMenu.MenuItem
-                  className="!p-1"
-                  onClick={() => {
-                    onChange(null);
-                    handleFormChange();
-                  }}
-                >
-                  Remove parent issue
-                </CustomMenu.MenuItem>
-              )}
-            />
-          </>
-        </CustomMenu>
-      ) : (
-        <button
-          type="button"
-          className="flex cursor-pointer items-center justify-between gap-1 rounded border-[0.5px] border-custom-border-300 px-2 py-1.5 text-xs hover:bg-custom-background-80"
-          onClick={() => setParentIssueListModalOpen(true)}
-        >
-          <LayoutPanelTop className="h-3 w-3 flex-shrink-0" />
-          <span className="whitespace-nowrap">Add parent</span>
-        </button>
-      )}
+      <div className="h-7">
+        {parentId ? (
+          <CustomMenu
+            customButton={
+              <button
+                type="button"
+                className="flex cursor-pointer items-center justify-between gap-1 h-full rounded border-[0.5px] border-custom-border-300 px-2 py-0.5 text-xs hover:bg-custom-background-80"
+              >
+                {selectedParentIssue?.project_id && (
+                  <IssueIdentifier
+                    projectId={selectedParentIssue.project_id}
+                    issueTypeId={selectedParentIssue.type_id}
+                    projectIdentifier={selectedParentIssue?.project__identifier}
+                    issueSequenceId={selectedParentIssue.sequence_id}
+                    textContainerClassName="text-xs"
+                  />
+                )}
+              </button>
+            }
+            placement="bottom-start"
+            className="h-full w-full"
+            customButtonClassName="h-full"
+            tabIndex={getIndex("parent_id")}
+          >
+            <>
+              <CustomMenu.MenuItem className="!p-1" onClick={() => setParentIssueListModalOpen(true)}>
+                {t("change_parent_issue")}
+              </CustomMenu.MenuItem>
+              <Controller
+                control={control}
+                name="parent_id"
+                render={({ field: { onChange } }) => (
+                  <CustomMenu.MenuItem
+                    className="!p-1"
+                    onClick={() => {
+                      onChange(null);
+                      handleFormChange();
+                    }}
+                  >
+                    {t("remove_parent_issue")}
+                  </CustomMenu.MenuItem>
+                )}
+              />
+            </>
+          </CustomMenu>
+        ) : (
+          <button
+            type="button"
+            className="flex cursor-pointer items-center justify-between gap-1 h-full rounded border-[0.5px] border-custom-border-300 px-2 py-0.5 text-xs hover:bg-custom-background-80"
+            onClick={() => setParentIssueListModalOpen(true)}
+          >
+            <LayoutPanelTop className="h-3 w-3 flex-shrink-0" />
+            <span className="whitespace-nowrap">{t("add_parent")}</span>
+          </button>
+        )}
+      </div>
       <Controller
         control={control}
         name="parent_id"
@@ -333,4 +339,4 @@ export const IssueDefaultProperties: React.FC<TIssueDefaultPropertiesProps> = ob
       />
     </div>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/issues/issue-modal/components/title-input.tsx b/web/core/components/issues/issue-modal/components/title-input.tsx
index 2499289e14f..568aec92b0b 100644
--- a/web/core/components/issues/issue-modal/components/title-input.tsx
+++ b/web/core/components/issues/issue-modal/components/title-input.tsx
@@ -4,6 +4,7 @@ import React from "react";
 import { observer } from "mobx-react";
 import { Control, Controller, FieldErrors } from "react-hook-form";
 // types
+import { useTranslation } from "@plane/i18n";
 import { TIssue } from "@plane/types";
 // ui
 import { Input } from "@plane/ui";
@@ -25,12 +26,13 @@ export const IssueTitleInput: React.FC<TIssueTitleInputProps> = observer((props)
   const { control, issueTitleRef, errors, handleFormChange } = props;
   // store hooks
   const { isMobile } = usePlatformOS();
+  const { t } = useTranslation();
 
   const { getIndex } = getTabIndex(ETabIndices.ISSUE_FORM, isMobile);
 
   const validateWhitespace = (value: string) => {
     if (value.trim() === "") {
-      return "Title is required";
+      return t("title_is_required");
     }
     return undefined;
   };
@@ -41,10 +43,10 @@ export const IssueTitleInput: React.FC<TIssueTitleInputProps> = observer((props)
         name="name"
         rules={{
           validate: validateWhitespace,
-          required: "Title is required",
+          required: t("title_is_required"),
           maxLength: {
             value: 255,
-            message: "Title should be less than 255 characters",
+            message: t("title_should_be_less_than_255_characters"),
           },
         }}
         render={({ field: { value, onChange, ref } }) => (
@@ -59,7 +61,7 @@ export const IssueTitleInput: React.FC<TIssueTitleInputProps> = observer((props)
             }}
             ref={issueTitleRef || ref}
             hasError={Boolean(errors.name)}
-            placeholder="Title"
+            placeholder={t("title")}
             className="w-full text-base"
             tabIndex={getIndex("name")}
             autoFocus
@@ -69,4 +71,4 @@ export const IssueTitleInput: React.FC<TIssueTitleInputProps> = observer((props)
       <span className="text-xs font-medium text-red-500">{errors?.name?.message}</span>
     </>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/issues/issue-modal/form.tsx b/web/core/components/issues/issue-modal/form.tsx
index f9dd9d06dd3..2846e0e55ee 100644
--- a/web/core/components/issues/issue-modal/form.tsx
+++ b/web/core/components/issues/issue-modal/form.tsx
@@ -6,6 +6,8 @@ import { useParams } from "next/navigation";
 import { useForm } from "react-hook-form";
 // editor
 import { EditorRefApi } from "@plane/editor";
+// i18n
+import { useTranslation } from "@plane/i18n";
 // types
 import type { TIssue, ISearchIssueResponse, TWorkspaceDraftIssue } from "@plane/types";
 // hooks
@@ -74,6 +76,7 @@ export interface IssueFormProps {
 }
 
 export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
+  const { t } = useTranslation();
   const {
     data,
     issueTitleRef,
@@ -85,11 +88,11 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
     isCreateMoreToggleEnabled,
     onCreateMoreToggleChange,
     isDraft,
-    moveToIssue,
-    modalTitle = `${data?.id ? "Update" : isDraft ? "Create a draft" : "Create new issue"}`,
+    moveToIssue = false,
+    modalTitle = `${data?.id ? t("update") : isDraft ? t("create_a_draft") : t("create_new_issue")}`,
     primaryButtonText = {
-      default: `${data?.id ? "Update" : isDraft ? "Save to Drafts" : "Save"}`,
-      loading: `${data?.id ? "Updating" : "Saving"}`,
+      default: `${data?.id ? t("update") : isDraft ? t("save_to_drafts") : t("save")}`,
+      loading: `${data?.id ? t("updating") : t("saving")}`,
     },
     isDuplicateModalOpen,
     handleDuplicateIssueModal,
@@ -188,8 +191,8 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
     if (!editorRef.current?.isEditorReadyToDiscard()) {
       setToast({
         type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: "Editor is not ready to discard changes.",
+        title: t("error"),
+        message: t("editor_is_not_ready_to_discard_changes"),
       });
       return;
     }
@@ -359,7 +362,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
                   >
                     <DeDupeIssueButtonLabel
                       isOpen={isDuplicateModalOpen}
-                      buttonLabel={`${duplicateIssues.length} duplicate issue${duplicateIssues.length > 1 ? "s" : ""} found!`}
+                      buttonLabel={`${duplicateIssues.length} ${duplicateIssues.length > 1 ? t("duplicate_issues_found") : t("duplicate_issue_found")}`}
                     />
                   </button>
                 )}
@@ -459,7 +462,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
                     role="button"
                   >
                     <ToggleSwitch value={isCreateMoreToggleEnabled} onChange={() => {}} size="sm" />
-                    <span className="text-xs">Create more</span>
+                    <span className="text-xs">{t("create_more")}</span>
                   </div>
                 )}
                 <div className="flex items-center gap-2">
@@ -479,7 +482,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
                     }}
                     tabIndex={getIndex("discard_button")}
                   >
-                    Discard
+                    {t("discard")}
                   </Button>
                   <Button
                     variant={moveToIssue ? "neutral-primary" : "primary"}
@@ -530,4 +533,4 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
       </div>
     </>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/issues/peek-overview/properties.tsx b/web/core/components/issues/peek-overview/properties.tsx
index fcc706cbb86..533df0bbdfd 100644
--- a/web/core/components/issues/peek-overview/properties.tsx
+++ b/web/core/components/issues/peek-overview/properties.tsx
@@ -2,9 +2,11 @@
 
 import { FC } from "react";
 import { observer } from "mobx-react";
-import { Signal, Tag, Triangle, LayoutPanelTop, CalendarClock, CalendarCheck2, Users, UserCircle2 } from "lucide-react";
+import { Signal, Tag, Triangle, LayoutPanelTop, CalendarClock, CalendarCheck2, Users, UserCircle2, Info } from "lucide-react";
+import axios from "axios";
 // hooks
 // ui icons
+import { useTranslation } from "@plane/i18n";
 import { DiceIcon, DoubleCircleIcon, ContrastIcon } from "@plane/ui";
 // components
 import {
@@ -21,6 +23,7 @@ import {
   IssueParentSelect,
   IssueLabel,
   TIssueOperations,
+  CustomProperties
 } from "@/components/issues";
 // helpers
 import { cn } from "@/helpers/common.helper";
@@ -29,7 +32,9 @@ import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";
 import { useIssueDetail, useMember, useProject, useProjectState } from "@/hooks/store";
 // plane web components
 import { IssueAdditionalPropertyValuesUpdate } from "@/plane-web/components/issue-types/values";
-import { IssueWorklogProperty } from "@/plane-web/components/issues";
+import { IssueWorklogProperty} from "@/plane-web/components/issues";
+import { ISSUE_ADDITIONAL_PROPERTIES } from "@/constants/issue";
+import { CustomProperty } from "../custom-properties";
 
 interface IPeekOverviewProperties {
   workspaceSlug: string;
@@ -39,8 +44,10 @@ interface IPeekOverviewProperties {
   issueOperations: TIssueOperations;
 }
 
+
 export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((props) => {
   const { workspaceSlug, projectId, issueId, issueOperations, disabled } = props;
+  const { t } = useTranslation();
   // store hooks
   const { getProjectById } = useProject();
   const {
@@ -53,25 +60,64 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
   if (!issue) return <></>;
   const createdByDetails = getUserDetails(issue?.created_by);
   const projectDetails = getProjectById(issue.project_id);
+  const customProperties = issue?.custom_properties || [];
+  const issue_type_id = issue?.type_id || "";
   const isEstimateEnabled = projectDetails?.estimate;
   const stateDetails = getStateById(issue.state_id);
-
   const minDate = getDate(issue.start_date);
   minDate?.setDate(minDate.getDate());
 
   const maxDate = getDate(issue.target_date);
   maxDate?.setDate(maxDate.getDate());
 
+  const handleCustomPropertiesUpdate = async (updatedProperties: CustomProperty[]) => {
+    try {
+      const updateRequests = updatedProperties.map((property) => {
+        const customPropertyId = property?.id || "";
+        const apiUrl = `/api/workspaces/${workspaceSlug}/issues/${issueId}/custom-properties/`;
+        if (customPropertyId) {
+          return axios.patch(
+            `${apiUrl}${customPropertyId}/`, 
+            { value: property.value },
+            {
+              headers: {
+                'Content-Type': 'application/json'
+              }
+            }
+          );
+        } else {
+          return axios.post(
+            apiUrl, 
+            {
+              key: property.key,
+              value: property.value,
+              issue_type_custom_property: property.issue_type_custom_property,
+              data_type: property.data_type,
+            },
+            {
+              headers: {
+                'x-api-key': 'TEST_API_TOKEN',
+                'Content-Type': 'application/json'
+              }
+            }
+          );
+        }
+      });
+      await Promise.all(updateRequests);
+    } catch (error) {
+    }
+  };
+  
   return (
     <div>
-      <h6 className="text-sm font-medium">Properties</h6>
+      <h6 className="text-sm font-medium">{t("properties")}</h6>
       {/* TODO: render properties using a common component */}
       <div className={`w-full space-y-2 mt-3 ${disabled ? "opacity-60" : ""}`}>
         {/* state */}
         <div className="flex w-full items-center gap-3 h-8">
           <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">
             <DoubleCircleIcon className="h-4 w-4 flex-shrink-0" />
-            <span>State</span>
+            <span>{t("state")}</span>
           </div>
           <StateDropdown
             value={issue?.state_id}
@@ -91,7 +137,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
         <div className="flex w-full items-center gap-3 h-8">
           <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">
             <Users className="h-4 w-4 flex-shrink-0" />
-            <span>Assignees</span>
+            <span>{t("assignees")}</span>
           </div>
           <MemberDropdown
             value={issue?.assignee_ids ?? undefined}
@@ -114,7 +160,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
         <div className="flex w-full items-center gap-3 h-8">
           <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">
             <Signal className="h-4 w-4 flex-shrink-0" />
-            <span>Priority</span>
+            <span>{t("priority")}</span>
           </div>
           <PriorityDropdown
             value={issue?.priority}
@@ -132,7 +178,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
           <div className="flex w-full items-center gap-3 h-8">
             <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">
               <UserCircle2 className="h-4 w-4 flex-shrink-0" />
-              <span>Created by</span>
+              <span>{t("created_by")} by</span>
             </div>
             <div className="w-full h-full flex items-center gap-1.5 rounded px-2 py-0.5 text-sm justify-between cursor-not-allowed">
               <ButtonAvatars showTooltip userIds={createdByDetails?.id} />
@@ -145,7 +191,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
         <div className="flex w-full items-center gap-3 h-8">
           <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">
             <CalendarClock className="h-4 w-4 flex-shrink-0" />
-            <span>Start date</span>
+            <span>{t("start_date")}</span>
           </div>
           <DateDropdown
             value={issue.start_date}
@@ -172,7 +218,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
         <div className="flex w-full items-center gap-3 h-8">
           <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">
             <CalendarCheck2 className="h-4 w-4 flex-shrink-0" />
-            <span>Due date</span>
+            <span>{t("due_date")}</span>
           </div>
           <DateDropdown
             value={issue.target_date}
@@ -203,7 +249,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
           <div className="flex w-full items-center gap-3 h-8">
             <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">
               <Triangle className="h-4 w-4 flex-shrink-0" />
-              <span>Estimate</span>
+              <span>{t("estimate")}</span>
             </div>
             <EstimateDropdown
               value={issue.estimate_point ?? undefined}
@@ -226,7 +272,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
           <div className="flex w-full items-center gap-3 min-h-8 h-full">
             <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">
               <DiceIcon className="h-4 w-4 flex-shrink-0" />
-              <span>Modules</span>
+              <span>{t("modules")}</span>
             </div>
             <IssueModuleSelect
               className="w-3/4 flex-grow"
@@ -243,7 +289,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
           <div className="flex w-full items-center gap-3 h-8">
             <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">
               <ContrastIcon className="h-4 w-4 flex-shrink-0" />
-              <span>Cycle</span>
+              <span>{t("cycle")}</span>
             </div>
             <IssueCycleSelect
               className="w-3/4 flex-grow"
@@ -260,7 +306,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
         <div className="flex w-full items-center gap-3 h-8">
           <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">
             <LayoutPanelTop className="h-4 w-4 flex-shrink-0" />
-            <p>Parent</p>
+            <p>{t("parent")}</p>
           </div>
           <IssueParentSelect
             className="w-3/4 flex-grow h-full"
@@ -276,7 +322,7 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
         <div className="flex w-full items-center gap-3 min-h-8">
           <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">
             <Tag className="h-4 w-4 flex-shrink-0" />
-            <span>Labels</span>
+            <span>{t("labels")}</span>
           </div>
           <div className="flex w-full flex-col gap-3 truncate">
             <IssueLabel workspaceSlug={workspaceSlug} projectId={projectId} issueId={issueId} disabled={disabled} />
@@ -299,6 +345,27 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
             isDisabled={disabled}
           />
         )}
+
+        {ISSUE_ADDITIONAL_PROPERTIES.map((prop: any) =>
+          issue[prop.key] ? (
+            <div key={prop?.key} className="flex w-full items-center gap-3 h-8">
+              <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">
+                <Info className="h-4 w-4 flex-shrink-0" />
+                <span>{t(prop?.key)}</span>
+              </div>
+              <div className="w-3/4 flex-grow group ml-2 text-sm">{issue[prop.key]}</div>
+            </div>
+          ) : null
+        )}
+
+        <CustomProperties
+          customProperties={Array.isArray(customProperties) ? customProperties : []}
+          issue_type_id={issue_type_id}
+          workspaceSlug={workspaceSlug}
+          updateCustomProperties={handleCustomPropertiesUpdate}
+          issueId={issueId}
+          layout="quarter"
+        />
       </div>
     </div>
   );
diff --git a/web/core/components/issues/select/label.tsx b/web/core/components/issues/select/label.tsx
index b5e56438251..fab28ec8ad6 100644
--- a/web/core/components/issues/select/label.tsx
+++ b/web/core/components/issues/select/label.tsx
@@ -4,8 +4,9 @@ import { useParams } from "next/navigation";
 import { usePopper } from "react-popper";
 import { Check, Component, Plus, Search, Tag } from "lucide-react";
 import { Combobox } from "@headlessui/react";
-// plane helpers
+//plane imports
 import { useOutsideClickDetector } from "@plane/helpers";
+import { useTranslation } from "@plane/i18n";
 // components
 import { IssueLabelsList } from "@/components/ui";
 // helpers
@@ -39,6 +40,7 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {
     createLabelEnabled = false,
     buttonClassName,
   } = props;
+  const { t } = useTranslation();
   // router
   const { workspaceSlug } = useParams();
   // store hooks
@@ -131,7 +133,7 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {
           ) : (
             <div className="h-full flex items-center justify-center gap-1 rounded border-[0.5px] border-custom-border-300 px-2 py-1 text-xs hover:bg-custom-background-80">
               <Tag className="h-3 w-3 flex-shrink-0" />
-              <span>Labels</span>
+              <span>{t("labels")}</span>
             </div>
           )}
         </button>
@@ -152,7 +154,7 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {
                 ref={inputRef}
                 className="w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none"
                 onChange={(event) => setQuery(event.target.value)}
-                placeholder="Search"
+                placeholder={t("search")}
                 displayValue={(assigned: any) => assigned?.name}
               />
             </div>
@@ -232,10 +234,10 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {
                       );
                   })
                 ) : (
-                  <p className="text-custom-text-400 italic py-1 px-1.5">No matching results</p>
+                  <p className="text-custom-text-400 italic py-1 px-1.5">{t("no_matching_results")}</p>
                 )
               ) : (
-                <p className="text-custom-text-400 italic py-1 px-1.5">Loading...</p>
+                <p className="text-custom-text-400 italic py-1 px-1.5">{t("loading")}</p>
               )}
               {createLabelEnabled && (
                 <button
@@ -244,7 +246,7 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {
                   onClick={() => setIsOpen(true)}
                 >
                   <Plus className="h-3 w-3" aria-hidden="true" />
-                  <span className="whitespace-nowrap">Create new label</span>
+                  <span className="whitespace-nowrap">{t("create_new_label")}</span>
                 </button>
               )}
             </div>
@@ -253,4 +255,4 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {
       )}
     </Combobox>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/modules/applied-filters/date.tsx b/web/core/components/modules/applied-filters/date.tsx
index 88d607de8df..f6368e07734 100644
--- a/web/core/components/modules/applied-filters/date.tsx
+++ b/web/core/components/modules/applied-filters/date.tsx
@@ -5,6 +5,7 @@ import { X } from "lucide-react";
 import { DATE_AFTER_FILTER_OPTIONS } from "@/constants/filters";
 import { renderFormattedDate } from "@/helpers/date-time.helper";
 import { capitalizeFirstLetter } from "@/helpers/string.helper";
+import { useTranslation } from "@plane/i18n";
 // constants
 
 type Props = {
@@ -15,13 +16,14 @@ type Props = {
 
 export const AppliedDateFilters: React.FC<Props> = observer((props) => {
   const { editable, handleRemove, values } = props;
+  const { t } = useTranslation();
 
   const getDateLabel = (value: string): string => {
     let dateLabel = "";
 
     const dateDetails = DATE_AFTER_FILTER_OPTIONS.find((d) => d.value === value);
 
-    if (dateDetails) dateLabel = dateDetails.name;
+    if (dateDetails) dateLabel = t(dateDetails.name);
     else {
       const dateParts = value.split(";");
 
diff --git a/web/core/components/modules/archived-modules/header.tsx b/web/core/components/modules/archived-modules/header.tsx
index 5a15687a27a..27a23b35df4 100644
--- a/web/core/components/modules/archived-modules/header.tsx
+++ b/web/core/components/modules/archived-modules/header.tsx
@@ -16,8 +16,10 @@ import { cn } from "@/helpers/common.helper";
 import { calculateTotalFilters } from "@/helpers/filter.helper";
 // hooks
 import { useMember, useModuleFilter } from "@/hooks/store";
+import { useTranslation } from "@plane/i18n";
 
 export const ArchivedModulesHeader: FC = observer(() => {
+  const { t } = useTranslation();
   // router
   const { projectId } = useParams();
   // refs
@@ -133,7 +135,7 @@ export const ArchivedModulesHeader: FC = observer(() => {
         />
         <FiltersDropdown
           icon={<ListFilter className="h-3 w-3" />}
-          title="Filters"
+          title={t("filters")}
           placement="bottom-end"
           isFiltersApplied={isFiltersApplied}
         >
diff --git a/web/core/components/modules/dropdowns/filters/start-date.tsx b/web/core/components/modules/dropdowns/filters/start-date.tsx
index 9bfd8f2d8e2..466563976d3 100644
--- a/web/core/components/modules/dropdowns/filters/start-date.tsx
+++ b/web/core/components/modules/dropdowns/filters/start-date.tsx
@@ -8,6 +8,7 @@ import { FilterHeader, FilterOption } from "@/components/issues";
 import { DATE_AFTER_FILTER_OPTIONS } from "@/constants/filters";
 // helpers
 import { isInDateFormat } from "@/helpers/date-time.helper";
+import { useTranslation } from "@plane/i18n";
 
 type Props = {
   appliedFilters: string[] | null;
@@ -17,6 +18,7 @@ type Props = {
 
 export const FilterStartDate: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, searchQuery } = props;
+  const { t } = useTranslation();
 
   const [previewEnabled, setPreviewEnabled] = useState(true);
   const [isDateFilterModalOpen, setIsDateFilterModalOpen] = useState(false);
@@ -62,7 +64,7 @@ export const FilterStartDate: React.FC<Props> = observer((props) => {
                   key={option.value}
                   isChecked={appliedFilters?.includes(option.value) ? true : false}
                   onClick={() => handleUpdate(option.value)}
-                  title={option.name}
+                  title={t(option.name)}
                   multiple
                 />
               ))}
diff --git a/web/core/components/modules/dropdowns/filters/target-date.tsx b/web/core/components/modules/dropdowns/filters/target-date.tsx
index ba82002dd8e..9ba32062d06 100644
--- a/web/core/components/modules/dropdowns/filters/target-date.tsx
+++ b/web/core/components/modules/dropdowns/filters/target-date.tsx
@@ -8,6 +8,7 @@ import { FilterHeader, FilterOption } from "@/components/issues";
 import { DATE_AFTER_FILTER_OPTIONS } from "@/constants/filters";
 // helpers
 import { isInDateFormat } from "@/helpers/date-time.helper";
+import { useTranslation } from "@plane/i18n";
 
 type Props = {
   appliedFilters: string[] | null;
@@ -17,6 +18,7 @@ type Props = {
 
 export const FilterTargetDate: React.FC<Props> = observer((props) => {
   const { appliedFilters, handleUpdate, searchQuery } = props;
+  const { t } = useTranslation();
 
   const [previewEnabled, setPreviewEnabled] = useState(true);
   const [isDateFilterModalOpen, setIsDateFilterModalOpen] = useState(false);
@@ -62,7 +64,7 @@ export const FilterTargetDate: React.FC<Props> = observer((props) => {
                   key={option.value}
                   isChecked={appliedFilters?.includes(option.value) ? true : false}
                   onClick={() => handleUpdate(option.value)}
-                  title={option.name}
+                  title={t(option.name)}
                   multiple
                 />
               ))}
diff --git a/web/core/components/modules/module-view-header.tsx b/web/core/components/modules/module-view-header.tsx
index 38c5a1b04ac..fa5c20263cd 100644
--- a/web/core/components/modules/module-view-header.tsx
+++ b/web/core/components/modules/module-view-header.tsx
@@ -12,6 +12,7 @@ import { useOutsideClickDetector } from "@plane/helpers";
 // types
 import { TModuleFilters } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Tooltip } from "@plane/ui";
 // components
 import { FiltersDropdown } from "@/components/issues";
@@ -25,6 +26,7 @@ import { useMember, useModuleFilter } from "@/hooks/store";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 
 export const ModuleViewHeader: FC = observer(() => {
+  const { t } = useTranslation();
   // refs
   const inputRef = useRef<HTMLInputElement>(null);
   // router
@@ -147,7 +149,7 @@ export const ModuleViewHeader: FC = observer(() => {
       />
       <FiltersDropdown
         icon={<ListFilter className="h-3 w-3" />}
-        title="Filters"
+        title={t("filters")}
         placement="bottom-end"
         isFiltersApplied={isFiltersApplied}
       >
diff --git a/web/core/components/pages/header/root.tsx b/web/core/components/pages/header/root.tsx
index 75b91a87741..316c0d165a9 100644
--- a/web/core/components/pages/header/root.tsx
+++ b/web/core/components/pages/header/root.tsx
@@ -3,6 +3,7 @@ import { observer } from "mobx-react";
 import { ListFilter } from "lucide-react";
 import { TPageFilterProps, TPageNavigationTabs } from "@plane/types";
 // components
+import { useTranslation } from "@plane/i18n";
 import { Header, EHeaderVariant } from "@plane/ui";
 import { FiltersDropdown } from "@/components/issues";
 import {
@@ -25,6 +26,7 @@ type Props = {
 
 export const PagesListHeaderRoot: React.FC<Props> = observer((props) => {
   const { pageType, projectId, workspaceSlug } = props;
+  const { t } = useTranslation();
   // store hooks
   const { filters, updateFilters, clearAllFilters } = useProjectPages();
   const {
@@ -69,7 +71,7 @@ export const PagesListHeaderRoot: React.FC<Props> = observer((props) => {
           />
           <FiltersDropdown
             icon={<ListFilter className="h-3 w-3" />}
-            title="Filters"
+            title={t("filters")}
             placement="bottom-end"
             isFiltersApplied={isFiltersApplied}
           >
diff --git a/web/core/components/profile/form.tsx b/web/core/components/profile/form.tsx
new file mode 100644
index 00000000000..c4ef27224fb
--- /dev/null
+++ b/web/core/components/profile/form.tsx
@@ -0,0 +1,487 @@
+import React, { useState } from "react";
+import { observer } from "mobx-react";
+import { Controller, useForm } from "react-hook-form";
+import { ChevronDown, CircleUserRound } from "lucide-react";
+import { Disclosure, Transition } from "@headlessui/react";
+import { useTranslation, SUPPORTED_LANGUAGES } from "@plane/i18n";
+import type { IUser, TUserProfile } from "@plane/types";
+import { Button, CustomSelect, CustomSearchSelect, Input, TOAST_TYPE, setPromiseToast, setToast } from "@plane/ui";
+// components
+import { DeactivateAccountModal } from "@/components/account";
+import { ImagePickerPopover, UserImageUploadModal } from "@/components/core";
+// import { TimezoneSelect } from "@/components/global";
+// constants
+import { USER_ROLES } from "@/constants/workspace";
+import { TIME_ZONES, TTimezone } from "@/constants/timezones";
+// helpers
+import { getFileURL } from "@/helpers/file.helper";
+// hooks
+import { useUser, useUserProfile } from "@/hooks/store";
+
+type TUserProfileForm = {
+  avatar_url: string;
+  cover_image: string;
+  cover_image_asset: any;
+  cover_image_url: string;
+  first_name: string;
+  last_name: string;
+  display_name: string;
+  email: string;
+  role: string;
+  language: string;
+  user_timezone: string;
+};
+
+export type TProfileFormProps = {
+  user: IUser;
+  profile: TUserProfile;
+};
+
+export const ProfileForm = observer((props: TProfileFormProps) => {
+  const { user, profile } = props;
+  // states
+  const [isLoading, setIsLoading] = useState(false);
+  const [isImageUploadModalOpen, setIsImageUploadModalOpen] = useState(false);
+  const [deactivateAccountModal, setDeactivateAccountModal] = useState(false);
+  // language support
+  const { t } = useTranslation();
+  // form info
+  const {
+    handleSubmit,
+    watch,
+    control,
+    setValue,
+    formState: { errors },
+  } = useForm<TUserProfileForm>({
+    defaultValues: {
+      avatar_url: user.avatar_url || "",
+      cover_image_asset: null,
+      cover_image_url: user.cover_image_url || "",
+      first_name: user.first_name || "",
+      last_name: user.last_name || "",
+      display_name: user.display_name || "",
+      email: user.email || "",
+      role: profile.role || "Product / Project Manager",
+      language: profile.language || "en",
+      user_timezone: "Asia/Kolkata",
+    },
+  });
+  // derived values
+  const userAvatar = watch("avatar_url");
+  const userCover = watch("cover_image_url");
+  // store hooks
+  const { data: currentUser, updateCurrentUser } = useUser();
+  const { updateUserProfile } = useUserProfile();
+
+  const getLanguageLabel = (value: string) => {
+    const selectedLanguage = SUPPORTED_LANGUAGES.find((l) => l.value === value);
+    if (!selectedLanguage) return value;
+    return selectedLanguage.label;
+  };
+
+  const handleProfilePictureDelete = async (url: string | null | undefined) => {
+    if (!url) return;
+    await updateCurrentUser({
+      avatar_url: "",
+    })
+      .then(() => {
+        setToast({
+          type: TOAST_TYPE.SUCCESS,
+          title: "Success!",
+          message: "Profile picture deleted successfully.",
+        });
+        setValue("avatar_url", "");
+      })
+      .catch(() => {
+        setToast({
+          type: TOAST_TYPE.ERROR,
+          title: "Error!",
+          message: "There was some error in deleting your profile picture. Please try again.",
+        });
+      })
+      .finally(() => {
+        setIsImageUploadModalOpen(false);
+      });
+  };
+
+  const onSubmit = async (formData: TUserProfileForm) => {
+    setIsLoading(true);
+    const userPayload: Partial<IUser> = {
+      first_name: formData.first_name,
+      last_name: formData.last_name,
+      avatar_url: formData.avatar_url,
+      display_name: formData?.display_name,
+      user_timezone: formData.user_timezone,
+    };
+    // if unsplash or a pre-defined image is uploaded, delete the old uploaded asset
+    if (formData.cover_image_url?.startsWith("http")) {
+      userPayload.cover_image = formData.cover_image_url;
+      userPayload.cover_image_asset = null;
+    }
+
+    const profilePayload: Partial<TUserProfile> = {
+      role: formData.role,
+      language: formData.language,
+    };
+
+    const updateCurrentUserDetail = updateCurrentUser(userPayload).finally(() => setIsLoading(false));
+    const updateCurrentUserProfile = updateUserProfile(profilePayload).finally(() => setIsLoading(false));
+
+    const promises = [updateCurrentUserDetail, updateCurrentUserProfile];
+    const updateUserAndProfile = Promise.all(promises);
+
+    setPromiseToast(updateUserAndProfile, {
+      loading: "Updating...",
+      success: {
+        title: "Success!",
+        message: () => `Profile updated successfully.`,
+      },
+      error: {
+        title: "Error!",
+        message: () => `There was some error in updating your profile. Please try again.`,
+      },
+    });
+  };
+
+  const getTimeZoneLabel = (timezone: TTimezone | undefined) => {
+    if (!timezone) return undefined;
+    return (
+      <div className="flex gap-1.5">
+        <span className="text-custom-text-400">{timezone.gmtOffset}</span>
+        <span className="text-custom-text-200">{timezone.name}</span>
+      </div>
+    );
+  };
+
+  const timeZoneOptions = TIME_ZONES.map((timeZone) => ({
+    value: timeZone.value,
+    query: timeZone.name + " " + timeZone.gmtOffset + " " + timeZone.value,
+    content: getTimeZoneLabel(timeZone),
+  }));
+
+  return (
+    <>
+      <DeactivateAccountModal isOpen={deactivateAccountModal} onClose={() => setDeactivateAccountModal(false)} />
+      <Controller
+        control={control}
+        name="avatar_url"
+        render={({ field: { onChange, value } }) => (
+          <UserImageUploadModal
+            isOpen={isImageUploadModalOpen}
+            onClose={() => setIsImageUploadModalOpen(false)}
+            handleRemove={async () => await handleProfilePictureDelete(currentUser?.avatar_url)}
+            onSuccess={(url) => {
+              onChange(url);
+              handleSubmit(onSubmit)();
+              setIsImageUploadModalOpen(false);
+            }}
+            value={value && value.trim() !== "" ? value : null}
+          />
+        )}
+      />
+      <form onSubmit={handleSubmit(onSubmit)}>
+        <div className="flex w-full flex-col gap-6">
+          <div className="relative h-44 w-full">
+            <img
+              src={userCover ? getFileURL(userCover) : "https://images.unsplash.com/photo-1506383796573-caf02b4a79ab"}
+              className="h-44 w-full rounded-lg object-cover"
+              alt={currentUser?.first_name ?? "Cover image"}
+            />
+            <div className="absolute -bottom-6 left-6 flex items-end justify-between">
+              <div className="flex gap-3">
+                <div className="flex h-16 w-16 items-center justify-center rounded-lg bg-custom-background-90">
+                  <button type="button" onClick={() => setIsImageUploadModalOpen(true)}>
+                    {!userAvatar || userAvatar === "" ? (
+                      <div className="h-16 w-16 rounded-md bg-custom-background-80 p-2">
+                        <CircleUserRound className="h-full w-full text-custom-text-200" />
+                      </div>
+                    ) : (
+                      <div className="relative h-16 w-16 overflow-hidden">
+                        <img
+                          src={getFileURL(userAvatar)}
+                          className="absolute left-0 top-0 h-full w-full rounded-lg object-cover"
+                          onClick={() => setIsImageUploadModalOpen(true)}
+                          alt={currentUser?.display_name}
+                          role="button"
+                        />
+                      </div>
+                    )}
+                  </button>
+                </div>
+              </div>
+            </div>
+            <div className="absolute bottom-3 right-3 flex">
+              <Controller
+                control={control}
+                name="cover_image_url"
+                render={({ field: { value, onChange } }) => (
+                  <ImagePickerPopover
+                    label={t("change_cover")}
+                    onChange={(imageUrl) => onChange(imageUrl)}
+                    control={control}
+                    value={value ?? "https://images.unsplash.com/photo-1506383796573-caf02b4a79ab"}
+                    isProfileCover
+                  />
+                )}
+              />
+            </div>
+          </div>
+          <div className="item-center mt-6 flex justify-between">
+            <div className="flex flex-col">
+              <div className="item-center flex text-lg font-medium text-custom-text-200">
+                <span>{`${watch("first_name")} ${watch("last_name")}`}</span>
+              </div>
+              <span className="text-sm text-custom-text-300 tracking-tight">{watch("email")}</span>
+            </div>
+          </div>
+          <div className="flex flex-col gap-2">
+            <div className="grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-3 gap-x-6 gap-y-4">
+              <div className="flex flex-col gap-1">
+                <h4 className="text-sm font-medium text-custom-text-200">
+                  {t("first_name")}&nbsp;
+                  <span className="text-red-500">*</span>
+                </h4>
+                <Controller
+                  control={control}
+                  name="first_name"
+                  rules={{
+                    required: "Please enter first name",
+                  }}
+                  render={({ field: { value, onChange, ref } }) => (
+                    <Input
+                      id="first_name"
+                      name="first_name"
+                      type="text"
+                      value={value}
+                      onChange={onChange}
+                      ref={ref}
+                      hasError={Boolean(errors.first_name)}
+                      placeholder="Enter your first name"
+                      className={`w-full rounded-md ${errors.first_name ? "border-red-500" : ""}`}
+                      maxLength={24}
+                      autoComplete="on"
+                    />
+                  )}
+                />
+                {errors.first_name && <span className="text-xs text-red-500">{errors.first_name.message}</span>}
+              </div>
+              <div className="flex flex-col gap-1">
+                <h4 className="text-sm font-medium text-custom-text-200">{t("last_name")}</h4>
+                <Controller
+                  control={control}
+                  name="last_name"
+                  render={({ field: { value, onChange, ref } }) => (
+                    <Input
+                      id="last_name"
+                      name="last_name"
+                      type="text"
+                      value={value}
+                      onChange={onChange}
+                      ref={ref}
+                      hasError={Boolean(errors.last_name)}
+                      placeholder="Enter your last name"
+                      className="w-full rounded-md"
+                      maxLength={24}
+                      autoComplete="on"
+                    />
+                  )}
+                />
+              </div>
+              <div className="flex flex-col gap-1">
+                <h4 className="text-sm font-medium text-custom-text-200">
+                  {t("display_name")}&nbsp;
+                  <span className="text-red-500">*</span>
+                </h4>
+                <Controller
+                  control={control}
+                  name="display_name"
+                  rules={{
+                    required: "Display name is required.",
+                    validate: (value) => {
+                      if (value.trim().length < 1) return "Display name can't be empty.";
+                      if (value.split("  ").length > 1) return "Display name can't have two consecutive spaces.";
+                      if (value.replace(/\s/g, "").length < 1) return "Display name must be at least 1 character long.";
+                      if (value.replace(/\s/g, "").length > 20)
+                        return "Display name must be less than 20 characters long.";
+                      return true;
+                    },
+                  }}
+                  render={({ field: { value, onChange, ref } }) => (
+                    <Input
+                      id="display_name"
+                      name="display_name"
+                      type="text"
+                      value={value}
+                      onChange={onChange}
+                      ref={ref}
+                      hasError={Boolean(errors?.display_name)}
+                      placeholder="Enter your display name"
+                      className={`w-full ${errors?.display_name ? "border-red-500" : ""}`}
+                      maxLength={24}
+                    />
+                  )}
+                />
+                {errors?.display_name && <span className="text-xs text-red-500">{errors?.display_name?.message}</span>}
+              </div>
+              <div className="flex flex-col gap-1">
+                <h4 className="text-sm font-medium text-custom-text-200">
+                  {t("email")}&nbsp;
+                  <span className="text-red-500">*</span>
+                </h4>
+                <Controller
+                  control={control}
+                  name="email"
+                  rules={{
+                    required: "Email is required.",
+                  }}
+                  render={({ field: { value, ref } }) => (
+                    <Input
+                      id="email"
+                      name="email"
+                      type="email"
+                      value={value}
+                      ref={ref}
+                      hasError={Boolean(errors.email)}
+                      placeholder="Enter your email"
+                      className={`w-full cursor-not-allowed rounded-md !bg-custom-background-90 ${
+                        errors.email ? "border-red-500" : ""
+                      }`}
+                      autoComplete="on"
+                      disabled
+                    />
+                  )}
+                />
+              </div>
+              <div className="flex flex-col gap-1">
+                <h4 className="text-sm font-medium text-custom-text-200">
+                  {t("role")}&nbsp;
+                  <span className="text-red-500">*</span>
+                </h4>
+                <Controller
+                  name="role"
+                  control={control}
+                  rules={{ required: "Role is required." }}
+                  render={({ field: { value, onChange } }) => (
+                    <CustomSelect
+                      value={value}
+                      onChange={onChange}
+                      label={value ? value.toString() : "Select your role"}
+                      buttonClassName={errors.role ? "border-red-500" : "border-none"}
+                      className="rounded-md border-[0.5px] !border-custom-border-200"
+                      optionsClassName="w-full"
+                      input
+                    >
+                      {USER_ROLES.map((item) => (
+                        <CustomSelect.Option key={item.value} value={item.value}>
+                          {item.label}
+                        </CustomSelect.Option>
+                      ))}
+                    </CustomSelect>
+                  )}
+                />
+                {errors.role && <span className="text-xs text-red-500">Please select a role</span>}
+              </div>
+            </div>
+          </div>
+          <div className="flex flex-col gap-1">
+            <div className="grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-3 gap-x-6 gap-y-4">
+              <div className="flex flex-col gap-1">
+                <h4 className="text-sm font-medium text-custom-text-200">
+                  {t("timezone")}&nbsp;
+                  <span className="text-red-500">*</span>
+                </h4>
+                <Controller
+                  name="user_timezone"
+                  control={control}
+                  rules={{ required: "Please select a timezone" }}
+                  render={({ field: { value, onChange } }) => (
+                    <CustomSearchSelect
+                      value={value}
+                      label={
+                        value
+                          ? (getTimeZoneLabel(TIME_ZONES.find((t) => t.value === value)) ?? value)
+                          : "Select a timezone"
+                      }
+                      options={timeZoneOptions}
+                      onChange={onChange}
+                      buttonClassName={errors.user_timezone ? "border-red-500" : ""}
+                      className="rounded-md border-[0.5px] !border-custom-border-200"
+                      optionsClassName="w-72"
+                      input
+                    />
+                  )}
+                />
+                {errors.user_timezone && <span className="text-xs text-red-500">{errors.user_timezone.message}</span>}
+              </div>
+              <div className="flex flex-col gap-1">
+                <div className="flex gap-2 items-center">
+                  <h4 className="text-sm font-medium text-custom-text-200">{t("language")} </h4>
+                  <div className="w-fit cursor-pointer rounded-2xl text-custom-primary-200 bg-custom-primary-100/20 text-center font-medium outline-none text-xs px-2">
+                    Alpha
+                  </div>
+                </div>
+                <Controller
+                  control={control}
+                  name="language"
+                  rules={{ required: "Please select a language" }}
+                  render={({ field: { value, onChange } }) => (
+                    <CustomSelect
+                      value={value}
+                      label={value ? getLanguageLabel(value) : "Select a language"}
+                      onChange={onChange}
+                      buttonClassName={errors.language ? "border-red-500" : "border-none"}
+                      className="rounded-md border-[0.5px] !border-custom-border-200"
+                      optionsClassName="w-full"
+                      input
+                    >
+                      {SUPPORTED_LANGUAGES.map((item) => (
+                        <CustomSelect.Option key={item.value} value={item.value}>
+                          {item.label}
+                        </CustomSelect.Option>
+                      ))}
+                    </CustomSelect>
+                  )}
+                />
+              </div>
+            </div>
+            <div className="flex items-center justify-between pt-6 pb-8">
+              <Button variant="primary" type="submit" loading={isLoading}>
+                {isLoading ? t("saving...") : t("save_changes")}
+              </Button>
+            </div>
+          </div>
+        </div>
+      </form>
+      <Disclosure as="div" className="border-t border-custom-border-100">
+        {({ open }) => (
+          <>
+            <Disclosure.Button as="button" type="button" className="flex w-full items-center justify-between py-4">
+              <span className="text-lg font-medium tracking-tight">{t("deactivate_account")}</span>
+              <ChevronDown className={`h-5 w-5 transition-all ${open ? "rotate-180" : ""}`} />
+            </Disclosure.Button>
+            <Transition
+              show={open}
+              enter="transition duration-100 ease-out"
+              enterFrom="transform opacity-0"
+              enterTo="transform opacity-100"
+              leave="transition duration-75 ease-out"
+              leaveFrom="transform opacity-100"
+              leaveTo="transform opacity-0"
+            >
+              <Disclosure.Panel>
+                <div className="flex flex-col gap-8">
+                  <span className="text-sm tracking-tight">{t("deactivate_account_description")}</span>
+                  <div>
+                    <Button variant="danger" onClick={() => setDeactivateAccountModal(true)}>
+                      {t("deactivate_account")}
+                    </Button>
+                  </div>
+                </div>
+              </Disclosure.Panel>
+            </Transition>
+          </>
+        )}
+      </Disclosure>
+    </>
+  );
+});
\ No newline at end of file
diff --git a/web/core/components/profile/index.ts b/web/core/components/profile/index.ts
index d0d33af96ae..be05e0c48fb 100644
--- a/web/core/components/profile/index.ts
+++ b/web/core/components/profile/index.ts
@@ -4,4 +4,5 @@ export * from "./profile-issues-filter";
 export * from "./sidebar";
 export * from "./time";
 export * from "./profile-setting-content-wrapper"
-export * from "./profile-setting-content-header"
\ No newline at end of file
+export * from "./profile-setting-content-header"
+export * from "./form";
\ No newline at end of file
diff --git a/web/core/components/profile/notification/email-notification-form.tsx b/web/core/components/profile/notification/email-notification-form.tsx
index d3e9049e72a..3122902659f 100644
--- a/web/core/components/profile/notification/email-notification-form.tsx
+++ b/web/core/components/profile/notification/email-notification-form.tsx
@@ -2,14 +2,14 @@
 
 import React, { FC, useEffect } from "react";
 import { Controller, useForm } from "react-hook-form";
+import { useTranslation } from "@plane/i18n";
 import { IUserEmailNotificationSettings } from "@plane/types";
 // ui
 import { Button, Checkbox, TOAST_TYPE, setToast } from "@plane/ui";
 // services
 import { UserService } from "@/services/user.service";
 // types
-
-interface IEmailNotificationFormProps {
+ interface IEmailNotificationFormProps {
   data: IUserEmailNotificationSettings;
 }
 
@@ -18,6 +18,7 @@ const userService = new UserService();
 
 export const EmailNotificationForm: FC<IEmailNotificationFormProps> = (props) => {
   const { data } = props;
+  const { t } = useTranslation();
   // form data
   const {
     handleSubmit,
@@ -43,9 +44,9 @@ export const EmailNotificationForm: FC<IEmailNotificationFormProps> = (props) =>
       .updateCurrentUserEmailNotificationSettings(payload)
       .then(() =>
         setToast({
-          title: "Success!",
+          title: t("success"),
           type: TOAST_TYPE.SUCCESS,
-          message: "Email Notification Settings updated successfully",
+          message: t("email_notification_setting_updated_successfully"),
         })
       )
       .catch((err) => console.error(err));
@@ -57,15 +58,13 @@ export const EmailNotificationForm: FC<IEmailNotificationFormProps> = (props) =>
 
   return (
     <>
-      <div className="pt-6 text-lg font-medium text-custom-text-100">Notify me when:</div>
+      <div className="pt-6 text-lg font-medium text-custom-text-100">{t("notify_me_when")}:</div>
       {/* Notification Settings */}
       <div className="flex flex-col py-2">
         <div className="flex gap-2 items-center pt-6">
           <div className="grow">
-            <div className="pb-1 text-base font-medium text-custom-text-100">Property changes</div>
-            <div className="text-sm font-normal text-custom-text-300">
-              Notify me when issue’s properties like assignees, priority, estimates or anything else changes.
-            </div>
+            <div className="pb-1 text-base font-medium text-custom-text-100">{t("property_changes")}</div>
+            <div className="text-sm font-normal text-custom-text-300">{t("property_changes_description")}</div>
           </div>
           <div className="shrink-0">
             <Controller
@@ -79,9 +78,9 @@ export const EmailNotificationForm: FC<IEmailNotificationFormProps> = (props) =>
         </div>
         <div className="flex gap-2 items-center pt-6 pb-2">
           <div className="grow">
-            <div className="pb-1 text-base font-medium text-custom-text-100">State change</div>
+            <div className="pb-1 text-base font-medium text-custom-text-100">{t("state_change")}</div>
             <div className="text-sm font-normal text-custom-text-300">
-              Notify me when the issues moves to a different state
+              {t("state_change_description")}
             </div>
           </div>
           <div className="shrink-0">
@@ -102,8 +101,8 @@ export const EmailNotificationForm: FC<IEmailNotificationFormProps> = (props) =>
         </div>
         <div className="flex gap-2 items-center border-0 border-l-[3px] border-custom-border-300 pl-3">
           <div className="grow">
-            <div className="pb-1 text-base font-medium text-custom-text-100">Issue completed</div>
-            <div className="text-sm font-normal text-custom-text-300">Notify me only when an issue is completed</div>
+            <div className="pb-1 text-base font-medium text-custom-text-100">{t("issue_completed")}</div>
+            <div className="text-sm font-normal text-custom-text-300">{t("issue_completed_description")}</div>
           </div>
           <div className="shrink-0">
             <Controller
@@ -117,9 +116,9 @@ export const EmailNotificationForm: FC<IEmailNotificationFormProps> = (props) =>
         </div>
         <div className="flex gap-2 items-center pt-6">
           <div className="grow">
-            <div className="pb-1 text-base font-medium text-custom-text-100">Comments</div>
+            <div className="pb-1 text-base font-medium text-custom-text-100">{t("comments")}</div>
             <div className="text-sm font-normal text-custom-text-300">
-              Notify me when someone leaves a comment on the issue
+              {t("comments_description")}
             </div>
           </div>
           <div className="shrink-0">
@@ -134,9 +133,9 @@ export const EmailNotificationForm: FC<IEmailNotificationFormProps> = (props) =>
         </div>
         <div className="flex gap-2 items-center pt-6">
           <div className="grow">
-            <div className="pb-1 text-base font-medium text-custom-text-100">Mentions</div>
+            <div className="pb-1 text-base font-medium text-custom-text-100">{t("mentions")}</div>
             <div className="text-sm font-normal text-custom-text-300">
-              Notify me only when someone mentions me in the comments or description
+              {t("mentions_description")}
             </div>
           </div>
           <div className="shrink-0">
@@ -157,4 +156,4 @@ export const EmailNotificationForm: FC<IEmailNotificationFormProps> = (props) =>
       </div>
     </>
   );
-};
+};
\ No newline at end of file
diff --git a/web/core/components/profile/overview/activity.tsx b/web/core/components/profile/overview/activity.tsx
index 7e5e6062132..0a5b84dfa36 100644
--- a/web/core/components/profile/overview/activity.tsx
+++ b/web/core/components/profile/overview/activity.tsx
@@ -3,6 +3,7 @@
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import useSWR from "swr";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { Loader, Card } from "@plane/ui";
 // components
@@ -23,6 +24,7 @@ import { UserService } from "@/services/user.service";
 const userService = new UserService();
 
 export const ProfileActivity = observer(() => {
+  const { t } = useTranslation();
   const { workspaceSlug, userId } = useParams();
   // store hooks
   const { data: currentUser } = useUser();
@@ -39,7 +41,7 @@ export const ProfileActivity = observer(() => {
 
   return (
     <div className="space-y-2">
-      <h3 className="text-lg font-medium">Recent activity</h3>
+      <h3 className="text-lg font-medium">{t("Recent activity")}</h3>
       <Card>
         {userProfileActivity ? (
           userProfileActivity.results.length > 0 ? (
diff --git a/web/core/components/profile/overview/priority-distribution.tsx b/web/core/components/profile/overview/priority-distribution.tsx
index 66f0e02e718..8911a5d63b6 100644
--- a/web/core/components/profile/overview/priority-distribution.tsx
+++ b/web/core/components/profile/overview/priority-distribution.tsx
@@ -2,6 +2,7 @@
 
 // ui
 import { IUserProfileData } from "@plane/types";
+import { useTranslation } from "@plane/i18n";
 import { Loader, Card } from "@plane/ui";
 import { BarGraph, ProfileEmptyState } from "@/components/ui";
 // image
@@ -14,77 +15,81 @@ type Props = {
   userProfile: IUserProfileData | undefined;
 };
 
-export const ProfilePriorityDistribution: React.FC<Props> = ({ userProfile }) => (
-  <div className="flex flex-col space-y-2">
-    <h3 className="text-lg font-medium">Issues by Priority</h3>
-    {userProfile ? (
-      <Card>
-        {userProfile.priority_distribution.length > 0 ? (
-          <BarGraph
-            data={userProfile.priority_distribution.map((priority) => ({
-              priority: capitalizeFirstLetter(priority.priority ?? "None"),
-              value: priority.priority_count,
-            }))}
-            height="300px"
-            indexBy="priority"
-            keys={["value"]}
-            borderRadius={4}
-            padding={0.7}
-            customYAxisTickValues={userProfile.priority_distribution.map((p) => p.priority_count)}
-            tooltip={(datum) => (
-              <div className="flex items-center gap-2 rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
-                <span
-                  className="h-3 w-3 rounded"
-                  style={{
-                    backgroundColor: datum?.color ?? "rgb(var(--color-primary-100))",
-                  }}
-                />
-                <span className="font-medium text-custom-text-200">{datum.data.priority}:</span>
-                <span>{datum.value}</span>
-              </div>
-            )}
-            colors={(datum) => {
-              if (datum.data.priority === "Urgent") return "#991b1b";
-              else if (datum.data.priority === "High") return "#ef4444";
-              else if (datum.data.priority === "Medium") return "#f59e0b";
-              else if (datum.data.priority === "Low") return "#16a34a";
-              else return "#e5e5e5";
-            }}
-            theme={{
-              axis: {
-                domain: {
+export const ProfilePriorityDistribution: React.FC<Props> = ({ userProfile }) => {
+  const { t } = useTranslation();
+  return (
+    <div className="flex flex-col space-y-2">
+      <h3 className="text-lg font-medium">{t("Issues by Priority")}</h3>
+      {userProfile ? (
+        <Card>
+          {userProfile.priority_distribution.length > 0 ? (
+            <BarGraph
+              data={userProfile.priority_distribution.map((priority) => ({
+                priorityKey: capitalizeFirstLetter(priority.priority ?? "None"),
+                priority: t(capitalizeFirstLetter(priority.priority ?? "None")),
+                value: priority.priority_count,
+              }))}
+              height="300px"
+              indexBy="priority"
+              keys={["value"]}
+              borderRadius={4}
+              padding={0.7}
+              customYAxisTickValues={userProfile.priority_distribution.map((p) => p.priority_count)}
+              tooltip={(datum) => (
+                <div className="flex items-center gap-2 rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
+                  <span
+                    className="h-3 w-3 rounded"
+                    style={{
+                      backgroundColor: datum?.color ?? "rgb(var(--color-primary-100))",
+                    }}
+                  />
+                  <span className="font-medium text-custom-text-200">{datum.data.priority}:</span>
+                  <span>{datum.value}</span>
+                </div>
+              )}
+              colors={(datum) => {
+                if (datum.data.priorityKey === "Urgent") return "#991b1b";
+                else if (datum.data.priorityKey === "High") return "#ef4444";
+                else if (datum.data.priorityKey === "Medium") return "#f59e0b";
+                else if (datum.data.priorityKey === "Low") return "#16a34a";
+                else return "#e5e5e5";
+              }}
+              theme={{
+                axis: {
+                  domain: {
+                    line: {
+                      stroke: "transparent",
+                    },
+                  },
+                },
+                grid: {
                   line: {
                     stroke: "transparent",
                   },
                 },
-              },
-              grid: {
-                line: {
-                  stroke: "transparent",
-                },
-              },
-            }}
-          />
-        ) : (
-          <div className="flex-grow p-7">
-            <ProfileEmptyState
-              title="No Data yet"
-              description="Create issues to view the them by priority in the graph for better analysis."
-              image={emptyBarGraph}
+              }}
             />
-          </div>
-        )}
-      </Card>
-    ) : (
-      <div className="grid place-items-center p-7">
-        <Loader className="flex items-end gap-12">
-          <Loader.Item width="30px" height="200px" />
-          <Loader.Item width="30px" height="150px" />
-          <Loader.Item width="30px" height="250px" />
-          <Loader.Item width="30px" height="150px" />
-          <Loader.Item width="30px" height="100px" />
-        </Loader>
-      </div>
-    )}
-  </div>
-);
+          ) : (
+            <div className="flex-grow p-7">
+              <ProfileEmptyState
+                title="No Data yet"
+                description="Create issues to view the them by priority in the graph for better analysis."
+                image={emptyBarGraph}
+              />
+            </div>
+          )}
+        </Card>
+      ) : (
+        <div className="grid place-items-center p-7">
+          <Loader className="flex items-end gap-12">
+            <Loader.Item width="30px" height="200px" />
+            <Loader.Item width="30px" height="150px" />
+            <Loader.Item width="30px" height="250px" />
+            <Loader.Item width="30px" height="150px" />
+            <Loader.Item width="30px" height="100px" />
+          </Loader>
+        </div>
+      )}
+    </div>
+  )
+};
diff --git a/web/core/components/profile/overview/state-distribution.tsx b/web/core/components/profile/overview/state-distribution.tsx
index c3533018cb3..be6dc1e2217 100644
--- a/web/core/components/profile/overview/state-distribution.tsx
+++ b/web/core/components/profile/overview/state-distribution.tsx
@@ -1,5 +1,6 @@
 // ui
 import { IUserProfileData, IUserStateDistribution } from "@plane/types";
+import { useTranslation } from "@plane/i18n";
 import { Card } from "@plane/ui";
 import { ProfileEmptyState, PieGraph } from "@/components/ui";
 
@@ -15,11 +16,12 @@ type Props = {
 };
 
 export const ProfileStateDistribution: React.FC<Props> = ({ stateDistribution, userProfile }) => {
+  const { t } = useTranslation();
   if (!userProfile) return null;
 
   return (
     <div className="flex flex-col space-y-2">
-      <h3 className="text-lg font-medium">Issues by state</h3>
+      <h3 className="text-lg font-medium">{t("Issues by state")}</h3>
       <Card className="h-full">
         {userProfile.state_distribution.length > 0 ? (
           <div className="grid grid-cols-1 gap-x-6 md:grid-cols-2">
@@ -44,7 +46,7 @@ export const ProfileStateDistribution: React.FC<Props> = ({ stateDistribution, u
                 colors={(datum) => datum?.data?.color}
                 tooltip={(datum) => (
                   <div className="flex items-center gap-2 rounded-md border border-custom-border-200 bg-custom-background-90 p-2 text-xs">
-                    <span className="capitalize text-custom-text-200">{datum.datum.label} issues:</span>{" "}
+                    <span className="capitalize text-custom-text-200">{t(String(datum.datum.label))} issues:</span>{" "}
                     {datum.datum.value}
                   </div>
                 )}
@@ -67,7 +69,7 @@ export const ProfileStateDistribution: React.FC<Props> = ({ stateDistribution, u
                           backgroundColor: STATE_GROUPS[group.state_group]?.color ?? "rgb(var(--color-primary-100))",
                         }}
                       />
-                      <div className="whitespace-nowrap">{STATE_GROUPS[group.state_group].label}</div>
+                      <div className="whitespace-nowrap">{t(STATE_GROUPS[group.state_group].label)}</div>
                     </div>
                     <div>{group.state_count}</div>
                   </div>
diff --git a/web/core/components/profile/overview/stats.tsx b/web/core/components/profile/overview/stats.tsx
index 50f6b0ae02f..64e7b9314cc 100644
--- a/web/core/components/profile/overview/stats.tsx
+++ b/web/core/components/profile/overview/stats.tsx
@@ -2,6 +2,7 @@
 
 import Link from "next/link";
 import { useParams } from "next/navigation";
+import { useTranslation } from "@plane/i18n";
 
 // ui
 import { UserCircle2 } from "lucide-react";
@@ -15,6 +16,7 @@ type Props = {
 
 export const ProfileStats: React.FC<Props> = ({ userProfile }) => {
   const { workspaceSlug, userId } = useParams();
+  const { t } = useTranslation();
 
   const overviewCards = [
     {
@@ -39,7 +41,7 @@ export const ProfileStats: React.FC<Props> = ({ userProfile }) => {
 
   return (
     <div className="space-y-2">
-      <h3 className="text-lg font-medium">Overview</h3>
+      <h3 className="text-lg font-medium">{t("Overview")}</h3>
       {userProfile ? (
         <div className="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
           {overviewCards.map((card) => (
@@ -49,7 +51,7 @@ export const ProfileStats: React.FC<Props> = ({ userProfile }) => {
                   <card.icon className="h-5 w-5" />
                 </div>
                 <div className="space-y-1">
-                  <p className="text-sm text-custom-text-400">{card.title}</p>
+                  <p className="text-sm text-custom-text-400">{t(card.title)}</p>
                   <p className="text-xl font-semibold">{card.value}</p>
                 </div>
               </Card>
diff --git a/web/core/components/profile/overview/workload.tsx b/web/core/components/profile/overview/workload.tsx
index 94ebc2fe6d8..8bcd9bdb50b 100644
--- a/web/core/components/profile/overview/workload.tsx
+++ b/web/core/components/profile/overview/workload.tsx
@@ -1,3 +1,4 @@
+import { useTranslation } from "@plane/i18n";
 // types
 import { IUserStateDistribution } from "@plane/types";
 import { Card, ECardDirection, ECardSpacing } from "@plane/ui";
@@ -8,34 +9,37 @@ type Props = {
   stateDistribution: IUserStateDistribution[];
 };
 
-export const ProfileWorkload: React.FC<Props> = ({ stateDistribution }) => (
-  <div className="space-y-2">
-    <h3 className="text-lg font-medium">Workload</h3>
-    <div className="grid grid-cols-1 justify-stretch gap-4 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-5">
-      {stateDistribution.map((group) => (
-        <div key={group.state_group}>
-          <a>
-            <Card direction={ECardDirection.ROW} spacing={ECardSpacing.SM}>
-              <div
-                className="h-3 w-3 rounded-sm my-2"
-                style={{
-                  backgroundColor: STATE_GROUPS[group.state_group].color,
-                }}
-              />
-              <div className="space-y-1 flex-col">
-                <span className="text-sm text-custom-text-400">
-                  {group.state_group === "unstarted"
-                    ? "Not started"
-                    : group.state_group === "started"
-                      ? "Working on"
-                      : STATE_GROUPS[group.state_group].label}
-                </span>
-                <p className="text-xl font-semibold">{group.state_count}</p>
-              </div>
-            </Card>
-          </a>
-        </div>
-      ))}
+export const ProfileWorkload: React.FC<Props> = ({ stateDistribution }) => {
+  const { t } = useTranslation();
+  return (
+    <div className="space-y-2">
+      <h3 className="text-lg font-medium">{t("Workload")}</h3>
+      <div className="grid grid-cols-1 justify-stretch gap-4 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-5">
+        {stateDistribution.map((group) => (
+          <div key={group.state_group}>
+            <a>
+              <Card direction={ECardDirection.ROW} spacing={ECardSpacing.SM}>
+                <div
+                  className="h-3 w-3 rounded-sm my-2"
+                  style={{
+                    backgroundColor: STATE_GROUPS[group.state_group].color,
+                  }}
+                />
+                <div className="space-y-1 flex-col">
+                  <span className="text-sm text-custom-text-400">
+                    {group.state_group === "unstarted"
+                      ? t("Not started")
+                      : group.state_group === "started"
+                        ? t("Working on")
+                        : t(STATE_GROUPS[group.state_group].label)}
+                  </span>
+                  <p className="text-xl font-semibold">{group.state_count}</p>
+                </div>
+              </Card>
+            </a>
+          </div>
+        ))}
+      </div>
     </div>
-  </div>
-);
+  )
+};
diff --git a/web/core/components/profile/profile-issues-filter.tsx b/web/core/components/profile/profile-issues-filter.tsx
index aaaa153613a..0a4693a2c21 100644
--- a/web/core/components/profile/profile-issues-filter.tsx
+++ b/web/core/components/profile/profile-issues-filter.tsx
@@ -16,8 +16,10 @@ import {
 import { isIssueFilterActive } from "@/helpers/filter.helper";
 // hooks
 import { useIssues, useLabel } from "@/hooks/store";
+import { useTranslation } from "@plane/i18n";
 
 export const ProfileIssuesFilter = observer(() => {
+  const { t } = useTranslation();
   // router
   const { workspaceSlug, userId } = useParams();
   // store hook
@@ -93,7 +95,7 @@ export const ProfileIssuesFilter = observer(() => {
         workspaceSlug.toString(),
         undefined,
         EIssueFilterType.DISPLAY_PROPERTIES,
-        property,
+        property as IIssueDisplayProperties,
         userId.toString()
       );
     },
@@ -108,7 +110,7 @@ export const ProfileIssuesFilter = observer(() => {
         selectedLayout={activeLayout}
       />
 
-      <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}>
+      <FiltersDropdown title={t("filters")} placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}>
         <FilterSelection
           layoutDisplayFiltersOptions={
             activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.profile_issues[activeLayout] : undefined
@@ -123,7 +125,7 @@ export const ProfileIssuesFilter = observer(() => {
         />
       </FiltersDropdown>
 
-      <FiltersDropdown title="Display" placement="bottom-end">
+      <FiltersDropdown title={t("display")} placement="bottom-end">
         <DisplayFiltersSelection
           layoutDisplayFiltersOptions={
             activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.profile_issues[activeLayout] : undefined
diff --git a/web/core/components/profile/sidebar.tsx b/web/core/components/profile/sidebar.tsx
index 7990f9b3d0e..690dd59dd43 100644
--- a/web/core/components/profile/sidebar.tsx
+++ b/web/core/components/profile/sidebar.tsx
@@ -90,7 +90,7 @@ export const ProfileSidebar: FC<TProfileSidebar> = observer((props) => {
       {userProjectsData ? (
         <>
           <div className="relative h-[110px]">
-            {currentUser?.id === userId && (
+            {/* Removing the edit button/link section {currentUser?.id === userId && (
               <div className="absolute right-3.5 top-3.5 grid h-5 w-5 place-items-center rounded bg-white">
                 <Link href="/profile">
                   <span className="grid place-items-center text-black">
@@ -98,7 +98,7 @@ export const ProfileSidebar: FC<TProfileSidebar> = observer((props) => {
                   </span>
                 </Link>
               </div>
-            )}
+            )} */}
             <img
               src={
                 userData?.cover_image_url
diff --git a/web/core/components/project/create/common-attributes.tsx b/web/core/components/project/create/common-attributes.tsx
index f753d0ae758..e6ccd2b2fa2 100644
--- a/web/core/components/project/create/common-attributes.tsx
+++ b/web/core/components/project/create/common-attributes.tsx
@@ -2,6 +2,7 @@ import { ChangeEvent } from "react";
 import { Controller, useFormContext, UseFormSetValue } from "react-hook-form";
 import { Info } from "lucide-react";
 import { cn } from "@plane/editor";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { Input, TextArea, Tooltip } from "@plane/ui";
 // constants
@@ -26,6 +27,7 @@ const ProjectCommonAttributes: React.FC<Props> = (props) => {
   } = useFormContext<TProject>();
 
   const { getIndex } = getTabIndex(ETabIndices.PROJECT_CREATE, isMobile);
+  const { t } = useTranslation();
 
   const handleNameChange = (onChange: (...event: any[]) => void) => (e: ChangeEvent<HTMLInputElement>) => {
     if (!isChangeInIdentifierRequired) {
@@ -50,10 +52,10 @@ const ProjectCommonAttributes: React.FC<Props> = (props) => {
           control={control}
           name="name"
           rules={{
-            required: "Name is required",
+            required: t("name_is_required"),
             maxLength: {
               value: 255,
-              message: "Title should be less than 255 characters",
+              message: t("title_should_be_less_than_255_characters"),
             },
           }}
           render={({ field: { value, onChange } }) => (
@@ -64,7 +66,7 @@ const ProjectCommonAttributes: React.FC<Props> = (props) => {
               value={value}
               onChange={handleNameChange(onChange)}
               hasError={Boolean(errors.name)}
-              placeholder="Project name"
+              placeholder={t("project_name")}
               className="w-full focus:border-blue-400"
               tabIndex={getIndex("name")}
             />
@@ -77,17 +79,17 @@ const ProjectCommonAttributes: React.FC<Props> = (props) => {
           control={control}
           name="identifier"
           rules={{
-            required: "Project ID is required",
+            required: t("project_id_is_required"),
             // allow only alphanumeric & non-latin characters
             validate: (value) =>
-              /^[ÇŞĞIİÖÜA-Z0-9]+$/.test(value.toUpperCase()) || "Only Alphanumeric & Non-latin characters are allowed.",
+              /^[ÇŞĞIİÖÜA-Z0-9]+$/.test(value.toUpperCase()) || t("only_alphanumeric_non_latin_characters_allowed"),
             minLength: {
               value: 1,
-              message: "Project ID must at least be of 1 character",
+              message: t("project_id_must_be_at_least_1_character"),
             },
             maxLength: {
               value: 5,
-              message: "Project ID must at most be of 5 characters",
+              message: t("project_id_must_be_at_most_5_characters"),
             },
           }}
           render={({ field: { value, onChange } }) => (
@@ -98,7 +100,7 @@ const ProjectCommonAttributes: React.FC<Props> = (props) => {
               value={value}
               onChange={handleIdentifierChange(onChange)}
               hasError={Boolean(errors.identifier)}
-              placeholder="Project ID"
+              placeholder={t("project_id")}
               className={cn("w-full text-xs focus:border-blue-400 pr-7", {
                 uppercase: value,
               })}
@@ -108,7 +110,7 @@ const ProjectCommonAttributes: React.FC<Props> = (props) => {
         />
         <Tooltip
           isMobile={isMobile}
-          tooltipContent="Helps you identify issues in the project uniquely. Max 5 characters."
+          tooltipContent={t("project_id_tooltip_content")}
           className="text-sm"
           position="right-top"
         >
@@ -125,7 +127,7 @@ const ProjectCommonAttributes: React.FC<Props> = (props) => {
               id="description"
               name="description"
               value={value}
-              placeholder="Description..."
+              placeholder={t("description")}
               onChange={onChange}
               className="!h-24 text-sm focus:border-blue-400"
               hasError={Boolean(errors?.description)}
@@ -138,4 +140,4 @@ const ProjectCommonAttributes: React.FC<Props> = (props) => {
   );
 };
 
-export default ProjectCommonAttributes;
+export default ProjectCommonAttributes;
\ No newline at end of file
diff --git a/web/core/components/project/create/header.tsx b/web/core/components/project/create/header.tsx
index 6bdbb3c7420..6ec0f74df70 100644
--- a/web/core/components/project/create/header.tsx
+++ b/web/core/components/project/create/header.tsx
@@ -1,6 +1,7 @@
 import { useState } from "react";
 import { Controller, useFormContext } from "react-hook-form";
 import { X } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 // plane types
 import { IProject } from "@plane/types";
 // plane ui
@@ -21,6 +22,7 @@ type Props = {
 const ProjectCreateHeader: React.FC<Props> = (props) => {
   const { handleClose, isMobile = false } = props;
   const { watch, control } = useFormContext<IProject>();
+  const { t } = useTranslation();
   // derived values
   const coverImage = watch("cover_image_url");
 
@@ -33,7 +35,7 @@ const ProjectCreateHeader: React.FC<Props> = (props) => {
         <img
           src={getFileURL(coverImage)}
           className="absolute left-0 top-0 h-full w-full rounded-lg object-cover"
-          alt="Project cover image"
+          alt={t("project_cover_image_alt")}
         />
       )}
 
@@ -48,7 +50,7 @@ const ProjectCreateHeader: React.FC<Props> = (props) => {
           control={control}
           render={({ field: { value, onChange } }) => (
             <ImagePickerPopover
-              label="Change Cover"
+              label={t("change_cover")}
               onChange={onChange}
               control={control}
               value={value}
@@ -100,4 +102,4 @@ const ProjectCreateHeader: React.FC<Props> = (props) => {
   );
 };
 
-export default ProjectCreateHeader;
+export default ProjectCreateHeader;
\ No newline at end of file
diff --git a/web/core/components/project/create/project-create-buttons.tsx b/web/core/components/project/create/project-create-buttons.tsx
index 2fa0706e08e..43872a1f9db 100644
--- a/web/core/components/project/create/project-create-buttons.tsx
+++ b/web/core/components/project/create/project-create-buttons.tsx
@@ -1,4 +1,5 @@
 import { useFormContext } from "react-hook-form";
+import { useTranslation } from "@plane/i18n";
 import { IProject } from "@plane/types";
 // ui
 import { Button } from "@plane/ui";
@@ -13,6 +14,7 @@ type Props = {
 };
 
 const ProjectCreateButtons: React.FC<Props> = (props) => {
+  const { t } = useTranslation();
   const { handleClose, isMobile = false } = props;
   const {
     formState: { isSubmitting },
@@ -23,13 +25,13 @@ const ProjectCreateButtons: React.FC<Props> = (props) => {
   return (
     <div className="flex justify-end gap-2 py-4 border-t border-custom-border-100">
       <Button variant="neutral-primary" size="sm" onClick={handleClose} tabIndex={getIndex("cancel")}>
-        Cancel
+        {t("cancel")}
       </Button>
       <Button variant="primary" type="submit" size="sm" loading={isSubmitting} tabIndex={getIndex("submit")}>
-        {isSubmitting ? "Creating" : "Create project"}
+        {isSubmitting ? t("creating") : t("create_project")}
       </Button>
     </div>
   );
 };
 
-export default ProjectCreateButtons;
+export default ProjectCreateButtons;
\ No newline at end of file
diff --git a/web/core/components/project/filters.tsx b/web/core/components/project/filters.tsx
index 9434f79951f..1545fc44ce7 100644
--- a/web/core/components/project/filters.tsx
+++ b/web/core/components/project/filters.tsx
@@ -12,6 +12,7 @@ import { ProjectFiltersSelection, ProjectOrderByDropdown } from "@/components/pr
 import { calculateTotalFilters } from "@/helpers/filter.helper";
 // hooks
 import { useMember, useProjectFilter } from "@/hooks/store";
+import { useTranslation } from "@plane/i18n";
 
 type Props = {
   filterMenuButton?: React.ReactNode;
@@ -21,6 +22,7 @@ type Props = {
 };
 
 const HeaderFilters = observer(({ filterMenuButton, isMobile, classname = "", filterClassname = "" }: Props) => {
+  const { t } = useTranslation();
   // router
   const { workspaceSlug } = useParams();
   const {
@@ -71,7 +73,7 @@ const HeaderFilters = observer(({ filterMenuButton, isMobile, classname = "", fi
       <div className={cn(filterClassname)}>
         <FiltersDropdown
           icon={<ListFilter className="h-3 w-3" />}
-          title="Filters"
+          title={t("filters")}
           placement="bottom-end"
           isFiltersApplied={isFiltersApplied}
           menuButton={filterMenuButton || null}
diff --git a/web/core/components/project/form.tsx b/web/core/components/project/form.tsx
index 3a076ce29ef..9053a4dbabc 100644
--- a/web/core/components/project/form.tsx
+++ b/web/core/components/project/form.tsx
@@ -3,6 +3,7 @@
 import { FC, useEffect, useState } from "react";
 import { Controller, useForm } from "react-hook-form";
 import { Info, Lock } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 // plane types
 import { IProject, IWorkspace } from "@plane/types";
 // plane ui
@@ -43,6 +44,7 @@ export interface IProjectDetailsForm {
 const projectService = new ProjectService();
 export const ProjectDetailsForm: FC<IProjectDetailsForm> = (props) => {
   const { project, workspaceSlug, projectId, isAdmin } = props;
+  const { t } = useTranslation();
   // states
   const [isOpen, setIsOpen] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
@@ -370,8 +372,8 @@ export const ProjectDetailsForm: FC<IProjectDetailsForm> = (props) => {
                         <div className="flex items-start gap-2">
                           <network.icon className="h-3.5 w-3.5" />
                           <div className="-mt-1">
-                            <p>{network.label}</p>
-                            <p className="text-xs text-custom-text-400">{network.description}</p>
+                            <p>{t(network.label)}</p>
+                            <p className="text-xs text-custom-text-400">{t(network.description)}</p>
                           </div>
                         </div>
                       </CustomSelect.Option>
@@ -420,4 +422,4 @@ export const ProjectDetailsForm: FC<IProjectDetailsForm> = (props) => {
       </div>
     </form>
   );
-};
+};
\ No newline at end of file
diff --git a/web/core/components/project/project-feature-update.tsx b/web/core/components/project/project-feature-update.tsx
index ff10271d82c..c49f521b691 100644
--- a/web/core/components/project/project-feature-update.tsx
+++ b/web/core/components/project/project-feature-update.tsx
@@ -3,6 +3,7 @@
 import React, { FC } from "react";
 import { observer } from "mobx-react";
 import Link from "next/link";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { Button, getButtonStyling, Row } from "@plane/ui";
 // components
@@ -20,6 +21,7 @@ type Props = {
 export const ProjectFeatureUpdate: FC<Props> = observer((props) => {
   const { workspaceSlug, projectId, onClose } = props;
   // store hooks
+  const { t } = useTranslation();
   const { getProjectById } = useProject();
 
   if (!workspaceSlug || !projectId) return null;
@@ -33,12 +35,12 @@ export const ProjectFeatureUpdate: FC<Props> = observer((props) => {
       </Row>
       <div className="flex items-center justify-between gap-2 mt-4 px-6 py-4 border-t border-custom-border-100">
         <div className="flex gap-1 text-sm text-custom-text-300 font-medium">
-          Congrats! Project <Logo logo={currentProjectDetails.logo_props} />{" "}
-          <p className="break-all">{currentProjectDetails.name}</p> created.
+          {t("congrats")}! {t("project")} <Logo logo={currentProjectDetails.logo_props} />{" "}
+          <p className="break-all">{currentProjectDetails.name}</p> {t("created").toLowerCase()}.
         </div>
         <div className="flex gap-2">
           <Button variant="neutral-primary" size="sm" onClick={onClose} tabIndex={1}>
-            Close
+            {t("close")}
           </Button>
           <Link
             href={`/${workspaceSlug}/projects/${projectId}/issues`}
@@ -46,10 +48,10 @@ export const ProjectFeatureUpdate: FC<Props> = observer((props) => {
             className={getButtonStyling("primary", "sm")}
             tabIndex={2}
           >
-            Open project
+            {t("open_project")}
           </Link>
         </div>
       </div>
     </>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/project/publish-project/modal.tsx b/web/core/components/project/publish-project/modal.tsx
index 5496e699398..39fdd14f81a 100644
--- a/web/core/components/project/publish-project/modal.tsx
+++ b/web/core/components/project/publish-project/modal.tsx
@@ -8,6 +8,7 @@ import { Check, ExternalLink, Globe2 } from "lucide-react";
 // types
 import { IProject, TProjectPublishLayouts, TProjectPublishSettings } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Button, Loader, ToggleSwitch, TOAST_TYPE, setToast, CustomSelect, ModalCore, EModalWidth } from "@plane/ui";
 // helpers
 import { SPACE_BASE_PATH, SPACE_BASE_URL } from "@/helpers/common.helper";
@@ -55,6 +56,7 @@ export const PublishProjectModal: React.FC<Props> = observer((props) => {
     unPublishProject,
     fetchSettingsLoader,
   } = useProjectPublish();
+  const { t } = useTranslation();
   // derived values
   const projectPublishSettings = getPublishSettingsByProjectID(project.id);
   // form info
@@ -230,7 +232,7 @@ export const PublishProjectModal: React.FC<Props> = observer((props) => {
             )}
             <div className="space-y-4">
               <div className="relative flex items-center justify-between gap-2">
-                <div className="text-sm">Views</div>
+                <div className="text-sm">{t("views")}</div>
                 <Controller
                   control={control}
                   name="view_props"
diff --git a/web/core/components/project/settings/features-list.tsx b/web/core/components/project/settings/features-list.tsx
index f1f17f2d598..c52a8da206a 100644
--- a/web/core/components/project/settings/features-list.tsx
+++ b/web/core/components/project/settings/features-list.tsx
@@ -2,6 +2,7 @@
 
 import { FC } from "react";
 import { observer } from "mobx-react";
+import { useTranslation } from "@plane/i18n";
 import { IProject } from "@plane/types";
 import { ToggleSwitch, Tooltip, setPromiseToast } from "@plane/ui";
 // hooks
@@ -20,6 +21,7 @@ type Props = {
 export const ProjectFeaturesList: FC<Props> = observer((props) => {
   const { workspaceSlug, projectId, isAdmin } = props;
   // store hooks
+  const { t } = useTranslation();
   const { captureEvent } = useEventTracker();
   const { data: currentUser } = useUser();
   const { getProjectById, updateProject } = useProject();
@@ -62,8 +64,8 @@ export const ProjectFeaturesList: FC<Props> = observer((props) => {
         return (
           <div key={featureSectionKey} className="">
             <div className="flex flex-col justify-center pb-2 border-b border-custom-border-100">
-              <h3 className="text-xl font-medium">{feature.title}</h3>
-              <h4 className="text-sm leading-5 text-custom-text-200">{feature.description}</h4>
+              <h3 className="text-xl font-medium">{t(feature.key)}</h3>
+              <h4 className="text-sm leading-5 text-custom-text-200">{t(`${feature.key}_description`)}</h4>
             </div>
             {Object.keys(feature.featureList).map((featureItemKey) => {
               const featureItem = feature.featureList[featureItemKey];
@@ -79,7 +81,7 @@ export const ProjectFeaturesList: FC<Props> = observer((props) => {
                       </div>
                       <div>
                         <div className="flex items-center gap-2">
-                          <h4 className="text-sm font-medium leading-5">{featureItem.title}</h4>
+                          <h4 className="text-sm font-medium leading-5">{t(featureItem.key)}</h4>
                           {featureItem.isPro && (
                             <Tooltip tooltipContent="Pro feature" position="top">
                               <UpgradeBadge />
@@ -87,7 +89,7 @@ export const ProjectFeaturesList: FC<Props> = observer((props) => {
                           )}
                         </div>
                         <p className="text-sm leading-5 tracking-tight text-custom-text-300">
-                          {featureItem.description}
+                          {t(`${featureItem.key}_description`)}
                         </p>
                       </div>
                     </div>
@@ -112,4 +114,4 @@ export const ProjectFeaturesList: FC<Props> = observer((props) => {
       })}
     </div>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/user/user-greetings.tsx b/web/core/components/user/user-greetings.tsx
index 216da7a5292..201c3cba855 100644
--- a/web/core/components/user/user-greetings.tsx
+++ b/web/core/components/user/user-greetings.tsx
@@ -1,4 +1,5 @@
 import { FC } from "react";
+import { useTranslation } from "@plane/i18n";
 // hooks
 import { IUser } from "@plane/types";
 import { useCurrentTime } from "@/hooks/use-current-time";
@@ -12,6 +13,7 @@ export const UserGreetingsView: FC<IUserGreetingsView> = (props) => {
   const { user } = props;
   // current time hook
   const { currentTime } = useCurrentTime();
+  const { t } = useTranslation();
 
   const hour = new Intl.DateTimeFormat("en-US", {
     hour12: false,
@@ -39,12 +41,12 @@ export const UserGreetingsView: FC<IUserGreetingsView> = (props) => {
   return (
     <div>
       <h3 className="text-xl font-semibold">
-        Good {greeting}, {user?.first_name} {user?.last_name}
+        {t(`Good ${greeting}`)}, {user?.first_name} {user?.last_name}
       </h3>
       <h6 className="flex items-center gap-2 font-medium text-custom-text-400">
         <div>{greeting === "morning" ? "🌤️" : greeting === "afternoon" ? "🌥️" : "🌙️"}</div>
         <div>
-          {weekDay}, {date} {timeString}
+          {t(weekDay)}, {date} {timeString}
         </div>
       </h6>
     </div>
diff --git a/web/core/components/views/applied-filters/root.tsx b/web/core/components/views/applied-filters/root.tsx
index 391e02bf2b2..71b97acb90d 100644
--- a/web/core/components/views/applied-filters/root.tsx
+++ b/web/core/components/views/applied-filters/root.tsx
@@ -8,6 +8,7 @@ import { EViewAccess } from "@/constants/views";
 // helpers
 import { replaceUnderscoreIfSnakeCase } from "@/helpers/string.helper";
 import { AppliedAccessFilters } from "./access";
+import { useParams, usePathname } from "next/navigation";
 // types
 
 type Props = {
@@ -24,6 +25,13 @@ const VIEW_ACCESS_FILTERS = ["view_type"];
 export const ViewAppliedFiltersList: React.FC<Props> = (props) => {
   const { appliedFilters, handleClearAllFilters, handleRemoveFilter, alwaysAllowEditing } = props;
 
+  const { workspaceSlug, projectId } = useParams();
+  const pathname = usePathname();
+  const isProjectViewsPage = !!(workspaceSlug && projectId && pathname?.includes("/views"));
+  const shouldShowRemoveButton = (isProjectViewsPage: boolean, filterKey: keyof TViewFilterProps): boolean => {
+    return !(isProjectViewsPage && filterKey === "owned_by");
+  };
+
   if (!appliedFilters) return null;
   if (Object.keys(appliedFilters).length === 0) return null;
 
@@ -61,15 +69,16 @@ export const ViewAppliedFiltersList: React.FC<Props> = (props) => {
                 values={Array.isArray(value) ? (value as string[]) : []}
               />
             )}
-            {isEditingAllowed && (
-              <button
-                type="button"
-                className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
-                onClick={() => handleRemoveFilter(filterKey, null)}
-              >
-                <X size={12} strokeWidth={2} />
-              </button>
-            )}
+            {isEditingAllowed &&
+              shouldShowRemoveButton(isProjectViewsPage, filterKey) && (
+                <button
+                  type="button"
+                  className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
+                  onClick={() => handleRemoveFilter(filterKey, null)}
+                >
+                  <X size={12} strokeWidth={2} />
+                </button>
+              )}
           </Tag>
         );
       })}
diff --git a/web/core/components/views/filters/filter-selection.tsx b/web/core/components/views/filters/filter-selection.tsx
index 00b8ea817e6..69d13b7b1aa 100644
--- a/web/core/components/views/filters/filter-selection.tsx
+++ b/web/core/components/views/filters/filter-selection.tsx
@@ -11,6 +11,7 @@ import { EViewAccess } from "@/constants/views";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 // plane web components
 import { FilterByAccess } from "@/plane-web/components/views/filters/access-filter";
+import { useParams, usePathname } from "next/navigation";
 
 type Props = {
   filters: TViewFilters;
@@ -24,6 +25,10 @@ export const ViewFiltersSelection: React.FC<Props> = observer((props) => {
   const [filtersSearchQuery, setFiltersSearchQuery] = useState("");
   // store
   const { isMobile } = usePlatformOS();
+  const { workspaceSlug, projectId } = useParams();
+  const pathname = usePathname();
+  const isProjectViewsPage = workspaceSlug && projectId && pathname?.includes("/views");
+
 
   // handles filter update
   const handleFilters = (key: keyof TViewFilterProps, value: boolean | string | EViewAccess | string[]) => {
@@ -104,6 +109,7 @@ export const ViewFiltersSelection: React.FC<Props> = observer((props) => {
         </div>
 
         {/* created by */}
+        {!isProjectViewsPage && (
         <div className="py-2">
           <FilterCreatedBy
             appliedFilters={filters.filters?.owned_by ?? null}
@@ -112,6 +118,7 @@ export const ViewFiltersSelection: React.FC<Props> = observer((props) => {
             memberIds={memberIds}
           />
         </div>
+        )}
       </div>
     </div>
   );
diff --git a/web/core/components/views/form.tsx b/web/core/components/views/form.tsx
index ede1fa10b6e..e60defee717 100644
--- a/web/core/components/views/form.tsx
+++ b/web/core/components/views/form.tsx
@@ -7,6 +7,7 @@ import { Layers } from "lucide-react";
 // types
 import { IProjectView, IIssueFilterOptions, IIssueDisplayProperties, IIssueDisplayFilterOptions } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Button, EmojiIconPicker, EmojiIconPickerTypes, Input, TextArea } from "@plane/ui";
 // components
 import { Logo } from "@/components/common";
@@ -43,6 +44,7 @@ const defaultValues: Partial<IProjectView> = {
 
 export const ProjectViewForm: React.FC<Props> = observer((props) => {
   const { handleFormSubmit, handleClose, data, preLoadedData } = props;
+  const { t } = useTranslation();
   // state
   const [isOpen, setIsOpen] = useState(false);
   // store hooks
@@ -199,7 +201,7 @@ export const ProjectViewForm: React.FC<Props> = observer((props) => {
                     value={value}
                     onChange={onChange}
                     hasError={Boolean(errors.name)}
-                    placeholder="Title"
+                    placeholder={t("title")}
                     className="w-full text-base"
                     tabIndex={getIndex("name")}
                     autoFocus
@@ -217,7 +219,7 @@ export const ProjectViewForm: React.FC<Props> = observer((props) => {
                 <TextArea
                   id="description"
                   name="description"
-                  placeholder="Description"
+                  placeholder={t("description")}
                   className="w-full text-base resize-none min-h-24"
                   hasError={Boolean(errors?.description)}
                   value={value}
@@ -250,7 +252,7 @@ export const ProjectViewForm: React.FC<Props> = observer((props) => {
                     control={control}
                     name="filters"
                     render={({ field: { onChange, value: filters } }) => (
-                      <FiltersDropdown title="Filters" tabIndex={getIndex("filters")}>
+                      <FiltersDropdown title={t("filters")} tabIndex={getIndex("filters")}>
                         <FilterSelection
                           filters={filters ?? {}}
                           handleFiltersUpdate={(key, value) => {
@@ -286,7 +288,7 @@ export const ProjectViewForm: React.FC<Props> = observer((props) => {
                     control={control}
                     name="display_properties"
                     render={({ field: { onChange: onDisplayPropertiesChange, value: displayProperties } }) => (
-                      <FiltersDropdown title="Display">
+                      <FiltersDropdown title={t("display")}>
                         <DisplayFiltersSelection
                           layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.issues[displayFilters.layout]}
                           displayFilters={displayFilters ?? {}}
@@ -330,10 +332,10 @@ export const ProjectViewForm: React.FC<Props> = observer((props) => {
       </div>
       <div className="px-5 py-4 flex items-center justify-end gap-2 border-t-[0.5px] border-custom-border-200">
         <Button variant="neutral-primary" size="sm" onClick={handleClose} tabIndex={getIndex("cancel")}>
-          Cancel
+          {t("cancel")}
         </Button>
         <Button variant="primary" size="sm" type="submit" tabIndex={getIndex("submit")} loading={isSubmitting}>
-          {data ? (isSubmitting ? "Updating" : "Update View") : isSubmitting ? "Creating" : "Create View"}
+          {data ? (isSubmitting ? t("updating") : t("update_view")) : isSubmitting ? t("creating") : t("create_view")}
         </Button>
       </div>
     </form>
diff --git a/web/core/components/views/view-list-header.tsx b/web/core/components/views/view-list-header.tsx
index 78d235ba97c..d5615f2497b 100644
--- a/web/core/components/views/view-list-header.tsx
+++ b/web/core/components/views/view-list-header.tsx
@@ -11,8 +11,10 @@ import { useMember, useProjectView } from "@/hooks/store";
 import { FiltersDropdown } from "../issues";
 import { ViewFiltersSelection } from "./filters/filter-selection";
 import { ViewOrderByDropdown } from "./filters/order-by";
+import { useTranslation } from "@plane/i18n";
 
 export const ViewListHeader = observer(() => {
+  const { t } = useTranslation();
   // states
   const [isSearchOpen, setIsSearchOpen] = useState(false);
   // refs
@@ -101,7 +103,7 @@ export const ViewListHeader = observer(() => {
         />
         <FiltersDropdown
           icon={<ListFilter className="h-3 w-3" />}
-          title="Filters"
+          title={t("filters")}
           placement="bottom-end"
           isFiltersApplied={false}
         >
diff --git a/web/core/components/workspace-notifications/sidebar/filters/applied-filter.tsx b/web/core/components/workspace-notifications/sidebar/filters/applied-filter.tsx
index 66c5e3a2ad5..20fced9a9b3 100644
--- a/web/core/components/workspace-notifications/sidebar/filters/applied-filter.tsx
+++ b/web/core/components/workspace-notifications/sidebar/filters/applied-filter.tsx
@@ -3,6 +3,7 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 import { X } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 // constants
 import { Header, EHeaderVariant, Tag } from "@plane/ui";
 import { ENotificationFilterType, FILTER_TYPE_OPTIONS } from "@/constants/notification";
@@ -15,6 +16,7 @@ type TAppliedFilters = {
 
 export const AppliedFilters: FC<TAppliedFilters> = observer((props) => {
   const { workspaceSlug } = props;
+  const { t } = useTranslation();
   // hooks
   const { filters, updateFilters } = useWorkspaceNotifications();
   // derived values
@@ -47,7 +49,7 @@ export const AppliedFilters: FC<TAppliedFilters> = observer((props) => {
               className="flex flex-wrap flex-start"
               onClick={() => handleFilterTypeChange(filter?.value, !isSelected)}
             >
-              <div className="whitespace-nowrap text-custom-text-200">{filter.label}</div>
+              <div className="whitespace-nowrap text-custom-text-200">{t(filter.label)}</div>
               <div className="w-4 h-4 flex justify-center items-center transition-all rounded-sm text-custom-text-200 hover:text-custom-text-100">
                 <X className="h-3 w-3" />
               </div>
diff --git a/web/core/components/workspace-notifications/sidebar/filters/menu/root.tsx b/web/core/components/workspace-notifications/sidebar/filters/menu/root.tsx
index 751ef84469e..f4165c4bc80 100644
--- a/web/core/components/workspace-notifications/sidebar/filters/menu/root.tsx
+++ b/web/core/components/workspace-notifications/sidebar/filters/menu/root.tsx
@@ -3,6 +3,7 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 import { ListFilter } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 import { PopoverMenu, Tooltip } from "@plane/ui";
 // components
 import { NotificationFilterOptionItem } from "@/components/workspace-notifications";
@@ -12,6 +13,7 @@ import { ENotificationFilterType, FILTER_TYPE_OPTIONS } from "@/constants/notifi
 import { usePlatformOS } from "@/hooks/use-platform-os";
 
 export const NotificationFilter: FC = observer(() => {
+  const { t } = useTranslation();
   // hooks
   const { isMobile } = usePlatformOS();
 
@@ -19,7 +21,7 @@ export const NotificationFilter: FC = observer(() => {
     <PopoverMenu
       data={FILTER_TYPE_OPTIONS}
       button={
-        <Tooltip tooltipContent="Inbox Filters" isMobile={isMobile} position="bottom">
+        <Tooltip tooltipContent={t("Inbox Filters")} isMobile={isMobile} position="bottom">
           <div className="flex-shrink-0 w-5 h-5 flex justify-center items-center overflow-hidden cursor-pointer transition-all hover:bg-custom-background-80 rounded-sm outline-none">
             <ListFilter className="h-3 w-3" />
           </div>
diff --git a/web/core/components/workspace-notifications/sidebar/header/options/menu-option/root.tsx b/web/core/components/workspace-notifications/sidebar/header/options/menu-option/root.tsx
index b719838b5a6..d2d36a1fa03 100644
--- a/web/core/components/workspace-notifications/sidebar/header/options/menu-option/root.tsx
+++ b/web/core/components/workspace-notifications/sidebar/header/options/menu-option/root.tsx
@@ -4,6 +4,7 @@ import { FC, ReactNode } from "react";
 import { observer } from "mobx-react";
 import { Check, CheckCircle, Clock } from "lucide-react";
 import { TNotificationFilter } from "@plane/types";
+import { useTranslation } from "@plane/i18n";
 import { ArchiveIcon, PopoverMenu } from "@plane/ui";
 // components
 import { NotificationMenuOptionItem } from "@/components/workspace-notifications";
@@ -22,6 +23,7 @@ export type TPopoverMenuOptions = {
 };
 
 export const NotificationHeaderMenuOption = observer(() => {
+  const { t } = useTranslation();
   // hooks
   const { filters, updateFilters, updateBulkFilters } = useWorkspaceNotifications();
 
@@ -34,7 +36,7 @@ export const NotificationHeaderMenuOption = observer(() => {
     {
       key: "menu-unread",
       type: "menu-item",
-      label: "Show unread",
+      label: t("Show unread"),
       isActive: filters?.read,
       prependIcon: <CheckCircle className="flex-shrink-0 h-3 w-3" />,
       appendIcon: filters?.read ? <Check className="w-3 h-3" /> : undefined,
@@ -43,7 +45,7 @@ export const NotificationHeaderMenuOption = observer(() => {
     {
       key: "menu-archived",
       type: "menu-item",
-      label: "Show archived",
+      label: t("Show archived"),
       isActive: filters?.archived,
       prependIcon: <ArchiveIcon className="flex-shrink-0 h-3 w-3" />,
       appendIcon: filters?.archived ? <Check className="w-3 h-3" /> : undefined,
@@ -56,7 +58,7 @@ export const NotificationHeaderMenuOption = observer(() => {
     {
       key: "menu-snoozed",
       type: "menu-item",
-      label: "Show snoozed",
+      label: t("Show snoozed"),
       isActive: filters?.snoozed,
       prependIcon: <Clock className="flex-shrink-0 h-3 w-3" />,
       appendIcon: filters?.snoozed ? <Check className="w-3 h-3" /> : undefined,
diff --git a/web/core/components/workspace-notifications/sidebar/header/options/root.tsx b/web/core/components/workspace-notifications/sidebar/header/options/root.tsx
index 8f2caf152a9..6290f9b04b4 100644
--- a/web/core/components/workspace-notifications/sidebar/header/options/root.tsx
+++ b/web/core/components/workspace-notifications/sidebar/header/options/root.tsx
@@ -1,6 +1,7 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 import { CheckCheck, RefreshCw } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 import { Spinner, Tooltip } from "@plane/ui";
 // components
 import { NotificationFilter, NotificationHeaderMenuOption } from "@/components/workspace-notifications";
@@ -17,6 +18,7 @@ type TNotificationSidebarHeaderOptions = {
 
 export const NotificationSidebarHeaderOptions: FC<TNotificationSidebarHeaderOptions> = observer((props) => {
   const { workspaceSlug } = props;
+  const { t } = useTranslation();
   // hooks
   const { isMobile } = usePlatformOS();
   const { loader, getNotifications, markAllNotificationsAsRead } = useWorkspaceNotifications();
@@ -44,7 +46,7 @@ export const NotificationSidebarHeaderOptions: FC<TNotificationSidebarHeaderOpti
   return (
     <div className="relative flex justify-center items-center gap-2 text-sm">
       {/* mark all notifications as read*/}
-      <Tooltip tooltipContent="Mark all as read" isMobile={isMobile} position="bottom">
+      <Tooltip tooltipContent={t("Mark all as read")} isMobile={isMobile} position="bottom">
         <div
           className="flex-shrink-0 w-5 h-5 flex justify-center items-center overflow-hidden cursor-pointer transition-all hover:bg-custom-background-80 rounded-sm"
           onClick={() => {
@@ -61,7 +63,7 @@ export const NotificationSidebarHeaderOptions: FC<TNotificationSidebarHeaderOpti
       </Tooltip>
 
       {/* refetch current notifications */}
-      <Tooltip tooltipContent="Refresh" isMobile={isMobile} position="bottom">
+      <Tooltip tooltipContent={t("Refresh")} isMobile={isMobile} position="bottom">
         <div
           className="flex-shrink-0 w-5 h-5 flex justify-center items-center overflow-hidden cursor-pointer transition-all hover:bg-custom-background-80 rounded-sm"
           onClick={refreshNotifications}
diff --git a/web/core/components/workspace-notifications/sidebar/root.tsx b/web/core/components/workspace-notifications/sidebar/root.tsx
index 767b96f42aa..e524f0f38d4 100644
--- a/web/core/components/workspace-notifications/sidebar/root.tsx
+++ b/web/core/components/workspace-notifications/sidebar/root.tsx
@@ -3,6 +3,7 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
+import { useTranslation } from "@plane/i18n";
 // components
 import { Header, Row, ERowVariant, EHeaderVariant, ContentWrapper } from "@plane/ui";
 import { CountChip } from "@/components/common";
@@ -22,6 +23,7 @@ import { getNumberCount } from "@/helpers/string.helper";
 import { useWorkspace, useWorkspaceNotifications } from "@/hooks/store";
 
 export const NotificationsSidebar: FC = observer(() => {
+  const { t } = useTranslation();
   const { workspaceSlug } = useParams();
   // hooks
   const { getWorkspaceBySlug } = useWorkspace();
@@ -66,7 +68,7 @@ export const NotificationsSidebar: FC = observer(() => {
                     : "text-custom-text-100 hover:text-custom-text-200"
                 )}
               >
-                <div className="font-medium">{tab.label}</div>
+                <div className="font-medium">{t(tab.label)}</div>
                 {tab.count(unreadNotificationsCount) > 0 && (
                   <CountChip count={getNumberCount(tab.count(unreadNotificationsCount))} />
                 )}
diff --git a/web/core/components/workspace/create-workspace-form.tsx b/web/core/components/workspace/create-workspace-form.tsx
index f9234290d34..b7f2259960a 100644
--- a/web/core/components/workspace/create-workspace-form.tsx
+++ b/web/core/components/workspace/create-workspace-form.tsx
@@ -3,6 +3,8 @@
 import { Dispatch, SetStateAction, useEffect, useState, FC } from "react";
 import { observer } from "mobx-react";
 import { Controller, useForm } from "react-hook-form";
+import { useTranslation } from "@plane/i18n";
+// constants
 // types
 import { IWorkspace } from "@plane/types";
 // ui
@@ -34,14 +36,15 @@ type Props = {
 const workspaceService = new WorkspaceService();
 
 export const CreateWorkspaceForm: FC<Props> = observer((props) => {
+  const { t } = useTranslation();
   const {
     onSubmit,
     defaultValues,
     setDefaultValues,
     secondaryButton,
     primaryButtonText = {
-      loading: "Creating...",
-      default: "Create Workspace",
+      loading: t("creating_workspace"),
+      default: t("create_workspace"),
     },
   } = props;
   // states
@@ -75,13 +78,13 @@ export const CreateWorkspaceForm: FC<Props> = observer((props) => {
                 payload: {
                   ...res,
                   state: "SUCCESS",
-                  element: "Create workspace page",
+                  element: t("create_workspace_page"),
                 },
               });
               setToast({
                 type: TOAST_TYPE.SUCCESS,
-                title: "Success!",
-                message: "Workspace created successfully.",
+                title: t("success"),
+                message: t("workspace_created_successfully"),
               });
 
               if (onSubmit) await onSubmit(res);
@@ -91,13 +94,13 @@ export const CreateWorkspaceForm: FC<Props> = observer((props) => {
                 eventName: WORKSPACE_CREATED,
                 payload: {
                   state: "FAILED",
-                  element: "Create workspace page",
+                  element: t("create_workspace_page"),
                 },
               });
               setToast({
                 type: TOAST_TYPE.ERROR,
-                title: "Error!",
-                message: "Workspace could not be created. Please try again.",
+                title: t("error"),
+                message: t("workspace_could_not_be_created_please_try_again"),
               });
             });
         } else setSlugError(true);
@@ -105,8 +108,8 @@ export const CreateWorkspaceForm: FC<Props> = observer((props) => {
       .catch(() => {
         setToast({
           type: TOAST_TYPE.ERROR,
-          title: "Error!",
-          message: "Some error occurred while creating workspace. Please try again.",
+          title: t("error"),
+          message: t("workspace_could_not_be_created_please_try_again"),
         });
       });
   };
@@ -124,7 +127,7 @@ export const CreateWorkspaceForm: FC<Props> = observer((props) => {
       <div className="space-y-6 sm:space-y-7">
         <div className="space-y-1 text-sm">
           <label htmlFor="workspaceName">
-            Workspace Name
+            {t("name_your_workspace")}
             <span className="ml-0.5 text-red-500">*</span>
           </label>
           <div className="flex flex-col gap-1">
@@ -132,12 +135,13 @@ export const CreateWorkspaceForm: FC<Props> = observer((props) => {
               control={control}
               name="name"
               rules={{
-                required: "Workspace name is required",
+                required: t("this_is_a_required_field"),
                 validate: (value) =>
-                  /^[\w\s-]*$/.test(value) || `Name can only contain (" "), ( - ), ( _ ) & alphanumeric characters.`,
+                  /^[\w\s-]*$/.test(value) ||
+                  t("workspaces_names_can_contain_only_space_dash_and_alphanumeric_characters"),
                 maxLength: {
                   value: 80,
-                  message: "Workspace name should not exceed 80 characters",
+                  message: t("limit_your_name_to_80_characters"),
                 },
               }}
               render={({ field: { value, ref, onChange } }) => (
@@ -154,7 +158,7 @@ export const CreateWorkspaceForm: FC<Props> = observer((props) => {
                   }}
                   ref={ref}
                   hasError={Boolean(errors.name)}
-                  placeholder="Enter workspace name..."
+                  placeholder={t("something_familiar_and_recognizable_is_always_best")}
                   className="w-full"
                 />
               )}
@@ -164,7 +168,7 @@ export const CreateWorkspaceForm: FC<Props> = observer((props) => {
         </div>
         <div className="space-y-1 text-sm">
           <label htmlFor="workspaceUrl">
-            Workspace URL
+            {t("set_your_workspace_url")}
             <span className="ml-0.5 text-red-500">*</span>
           </label>
           <div className="flex w-full items-center rounded-md border-[0.5px] border-custom-border-200 px-3">
@@ -173,10 +177,10 @@ export const CreateWorkspaceForm: FC<Props> = observer((props) => {
               control={control}
               name="slug"
               rules={{
-                required: "Workspace slug is required",
+                required: t("this_is_a_required_field"),
                 maxLength: {
                   value: 48,
-                  message: "Workspace slug should not exceed 48 characters",
+                  message: t("limit_your_url_to_48_characters"),
                 },
               }}
               render={({ field: { onChange, value, ref } }) => (
@@ -190,34 +194,34 @@ export const CreateWorkspaceForm: FC<Props> = observer((props) => {
                   }}
                   ref={ref}
                   hasError={Boolean(errors.slug)}
-                  placeholder="Enter workspace url..."
+                  placeholder={t("workspace_name")}
                   className="block w-full rounded-md border-none bg-transparent !px-0 py-2 text-sm"
                 />
               )}
             />
           </div>
-          {slugError && <p className="-mt-3 text-sm text-red-500">Workspace URL is already taken!</p>}
+          {slugError && <p className="-mt-3 text-sm text-red-500">{t("workspace_url_is_already_taken")}</p>}
           {invalidSlug && (
-            <p className="text-sm text-red-500">{`URL can only contain ( - ), ( _ ) & alphanumeric characters.`}</p>
+            <p className="text-sm text-red-500">{t("urls_can_contain_only_dash_and_alphanumeric_characters")}</p>
           )}
           {errors.slug && <span className="text-xs text-red-500">{errors.slug.message}</span>}
         </div>
         <div className="space-y-1 text-sm">
           <span>
-            What size is your organization?<span className="ml-0.5 text-red-500">*</span>
+            {t("how_many_people_will_use_this_workspace")}<span className="ml-0.5 text-red-500">*</span>
           </span>
           <div className="w-full">
             <Controller
               name="organization_size"
               control={control}
-              rules={{ required: "This field is required" }}
+              rules={{ required: t("this_is_a_required_field") }}
               render={({ field: { value, onChange } }) => (
                 <CustomSelect
                   value={value}
                   onChange={onChange}
                   label={
                     ORGANIZATION_SIZE.find((c) => c === value) ?? (
-                      <span className="text-custom-text-400">Select organization size</span>
+                      <span className="text-custom-text-400">{t("select_a_range")}</span>
                     )
                   }
                   buttonClassName="!border-[0.5px] !border-custom-border-200 !shadow-none"
@@ -246,10 +250,10 @@ export const CreateWorkspaceForm: FC<Props> = observer((props) => {
         </Button>
         {!secondaryButton && (
           <Button variant="neutral-primary" type="button" size="md" onClick={() => router.back()}>
-            Go back
+            {t("go_back")}
           </Button>
         )}
       </div>
     </form>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/workspace/sidebar/dropdown.tsx b/web/core/components/workspace/sidebar/dropdown.tsx
index a60a7d7e1b1..8c56d650eed 100644
--- a/web/core/components/workspace/sidebar/dropdown.tsx
+++ b/web/core/components/workspace/sidebar/dropdown.tsx
@@ -1,15 +1,16 @@
 "use client";
 
-import { Fragment, Ref, useState } from "react";
+import { Fragment, Ref, useState, useMemo } from "react";
 import { observer } from "mobx-react";
 import Link from "next/link";
 import { useParams } from "next/navigation";
-import { usePopper } from "react-popper";
+//import { usePopper } from "react-popper";
 // icons
 import { Check, ChevronDown, LogOut, Mails, PlusSquare, Settings } from "lucide-react";
 // ui
 import { Menu, Transition } from "@headlessui/react";
 // types
+import { useTranslation } from "@plane/i18n";
 import { IWorkspace } from "@plane/types";
 // plane ui
 import { Avatar, Loader, TOAST_TYPE, setToast } from "@plane/ui";
@@ -22,25 +23,29 @@ import { useAppTheme, useUser, useUserPermissions, useUserProfile, useWorkspace
 import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
 import { WorkspaceLogo } from "../logo";
 
-// Static Data
-const userLinks = (workspaceSlug: string) => [
-  {
-    key: "workspace_invites",
-    name: "Workspace invites",
-    href: "/invitations",
-    icon: Mails,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
-  },
-  {
-    key: "settings",
-    name: "Workspace settings",
-    href: `/${workspaceSlug}/settings`,
-    icon: Settings,
-    access: [EUserPermissions.ADMIN],
-  },
-];
+
 
 export const SidebarDropdown = observer(() => {
+  const { t } = useTranslation();
+  const userLinks = useMemo(
+    () => (workspaceSlug: string) => [
+      {
+        key: "workspace_invites",
+        name: t("workspace_invites"),
+        href: "/invitations",
+        icon: Mails,
+        access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
+      },
+      {
+        key: "settings",
+        name: t("workspace_settings"),
+        href: `/${workspaceSlug}/settings`,
+        icon: Settings,
+        access: [EUserPermissions.ADMIN],
+      },
+    ],
+    [t]
+  );
   // router params
   const { workspaceSlug } = useParams();
   // store hooks
@@ -57,20 +62,20 @@ export const SidebarDropdown = observer(() => {
   const isUserInstanceAdmin = false;
   const { currentWorkspace: activeWorkspace, workspaces } = useWorkspace();
   // popper-js refs
-  const [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);
-  const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);
-  // popper-js init
-  const { styles, attributes } = usePopper(referenceElement, popperElement, {
-    placement: "right",
-    modifiers: [
-      {
-        name: "preventOverflow",
-        options: {
-          padding: 12,
-        },
-      },
-    ],
-  });
+  // const [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);
+  // const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);
+  // // popper-js init
+  // const { styles, attributes } = usePopper(referenceElement, popperElement, {
+  //   placement: "right",
+  //   modifiers: [
+  //     {
+  //       name: "preventOverflow",
+  //       options: {
+  //         padding: 12,
+  //       },
+  //     },
+  //   ],
+  // });
 
   const handleWorkspaceNavigation = (workspace: IWorkspace) =>
     updateUserProfile({
@@ -81,8 +86,8 @@ export const SidebarDropdown = observer(() => {
     await signOut().catch(() =>
       setToast({
         type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: "Failed to sign out. Please try again.",
+        title: t("error"),
+        message: t("failed_to_sign_out_please_try_again"),
       })
     );
   };
@@ -105,6 +110,7 @@ export const SidebarDropdown = observer(() => {
         {({ open }) => (
           <>
             <Menu.Button
+              disabled={true}
               className={cn(
                 "group/menu-button flex items-center justify-between gap-1 p-1 truncate rounded text-sm font-medium text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80 focus:outline-none",
                 {
@@ -116,7 +122,7 @@ export const SidebarDropdown = observer(() => {
                 <WorkspaceLogo logo={activeWorkspace?.logo_url} name={activeWorkspace?.name} />
                 {!sidebarCollapsed && (
                   <h4 className="truncate text-base font-medium text-custom-text-100">
-                    {activeWorkspace?.name ?? "Loading..."}
+                    {activeWorkspace?.name ?? t("loading")}
                   </h4>
                 )}
               </div>
@@ -172,7 +178,7 @@ export const SidebarDropdown = observer(() => {
                                     <img
                                       src={getFileURL(workspace.logo_url)}
                                       className="absolute left-0 top-0 h-full w-full rounded object-cover"
-                                      alt="Workspace Logo"
+                                      alt={t("workspace_logo")}
                                     />
                                   ) : (
                                     (workspace?.name?.[0] ?? "...")
@@ -205,15 +211,6 @@ export const SidebarDropdown = observer(() => {
                     )}
                   </div>
                   <div className="w-full flex flex-col items-start justify-start gap-2 px-4 py-2 text-sm">
-                    <Link href="/create-workspace" className="w-full">
-                      <Menu.Item
-                        as="div"
-                        className="flex items-center gap-2 rounded px-2 py-1 text-sm font-medium text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80"
-                      >
-                        <PlusSquare strokeWidth={1.75} className="h-4 w-4 flex-shrink-0" />
-                        Create workspace
-                      </Menu.Item>
-                    </Link>
                     {userLinks(workspaceSlug?.toString() ?? "").map(
                       (link, index) =>
                         allowPermissions(link.access, EUserPermissionsLevel.WORKSPACE) && (
@@ -244,7 +241,7 @@ export const SidebarDropdown = observer(() => {
                       onClick={handleSignOut}
                     >
                       <LogOut className="size-4 flex-shrink-0" />
-                      Sign out
+                      {t("sign_out")}
                     </Menu.Item>
                   </div>
                 </div>
@@ -254,17 +251,17 @@ export const SidebarDropdown = observer(() => {
         )}
       </Menu>
       {!sidebarCollapsed && (
-        <Menu as="div" className="relative flex-shrink-0">
-          <Menu.Button className="grid place-items-center outline-none" ref={setReferenceElement}>
-            <Avatar
-              name={currentUser?.display_name}
-              src={getFileURL(currentUser?.avatar_url ?? "")}
-              size={24}
-              shape="square"
-              className="!text-base"
-            />
-          </Menu.Button>
-          <Transition
+         <div className="relative flex-shrink-0">
+          <Avatar
+            name={currentUser?.display_name}
+            src={getFileURL(currentUser?.avatar_url ?? "")}
+            size={24}
+            shape="square"
+            className="!text-base"
+          />
+        </div> 
+      )}
+          {/* <Transition
             as={Fragment}
             enter="transition ease-out duration-100"
             enterFrom="transform opacity-0 scale-95"
@@ -286,7 +283,7 @@ export const SidebarDropdown = observer(() => {
                   <Menu.Item as="div">
                     <span className="flex w-full items-center gap-2 rounded px-2 py-1 hover:bg-custom-sidebar-background-80">
                       <Settings className="h-4 w-4 stroke-[1.5]" />
-                      <span>Settings</span>
+                      <span>{t("settings")}</span>
                     </span>
                   </Menu.Item>
                 </Link>
@@ -299,7 +296,7 @@ export const SidebarDropdown = observer(() => {
                   onClick={handleSignOut}
                 >
                   <LogOut className="size-4 stroke-[1.5]" />
-                  Sign out
+                  {t("sign_out")}
                 </Menu.Item>
               </div>
               {isUserInstanceAdmin && (
@@ -307,7 +304,7 @@ export const SidebarDropdown = observer(() => {
                   <Link href={GOD_MODE_URL}>
                     <Menu.Item as="button" type="button" className="w-full">
                       <span className="flex w-full items-center justify-center rounded bg-custom-primary-100/20 px-2 py-1 text-sm font-medium text-custom-primary-100 hover:bg-custom-primary-100/30 hover:text-custom-primary-200">
-                        Enter God Mode
+                        {t("enter_god_mode")}
                       </span>
                     </Menu.Item>
                   </Link>
@@ -316,7 +313,7 @@ export const SidebarDropdown = observer(() => {
             </Menu.Items>
           </Transition>
         </Menu>
-      )}
+      )} */}
     </div>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/workspace/sidebar/favorites/favorites-menu.tsx b/web/core/components/workspace/sidebar/favorites/favorites-menu.tsx
index 89cd6f36f3a..82a632c8600 100644
--- a/web/core/components/workspace/sidebar/favorites/favorites-menu.tsx
+++ b/web/core/components/workspace/sidebar/favorites/favorites-menu.tsx
@@ -8,6 +8,7 @@ import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { ChevronRight, FolderPlus } from "lucide-react";
 import { Disclosure, Transition } from "@headlessui/react";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { IFavorite } from "@plane/types";
 import { setToast, TOAST_TYPE, Tooltip } from "@plane/ui";
@@ -32,6 +33,7 @@ export const SidebarFavoritesMenu = observer(() => {
   const [isDragging, setIsDragging] = useState(false);
 
   // store hooks
+  const { t } = useTranslation();
   const { sidebarCollapsed } = useAppTheme();
   const { favoriteIds, groupedFavorites, deleteFavorite, removeFromFavoriteFolder } = useFavorite();
   const { workspaceSlug } = useParams();
@@ -51,15 +53,15 @@ export const SidebarFavoritesMenu = observer(() => {
       .then(() => {
         setToast({
           type: TOAST_TYPE.SUCCESS,
-          title: "Success!",
-          message: "Favorite removed successfully.",
+          title: t("success"),
+          message: t("favorite_removed_successfully"),
         });
       })
       .catch(() => {
         setToast({
           type: TOAST_TYPE.ERROR,
-          title: "Error!",
-          message: "Something went wrong!",
+          title: t("error"),
+          message: t("something_went_wrong"),
         });
       });
   };
@@ -131,10 +133,10 @@ export const SidebarFavoritesMenu = observer(() => {
             )}
           >
             <span onClick={() => toggleFavoriteMenu(!isFavoriteMenuOpen)} className="flex-1 text-start">
-              YOUR FAVORITES
+              {t("your_favorites").toUpperCase()}
             </span>
             <span className="flex flex-shrink-0 opacity-0 pointer-events-none group-hover/workspace-button:opacity-100 group-hover/workspace-button:pointer-events-auto rounded p-0.5 ">
-              <Tooltip tooltipHeading="Create folder" tooltipContent="">
+              <Tooltip tooltipHeading={t("create_folder")} tooltipContent="">
                 <FolderPlus
                   onClick={() => {
                     setCreateNewFolder(true);
@@ -173,7 +175,9 @@ export const SidebarFavoritesMenu = observer(() => {
               {Object.keys(groupedFavorites).length === 0 ? (
                 <>
                   {!sidebarCollapsed && (
-                    <span className="text-custom-text-400 text-xs font-medium px-8 py-1.5">No favorites yet</span>
+                    <span className="text-custom-text-400 text-xs font-medium px-8 py-1.5">
+                      {t("no_favorites_yet")}
+                    </span>
                   )}
                 </>
               ) : (
@@ -219,4 +223,4 @@ export const SidebarFavoritesMenu = observer(() => {
       />
     </>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx b/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx
index 1b95ba3a041..7219985e513 100644
--- a/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx
+++ b/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx
@@ -2,6 +2,7 @@ import { useEffect, useRef } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { Controller, SubmitHandler, useForm } from "react-hook-form";
+import { useTranslation } from "@plane/i18n";
 // plane helpers
 import { useOutsideClickDetector } from "@plane/helpers";
 // plane ui
@@ -24,6 +25,7 @@ type TProps = {
 };
 export const NewFavoriteFolder = observer((props: TProps) => {
   const { setCreateNewFolder, actionType, defaultName, favoriteId } = props;
+  const { t } = useTranslation();
   const { workspaceSlug } = useParams();
   const { addFavorite, updateFavorite, existingFolders } = useFavorite();
 
@@ -42,8 +44,8 @@ export const NewFavoriteFolder = observer((props: TProps) => {
     if (existingFolders.includes(formData.name))
       return setToast({
         type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: "Folder already exists",
+        title: t("error"),
+        message: t("folder_already_exists"),
       });
     formData = {
       entity_type: "folder",
@@ -56,23 +58,23 @@ export const NewFavoriteFolder = observer((props: TProps) => {
     if (formData.name === "")
       return setToast({
         type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: "Folder name cannot be empty",
+        title: t("error"),
+        message: t("folder_name_cannot_be_empty"),
       });
 
     addFavorite(workspaceSlug.toString(), formData)
       .then(() => {
         setToast({
           type: TOAST_TYPE.SUCCESS,
-          title: "Success!",
-          message: "Favorite created successfully.",
+          title: t("success"),
+          message: t("favorite_created_successfully"),
         });
       })
       .catch(() => {
         setToast({
           type: TOAST_TYPE.ERROR,
-          title: "Error!",
-          message: "Something went wrong!",
+          title: t("error"),
+          message: t("something_went_wrong"),
         });
       });
     setCreateNewFolder(false);
@@ -84,8 +86,8 @@ export const NewFavoriteFolder = observer((props: TProps) => {
     if (existingFolders.includes(formData.name))
       return setToast({
         type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: "Folder already exists",
+        title: t("error"),
+        message: t("folder_already_exists"),
       });
     const payload = {
       name: formData.name.trim(),
@@ -94,23 +96,23 @@ export const NewFavoriteFolder = observer((props: TProps) => {
     if (formData.name.trim() === "")
       return setToast({
         type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: "Folder name cannot be empty",
+        title: t("error"),
+        message: t("folder_name_cannot_be_empty"),
       });
 
     updateFavorite(workspaceSlug.toString(), favoriteId, payload)
       .then(() => {
         setToast({
           type: TOAST_TYPE.SUCCESS,
-          title: "Success!",
-          message: "Favorite updated successfully.",
+          title: t("success"),
+          message: t("favorite_updated_successfully"),
         });
       })
       .catch(() => {
         setToast({
           type: TOAST_TYPE.ERROR,
-          title: "Error!",
-          message: "Something went wrong!",
+          title: t("error"),
+          message: t("something_went_wrong"),
         });
       });
     setCreateNewFolder(false);
@@ -132,9 +134,9 @@ export const NewFavoriteFolder = observer((props: TProps) => {
           name="name"
           control={control}
           rules={{ required: true }}
-          render={({ field }) => <Input className="w-full" placeholder="New folder" {...field} />}
+          render={({ field }) => <Input className="w-full" placeholder={t("new_folder")} {...field} />}
         />
       </form>
     </div>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/workspace/sidebar/help-section.tsx b/web/core/components/workspace/sidebar/help-section.tsx
index 5570b5727a0..dfb054b0f93 100644
--- a/web/core/components/workspace/sidebar/help-section.tsx
+++ b/web/core/components/workspace/sidebar/help-section.tsx
@@ -5,6 +5,7 @@ import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { FileText, HelpCircle, MessagesSquare, MoveLeft, User } from "lucide-react";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { CustomMenu, Tooltip, ToggleSwitch } from "@plane/ui";
 // components
 import { ProductUpdatesModal } from "@/components/global";
@@ -15,7 +16,6 @@ import { useAppTheme, useCommandPalette, useInstance, useTransient, useUserSetti
 import { usePlatformOS } from "@/hooks/use-platform-os";
 // plane web components
 import { PlaneVersionNumber } from "@/plane-web/components/global";
-import { WorkspaceEditionBadge } from "@/plane-web/components/workspace";
 import { ENABLE_LOCAL_DB_CACHE } from "@/plane-web/constants/issues";
 
 export interface WorkspaceHelpSectionProps {
@@ -23,6 +23,7 @@ export interface WorkspaceHelpSectionProps {
 }
 
 export const SidebarHelpSection: React.FC<WorkspaceHelpSectionProps> = observer(() => {
+  const { t } = useTranslation();
   const { workspaceSlug, projectId } = useParams();
   // store hooks
   const { sidebarCollapsed, toggleSidebar } = useAppTheme();
@@ -52,125 +53,11 @@ export const SidebarHelpSection: React.FC<WorkspaceHelpSectionProps> = observer(
           }
         )}
       >
+        
         <div
-          className={`relative flex flex-shrink-0 items-center gap-1 ${isCollapsed ? "flex-col justify-center" : "justify-evenly"}`}
+          className={`flex flex-shrink-0 items-center gap-1 ${isCollapsed ? "flex-col justify-center" : "justify-end ml-auto"}`}
         >
-          <CustomMenu
-            customButton={
-              <button
-                type="button"
-                className={cn(
-                  "grid place-items-center rounded-md p-1 outline-none text-custom-text-200 hover:text-custom-text-100 hover:bg-custom-background-90",
-                  {
-                    "bg-custom-background-90": isNeedHelpOpen,
-                  }
-                )}
-              >
-                <Tooltip tooltipContent="Help" isMobile={isMobile} disabled={isNeedHelpOpen}>
-                  <HelpCircle className="h-[18px] w-[18px] outline-none" />
-                </Tooltip>
-              </button>
-            }
-            customButtonClassName={`relative grid place-items-center rounded-md p-1.5 outline-none ${isCollapsed ? "w-full" : ""}`}
-            menuButtonOnClick={() => !isNeedHelpOpen && setIsNeedHelpOpen(true)}
-            onMenuClose={() => setIsNeedHelpOpen(false)}
-            placement={isCollapsed ? "left-end" : "top-end"}
-            maxHeight="lg"
-            closeOnSelect
-          >
-            <CustomMenu.MenuItem>
-              <a
-                href="https://go.plane.so/p-docs"
-                target="_blank"
-                className="flex items-center justify- gap-x-2 rounded text-xs hover:bg-custom-background-80"
-              >
-                <FileText className="h-3.5 w-3.5 text-custom-text-200" size={14} />
-                <span className="text-xs">Documentation</span>
-              </a>
-            </CustomMenu.MenuItem>
-            {config?.intercom_app_id && config?.is_intercom_enabled && (
-              <CustomMenu.MenuItem>
-                <button
-                  type="button"
-                  onClick={handleCrispWindowShow}
-                  className="flex w-full items-center gap-x-2 rounded text-xs hover:bg-custom-background-80"
-                >
-                  <MessagesSquare className="h-3.5 w-3.5 text-custom-text-200" />
-                  <span className="text-xs">Message support</span>
-                </button>
-              </CustomMenu.MenuItem>
-            )}
-            <CustomMenu.MenuItem>
-              <a
-                href="mailto:sales@plane.so"
-                target="_blank"
-                className="flex items-center justify- gap-x-2 rounded text-xs hover:bg-custom-background-80"
-              >
-                <User className="h-3.5 w-3.5 text-custom-text-200" size={14} />
-                <span className="text-xs">Contact sales</span>
-              </a>
-            </CustomMenu.MenuItem>
-            <div className="my-1 border-t border-custom-border-200" />
-            {ENABLE_LOCAL_DB_CACHE && (
-              <CustomMenu.MenuItem>
-                <div
-                  onClick={(e) => {
-                    e.preventDefault();
-                    e.stopPropagation();
-                  }}
-                  className="flex w-full items-center justify-between text-xs hover:bg-custom-background-80"
-                >
-                  <span className="racking-tight">Local Cache</span>
-                  <ToggleSwitch
-                    value={canUseLocalDB}
-                    onChange={() => toggleLocalDB(workspaceSlug?.toString(), projectId?.toString())}
-                  />
-                </div>
-              </CustomMenu.MenuItem>
-            )}
-            <CustomMenu.MenuItem>
-              <button
-                type="button"
-                onClick={() => toggleShortcutModal(true)}
-                className="flex w-full items-center justify-start text-xs hover:bg-custom-background-80"
-              >
-                <span className="text-xs">Keyboard shortcuts</span>
-              </button>
-            </CustomMenu.MenuItem>
-            <CustomMenu.MenuItem>
-              <button
-                type="button"
-                onClick={() => setIsChangeLogOpen(true)}
-                className="flex w-full items-center justify-start text-xs hover:bg-custom-background-80"
-              >
-                <span className="text-xs">What&apos;s new</span>
-              </button>
-            </CustomMenu.MenuItem>
-            <CustomMenu.MenuItem>
-              <a
-                href="https://go.plane.so/p-discord"
-                target="_blank"
-                className="flex items-center justify- gap-x-2 rounded text-xs hover:bg-custom-background-80"
-              >
-                <span className="text-xs">Discord</span>
-              </a>
-            </CustomMenu.MenuItem>
-            <div className="px-1 pt-2 mt-1 text-xs text-custom-text-200 border-t border-custom-border-200">
-              <PlaneVersionNumber />
-            </div>
-          </CustomMenu>
-        </div>
-        <div
-          className={cn("w-full flex-grow px-0.5", {
-            hidden: isCollapsed,
-          })}
-        >
-          <WorkspaceEditionBadge />
-        </div>
-        <div
-          className={`flex flex-shrink-0 items-center gap-1 ${isCollapsed ? "flex-col justify-center" : "justify-evenly"}`}
-        >
-          <Tooltip tooltipContent={`${isCollapsed ? "Expand" : "Hide"}`} isMobile={isMobile}>
+          <Tooltip tooltipContent={`${isCollapsed ? t("expand") : t("hide")}`} isMobile={isMobile}>
             <button
               type="button"
               className={`grid place-items-center rounded-md p-1 text-custom-text-200 outline-none hover:bg-custom-background-90 hover:text-custom-text-100 ${isCollapsed ? "w-full" : ""
diff --git a/web/core/components/workspace/sidebar/projects-list-item.tsx b/web/core/components/workspace/sidebar/projects-list-item.tsx
index 2f809bb47d7..1a9ef1c8ad0 100644
--- a/web/core/components/workspace/sidebar/projects-list-item.tsx
+++ b/web/core/components/workspace/sidebar/projects-list-item.tsx
@@ -25,6 +25,7 @@ import {
 import { Disclosure, Transition } from "@headlessui/react";
 // plane helpers
 import { useOutsideClickDetector } from "@plane/helpers";
+import { useTranslation } from "@plane/i18n";
 // ui
 import {
   CustomMenu,
@@ -73,34 +74,10 @@ const navigation = (workspaceSlug: string, projectId: string) => [
     Icon: LayersIcon,
     access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
   },
-  {
-    name: "Cycles",
-    href: `/${workspaceSlug}/projects/${projectId}/cycles`,
-    Icon: ContrastIcon,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
-  },
-  {
-    name: "Modules",
-    href: `/${workspaceSlug}/projects/${projectId}/modules`,
-    Icon: DiceIcon,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
-  },
-  {
+   {
     name: "Views",
     href: `/${workspaceSlug}/projects/${projectId}/views`,
-    Icon: Layers,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
-  },
-  {
-    name: "Pages",
-    href: `/${workspaceSlug}/projects/${projectId}/pages`,
-    Icon: FileText,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
-  },
-  {
-    name: "Intake",
-    href: `/${workspaceSlug}/projects/${projectId}/inbox`,
-    Icon: Intake,
+    Icon: LayersIcon, 
     access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
   },
 ];
@@ -110,6 +87,7 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
     props;
   // store hooks
   const { sidebarCollapsed: isSidebarCollapsed, toggleSidebar } = useAppTheme();
+  const { t } = useTranslation();
   const { setTrackElement } = useEventTracker();
   const { addProjectToFavorites, removeProjectFromFavorites, getProjectById } = useProject();
   const { isMobile } = usePlatformOS();
@@ -151,14 +129,14 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
 
     const addToFavoritePromise = addProjectToFavorites(workspaceSlug.toString(), project.id);
     setPromiseToast(addToFavoritePromise, {
-      loading: "Adding project to favorites...",
+      loading: t("adding_project_to_favorites"),
       success: {
-        title: "Success!",
-        message: () => "Project added to favorites.",
+        title: t("success"),
+        message: () => t("project_added_to_favorites"),
       },
       error: {
-        title: "Error!",
-        message: () => "Couldn't add the project to favorites. Please try again.",
+        title: t("error"),
+        message: () => t("couldnt_add_the_project_to_favorites"),
       },
     });
   };
@@ -168,14 +146,14 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
 
     const removeFromFavoritePromise = removeProjectFromFavorites(workspaceSlug.toString(), project.id);
     setPromiseToast(removeFromFavoritePromise, {
-      loading: "Removing project from favorites...",
+      loading: t("removing_project_from_favorites"),
       success: {
-        title: "Success!",
-        message: () => "Project removed from favorites.",
+        title: t("success"),
+        message: () => t("project_removed_from_favorites"),
       },
       error: {
-        title: "Error!",
-        message: () => "Couldn't remove the project from favorites. Please try again.",
+        title: t("error"),
+        message: () => t("couldnt_remove_the_project_from_favorites"),
       },
     });
   };
@@ -291,7 +269,7 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
   }, [URLProjectId]);
 
   const handleItemClick = () => {
-    if (!isProjectListOpen && !isMobile) router.push(`/${workspaceSlug}/projects/${project.id}/issues`);
+    // if (!isProjectListOpen && !isMobile) router.push(`/${workspaceSlug}/projects/${project.id}/issues`);
     setIsProjectListOpen((prev) => !prev);
   };
 
@@ -320,7 +298,9 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
             {!disableDrag && (
               <Tooltip
                 isMobile={isMobile}
-                tooltipContent={project.sort_order === null ? "Join the project to rearrange" : "Drag to rearrange"}
+                tooltipContent={
+                  project.sort_order === null ? t("join_the_project_to_rearrange") : t("drag_to_rearrange")
+                }
                 position="top-right"
                 disabled={isDragging}
               >
@@ -412,7 +392,7 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
                             "fill-yellow-500 stroke-yellow-500": project.is_favorite,
                           })}
                         />
-                        <span>{project.is_favorite ? "Remove from favorites" : "Add to favorites"}</span>
+                        <span>{project.is_favorite ? t("remove_from_favorites") : t("add_to_favorites")}</span>
                       </span>
                     </CustomMenu.MenuItem>
                   )}
@@ -424,7 +404,7 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
                         <div className="flex h-4 w-4 cursor-pointer items-center justify-center rounded text-custom-sidebar-text-200 transition-all duration-300 hover:bg-custom-sidebar-background-80">
                           <Share2 className="h-3.5 w-3.5 stroke-[1.5]" />
                         </div>
-                        <div>{project.anchor ? "Publish settings" : "Publish"}</div>
+                        <div>{project.anchor ? t("publish_settings") : t("publish")}</div>
                       </div>
                     </CustomMenu.MenuItem>
                   )}
@@ -441,7 +421,7 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
                   <CustomMenu.MenuItem onClick={handleCopyText}>
                     <span className="flex items-center justify-start gap-2">
                       <LinkIcon className="h-3.5 w-3.5 stroke-[1.5]" />
-                      <span>Copy link</span>
+                      <span>{t("copy_link")}</span>
                     </span>
                   </CustomMenu.MenuItem>
                   {isAuthorized && (
@@ -449,25 +429,25 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
                       <Link href={`/${workspaceSlug}/projects/${project?.id}/archives/issues`}>
                         <div className="flex items-center justify-start gap-2">
                           <ArchiveIcon className="h-3.5 w-3.5 stroke-[1.5]" />
-                          <span>Archives</span>
+                          <span>{t("archives")}</span>
                         </div>
                       </Link>
                     </CustomMenu.MenuItem>
                   )}
-                  <CustomMenu.MenuItem>
+                  {/* <CustomMenu.MenuItem>
                     <Link href={`/${workspaceSlug}/projects/${project?.id}/settings`}>
                       <div className="flex items-center justify-start gap-2">
                         <Settings className="h-3.5 w-3.5 stroke-[1.5]" />
-                        <span>Settings</span>
+                        <span>{t("settings")}</span>
                       </div>
                     </Link>
-                  </CustomMenu.MenuItem>
+                  </CustomMenu.MenuItem> */}
                   {/* leave project */}
                   {!isAuthorized && (
                     <CustomMenu.MenuItem onClick={handleLeaveProject}>
                       <div className="flex items-center justify-start gap-2">
                         <LogOut className="h-3.5 w-3.5 stroke-[1.5]" />
-                        <span>Leave project</span>
+                        <span>{t("leave_project")}</span>
                       </div>
                     </CustomMenu.MenuItem>
                   )}
@@ -555,4 +535,4 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
       </Disclosure>
     </>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/workspace/sidebar/projects-list.tsx b/web/core/components/workspace/sidebar/projects-list.tsx
index b1206caf364..e48d365bcbb 100644
--- a/web/core/components/workspace/sidebar/projects-list.tsx
+++ b/web/core/components/workspace/sidebar/projects-list.tsx
@@ -7,6 +7,7 @@ import { observer } from "mobx-react";
 import { useParams, usePathname } from "next/navigation";
 import { Briefcase, ChevronRight, Plus } from "lucide-react";
 import { Disclosure, Transition } from "@headlessui/react";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { TOAST_TYPE, Tooltip, setToast } from "@plane/ui";
 // components
@@ -29,11 +30,12 @@ export const SidebarProjectsList: FC = observer(() => {
   // states
 
   const [isAllProjectsListOpen, setIsAllProjectsListOpen] = useState(isAllProjectsListOpenInLocalStorage === "true");
-  const [isProjectModalOpen, setIsProjectModalOpen] = useState(false);
+  // const [isProjectModalOpen, setIsProjectModalOpen] = useState(false);  
   const [isScrolled, setIsScrolled] = useState(false); // scroll animation state
   // refs
   const containerRef = useRef<HTMLDivElement | null>(null);
   // store hooks
+  const { t } = useTranslation();
   const { toggleCreateProjectModal } = useCommandPalette();
   const { sidebarCollapsed } = useAppTheme();
   const { setTrackElement } = useEventTracker();
@@ -54,8 +56,8 @@ export const SidebarProjectsList: FC = observer(() => {
     copyUrlToClipboard(`${workspaceSlug}/projects/${projectId}/issues`).then(() => {
       setToast({
         type: TOAST_TYPE.SUCCESS,
-        title: "Link Copied!",
-        message: "Project link copied to clipboard.",
+        title: t("link_copied"),
+        message: t("project_link_copied_to_clipboard"),
       });
     });
   };
@@ -84,8 +86,8 @@ export const SidebarProjectsList: FC = observer(() => {
       updateProjectView(workspaceSlug.toString(), sourceId, { sort_order: updatedSortOrder }).catch(() => {
         setToast({
           type: TOAST_TYPE.ERROR,
-          title: "Error!",
-          message: "Something went wrong. Please try again.",
+          title: t("error"),
+          message: t("something_went_wrong"),
         });
       });
   };
@@ -139,14 +141,14 @@ export const SidebarProjectsList: FC = observer(() => {
   }, [pathname]);
   return (
     <>
-      {workspaceSlug && (
+      {/* {workspaceSlug && (
         <CreateProjectModal
           isOpen={isProjectModalOpen}
           onClose={() => setIsProjectModalOpen(false)}
           setToFavorite={false}
           workspaceSlug={workspaceSlug.toString()}
         />
-      )}
+      )} */}
       <div
         ref={containerRef}
         className={cn({
@@ -175,32 +177,37 @@ export const SidebarProjectsList: FC = observer(() => {
                 )}
                 onClick={() => toggleListDisclosure(!isAllProjectsListOpen)}
               >
-                <Tooltip tooltipHeading="YOUR PROJECTS" tooltipContent="" position="right" disabled={!isCollapsed}>
+                <Tooltip
+                  tooltipHeading={t("your_projects").toUpperCase()}
+                  tooltipContent=""
+                  position="right"
+                  disabled={!isCollapsed}
+                >
                   <>
                     {isCollapsed ? (
                       <Briefcase className="flex-shrink-0 size-3" />
                     ) : (
-                      <span className="text-xs font-semibold">YOUR PROJECTS</span>
+                      <span className="text-xs font-semibold">{t("your_projects").toUpperCase()}</span>
                     )}
                   </>
                 </Tooltip>
               </Disclosure.Button>
               {!isCollapsed && (
                 <div className="flex items-center opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto">
-                  {isAuthorizedUser && (
-                    <Tooltip tooltipHeading="Create project" tooltipContent="">
-                      <button
-                        type="button"
-                        className="p-0.5 rounded hover:bg-custom-sidebar-background-80 flex-shrink-0"
-                        onClick={() => {
-                          setTrackElement(`APP_SIDEBAR_JOINED_BLOCK`);
-                          setIsProjectModalOpen(true);
-                        }}
-                      >
-                        <Plus className="size-3" />
-                      </button>
-                    </Tooltip>
-                  )}
+                  {/* {isAuthorizedUser && (
+                    // <Tooltip tooltipHeading={t("create_project")} tooltipContent="">
+                    //   <button
+                    //     type="button"
+                    //     className="p-0.5 rounded hover:bg-custom-sidebar-background-80 flex-shrink-0"
+                    //     onClick={() => {
+                    //       setTrackElement(`APP_SIDEBAR_JOINED_BLOCK`);
+                    //       setIsProjectModalOpen(true);
+                    //     }}
+                    //   >
+                    //     <Plus className="size-3" /> 
+                    //   </button>
+                    // </Tooltip>
+                  )} */}
                   <Disclosure.Button
                     as="button"
                     type="button"
@@ -265,10 +272,10 @@ export const SidebarProjectsList: FC = observer(() => {
               toggleCreateProjectModal(true);
             }}
           >
-            {!isCollapsed && "Add project"}
+            {!isCollapsed && t("add_project")}
           </button>
         )}
       </div>
     </>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/workspace/sidebar/quick-actions.tsx b/web/core/components/workspace/sidebar/quick-actions.tsx
index 895e7133564..426370ca1f3 100644
--- a/web/core/components/workspace/sidebar/quick-actions.tsx
+++ b/web/core/components/workspace/sidebar/quick-actions.tsx
@@ -2,6 +2,7 @@ import { useRef, useState } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { ChevronUp, PenSquare, Search } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
 // types
 import { TIssue } from "@plane/types";
 // components
@@ -15,6 +16,7 @@ import useLocalStorage from "@/hooks/use-local-storage";
 import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
 
 export const SidebarQuickActions = observer(() => {
+  const { t } = useTranslation();
   // states
   const [isDraftIssueModalOpen, setIsDraftIssueModalOpen] = useState(false);
   const [isDraftButtonOpen, setIsDraftButtonOpen] = useState(false);
@@ -92,7 +94,7 @@ export const SidebarQuickActions = observer(() => {
           disabled={disabled}
         >
           <PenSquare className="size-4" />
-          {!isSidebarCollapsed && <span className="text-sm font-medium">New issue</span>}
+          {!isSidebarCollapsed && <span className="text-sm font-medium">{t("new_issue")}</span>}
         </button>
         <button
           className={cn(
@@ -108,4 +110,4 @@ export const SidebarQuickActions = observer(() => {
       </div>
     </>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/workspace/sidebar/user-menu.tsx b/web/core/components/workspace/sidebar/user-menu.tsx
index 4ca6a7e860b..9841f559408 100644
--- a/web/core/components/workspace/sidebar/user-menu.tsx
+++ b/web/core/components/workspace/sidebar/user-menu.tsx
@@ -4,6 +4,7 @@ import React from "react";
 import { observer } from "mobx-react";
 import Link from "next/link";
 import { useParams, usePathname } from "next/navigation";
+import { useTranslation } from "@plane/i18n";
 // components
 import { Tooltip } from "@plane/ui";
 import { SidebarNavItem } from "@/components/sidebar";
@@ -19,6 +20,7 @@ import { usePlatformOS } from "@/hooks/use-platform-os";
 import { EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
 
 export const SidebarUserMenu = observer(() => {
+  const { t } = useTranslation();
   // store hooks
   const { toggleSidebar, sidebarCollapsed } = useAppTheme();
   const { captureEvent } = useEventTracker();
@@ -64,7 +66,7 @@ export const SidebarUserMenu = observer(() => {
           allowPermissions(link.access, EUserPermissionsLevel.WORKSPACE, workspaceSlug.toString()) && (
             <Tooltip
               key={link.key}
-              tooltipContent={link.label}
+              tooltipContent={t(link.key)}
               position="right"
               className="ml-2"
               disabled={!sidebarCollapsed}
@@ -77,7 +79,7 @@ export const SidebarUserMenu = observer(() => {
                 >
                   <div className="flex items-center gap-1.5 py-[1px]">
                     <link.Icon className="size-4 flex-shrink-0" />
-                    {!sidebarCollapsed && <p className="text-sm leading-5 font-medium">{link.label}</p>}
+                    {!sidebarCollapsed && <p className="text-sm leading-5 font-medium">{t(link.key)}</p>}
                   </div>
                   {link.key === "notifications" && notificationIndicatorElement}
                 </SidebarNavItem>
@@ -88,4 +90,4 @@ export const SidebarUserMenu = observer(() => {
       })}
     </div>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/workspace/sidebar/workspace-menu.tsx b/web/core/components/workspace/sidebar/workspace-menu.tsx
index 4e3031ea034..a86519f66f0 100644
--- a/web/core/components/workspace/sidebar/workspace-menu.tsx
+++ b/web/core/components/workspace/sidebar/workspace-menu.tsx
@@ -8,6 +8,7 @@ import { ArchiveIcon, ChevronRight, MoreHorizontal, Settings } from "lucide-reac
 import { Disclosure, Transition } from "@headlessui/react";
 // plane helpers
 import { useOutsideClickDetector } from "@plane/helpers";
+import { useTranslation } from "@plane/i18n";
 // ui
 import { CustomMenu, Tooltip } from "@plane/ui";
 // components
@@ -31,6 +32,7 @@ export const SidebarWorkspaceMenu = observer(() => {
   // refs
   const actionSectionRef = useRef<HTMLDivElement | null>(null);
   // store hooks
+  const { t } = useTranslation();
   const { toggleSidebar, sidebarCollapsed } = useAppTheme();
   const { captureEvent } = useEventTracker();
   const { isMobile } = usePlatformOS();
@@ -82,7 +84,7 @@ export const SidebarWorkspaceMenu = observer(() => {
             className="flex-1 sticky top-0  z-10  w-full  py-1.5 flex items-center justify-between gap-1 text-custom-sidebar-text-400  text-xs font-semibold"
             onClick={() => toggleWorkspaceMenu(!isWorkspaceMenuOpen)}
           >
-            <span>WORKSPACE</span>
+            <span>{t("workspace").toUpperCase()}</span>
           </Disclosure.Button>
           <CustomMenu
             customButton={
@@ -109,7 +111,7 @@ export const SidebarWorkspaceMenu = observer(() => {
               <Link href={`/${workspaceSlug}/projects/archives`}>
                 <div className="flex items-center justify-start gap-2">
                   <ArchiveIcon className="h-3.5 w-3.5 stroke-[1.5]" />
-                  <span>Archives</span>
+                  <span>{t("archives")}</span>
                 </div>
               </Link>
             </CustomMenu.MenuItem>
@@ -119,7 +121,7 @@ export const SidebarWorkspaceMenu = observer(() => {
                 <Link href={`/${workspaceSlug}/settings`}>
                   <div className="flex items-center justify-start gap-2">
                     <Settings className="h-3.5 w-3.5 stroke-[1.5]" />
-                    <span>Settings</span>
+                    <span>{t("settings")}</span>
                   </div>
                 </Link>
               </CustomMenu.MenuItem>
@@ -163,7 +165,7 @@ export const SidebarWorkspaceMenu = observer(() => {
                 allowPermissions(link.access, EUserPermissionsLevel.WORKSPACE, workspaceSlug.toString()) && (
                   <Tooltip
                     key={link.key}
-                    tooltipContent={link.label}
+                    tooltipContent={t(link.key)}
                     position="right"
                     className="ml-2"
                     disabled={!sidebarCollapsed}
@@ -181,7 +183,7 @@ export const SidebarWorkspaceMenu = observer(() => {
                               "rotate-180": link.key === "active-cycles",
                             })}
                           />
-                          {!sidebarCollapsed && <p className="text-sm leading-5 font-medium">{link.label}</p>}
+                          {!sidebarCollapsed && <p className="text-sm leading-5 font-medium">{t(link.key)}</p>}
                         </div>
                         {!sidebarCollapsed && link.key === "active-cycles" && indicatorElement}
                       </SidebarNavItem>
@@ -194,4 +196,4 @@ export const SidebarWorkspaceMenu = observer(() => {
       </Transition>
     </Disclosure>
   );
-});
+});
\ No newline at end of file
diff --git a/web/core/components/workspace/views/default-view-list-item.tsx b/web/core/components/workspace/views/default-view-list-item.tsx
index 0d0e627b65a..dbf5ec01639 100644
--- a/web/core/components/workspace/views/default-view-list-item.tsx
+++ b/web/core/components/workspace/views/default-view-list-item.tsx
@@ -3,11 +3,13 @@ import Link from "next/link";
 import { useParams } from "next/navigation";
 // helpers
 import { truncateText } from "@/helpers/string.helper";
+import { useTranslation } from "@plane/i18n";
 
 type Props = { view: { key: string; label: string } };
 
 export const GlobalDefaultViewListItem: React.FC<Props> = observer((props) => {
   const { view } = props;
+  const { t } = useTranslation();
   // router
   const { workspaceSlug } = useParams();
 
@@ -18,7 +20,7 @@ export const GlobalDefaultViewListItem: React.FC<Props> = observer((props) => {
           <div className="flex w-full items-center justify-between">
             <div className="flex items-center gap-4">
               <div className="flex flex-col">
-                <p className="truncate text-sm font-medium leading-4">{truncateText(view.label, 75)}</p>
+                <p className="truncate text-sm font-medium leading-4">{truncateText(t(view.key), 75)}</p>
               </div>
             </div>
           </div>
diff --git a/web/core/components/workspace/views/form.tsx b/web/core/components/workspace/views/form.tsx
index 6fce455a825..c9965e79391 100644
--- a/web/core/components/workspace/views/form.tsx
+++ b/web/core/components/workspace/views/form.tsx
@@ -6,6 +6,7 @@ import { Controller, useForm } from "react-hook-form";
 // types
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, IWorkspaceView } from "@plane/types";
 // ui
+import { useTranslation } from "@plane/i18n";
 import { Button, Input, TextArea } from "@plane/ui";
 // components
 import { AppliedFiltersList, DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues";
@@ -35,6 +36,7 @@ const defaultValues: Partial<IWorkspaceView> = {
 
 export const WorkspaceViewForm: React.FC<Props> = observer((props) => {
   const { handleFormSubmit, handleClose, data, preLoadedData } = props;
+  const { t } = useTranslation();
   // store hooks
   const { workspaceLabels } = useLabel();
   const {
@@ -129,7 +131,7 @@ export const WorkspaceViewForm: React.FC<Props> = observer((props) => {
                   onChange={onChange}
                   ref={ref}
                   hasError={Boolean(errors.name)}
-                  placeholder="Title"
+                  placeholder={t("title")}
                   className="w-full text-base"
                 />
               )}
@@ -145,7 +147,7 @@ export const WorkspaceViewForm: React.FC<Props> = observer((props) => {
                   id="description"
                   name="description"
                   value={value}
-                  placeholder="Description"
+                  placeholder={t("description")}
                   onChange={onChange}
                   className="w-full text-base resize-none min-h-24"
                   hasError={Boolean(errors?.description)}
@@ -160,7 +162,7 @@ export const WorkspaceViewForm: React.FC<Props> = observer((props) => {
               control={control}
               name="filters"
               render={({ field: { onChange, value: filters } }) => (
-                <FiltersDropdown title="Filters">
+                <FiltersDropdown title={t("filters")}>
                   <FilterSelection
                     filters={filters ?? {}}
                     handleFiltersUpdate={(key, value) => {
@@ -197,7 +199,7 @@ export const WorkspaceViewForm: React.FC<Props> = observer((props) => {
                   control={control}
                   name="display_properties"
                   render={({ field: { onChange: onDisplayPropertiesChange, value: displayProperties } }) => (
-                    <FiltersDropdown title="Display">
+                    <FiltersDropdown title={t("display")}>
                       <DisplayFiltersSelection
                         layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.my_issues.spreadsheet}
                         displayFilters={displayFilters ?? {}}
@@ -237,10 +239,10 @@ export const WorkspaceViewForm: React.FC<Props> = observer((props) => {
       </div>
       <div className="px-5 py-4 flex items-center justify-end gap-2 border-t-[0.5px] border-custom-border-200">
         <Button variant="neutral-primary" size="sm" onClick={handleClose}>
-          Cancel
+          {t("cancel")}
         </Button>
         <Button variant="primary" size="sm" type="submit" loading={isSubmitting}>
-          {data ? (isSubmitting ? "Updating" : "Update View") : isSubmitting ? "Creating" : "Create View"}
+          {data ? (isSubmitting ? t("updating") : t("update_view")) : isSubmitting ? t("creating") : t("create_view")}
         </Button>
       </div>
     </form>
diff --git a/web/core/components/workspace/views/header.tsx b/web/core/components/workspace/views/header.tsx
index 559bd6578ca..c95038ebf71 100644
--- a/web/core/components/workspace/views/header.tsx
+++ b/web/core/components/workspace/views/header.tsx
@@ -6,6 +6,7 @@ import { Plus } from "lucide-react";
 // types
 import { TStaticViewTypes } from "@plane/types";
 // components
+import { useTranslation } from "@plane/i18n";
 import { Header, EHeaderVariant } from "@plane/ui";
 import {
   CreateUpdateWorkspaceViewModal,
@@ -52,6 +53,7 @@ const DefaultViewTab = (props: {
   };
 }) => {
   const { tab } = props;
+  const { t } = useTranslation();
   // refs
   const parentRef = useRef<HTMLDivElement>(null);
   // router
@@ -64,7 +66,10 @@ const DefaultViewTab = (props: {
         parentRef={parentRef}
         globalViewId={globalViewId?.toString()}
         workspaceSlug={workspaceSlug?.toString()}
-        view={tab}
+        view={{
+          key: tab.key,
+          label: t(tab.key) // Translate using the key
+        }}
       />
     </div>
   );
diff --git a/web/core/constants/analytics.ts b/web/core/constants/analytics.ts
index 58abd208c63..7435701544a 100644
--- a/web/core/constants/analytics.ts
+++ b/web/core/constants/analytics.ts
@@ -54,7 +54,7 @@ export const ANALYTICS_X_AXIS_VALUES: { value: TXAxisValues; label: string }[] =
   {
     value: "created_at",
     label: "Created date",
-  },
+  }
 ];
 
 export const ANALYTICS_Y_AXIS_VALUES: { value: TYAxisValues; label: string }[] = [
diff --git a/web/core/constants/cycle.ts b/web/core/constants/cycle.ts
index 6f69e8f50a2..bdf900d46ac 100644
--- a/web/core/constants/cycle.ts
+++ b/web/core/constants/cycle.ts
@@ -93,37 +93,43 @@ export const CYCLE_STATUS: {
 
 export const WORKSPACE_ACTIVE_CYCLES_DETAILS = [
   {
+    key: "10000_feet_view",
     title: "10,000-feet view of all active cycles.",
     description:
       "Zoom out to see running cycles across all your projects at once instead of going from Cycle to Cycle in each project.",
     icon: Folder,
   },
   {
+    key: "get_snapshot_of_each_active_cycle",
     title: "Get a snapshot of each active cycle.",
     description:
       "Track high-level metrics for all active cycles, see their state of progress, and get a sense of scope against deadlines.",
     icon: CircleDashed,
   },
   {
+    key: "compare_burndowns",
     title: "Compare burndowns.",
     description: "Monitor how each of your teams are performing with a peek into each cycle’s burndown report.",
     icon: BarChart4,
   },
   {
+    key: "quickly_see_make_or_break_issues",
     title: "Quickly see make-or-break issues. ",
     description:
       "Preview high-priority issues for each cycle against due dates. See all of them per cycle in one click.",
     icon: AlertOctagon,
   },
   {
+    key: "zoom_into_cycles_that_need_attention",
     title: "Zoom into cycles that need attention. ",
     description: "Investigate the state of any cycle that doesn’t conform to expectations in one click.",
     icon: Search,
   },
   {
+    key: "stay_ahead_of_blockers",
     title: "Stay ahead of blockers.",
     description:
       "Spot challenges from one project to another and see inter-cycle dependencies that aren’t obvious from any other view.",
     icon: Microscope,
   },
-];
+];
\ No newline at end of file
diff --git a/web/core/constants/dashboard.ts b/web/core/constants/dashboard.ts
index 3cfdec0e287..88f59b4714a 100644
--- a/web/core/constants/dashboard.ts
+++ b/web/core/constants/dashboard.ts
@@ -258,14 +258,14 @@ export const SIDEBAR_WORKSPACE_MENU_ITEMS: {
   highlight: (pathname: string, baseUrl: string) => boolean;
   Icon: React.FC<Props>;
 }[] = [
-  {
-    key: "projects",
-    label: "Projects",
-    href: `/projects`,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
-    highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/projects/`,
-    Icon: Briefcase,
-  },
+  // {
+  //   key: "projects",
+  //   label: "Projects",
+  //   href: `/projects`,
+  //   access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
+  //   highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/projects/`,
+  //   Icon: Briefcase,
+  // },
   {
     key: "all-issues",
     label: "Views",
@@ -273,23 +273,23 @@ export const SIDEBAR_WORKSPACE_MENU_ITEMS: {
     access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
     highlight: (pathname: string, baseUrl: string) => pathname.includes(`${baseUrl}/workspace-views/`),
     Icon: Layers,
-  },
-  {
-    key: "active-cycles",
-    label: "Cycles",
-    href: `/active-cycles`,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
-    highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/active-cycles/`,
-    Icon: ContrastIcon,
-  },
-  {
-    key: "analytics",
-    label: "Analytics",
-    href: `/analytics`,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
-    highlight: (pathname: string, baseUrl: string) => pathname.includes(`${baseUrl}/analytics/`),
-    Icon: BarChart2,
-  },
+  }
+  // {
+  //   key: "active-cycles",
+  //   label: "Cycles",
+  //   href: `/active-cycles`,
+  //   access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
+  //   highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/active-cycles/`,
+  //   Icon: ContrastIcon,
+  // },
+  // {
+  //   key: "analytics",
+  //   label: "Analytics",
+  //   href: `/analytics`,
+  //   access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
+  //   highlight: (pathname: string, baseUrl: string) => pathname.includes(`${baseUrl}/analytics/`),
+  //   Icon: BarChart2,
+  // },
 ];
 
 type TLinkOptions = {
diff --git a/web/core/constants/issue.ts b/web/core/constants/issue.ts
index 8629c05a253..82c1b7cec39 100644
--- a/web/core/constants/issue.ts
+++ b/web/core/constants/issue.ts
@@ -9,6 +9,7 @@ import {
   TIssueOrderByOptions,
   TIssuePriorities,
   TIssueGroupingFilters,
+  TIssue
 } from "@plane/types";
 
 export const DRAG_ALLOWED_GROUPS: TIssueGroupByOptions[] = [
@@ -109,6 +110,20 @@ export const ISSUE_FILTER_OPTIONS: {
   // { key: "draft", title: "Draft Issues" },
 ];
 
+const whileListedCustomProperties = [
+  { key: "trip_reference_number", title: "Trip Reference Number" },
+  { key: "reference_number", title: "Reference Number" },
+  { key: "hub_code", title: "Hub Code" },
+  { key: "hub_name", title: "Hub Name" },
+  { key: "customer_code", title: "Customer Code" },
+  { key: "customer_name", title: "Customer Name" },
+  { key: "vendor_name", title: "Vendor Name" },
+  { key: "vendor_code", title: "Vendor Code" },
+  { key: "worker_code", title: "Worker Code" },
+  { key: "worker_name", title: "Worker Name" },
+  { key: "business_type", title: "Business Type" },
+];
+
 export const ISSUE_DISPLAY_PROPERTIES_KEYS: (keyof IIssueDisplayProperties)[] = [
   "assignee",
   "start_date",
@@ -126,6 +141,17 @@ export const ISSUE_DISPLAY_PROPERTIES_KEYS: (keyof IIssueDisplayProperties)[] =
   "modules",
   "cycle",
   "issue_type",
+  "trip_reference_number",
+  "reference_number",
+  "hub_code",
+  "hub_name",
+  "customer_code",
+  "customer_name",
+  "vendor_name",
+  "vendor_code",
+  "worker_code",
+  "worker_name",
+  "business_type",
 ];
 
 export const ISSUE_DISPLAY_PROPERTIES: {
@@ -146,6 +172,17 @@ export const ISSUE_DISPLAY_PROPERTIES: {
   { key: "estimate", title: "Estimate" },
   { key: "modules", title: "Modules" },
   { key: "cycle", title: "Cycle" },
+  { key: "trip_reference_number", title: "Trip Reference Number" },
+  { key: "reference_number", title: "Reference Number" },
+  { key: "hub_code", title: "Hub Code" },
+  { key: "hub_name", title: "Hub Name" },
+  { key: "customer_code", title: "Customer Code" },
+  { key: "customer_name", title: "Customer Name" },
+  { key: "vendor_name", title: "Vendor Name" },
+  { key: "vendor_code", title: "Vendor Code" },
+  { key: "worker_code", title: "Worker Code" },
+  { key: "worker_name", title: "Worker Name" },
+  { key: "business_type", title: "Business Type" },
 ];
 
 export const ISSUE_EXTRA_OPTIONS: {
@@ -307,6 +344,18 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
         "project",
         "start_date",
         "target_date",
+        "hub_code",
+        "hub_name",
+        "customer_code",
+        "customer_name",
+        "worker_code",
+        "worker_name",
+        "vendor_code",
+        "vendor_name",
+        "business_type",
+        "trip_reference_number",
+        "reference_number",
+        "custom_properties",
       ],
       display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
       display_filters: {
@@ -354,6 +403,18 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
         "start_date",
         "target_date",
         "issue_type",
+        "hub_code",
+        "hub_name",
+        "customer_code",
+        "customer_name",
+        "worker_code",
+        "worker_name",
+        "vendor_code",
+        "vendor_name",
+        "business_type",
+        "trip_reference_number",
+        "reference_number",
+        "custom_properties"
       ],
       display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
       display_filters: {
@@ -427,6 +488,19 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
         "start_date",
         "target_date",
         "issue_type",
+        "custom_properties",
+        "hub_code",
+        "hub_name",
+        "customer_code",
+        "customer_name",
+        "worker_code",
+        "worker_name",
+        "vendor_code",
+        "vendor_name",
+        "business_type",
+        "trip_reference_number",
+        "reference_number",
+        "custom_properties"
       ],
       display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
       display_filters: {
@@ -493,3 +567,20 @@ export const groupReactionEmojis = (reactions: any) => {
 
   return groupedEmojis;
 };
+
+export const ISSUE_ADDITIONAL_PROPERTIES: {
+    key: keyof TIssue;
+    title: string;
+  }[] = [
+    { key: "trip_reference_number", title: "Trip Ref Number" },
+    { key: "reference_number", title: "Reference Number" },
+    { key: "hub_code", title: "Hub Code" },
+    { key: "hub_name", title: "Hub Name" },
+    { key: "customer_code", title: "Customer Code" },
+    { key: "customer_name", title: "Customer Name" },
+    { key: "vendor_code", title: "Vendor Code" },
+    { key: "vendor_name", title: "Vendor Name" },
+    { key: "worker_code", title: "Worker Code" },
+    { key: "worker_name", title: "Worker Name" },
+    { key: "business_type", title: "Business Type" },
+  ];
\ No newline at end of file
diff --git a/web/core/constants/profile.ts b/web/core/constants/profile.ts
index 479cb825bd6..29e865c7941 100644
--- a/web/core/constants/profile.ts
+++ b/web/core/constants/profile.ts
@@ -48,6 +48,7 @@ export const PROFILE_ACTION_LINKS: {
 
 export const PROFILE_VIEWER_TAB = [
   {
+    key: "summary",
     route: "",
     label: "Summary",
     selected: "/",
@@ -56,6 +57,7 @@ export const PROFILE_VIEWER_TAB = [
 
 export const PROFILE_ADMINS_TAB = [
   {
+    key: "assigned",
     route: "assigned",
     label: "Assigned",
     selected: "/assigned/",
@@ -66,13 +68,15 @@ export const PROFILE_ADMINS_TAB = [
     selected: "/created/",
   },
   {
+    key: "subscribed",
     route: "subscribed",
     label: "Subscribed",
     selected: "/subscribed/",
   },
   {
+    key: "activity",
     route: "activity",
     label: "Activity",
     selected: "/activity/",
   },
-];
+];
\ No newline at end of file
diff --git a/web/core/constants/spreadsheet.ts b/web/core/constants/spreadsheet.ts
index e4e8d8ee57b..904e1e54f2d 100644
--- a/web/core/constants/spreadsheet.ts
+++ b/web/core/constants/spreadsheet.ts
@@ -11,6 +11,7 @@ import {
   CalendarCheck2,
   CalendarClock,
   Users,
+  Tags,
 } from "lucide-react";
 // types
 import { IIssueDisplayProperties, TIssue, TIssueOrderByOptions } from "@plane/types";
@@ -32,6 +33,7 @@ import {
   SpreadsheetStateColumn,
   SpreadsheetSubIssueColumn,
   SpreadsheetUpdatedOnColumn,
+  SpreadsheetStandardPropertyColumn,
 } from "@/components/issues/issue-layouts/spreadsheet";
 
 export const SPREADSHEET_PROPERTY_DETAILS: {
@@ -47,11 +49,12 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
       onClose: () => void;
       onChange: (issue: TIssue, data: Partial<TIssue>, updates: any) => void;
       disabled: boolean;
+      property: string;
     }>;
   };
 } = {
   assignee: {
-    title: "Assignees",
+    title: "assignees",
     ascendingOrderKey: "assignees__first_name",
     ascendingOrderTitle: "A",
     descendingOrderKey: "-assignees__first_name",
@@ -60,7 +63,7 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     Column: SpreadsheetAssigneeColumn,
   },
   created_on: {
-    title: "Created on",
+    title: "created_on",
     ascendingOrderKey: "-created_at",
     ascendingOrderTitle: "New",
     descendingOrderKey: "created_at",
@@ -69,7 +72,7 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     Column: SpreadsheetCreatedOnColumn,
   },
   due_date: {
-    title: "Due date",
+    title: "due_date",
     ascendingOrderKey: "-target_date",
     ascendingOrderTitle: "New",
     descendingOrderKey: "target_date",
@@ -78,7 +81,7 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     Column: SpreadsheetDueDateColumn,
   },
   estimate: {
-    title: "Estimate",
+    title: "estimate",
     ascendingOrderKey: "estimate_point",
     ascendingOrderTitle: "Low",
     descendingOrderKey: "-estimate_point",
@@ -87,7 +90,7 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     Column: SpreadsheetEstimateColumn,
   },
   labels: {
-    title: "Labels",
+    title: "labels",
     ascendingOrderKey: "labels__name",
     ascendingOrderTitle: "A",
     descendingOrderKey: "-labels__name",
@@ -96,7 +99,7 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     Column: SpreadsheetLabelColumn,
   },
   modules: {
-    title: "Modules",
+    title: "modules",
     ascendingOrderKey: "issue_module__module__name",
     ascendingOrderTitle: "A",
     descendingOrderKey: "-issue_module__module__name",
@@ -105,7 +108,7 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     Column: SpreadsheetModuleColumn,
   },
   cycle: {
-    title: "Cycle",
+    title: "cycle",
     ascendingOrderKey: "issue_cycle__cycle__name",
     ascendingOrderTitle: "A",
     descendingOrderKey: "-issue_cycle__cycle__name",
@@ -114,7 +117,7 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     Column: SpreadsheetCycleColumn,
   },
   priority: {
-    title: "Priority",
+    title: "priority",
     ascendingOrderKey: "priority",
     ascendingOrderTitle: "None",
     descendingOrderKey: "-priority",
@@ -123,7 +126,7 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     Column: SpreadsheetPriorityColumn,
   },
   start_date: {
-    title: "Start date",
+    title: "start_date",
     ascendingOrderKey: "-start_date",
     ascendingOrderTitle: "New",
     descendingOrderKey: "start_date",
@@ -132,7 +135,7 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     Column: SpreadsheetStartDateColumn,
   },
   state: {
-    title: "State",
+    title: "state",
     ascendingOrderKey: "state__name",
     ascendingOrderTitle: "A",
     descendingOrderKey: "-state__name",
@@ -141,7 +144,7 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     Column: SpreadsheetStateColumn,
   },
   updated_on: {
-    title: "Updated on",
+    title: "updated_on",
     ascendingOrderKey: "-updated_at",
     ascendingOrderTitle: "New",
     descendingOrderKey: "updated_at",
@@ -150,7 +153,7 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     Column: SpreadsheetUpdatedOnColumn,
   },
   link: {
-    title: "Link",
+    title: "link",
     ascendingOrderKey: "-link_count",
     ascendingOrderTitle: "Most",
     descendingOrderKey: "link_count",
@@ -159,7 +162,7 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     Column: SpreadsheetLinkColumn,
   },
   attachment_count: {
-    title: "Attachment",
+    title: "attachment",
     ascendingOrderKey: "-attachment_count",
     ascendingOrderTitle: "Most",
     descendingOrderKey: "attachment_count",
@@ -168,7 +171,7 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     Column: SpreadsheetAttachmentColumn,
   },
   sub_issue_count: {
-    title: "Sub-issue",
+    title: "sub_issue",
     ascendingOrderKey: "-sub_issues_count",
     ascendingOrderTitle: "Most",
     descendingOrderKey: "sub_issues_count",
@@ -176,6 +179,105 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     icon: LayersIcon,
     Column: SpreadsheetSubIssueColumn,
   },
+  trip_reference_number: {
+    title: "trip_reference_number",
+    ascendingOrderKey: "trip_reference_number",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-trip_reference_number",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  reference_number: {
+    title: "reference_number",
+    ascendingOrderKey: "reference_number",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-reference_number",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  hub_code: {
+    title: "hub_code",
+    ascendingOrderKey: "hub_code",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-hub_code",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  hub_name: {
+    title: "hub_name",
+    ascendingOrderKey: "hub_name",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-hub_name",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  customer_code: {
+    title: "customer_code",
+    ascendingOrderKey: "customer_code",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-customer_code",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  customer_name: {
+    title: "customer_name",
+    ascendingOrderKey: "customer_name",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-customer_name",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  vendor_name: {
+    title: "vendor_name",
+    ascendingOrderKey: "vendor_name",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-vendor_name",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  vendor_code: {
+    title: "vendor_code",
+    ascendingOrderKey: "vendor_code",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-vendor_code",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  worker_code: {
+    title: "worker_code",
+    ascendingOrderKey: "worker_code",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-worker_code",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  worker_name: {
+    title: "worker_name",
+    ascendingOrderKey: "worker_name",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-worker_name",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  business_type: {
+    title: "business_type",
+    ascendingOrderKey: "business_type",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-business_type",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
 };
 
 export const SPREADSHEET_PROPERTY_LIST: (keyof IIssueDisplayProperties)[] = [
@@ -193,6 +295,17 @@ export const SPREADSHEET_PROPERTY_LIST: (keyof IIssueDisplayProperties)[] = [
   "link",
   "attachment_count",
   "sub_issue_count",
+  "trip_reference_number",
+  "reference_number",
+  "hub_code",
+  "hub_name",
+  "customer_code",
+  "customer_name",
+  "vendor_name",
+  "vendor_code",
+  "worker_code",
+  "worker_name",
+  "business_type",
 ];
 
 export const SPREADSHEET_SELECT_GROUP = "spreadsheet-issues";
diff --git a/web/core/constants/themes.ts b/web/core/constants/themes.ts
index c221a631edc..5e705762ad0 100644
--- a/web/core/constants/themes.ts
+++ b/web/core/constants/themes.ts
@@ -1,6 +1,7 @@
 export const THEMES = ["light", "dark", "light-contrast", "dark-contrast", "custom"];
 
 export interface I_THEME_OPTION {
+  key: string;
   value: string;
   label: string;
   type: string;
@@ -13,6 +14,7 @@ export interface I_THEME_OPTION {
 
 export const THEME_OPTIONS: I_THEME_OPTION[] = [
   {
+    key: "system_preference",
     value: "system",
     label: "System preference",
     type: "light",
@@ -23,6 +25,7 @@ export const THEME_OPTIONS: I_THEME_OPTION[] = [
     },
   },
   {
+    key: "light",
     value: "light",
     label: "Light",
     type: "light",
@@ -33,6 +36,7 @@ export const THEME_OPTIONS: I_THEME_OPTION[] = [
     },
   },
   {
+    key: "dark",
     value: "dark",
     label: "Dark",
     type: "dark",
@@ -43,6 +47,7 @@ export const THEME_OPTIONS: I_THEME_OPTION[] = [
     },
   },
   {
+    key: "light_contrast",
     value: "light-contrast",
     label: "Light high contrast",
     type: "light",
@@ -53,6 +58,7 @@ export const THEME_OPTIONS: I_THEME_OPTION[] = [
     },
   },
   {
+    key: "dark_contrast",
     value: "dark-contrast",
     label: "Dark high contrast",
     type: "dark",
@@ -63,6 +69,7 @@ export const THEME_OPTIONS: I_THEME_OPTION[] = [
     },
   },
   {
+    key: "custom",
     value: "custom",
     label: "Custom theme",
     type: "light",
@@ -72,4 +79,4 @@ export const THEME_OPTIONS: I_THEME_OPTION[] = [
       color2: "#FF5151",
     },
   },
-];
+];
\ No newline at end of file
diff --git a/web/core/constants/workspace.ts b/web/core/constants/workspace.ts
index 405c680d725..39f35fc7428 100644
--- a/web/core/constants/workspace.ts
+++ b/web/core/constants/workspace.ts
@@ -8,6 +8,7 @@ import GithubLogo from "@/public/services/github.png";
 import JiraLogo from "@/public/services/jira.svg";
 import JSONLogo from "@/public/services/json.svg";
 
+
 export const ROLE = {
   [EUserPermissions.GUEST]: "Guest",
   [EUserPermissions.MEMBER]: "Member",
diff --git a/web/core/hooks/use-group-dragndrop.ts b/web/core/hooks/use-group-dragndrop.ts
index 08695d341d2..0a1c3ef697a 100644
--- a/web/core/hooks/use-group-dragndrop.ts
+++ b/web/core/hooks/use-group-dragndrop.ts
@@ -61,8 +61,8 @@ export const useGroupIssuesDragNDrop = (
     const moduleKey = ISSUE_FILTER_DEFAULT_DATA["module"];
     const cycleKey = ISSUE_FILTER_DEFAULT_DATA["cycle"];
 
-    const isModuleChanged = Object.keys(data).includes(moduleKey);
-    const isCycleChanged = Object.keys(data).includes(cycleKey);
+    const isModuleChanged = Object.keys(data).includes(moduleKey.toString());
+    const isCycleChanged = Object.keys(data).includes(cycleKey.toString());
 
     if (isCycleChanged && workspaceSlug) {
       if (data[cycleKey]) {
diff --git a/web/core/layouts/auth-layout/project-wrapper.tsx b/web/core/layouts/auth-layout/project-wrapper.tsx
index c5a812569b7..d06c071e15a 100644
--- a/web/core/layouts/auth-layout/project-wrapper.tsx
+++ b/web/core/layouts/auth-layout/project-wrapper.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import { FC, ReactNode, useEffect } from "react";
+import { FC, Fragment, ReactNode, useEffect } from "react";
 import { observer } from "mobx-react";
-import { useParams } from "next/navigation";
+import { useParams, usePathname } from "next/navigation";
 import useSWR from "swr";
 
 // components
@@ -55,7 +55,7 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
   const { getProjectEstimates } = useProjectEstimates();
   // router
   const { workspaceSlug, projectId } = useParams();
-
+  const pathname = usePathname();
   const projectMemberInfo = projectUserInfo?.[workspaceSlug?.toString()]?.[projectId?.toString()];
 
   // Initialize module timeline chart
@@ -178,5 +178,5 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
       </div>
     );
 
-  return <>{children}</>;
+  return <Fragment key={pathname ?? ""}>{children}</Fragment>;
 });
diff --git a/web/core/lib/wrappers/store-wrapper.tsx b/web/core/lib/wrappers/store-wrapper.tsx
index fa60c354e3c..b0c5ef3118c 100644
--- a/web/core/lib/wrappers/store-wrapper.tsx
+++ b/web/core/lib/wrappers/store-wrapper.tsx
@@ -1,7 +1,8 @@
-import { ReactNode, useEffect, FC, useState } from "react";
+import { ReactNode, useEffect, FC } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { useTheme } from "next-themes";
+import { useTranslation, Language } from "@plane/i18n";
 // helpers
 import { applyTheme, unsetCustomCssVariables } from "@/helpers/theme.helper";
 // hooks
@@ -21,6 +22,7 @@ const StoreWrapper: FC<TStoreWrapper> = observer((props) => {
   const { setQuery } = useRouterParams();
   const { sidebarCollapsed, toggleSidebar } = useAppTheme();
   const { data: userProfile } = useUserProfile();
+  const { changeLanguage } = useTranslation();
 
   /**
    * Sidebar collapsed fetching from local storage
@@ -28,7 +30,6 @@ const StoreWrapper: FC<TStoreWrapper> = observer((props) => {
   useEffect(() => {
     const localValue = localStorage && localStorage.getItem("app_sidebar_collapsed");
     const localBoolValue = localValue ? (localValue === "true" ? true : false) : false;
-
     if (localValue && sidebarCollapsed === undefined) toggleSidebar(localBoolValue);
   }, [sidebarCollapsed, setTheme, toggleSidebar]);
 
@@ -37,7 +38,6 @@ const StoreWrapper: FC<TStoreWrapper> = observer((props) => {
    */
   useEffect(() => {
     if (!userProfile?.theme?.theme) return;
-
     const currentTheme = userProfile?.theme?.theme || "system";
     const currentThemePalette = userProfile?.theme?.palette;
     if (currentTheme) {
@@ -51,6 +51,11 @@ const StoreWrapper: FC<TStoreWrapper> = observer((props) => {
     }
   }, [userProfile?.theme?.theme, userProfile?.theme?.palette, setTheme]);
 
+  useEffect(() => {
+    if (!userProfile?.language) return;
+    changeLanguage(userProfile?.language as Language);
+  }, [userProfile?.language, changeLanguage]);
+
   useEffect(() => {
     if (!params) return;
     setQuery(params);
@@ -59,4 +64,4 @@ const StoreWrapper: FC<TStoreWrapper> = observer((props) => {
   return <>{children}</>;
 });
 
-export default StoreWrapper;
+export default StoreWrapper;
\ No newline at end of file
diff --git a/web/core/services/workspace.service.ts b/web/core/services/workspace.service.ts
index e1aa9b7cd2b..da8dbd16ab9 100644
--- a/web/core/services/workspace.service.ts
+++ b/web/core/services/workspace.service.ts
@@ -277,4 +277,24 @@ export class WorkspaceService extends APIService {
         throw error?.response?.data;
       });
   }
+
+  async getIssuesCustomProperties(workspaceSlug: string, fetchConfig: {query: string, page: number, key?: string}): Promise<Record<string, any>[]> {
+    return this.get(
+      `/api/workspaces/${workspaceSlug}/custom-properties?query=${fetchConfig.query}&page=${fetchConfig.page}&field=${fetchConfig.key}`,
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getIssueAdditionalProperties(workspaceSlug: string, field: any, query: string, page: number): Promise<any> {
+    return this.get(
+      `/api/workspaces/${workspaceSlug}/search?field=${field}&query=${query}&page=${page}`,
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
 }
diff --git a/web/core/store/issue/helpers/base-issues.store.ts b/web/core/store/issue/helpers/base-issues.store.ts
index 462643eb287..32b264e7e32 100644
--- a/web/core/store/issue/helpers/base-issues.store.ts
+++ b/web/core/store/issue/helpers/base-issues.store.ts
@@ -174,6 +174,28 @@ const ISSUE_ORDERBY_KEY: Record<TIssueOrderByOptions, keyof TIssue> = {
   "-attachment_count": "attachment_count",
   sub_issues_count: "sub_issues_count",
   "-sub_issues_count": "sub_issues_count",
+  trip_reference_number: "trip_reference_number",
+  "-trip_reference_number": "trip_reference_number",
+  reference_number: "reference_number",
+  "-reference_number": "reference_number",
+  hub_code: "hub_code",
+  "-hub_code": "hub_code",
+  hub_name: "hub_name",
+  "-hub_name": "hub_name",
+  customer_code: "customer_code",
+  "-customer_code": "customer_code",
+  customer_name: "customer_name",
+  "-customer_name": "customer_name",
+  vendor_name: "vendor_name",
+  "-vendor_name": "vendor_name",
+  vendor_code: "vendor_code",
+  "-vendor_code": "vendor_code",
+  worker_code: "worker_code",
+  "-worker_code": "worker_code",
+  worker_name: "worker_name",
+  "-worker_name": "worker_name",
+  business_type: "business_type",
+  "-business_type": "business_type",
 };
 
 export abstract class BaseIssuesStore implements IBaseIssuesStore {
diff --git a/web/core/store/issue/helpers/issue-filter-helper.store.ts b/web/core/store/issue/helpers/issue-filter-helper.store.ts
index 3db6dcbb37f..69c23ad6f84 100644
--- a/web/core/store/issue/helpers/issue-filter-helper.store.ts
+++ b/web/core/store/issue/helpers/issue-filter-helper.store.ts
@@ -82,6 +82,7 @@ export class IssueFilterHelperStore implements IIssueFilterHelperStore {
     const computedFilters: Partial<Record<TIssueParams, undefined | string[] | boolean | string>> = {
       // issue filters
       priority: filters?.priority || undefined,
+      custom_properties: filters?.custom_properties || undefined,
       state_group: filters?.state_group || undefined,
       state: filters?.state || undefined,
       assignees: filters?.assignees || undefined,
@@ -103,6 +104,17 @@ export class IssueFilterHelperStore implements IIssueFilterHelperStore {
       order_by: displayFilters?.order_by || undefined,
       type: displayFilters?.type || undefined,
       sub_issue: displayFilters?.sub_issue ?? true,
+      hub_code: filters?.hub_code || undefined,
+      hub_name: filters?.hub_name || undefined,
+      worker_code: filters?.worker_code || undefined,
+      worker_name: filters?.worker_name || undefined,
+      customer_code: filters?.customer_code || undefined,
+      customer_name: filters?.customer_name || undefined,
+      trip_reference_number: filters?.trip_reference_number || undefined,
+      vendor_code: filters?.vendor_code || undefined,
+      vendor_name: filters?.vendor_name || undefined,
+      business_type: filters?.business_type || undefined,
+      reference_number: filters?.reference_number || undefined,
     };
 
     const issueFiltersParams: Partial<Record<TIssueParams, boolean | string>> = {};
@@ -144,6 +156,17 @@ export class IssueFilterHelperStore implements IIssueFilterHelperStore {
     project: filters?.project || null,
     subscriber: filters?.subscriber || null,
     issue_type: filters?.issue_type || null,
+    hub_code: filters?.hub_code || null,
+    hub_name: filters?.hub_name || null,
+    worker_code: filters?.worker_code || null,
+    worker_name: filters?.worker_name || null,
+    customer_code: filters?.customer_code || null,
+    customer_name: filters?.customer_name || null,
+    trip_reference_number: filters?.trip_reference_number || null,
+    vendor_code: filters?.vendor_code || null,
+    vendor_name: filters?.vendor_name || null,
+    business_type: filters?.business_type || null,
+    reference_number: filters?.reference_number || null,
   });
 
   /**
diff --git a/web/core/store/issue/issue-details/issue.store.ts b/web/core/store/issue/issue-details/issue.store.ts
index db0ccc39af2..8ec30a65131 100644
--- a/web/core/store/issue/issue-details/issue.store.ts
+++ b/web/core/store/issue/issue-details/issue.store.ts
@@ -181,6 +181,18 @@ export class IssueStore implements IIssueStore {
       updated_by: issue?.updated_by,
       is_draft: issue?.is_draft,
       is_subscribed: issue?.is_subscribed,
+      custom_properties: issue?.custom_properties,
+      hub_code: issue?.hub_code, 
+      hub_name: issue?.hub_name,
+      customer_code: issue?.customer_code, 
+      customer_name: issue?.customer_name, 
+      reference_number: issue?.reference_number, 
+      trip_reference_number: issue?.trip_reference_number, 
+      vendor_code: issue?.vendor_code, 
+      vendor_name: issue?.vendor_name, 
+      worker_code: issue?.worker_code,
+      worker_name: issue?.worker_name,
+      business_type: issue?.business_type,
     };
 
     this.rootIssueDetailStore.rootIssueStore.issues.addIssue([issuePayload]);
diff --git a/web/core/store/project-view.store.ts b/web/core/store/project-view.store.ts
index b9f4e865681..a1d985145c3 100644
--- a/web/core/store/project-view.store.ts
+++ b/web/core/store/project-view.store.ts
@@ -2,7 +2,7 @@ import { set } from "lodash";
 import { observable, action, makeObservable, runInAction, computed } from "mobx";
 import { computedFn } from "mobx-utils";
 // types
-import { IProjectView, TPublishViewDetails, TPublishViewSettings, TViewFilters } from "@plane/types";
+import { IProjectView, TPublishViewDetails, TPublishViewSettings, TViewFilters, TViewFilterProps } from "@plane/types";
 // constants
 import { EViewAccess } from "@/constants/views";
 // helpers
@@ -131,12 +131,18 @@ export class ProjectViewStore implements IProjectViewStore {
     if (!this.fetchedMap[projectId]) return undefined;
 
     const ViewsList = Object.values(this.viewMap ?? {});
+    const effectiveFilters: TViewFilterProps = this.filters.filters ? { ...this.filters.filters } : {};
+    if (effectiveFilters.owned_by == null) {
+      const currentUserId = this.rootStore.user.data?.id?.toString();
+      if (currentUserId) effectiveFilters.owned_by = [currentUserId];
+    }
+    
     // helps to filter views based on the projectId, searchQuery and filters
     let filteredViews = ViewsList.filter(
       (view) =>
         view?.project === projectId &&
         getViewName(view.name).toLowerCase().includes(this.filters.searchQuery.toLowerCase()) &&
-        shouldFilterView(view, this.filters.filters)
+        shouldFilterView(view, effectiveFilters)
     );
     filteredViews = orderViews(filteredViews, this.filters.sortKey, this.filters.sortBy);
 
diff --git a/web/core/store/user/profile.store.ts b/web/core/store/user/profile.store.ts
index 9537da7da35..21891f61aef 100644
--- a/web/core/store/user/profile.store.ts
+++ b/web/core/store/user/profile.store.ts
@@ -58,6 +58,7 @@ export class ProfileStore implements IUserProfileStore {
     has_billing_address: false,
     created_at: "",
     updated_at: "",
+    language: ""
   };
 
   // services
@@ -232,4 +233,4 @@ export class ProfileStore implements IUserProfileStore {
       throw error;
     }
   };
-}
+}
\ No newline at end of file
diff --git a/web/helpers/issue.helper.ts b/web/helpers/issue.helper.ts
index d1fc970185e..2a5f4d9475a 100644
--- a/web/helpers/issue.helper.ts
+++ b/web/helpers/issue.helper.ts
@@ -307,4 +307,15 @@ export const getComputedDisplayProperties = (
   modules: displayProperties?.modules ?? true,
   cycle: displayProperties?.cycle ?? true,
   issue_type: displayProperties?.issue_type ?? true,
+  trip_reference_number: displayProperties?.trip_reference_number ?? true,
+  reference_number: displayProperties?.reference_number ?? true,
+  hub_code: displayProperties?.hub_code ?? true,
+  hub_name: displayProperties?.hub_name ?? true,
+  customer_code: displayProperties?.customer_code ?? true,
+  customer_name: displayProperties?.customer_name ?? true,
+  vendor_name: displayProperties?.vendor_name ?? true,
+  vendor_code: displayProperties?.vendor_code ?? true,
+  worker_code: displayProperties?.worker_code ?? true,
+  worker_name: displayProperties?.worker_name ?? true,
+  business_type: displayProperties?.business_type ?? true,
 });
diff --git a/web/next.config.js b/web/next.config.js
index 14ba0d73579..2d766cb3191 100644
--- a/web/next.config.js
+++ b/web/next.config.js
@@ -15,7 +15,11 @@ const nextConfig = {
       {
         source: "/(.*)?",
         headers: [
-          { key: "X-Frame-Options", value: "SAMEORIGIN" },
+          { key: "X-Frame-Options", value: "ALLOWALL" },
+          {
+            key: "Content-Security-Policy",
+            value: "frame-ancestors 'self' https://*.shipsy.io http://*.localhost:3001 http://*.localhost:3002 http://5.223.42.156:3000/", // Replace with the domains allowed to embed your app
+          },
           // {
           //   key: "Referrer-Policy",
           //   value: "origin-when-cross-origin",
@@ -29,6 +33,7 @@ const nextConfig = {
   images: {
     unoptimized: true,
   },
+  transpilePackages: ["@plane/i18n"],
   // webpack: (config, { isServer }) => {
   //   if (!isServer) {
   //     // Ensure that all imports of 'yjs' resolve to the same instance
@@ -63,6 +68,11 @@ const nextConfig = {
         destination: "/",
         permanent: true,
       },
+      {
+        source: "/profile/:path*",
+        destination: "/",
+        permanent: false,
+      },
     ];
   },
   async rewrites() {
diff --git a/web/package.json b/web/package.json
index 54b70a2d79a..aa1819469e5 100644
--- a/web/package.json
+++ b/web/package.json
@@ -33,6 +33,7 @@
     "@plane/helpers": "*",
     "@plane/types": "*",
     "@plane/ui": "*",
+    "@plane/i18n": "*",
     "@popperjs/core": "^2.11.8",
     "@react-pdf/renderer": "^3.4.5",
     "@sentry/nextjs": "^8.32.0",