diff --git a/src/pages/en/utokyo_wifi/certificate_renewal.mdx b/src/pages/en/utokyo_wifi/certificate_renewal.mdx
index 1239ed4181..c5d40cb85a 100644
--- a/src/pages/en/utokyo_wifi/certificate_renewal.mdx
+++ b/src/pages/en/utokyo_wifi/certificate_renewal.mdx
@@ -20,7 +20,7 @@ You may be unable to access the “UTokyo Wi-Fi Account Menu” normally. Please
* There are two types of fingerprints (SHA-1 and SHA-256) listed on [Connect Configuration](/en/utokyo_wifi/#connect-configuration);matching one type will suffice
* Note that the displayed screens and behavior may vary depending on the OS or device types.
{:.medium.center.border}
- {:.medium.center.border}{:.medium.center.border}
+ {:.medium.center.border}{:.medium.center.border}
## Troubleshooting guide
diff --git a/src/pages/en/utokyo_wifi/img/windows10-certificate.jpg b/src/pages/en/utokyo_wifi/img/windows10-certificate.jpg
deleted file mode 100644
index 343ef82144..0000000000
Binary files a/src/pages/en/utokyo_wifi/img/windows10-certificate.jpg and /dev/null differ
diff --git a/src/pages/en/utokyo_wifi/img/windows10-createprofile.jpg b/src/pages/en/utokyo_wifi/img/windows10-createprofile.jpg
deleted file mode 100644
index 0f50199fdd..0000000000
Binary files a/src/pages/en/utokyo_wifi/img/windows10-createprofile.jpg and /dev/null differ
diff --git a/src/pages/en/utokyo_wifi/img/windows10-deleteprofile.jpg b/src/pages/en/utokyo_wifi/img/windows10-deleteprofile.jpg
deleted file mode 100644
index 92c174df1d..0000000000
Binary files a/src/pages/en/utokyo_wifi/img/windows10-deleteprofile.jpg and /dev/null differ
diff --git a/src/pages/en/utokyo_wifi/img/windows10-selectssid.PNG b/src/pages/en/utokyo_wifi/img/windows10-selectssid.PNG
deleted file mode 100644
index f5c741fa4c..0000000000
Binary files a/src/pages/en/utokyo_wifi/img/windows10-selectssid.PNG and /dev/null differ
diff --git a/src/pages/en/utokyo_wifi/img/windows10-turnon-globe.PNG b/src/pages/en/utokyo_wifi/img/windows10-turnon-globe.PNG
deleted file mode 100644
index 914c195ffe..0000000000
Binary files a/src/pages/en/utokyo_wifi/img/windows10-turnon-globe.PNG and /dev/null differ
diff --git a/src/pages/en/utokyo_wifi/img/windows10-turnon-sector.PNG b/src/pages/en/utokyo_wifi/img/windows10-turnon-sector.PNG
deleted file mode 100644
index f61b00d9ac..0000000000
Binary files a/src/pages/en/utokyo_wifi/img/windows10-turnon-sector.PNG and /dev/null differ
diff --git a/src/pages/en/utokyo_wifi/img/windows11-certificate.png b/src/pages/en/utokyo_wifi/img/windows11-certificate.png
new file mode 100644
index 0000000000..2101ffa071
Binary files /dev/null and b/src/pages/en/utokyo_wifi/img/windows11-certificate.png differ
diff --git a/src/pages/en/utokyo_wifi/img/windows11-createprofile.png b/src/pages/en/utokyo_wifi/img/windows11-createprofile.png
new file mode 100644
index 0000000000..ca516648d1
Binary files /dev/null and b/src/pages/en/utokyo_wifi/img/windows11-createprofile.png differ
diff --git a/src/pages/en/utokyo_wifi/img/windows11-deleteprofile.png b/src/pages/en/utokyo_wifi/img/windows11-deleteprofile.png
new file mode 100644
index 0000000000..3ed19041ea
Binary files /dev/null and b/src/pages/en/utokyo_wifi/img/windows11-deleteprofile.png differ
diff --git a/src/pages/en/utokyo_wifi/img/windows11-selectssid-2.png b/src/pages/en/utokyo_wifi/img/windows11-selectssid-2.png
new file mode 100644
index 0000000000..22545ecb7d
Binary files /dev/null and b/src/pages/en/utokyo_wifi/img/windows11-selectssid-2.png differ
diff --git a/src/pages/en/utokyo_wifi/img/windows11-selectssid.png b/src/pages/en/utokyo_wifi/img/windows11-selectssid.png
new file mode 100644
index 0000000000..e4313b4a5a
Binary files /dev/null and b/src/pages/en/utokyo_wifi/img/windows11-selectssid.png differ
diff --git a/src/pages/en/utokyo_wifi/img/windows11-turnon-globe.png b/src/pages/en/utokyo_wifi/img/windows11-turnon-globe.png
new file mode 100644
index 0000000000..e5d4562ed2
Binary files /dev/null and b/src/pages/en/utokyo_wifi/img/windows11-turnon-globe.png differ
diff --git a/src/pages/en/utokyo_wifi/img/windows11-turnon-sector.png b/src/pages/en/utokyo_wifi/img/windows11-turnon-sector.png
new file mode 100644
index 0000000000..2d9d507fa1
Binary files /dev/null and b/src/pages/en/utokyo_wifi/img/windows11-turnon-sector.png differ
diff --git a/src/pages/en/utokyo_wifi/windows.mdx b/src/pages/en/utokyo_wifi/windows.mdx
index c0419914b3..82618f0db1 100644
--- a/src/pages/en/utokyo_wifi/windows.mdx
+++ b/src/pages/en/utokyo_wifi/windows.mdx
@@ -23,40 +23,42 @@ import Mfa100 from "./_Mfa100.mdx";
{:#procedure}
### Step 1: Enable the Wi-Fi function in the taskbar
{:#turn-on}
-Select the globe icon in the taskbar, and then select the fan-shaped “Wi-Fi” icon to enable the Wi-Fi function.
-If there is only the fan-shaped “Wi-Fi” icon but no globe icon, simply select the former.
-{:.medium.center.border}
-{:.medium.center.border}
+Select the globe icon in the taskbar, and then select the “>” icon next to fan-shaped “Wi-Fi” icon to enable the Wi-Fi function. If there is only the fan-shaped “Wi-Fi” icon but no globe icon, simply select the former.
+{:.medium.center}
+
+{:.medium.center}
### Step 2: Select the proper SSID from the SSID list
{:#select-ssid}
-{:.medium.center.border}
+
+{:.medium.center}{:.medium.center}
### Step 3: Delete the existing Wi-Fi setting information
{:#delete-profile}
Right click the SSID you found in Step 2, select “Forget” from the displayed menu.
-{:.medium.center.border}
+{:.medium.center}
### Step 4: Enter the required information and connect
{:#create-profile}
-Select the SSID named `0000UTokyo` from the SSID list again.
-The screen of the Wi-Fi settings will be displayed after you select the SSID. To enter the required setting information into each field, follow the instructions below. You do not have to set those items that are shown in the following table but are not displayed on the screen. Once you have entered the setting information, select the connection button.
+Select the SSID named `0000UTokyo` from the SSID list again, and select the “Connect” button.
+
+The screen of the Wi-Fi settings will be displayed. To enter the required setting information into each field, follow the instructions below. You do not have to set those items that are shown in the following table but are not displayed on the screen. Once you have entered the setting information, select the connection button.
| Field name | Content |
| :-----------: | :------------------- |
-| Username | Enter the user ID for the UTokyo Wi-Fi (Begin with a `u` and ending with `@wifi.u-tokyo.ac.jp`). |
+| User name | Enter the user ID for the UTokyo Wi-Fi (Begin with a `u` and ending with `@wifi.u-tokyo.ac.jp`). |
| Password | Enter the password for the UTokyo Wi-Fi. |
-{:.medium.center.border}
+{:.medium.center}
#### Supplement
{:#create-profile-notes}
* Enter the user ID and password for the UTokyo Wi-Fi account into the fields of “User name” and “Password”. Note that they are not the regular ID and password for the UTokyo Account. You can check the user ID and password in the notification email described in the ”**Preparation**” step or the screen of the completed application.
* If there are any setting items other than mentioned above, please configure them as needed. If you have no particular preferences, you can leave the default settings.
-* During the connecting operation, a screen asking if you trust the certificate may appear. To verify whether the certificate is correct, compare the "server fingerprint" of the displayed certificate with the fingerprint listed in 「[Connect Configuration](/utokyo_wifi/#connect-configuration)」. If they match, trust the certificate.
- * In addition, there are two types of fingerprints (SHA-1 and SHA-256) listed on [Connect Configuration](/en/utokyo_wifi/#connect-configuration);matching one type will suffice
+* During the connecting operation, a screen asking if you trust the certificate may appear. To verify whether the certificate is correct, compare the "server fingerprint" of the displayed certificate with the fingerprint listed in “[Connect Configuration](../#connect-configuration)”. If they match, trust the certificate.
+ * In addition, there are two types of fingerprints (SHA-1 and SHA-256) listed on [Connect Configuration](../#connect-configuration); matching one type will suffice
## Troubleshooting guide