diff --git a/frontend/app/components/Dashboard/components/DashboardWidgetGrid/DashboardWidgetGrid.tsx b/frontend/app/components/Dashboard/components/DashboardWidgetGrid/DashboardWidgetGrid.tsx
index b318855ef..3c7702139 100644
--- a/frontend/app/components/Dashboard/components/DashboardWidgetGrid/DashboardWidgetGrid.tsx
+++ b/frontend/app/components/Dashboard/components/DashboardWidgetGrid/DashboardWidgetGrid.tsx
@@ -59,7 +59,7 @@ function DashboardWidgetGrid(props: Props) {
                 >
                     <div className="grid gap-4 grid-cols-4 items-start pb-10" id={props.id}>{smallWidgets.length > 0 ? (
                         <>
-                            <div className="font-semibold text-xl py-4 flex items-center gap-2 col-span-4">
+                            <div className="font-semibold text-xl pt-4 flex items-center gap-2 col-span-4">
                                 <Icon name="grid-horizontal" size={26}/>
                                 Web Vitals
                             </div>
@@ -85,7 +85,7 @@ function DashboardWidgetGrid(props: Props) {
                     ) : null}
 
                         {smallWidgets.length > 0 && regularWidgets.length > 0 ? (
-                            <div className="font-semibold text-xl py-4 flex items-center gap-2 col-span-4">
+                            <div className="font-semibold text-xl pt-4 flex items-center gap-2 col-span-4">
                                 <Icon name="grid-horizontal" size={26}/>
                                 All Cards
                             </div>
diff --git a/frontend/app/components/Dashboard/components/WidgetDateRange/WidgetDateRange.tsx b/frontend/app/components/Dashboard/components/WidgetDateRange/WidgetDateRange.tsx
index 2527b1f34..d795c45bc 100644
--- a/frontend/app/components/Dashboard/components/WidgetDateRange/WidgetDateRange.tsx
+++ b/frontend/app/components/Dashboard/components/WidgetDateRange/WidgetDateRange.tsx
@@ -27,6 +27,8 @@ function WidgetDateRange({
                 period={period}
                 onChange={onChangePeriod}
                 right={true}
+                isAnt={true}
+                useButtonStyle={true}
             />
         </Space>
     );
diff --git a/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapperNew.tsx b/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapperNew.tsx
index 8fb7bec07..043d0fc04 100644
--- a/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapperNew.tsx
+++ b/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapperNew.tsx
@@ -93,9 +93,9 @@ function WidgetWrapperNew(props: Props & RouteComponentProps) {
     return (
         <Card
             className={cn(
-                'relative group',
+                'relative group rounded-lg',
                 'col-span-' + widget.config.col,
-                {'hover:shadow': !isTemplate && isWidget},
+                {'hover:shadow-sm': !isTemplate && isWidget},
             )}
             style={{
                 userSelect: 'none',
diff --git a/frontend/app/components/ForgotPassword/ForgotPassword.tsx b/frontend/app/components/ForgotPassword/ForgotPassword.tsx
index 2f962e94b..253c7283d 100644
--- a/frontend/app/components/ForgotPassword/ForgotPassword.tsx
+++ b/frontend/app/components/ForgotPassword/ForgotPassword.tsx
@@ -1,6 +1,7 @@
 import Copyright from 'Shared/Copyright';
 import React from 'react';
-import { Form, Input, Loader, Button, Link, Icon, Message } from 'UI';
+import { Form, Input, Loader, Link, Icon, Message } from 'UI';
+import {Button} from 'antd';
 import { login as loginRoute } from 'App/routes';
 import { connect } from 'react-redux';
 import ResetPassword from './ResetPasswordRequest';
@@ -41,7 +42,7 @@ function ForgotPassword(props: Props) {
           <div className="flex flex-col items-center justify-center">
             <div className="my-8">
               <Link to={LOGIN}>
-                <div className="link">{'Back to Login'}</div>
+                <Button type="link" >{'Back to Login'}</Button>
               </Link>
             </div>
           </div>
diff --git a/frontend/app/components/ForgotPassword/ResetPasswordRequest.tsx b/frontend/app/components/ForgotPassword/ResetPasswordRequest.tsx
index 5c970457c..4be5b00c1 100644
--- a/frontend/app/components/ForgotPassword/ResetPasswordRequest.tsx
+++ b/frontend/app/components/ForgotPassword/ResetPasswordRequest.tsx
@@ -75,7 +75,7 @@ function ResetPasswordRequest(props: Props) {
                 required
               />
             </Form.Field>
-            <Button type="submit" variant="primary" className="mt-4" loading={loading} disabled={loading}>
+            <Button type="submit" variant="primary" className="mt-4 rounded-lg" loading={loading} disabled={loading}>
               Email password reset link
             </Button>
           </>
diff --git a/frontend/app/components/Login/Login.tsx b/frontend/app/components/Login/Login.tsx
index 519f693c3..e59be3a85 100644
--- a/frontend/app/components/Login/Login.tsx
+++ b/frontend/app/components/Login/Login.tsx
@@ -141,7 +141,7 @@ const Login: React.FC<LoginProps> = ({errors, loading, authDetails, login, setJw
               <div className="px-8 w-full">
                 <Button
                   data-test-id={'log-button'}
-                  className="mt-2 w-full text-center"
+                  className="mt-2 w-full text-center rounded-lg"
                   type="submit"
                   variant="primary"
                 >
diff --git a/frontend/app/components/ui/Input/Input.tsx b/frontend/app/components/ui/Input/Input.tsx
index 13ee8d0b1..89698cb79 100644
--- a/frontend/app/components/ui/Input/Input.tsx
+++ b/frontend/app/components/ui/Input/Input.tsx
@@ -24,7 +24,7 @@ const Input = React.forwardRef((props: Props, ref: any) => {
                     rows={rows}
                     style={{ resize: 'none' }}
                     maxLength={500}
-                    className={cn('p-2 border border-gray-light bg-white w-full rounded', className, { 'pl-10': icon })}
+                    className={cn('p-2 border border-gray-light bg-white w-full rounded-lg', className, { 'pl-10': icon })}
                     {...rest}
                 />
             ) : (
@@ -32,7 +32,7 @@ const Input = React.forwardRef((props: Props, ref: any) => {
                     ref={ref}
                     type={type}
                     style={{ height: `${height}px`, width: width? `${width}px` : '' }}
-                    className={cn('p-2 border border-gray-light bg-white w-full rounded', className, { 'pl-10': icon })}
+                    className={cn('p-2 border border-gray-light bg-white w-full rounded-lg', className, { 'pl-10': icon })}
                     {...rest}
                 />
             )}