diff --git a/web/app/(shareLayout)/webapp-reset-password/layout.tsx b/web/app/(shareLayout)/webapp-reset-password/layout.tsx
index c7df9ecd27..e0ac6b9ad6 100644
--- a/web/app/(shareLayout)/webapp-reset-password/layout.tsx
+++ b/web/app/(shareLayout)/webapp-reset-password/layout.tsx
@@ -17,7 +17,7 @@ export default function SignInLayout({ children }: any) {
             'md:px-[108px]',
           )
         }>
-          <div className='flex flex-col md:w-[400px]'>
+          <div className='flex w-[400px] flex-col'>
             {children}
           </div>
         </div>
diff --git a/web/app/(shareLayout)/webapp-signin/LoginLogo.tsx b/web/app/(shareLayout)/webapp-signin/LoginLogo.tsx
deleted file mode 100644
index 73dfb88205..0000000000
--- a/web/app/(shareLayout)/webapp-signin/LoginLogo.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-'use client'
-import type { FC } from 'react'
-import classNames from '@/utils/classnames'
-import { useGlobalPublicStore } from '@/context/global-public-context'
-import { useTheme } from 'next-themes'
-
-type LoginLogoProps = {
-  className?: string
-}
-
-const LoginLogo: FC<LoginLogoProps> = ({
-  className,
-}) => {
-  const { systemFeatures } = useGlobalPublicStore()
-  const { theme } = useTheme()
-
-  let src = theme === 'light' ? '/logo/logo-site.png' : `/logo/logo-site-${theme}.png`
-  if (systemFeatures.branding.enabled)
-    src = systemFeatures.branding.login_page_logo
-
-  return (
-    <img
-      src={src}
-      className={classNames('block w-auto h-10', className)}
-      alt='logo'
-    />
-  )
-}
-
-export default LoginLogo
diff --git a/web/app/(shareLayout)/webapp-signin/_header.tsx b/web/app/(shareLayout)/webapp-signin/_header.tsx
deleted file mode 100644
index 5e85a8d306..0000000000
--- a/web/app/(shareLayout)/webapp-signin/_header.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-'use client'
-import React from 'react'
-import { useContext } from 'use-context-selector'
-import Select from '@/app/components/base/select/locale'
-import Divider from '@/app/components/base/divider'
-import { languages } from '@/i18n/language'
-import type { Locale } from '@/i18n'
-import I18n from '@/context/i18n'
-import dynamic from 'next/dynamic'
-
-// Avoid rendering the logo and theme selector on the server
-const DifyLogo = dynamic(() => import('@/app/components/base/logo/dify-logo'), {
-  ssr: false,
-  loading: () => <div className='h-7 w-16 bg-transparent' />,
-})
-const ThemeSelector = dynamic(() => import('@/app/components/base/theme-selector'), {
-  ssr: false,
-  loading: () => <div className='size-8 bg-transparent' />,
-})
-
-const Header = () => {
-  const { locale, setLocaleOnClient } = useContext(I18n)
-
-  return (
-    <div className='flex w-full items-center justify-between p-6'>
-      <DifyLogo size='large' />
-      <div className='flex items-center gap-1'>
-        <Select
-          value={locale}
-          items={languages.filter(item => item.supported)}
-          onChange={(value) => {
-            setLocaleOnClient(value as Locale)
-          }}
-        />
-        <Divider type='vertical' className='mx-0 ml-2 h-4' />
-        <ThemeSelector />
-      </div>
-    </div>
-  )
-}
-
-export default Header
diff --git a/web/app/(shareLayout)/webapp-signin/assets/github.svg b/web/app/(shareLayout)/webapp-signin/assets/github.svg
deleted file mode 100644
index f03798b5e1..0000000000
--- a/web/app/(shareLayout)/webapp-signin/assets/github.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_131_1011)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.0003 0.5C9.15149 0.501478 6.39613 1.51046 4.22687 3.34652C2.05761 5.18259 0.615903 7.72601 0.159545 10.522C-0.296814 13.318 0.261927 16.1842 1.73587 18.6082C3.20981 21.0321 5.50284 22.8558 8.20493 23.753C8.80105 23.8636 9.0256 23.4941 9.0256 23.18C9.0256 22.8658 9.01367 21.955 9.0097 20.9592C5.6714 21.6804 4.96599 19.5505 4.96599 19.5505C4.42152 18.1674 3.63464 17.8039 3.63464 17.8039C2.54571 17.065 3.71611 17.0788 3.71611 17.0788C4.92227 17.1637 5.55616 18.3097 5.55616 18.3097C6.62521 20.1333 8.36389 19.6058 9.04745 19.2976C9.15475 18.5251 9.46673 17.9995 9.8105 17.7012C7.14383 17.4008 4.34204 16.3774 4.34204 11.8054C4.32551 10.6197 4.76802 9.47305 5.57801 8.60268C5.45481 8.30236 5.04348 7.08923 5.69524 5.44143C5.69524 5.44143 6.7027 5.12135 8.9958 6.66444C10.9627 6.12962 13.0379 6.12962 15.0047 6.66444C17.2958 5.12135 18.3013 5.44143 18.3013 5.44143C18.9551 7.08528 18.5437 8.29841 18.4205 8.60268C19.2331 9.47319 19.6765 10.6218 19.6585 11.8094C19.6585 16.3912 16.8507 17.4008 14.1801 17.6952C14.6093 18.0667 14.9928 18.7918 14.9928 19.9061C14.9928 21.5026 14.9789 22.7868 14.9789 23.18C14.9789 23.4981 15.1955 23.8695 15.8035 23.753C18.5059 22.8557 20.7992 21.0317 22.2731 18.6073C23.747 16.183 24.3055 13.3163 23.8486 10.5201C23.3917 7.7238 21.9493 5.18035 19.7793 3.34461C17.6093 1.50886 14.8533 0.500541 12.0042 0.5H12.0003Z" fill="#191717"/>
-<path d="M4.54444 17.6321C4.5186 17.6914 4.42322 17.7092 4.34573 17.6677C4.26823 17.6262 4.21061 17.5491 4.23843 17.4879C4.26625 17.4266 4.35964 17.4108 4.43714 17.4523C4.51463 17.4938 4.57424 17.5729 4.54444 17.6321Z" fill="#191717"/>
-<path d="M5.03123 18.1714C4.99008 18.192 4.943 18.1978 4.89805 18.1877C4.8531 18.1776 4.81308 18.1523 4.78483 18.1161C4.70734 18.0331 4.69143 17.9185 4.75104 17.8671C4.81066 17.8157 4.91797 17.8395 4.99546 17.9224C5.07296 18.0054 5.09084 18.12 5.03123 18.1714Z" fill="#191717"/>
-<path d="M5.50425 18.857C5.43072 18.9084 5.30553 18.857 5.23598 18.7543C5.21675 18.7359 5.20146 18.7138 5.19101 18.6893C5.18056 18.6649 5.17517 18.6386 5.17517 18.612C5.17517 18.5855 5.18056 18.5592 5.19101 18.5347C5.20146 18.5103 5.21675 18.4882 5.23598 18.4698C5.3095 18.4204 5.4347 18.4698 5.50425 18.5705C5.57379 18.6713 5.57578 18.8057 5.50425 18.857V18.857Z" fill="#191717"/>
-<path d="M6.14612 19.5207C6.08054 19.5939 5.94741 19.5741 5.83812 19.4753C5.72883 19.3765 5.70299 19.2422 5.76857 19.171C5.83414 19.0999 5.96727 19.1197 6.08054 19.2165C6.1938 19.3133 6.21566 19.4496 6.14612 19.5207V19.5207Z" fill="#191717"/>
-<path d="M7.04617 19.9081C7.01637 20.001 6.88124 20.0425 6.74612 20.003C6.611 19.9635 6.52158 19.8528 6.54741 19.758C6.57325 19.6631 6.71036 19.6197 6.84747 19.6631C6.98457 19.7066 7.07201 19.8113 7.04617 19.9081Z" fill="#191717"/>
-<path d="M8.02783 19.9752C8.02783 20.072 7.91656 20.155 7.77349 20.1569C7.63042 20.1589 7.51318 20.0799 7.51318 19.9831C7.51318 19.8863 7.62445 19.8033 7.76752 19.8013C7.91059 19.7993 8.02783 19.8764 8.02783 19.9752Z" fill="#191717"/>
-<path d="M8.9419 19.8232C8.95978 19.92 8.86042 20.0207 8.71735 20.0445C8.57428 20.0682 8.4491 20.0109 8.43121 19.916C8.41333 19.8212 8.51666 19.7185 8.65576 19.6928C8.79485 19.6671 8.92401 19.7264 8.9419 19.8232Z" fill="#191717"/>
-</g>
-<defs>
-<clipPath id="clip0_131_1011">
-<rect width="24" height="24" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/web/app/(shareLayout)/webapp-signin/assets/google.svg b/web/app/(shareLayout)/webapp-signin/assets/google.svg
deleted file mode 100644
index 6bcacfcddc..0000000000
--- a/web/app/(shareLayout)/webapp-signin/assets/google.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_729_2080)">
-<path d="M20.3052 10.2302C20.3052 9.55044 20.2501 8.86699 20.1325 8.19824H10.7002V12.0491H16.1016C15.8775 13.291 15.1573 14.3897 14.1027 15.0878V17.5864H17.3252C19.2176 15.8448 20.3052 13.2726 20.3052 10.2302Z" fill="#4285F4"/>
-<path d="M10.6999 20.0008C13.397 20.0008 15.6714 19.1152 17.3286 17.5867L14.1061 15.088C13.2096 15.698 12.0521 16.0434 10.7036 16.0434C8.09474 16.0434 5.88272 14.2833 5.08904 11.917H1.76367V14.4928C3.46127 17.8696 6.91892 20.0008 10.6999 20.0008Z" fill="#34A853"/>
-<path d="M5.08564 11.9172C4.66676 10.6753 4.66676 9.33044 5.08564 8.08848V5.5127H1.76395C0.345611 8.33834 0.345611 11.6674 1.76395 14.493L5.08564 11.9172Z" fill="#FBBC04"/>
-<path d="M10.6999 3.95805C12.1256 3.936 13.5035 4.47247 14.536 5.45722L17.3911 2.60218C15.5833 0.904587 13.1838 -0.0287217 10.6999 0.000673888C6.91892 0.000673888 3.46126 2.13185 1.76367 5.51234L5.08537 8.08813C5.87537 5.71811 8.09106 3.95805 10.6999 3.95805Z" fill="#EA4335"/>
-</g>
-<defs>
-<clipPath id="clip0_729_2080">
-<rect width="20" height="20" fill="white" transform="translate(0.5)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/web/app/(shareLayout)/webapp-signin/check-code/page.tsx b/web/app/(shareLayout)/webapp-signin/check-code/page.tsx
index 3231cb4fbb..394de93400 100644
--- a/web/app/(shareLayout)/webapp-signin/check-code/page.tsx
+++ b/web/app/(shareLayout)/webapp-signin/check-code/page.tsx
@@ -81,7 +81,7 @@ export default function CheckCode() {
     catch (error) { console.error(error) }
   }
 
-  return <div className='flex flex-col gap-3'>
+  return <div className='flex w-[400px] flex-col gap-3'>
     <div className='inline-flex h-14 w-14 items-center justify-center rounded-2xl border border-components-panel-border-subtle bg-background-default-dodge shadow-lg'>
       <RiMailSendFill className='h-6 w-6 text-2xl text-text-accent-light-mode-only' />
     </div>
diff --git a/web/app/(shareLayout)/webapp-signin/layout.tsx b/web/app/(shareLayout)/webapp-signin/layout.tsx
index e42bd9f10a..39d8ceea37 100644
--- a/web/app/(shareLayout)/webapp-signin/layout.tsx
+++ b/web/app/(shareLayout)/webapp-signin/layout.tsx
@@ -1,5 +1,5 @@
 'use client'
-import Header from './_header'
+import Header from '@/app/signin/_header'
 
 import cn from '@/utils/classnames'
 import { useGlobalPublicStore } from '@/context/global-public-context'
diff --git a/web/app/(shareLayout)/webapp-signin/page.module.css b/web/app/(shareLayout)/webapp-signin/page.module.css
deleted file mode 100644
index eda396f763..0000000000
--- a/web/app/(shareLayout)/webapp-signin/page.module.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.githubIcon {
-  background: center/contain url('./assets/github.svg');
-}
-
-.googleIcon {
-  background: center/contain url('./assets/google.svg');
-}