diff --git a/README.md b/README.md
index 43ae586e8..f0092b6a3 100644
--- a/README.md
+++ b/README.md
@@ -266,7 +266,7 @@ _Collections are synced with cloud / local session storage_
 
 </details>
 
-_Official proxy server is hosted by Hoppscotch - **[GitHub](https://github.com/hoppscotch/proxyscotch)** - **[Privacy Policy](https://github.com/hoppscotch/proxyscotch/wiki/Privacy-policy)**_
+_Official proxy server is hosted by Hoppscotch - **[GitHub](https://github.com/hoppscotch/proxyscotch)** - **[Privacy Policy](https://docs.hoppscotch.io/privacy)**_
 
 📜 **Pre-Request Scripts β:** Snippets of code associated with a request that are executed before the request is sent.
 
@@ -300,7 +300,7 @@ _Official proxy server is hosted by Hoppscotch - **[GitHub](https://github.com/h
 
 ⌨️ **Keyboard Shortcuts:** Optimized for efficiency.
 
-> **[Shortcuts WIki](https://github.com/hoppscotch/hoppscotch/wiki/Shortcuts)**
+> **[Shortcuts](https://docs.hoppscotch.io/features/shortcuts)**
 
 🌎 **i18n:** Experience the app in your own language.
 
@@ -408,7 +408,7 @@ _Add-ons are developed and maintained under **[Official Hoppscotch Organization]
 
 </details>
 
-**To find out more, please check out [Hoppscotch Wiki](https://github.com/hoppscotch/hoppscotch/wiki).**
+**To find out more, please check out our [Documentation](https://docs.hoppscotch.io).**
 
 ## **Demo**
 
diff --git a/components/app/Footer.vue b/components/app/Footer.vue
index f5770113e..3272c2d96 100644
--- a/components/app/Footer.vue
+++ b/components/app/Footer.vue
@@ -32,16 +32,12 @@
             arrow
           >
             <template #trigger>
-              <ButtonSecondary
-                v-tippy="{ theme: 'tooltip' }"
-                icon="help_center"
-                :title="$t('app.help')"
-              />
+              <ButtonSecondary icon="help_center" :label="$t('app.help')" />
             </template>
             <div class="flex flex-col">
               <SmartItem
                 :label="$t('app.documentation')"
-                to="https://github.com/hoppscotch/hoppscotch/wiki"
+                to="https://docs.hoppscotch.io"
                 blank
                 @click.native="$refs.options.tippy().hide()"
               />
@@ -74,7 +70,7 @@
               />
               <SmartItem
                 :label="$t('app.terms_and_privacy')"
-                to="https://github.com/hoppscotch/hoppscotch/wiki/Privacy-Policy"
+                to="https://docs.hoppscotch.io/privacy"
                 blank
                 @click.native="$refs.options.tippy().hide()"
               />
diff --git a/components/app/Header.vue b/components/app/Header.vue
index 5f4fed02b..1293be9d0 100644
--- a/components/app/Header.vue
+++ b/components/app/Header.vue
@@ -121,10 +121,7 @@ export default defineComponent({
               setLocalConfig("cookiesAllowed", "yes")
               toastObject.goAway(0)
               window
-                .open(
-                  "https://github.com/hoppscotch/hoppscotch/wiki/Privacy-Policy",
-                  "_blank"
-                )
+                .open("https://docs.hoppscotch.io/privacy", "_blank")
                 .focus()
             },
           },
diff --git a/components/app/Support.vue b/components/app/Support.vue
index 53218fcae..e6831e35a 100644
--- a/components/app/Support.vue
+++ b/components/app/Support.vue
@@ -9,7 +9,7 @@
         <SmartItem
           icon="menu_book"
           :label="$t('app.documentation')"
-          to="https://github.com/hoppscotch/hoppscotch/wiki"
+          to="https://docs.hoppscotch.io"
           :description="$t('support.documentation')"
           info-icon="chevron_right"
           active
diff --git a/components/firebase/Login.vue b/components/firebase/Login.vue
index 7d50e425f..7c3da52c2 100644
--- a/components/firebase/Login.vue
+++ b/components/firebase/Login.vue
@@ -80,14 +80,14 @@
         By signing in, you are agreeing to our
         <SmartAnchor
           class="link"
-          to="https://github.com/hoppscotch/hoppscotch/wiki/Terms-&-Conditions"
+          to="https://docs.hoppscotch.io/terms"
           blank
           label="Terms of Service"
         />
         and
         <SmartAnchor
           class="link"
-          to="https://github.com/hoppscotch/hoppscotch/wiki/Privacy-Policy"
+          to="https://docs.hoppscotch.io/privacy"
           blank
           label="Privacy Policy"
         />.
diff --git a/components/http/PreRequestScript.vue b/components/http/PreRequestScript.vue
index 2489f89e0..7231dfc14 100644
--- a/components/http/PreRequestScript.vue
+++ b/components/http/PreRequestScript.vue
@@ -64,7 +64,7 @@
         <SmartAnchor
           class="link"
           :label="$t('action.learn_more')"
-          to="https://github.com/hoppscotch/hoppscotch/wiki/Pre-Request-Scripts"
+          to="https://docs.hoppscotch.io/features/pre-request-script"
           blank
         />
         <h4 class="font-bold text-secondaryLight pt-6">
diff --git a/components/http/Request.vue b/components/http/Request.vue
index affc2ec7a..be47f192c 100644
--- a/components/http/Request.vue
+++ b/components/http/Request.vue
@@ -140,7 +140,7 @@
         :label="$t('request.save')"
         :shortcut="[getSpecialKey(), 'S']"
         outline
-        @click.native="showSaveRequestModal = true"
+        @click.native="saveRequest()"
       />
       <span class="flex">
         <tippy
@@ -388,13 +388,21 @@ export default defineComponent({
         const req = getRESTRequest()
 
         // TODO: handle error case (NOTE: saveRequestAsTeams is async)
-        saveRequestAsTeams(
-          apolloClient,
-          JSON.stringify(req),
-          req.name,
-          saveCtx.requestID
-        )
+        try {
+          saveRequestAsTeams(
+            apolloClient,
+            JSON.stringify(req),
+            req.name,
+            saveCtx.requestID
+          )
+        } catch (error) {
+          showSaveRequestModal.value = true
+          return
+        }
       }
+      $toast.success(t("request.saved").toString(), {
+        icon: "done",
+      })
     }
 
     defineActionHandler("request.send-cancel", () => {
@@ -433,6 +441,7 @@ export default defineComponent({
       clearContent,
       copyRequest,
       onSelectMethod,
+      saveRequest,
 
       EXPERIMENTAL_URL_BAR_ENABLED: useSetting("EXPERIMENTAL_URL_BAR_ENABLED"),
 
diff --git a/components/http/Tests.vue b/components/http/Tests.vue
index de12947d1..b894dd1e6 100644
--- a/components/http/Tests.vue
+++ b/components/http/Tests.vue
@@ -64,7 +64,7 @@
         <SmartAnchor
           class="link"
           :label="$t('action.learn_more')"
-          to="https://github.com/hoppscotch/hoppscotch/wiki/Post-Request-Tests"
+          to="https://docs.hoppscotch.io/features/tests"
           blank
         />
         <h4 class="font-bold text-secondaryLight pt-6">
diff --git a/locales/en.json b/locales/en.json
index c07f3d1d1..ba536a279 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -42,7 +42,8 @@
     "contact_us": "Contact us",
     "copy": "Copy",
     "documentation": "Documentation",
-    "help": "Help, feedback and</br>documentation",
+    "help": "Help & feedback",
+    "reload": "Reload",
     "home": "Home",
     "invite": "Invite",
     "invite_description": "In Hoppscotch, we designed a simple and intuitive interface for creating and managing your APIs. Hoppscotch is a tool that helps you build, test, document and share your APIs.",
@@ -264,6 +265,7 @@
     "name": "Request name",
     "parameter_list": "Query Parameters",
     "parameters": "Parameters",
+    "saved": "Request saved",
     "payload": "Payload",
     "query": "Query",
     "raw_body": "Raw Request Body",
diff --git a/pages/settings.vue b/pages/settings.vue
index 7925031be..8d1965d9e 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -294,7 +294,7 @@
               }}
               <SmartLink
                 class="link"
-                to="https://github.com/hoppscotch/proxyscotch/wiki/Privacy-policy"
+                to="https://docs.hoppscotch.io/privacy"
                 blank
               >
                 {{ $t("app.proxy_privacy_policy") }} </SmartLink