diff --git a/src/components/Calendar/Years.tsx b/src/components/Calendar/Years.tsx
index 0bbef7b5..a832ecdb 100644
--- a/src/components/Calendar/Years.tsx
+++ b/src/components/Calendar/Years.tsx
@@ -3,7 +3,7 @@ import React, { useContext } from "react";
 import { generateArrayNumber } from "../../helpers";
 import { RoundedButton } from "../utils";
 
-import DatepickerContext from "contexts/DatepickerContext";
+import DatepickerContext from "../../contexts/DatepickerContext";
 
 interface Props {
     year: number;
diff --git a/src/components/Datepicker.tsx b/src/components/Datepicker.tsx
index 54e90b78..809a47e2 100644
--- a/src/components/Datepicker.tsx
+++ b/src/components/Datepicker.tsx
@@ -333,7 +333,7 @@ const Datepicker: React.FC<DatepickerType> = ({
                 <Input setContextRef={setInputRef} />
 
                 <div
-                    className="transition-all ease-out duration-300 absolute z-10 mt-[1px] text-sm lg:text-xs 2xl:text-sm translate-y-4 opacity-0 hidden"
+                    className="end-0 transition-all ease-out duration-300 absolute z-10 mt-[1px] text-sm lg:text-xs 2xl:text-sm translate-y-4 opacity-0 hidden"
                     ref={calendarContainerRef}
                 >
                     <Arrow ref={arrowRef} />
diff --git a/src/components/Input.tsx b/src/components/Input.tsx
index 38fc856e..ab3d452c 100644
--- a/src/components/Input.tsx
+++ b/src/components/Input.tsx
@@ -153,7 +153,7 @@ const Input: React.FC<Props> = (e: Props) => {
         }
 
         const defaultToggleClassName =
-            "absolute right-0 h-full px-3 text-gray-400 focus:outline-none disabled:opacity-40 disabled:cursor-not-allowed";
+            "absolute end-0 h-full px-3 text-gray-400 focus:outline-none disabled:opacity-40 disabled:cursor-not-allowed";
 
         return typeof toggleClassName === "function"
             ? toggleClassName(defaultToggleClassName)
diff --git a/src/components/utils.tsx b/src/components/utils.tsx
index 6bdb31a7..456c08fb 100644
--- a/src/components/utils.tsx
+++ b/src/components/utils.tsx
@@ -123,7 +123,7 @@ export const Arrow = React.forwardRef<HTMLDivElement, {}>((props, ref) => {
     return (
         <div
             ref={ref}
-            className="absolute z-20 h-4 w-4 rotate-45 mt-0.5 ml-[1.2rem] border-l border-t border-gray-300 bg-white dark:bg-slate-800 dark:border-slate-600"
+            className="absolute end-0 z-20 h-4 w-4 rotate-45 mt-0.5 ml-[1.2rem] border-l border-t border-gray-300 bg-white dark:bg-slate-800 dark:border-slate-600"
         />
     );
 });