diff --git a/src/assets/images/hiddify-logo-noroz.png b/src/assets/images/hiddify-logo-noroz.png
new file mode 100644
index 0000000..e662c81
Binary files /dev/null and b/src/assets/images/hiddify-logo-noroz.png differ
diff --git a/src/pages/home/components/BrandAndLogo.tsx b/src/pages/home/components/BrandAndLogo.tsx
index 2693956..bf2e8f4 100644
--- a/src/pages/home/components/BrandAndLogo.tsx
+++ b/src/pages/home/components/BrandAndLogo.tsx
@@ -1,6 +1,6 @@
 import { Text } from "@designSystem/Text"
 import { CardMedia } from "@mui/material";
-import HLogo from '@assets/images/hiddify-logo.png'
+import HLogo from '@assets/images/hiddify-logo-noroz.png'
 import { getWindowData } from "../../../utils/getWindowData";
 import { useState } from "react";
 
diff --git a/src/pages/home/components/Header.tsx b/src/pages/home/components/Header.tsx
index 47c6649..58871d2 100644
--- a/src/pages/home/components/Header.tsx
+++ b/src/pages/home/components/Header.tsx
@@ -3,7 +3,7 @@ import ShareIcon from '@mui/icons-material/Share';
 import MenuDropdown from "./MenuDropdown";
 import { Dispatch, FC, SetStateAction, useState } from "react";
 import { Button, CardMedia, Tooltip } from "@mui/material";
-import HLogo from '@assets/images/hiddify-logo.png'
+import HLogo from '@assets/images/hiddify-logo-noroz.png'
 import { Modal } from "../../../designSystem/Modal";
 import ShareLinks from "./ShareLinks";
 import DohContent from "./DohContent";
diff --git a/src/pages/home/components/PreLoading.tsx b/src/pages/home/components/PreLoading.tsx
index 1ee99c9..fc66cf5 100644
--- a/src/pages/home/components/PreLoading.tsx
+++ b/src/pages/home/components/PreLoading.tsx
@@ -1,5 +1,5 @@
 import { Text } from '../../../designSystem/Text'
-import HLogoSvg from '@assets/svg/hiddify-logo.svg?react';
+import HLogoSvg from '@assets/images/hiddify-logo-noroz.png';
 
 
 
@@ -9,7 +9,7 @@ const PreLoading = () => {
     <div className='bg-[#F4F4F9] w-screen h-screen overflow-hidden md:flex md:justify-center md:items-center'>
         <div className='w-full h-full bg-transparent flex flex-col gap-5 items-center justify-center'>
             <div className='w-[250px] h-[250px] md:w-[350px] md:h-[350px] bg-gray-300 bg-opacity-50 rounded-full flex items-center justify-center p-20'>
-                <HLogoSvg />
+                <img src={HLogoSvg} />
             </div>
             <Text fontSize='lg' fontWeight='semibold' className='text-[#455FE9]'>Hiddify</Text>
             <Text fontSize='lg' fontWeight='semibold' className='text-[#455FE9]'>Powered By Hiddify.com</Text>
diff --git a/src/pages/home/components/RemainingTime.tsx b/src/pages/home/components/RemainingTime.tsx
index 5e88dd0..78a0371 100644
--- a/src/pages/home/components/RemainingTime.tsx
+++ b/src/pages/home/components/RemainingTime.tsx
@@ -4,50 +4,19 @@ import AccessAlarmIcon from '@mui/icons-material/AccessAlarm';
 import AllInclusiveIcon from '@mui/icons-material/AllInclusive';
 import { ClickAwayListener, Tooltip } from '@mui/material';
 import { useEffect, useState } from 'react';
+import moment from 'moment';
 
 
 const RemainingTime = ({ remainingDays, resetIn }) => {
     const [showFullTime, setShowFullTime] = useState(false)
-    const [dateRepresentation, setDateRepresentation] = useState('-')
     const { t } = useTranslation();
-
-    const calculateRemainingTime = (days) => {
-        const years = Math.floor(days / 365);
-        const months = Math.floor((days % 365) / 30);
-        const daysLeft = days % 365 === 0 || days % 30 === 0 ? 0 : days % 30;
-    
-        return { years, months, days: daysLeft };
-      };
-    
-      const [timeRemaining, setTimeRemaining] = useState(calculateRemainingTime(remainingDays));
     
-      useEffect(() => {
-        const remaining = calculateRemainingTime(remainingDays)
-
-        setTimeRemaining(remaining)
-
-        if (remaining.years > 0) {
-          setDateRepresentation(remaining.years + (remaining.years === 1 ? " " + t('Year') : " " + t('Years')))
-        } else if (remaining.months > 0) {
-          setDateRepresentation(remaining.months + (remaining.months === 1 ? " " + t('Month') : " " + t('Months')))
-        } else if (remaining.days > 0) {
-          setDateRepresentation(remaining.days + (remaining.days === 1 ? " " + t('Day') : " " + t('Days')))
-        }
-      }, [remainingDays]);
 
       const tooltipContent = (
-        <div>
+        <span>
           {t('Remaining time') + ': '}
-          {timeRemaining.years > 0 && (
-            <span>{timeRemaining.years} {timeRemaining.years === 1 ? t('Year') + ' ' : t('Years') + ' '}</span>
-          )}
-          {timeRemaining.months > 0 && (
-            <span>{timeRemaining.months} {timeRemaining.months === 1 ? t('Month') + ' ' : t('Months') + ' '}</span>
-          )}
-          {timeRemaining.days > 0 && (
-            <span>{timeRemaining.days} {timeRemaining.days === 1 ? t('Day') + ' ' : t('Days') + ' '}</span>
-          )}
-        </div>
+          {remainingDays ? remainingDays + ' ' + t('Days') : '-'}
+        </span>
       );
 
   return (
@@ -62,7 +31,7 @@ const RemainingTime = ({ remainingDays, resetIn }) => {
                         {t('Remaining time')}
                     </Text>
                     <Text className="text-[#212529] whitespace-nowrap" fontSize="sm" fontWeight="regular">
-                        {remainingDays > 1000 ? <AllInclusiveIcon className='text-[#212529]' fontSize='small' /> : dateRepresentation ? dateRepresentation : '-'}
+                        {remainingDays > 1000 ? <AllInclusiveIcon className='text-[#212529]' fontSize='small' /> : remainingDays ? remainingDays + ' ' + t('Days') : '-'}
                     </Text>
                 </div>
             </div>
diff --git a/src/pages/home/components/UsedTraffic.tsx b/src/pages/home/components/UsedTraffic.tsx
index 5d781f2..cc53d51 100644
--- a/src/pages/home/components/UsedTraffic.tsx
+++ b/src/pages/home/components/UsedTraffic.tsx
@@ -20,7 +20,7 @@ const UsedTraffic = ({ current, total }) => {
 
   return (
     <ClickAwayListener onClickAway={() => setShowFullTraffic(false)}>
-        <Tooltip open={showFullTraffic} title={roundedCurrent || roundedCurrent === 0 ? t('Used Traffic') + ': ' + roundedCurrent + ' GB' : t('Used Traffic') + ': '} placement="top">
+        <Tooltip open={showFullTraffic} title={roundedCurrent ? t('Used Traffic') + ': ' + roundedCurrent + ' GB' : t('Used Traffic') + ': -'} placement="top">
             <div onClick={() => setShowFullTraffic(!showFullTraffic)} className="flex flex-col lg:flex-row items-center justify-center gap-2">
                 <div className="w-8 h-8 bg-[#D6DEF7] rounded-[8px] flex items-center justify-center">
                     <InsertChartOutlinedIcon sx={{ color: '#495057'}} />