diff --git a/src/app/components/Badge/index.tsx b/src/app/components/Badge/index.tsx
index 2fe880828a..277eb143b4 100644
--- a/src/app/components/Badge/index.tsx
+++ b/src/app/components/Badge/index.tsx
@@ -1,24 +1,39 @@
-import { useTranslation } from "react-i18next";
+import { PopiconsXLine } from "@popicons/react";
 import { classNames } from "~/app/utils";
 
 type Props = {
-  label: "budget" | "auth" | "imported";
+  label: string;
   className: string;
+  onDelete?: () => void;
+  description?: string;
 };
 
-export default function Badge({ label, className }: Props) {
-  const { t: tComponents } = useTranslation("components", {
-    keyPrefix: "badge",
-  });
-
+export default function Badge({
+  label,
+  className,
+  onDelete,
+  description,
+}: Props) {
   return (
-    <span
+    <div
       className={classNames(
-        "inline-block leading-none rounded-full font-medium mr-2 py-1 px-2 text-xs",
+        "inline-flex items-center leading-none rounded-full font-medium mr-2 py-1 pr-2 pl-3 mb-2 text-xs cursor-default",
         className
       )}
+      title={description}
     >
-      {tComponents(`label.${label}`)}
-    </span>
+      {label.toUpperCase()}
+      {onDelete && (
+        <button
+          type="button"
+          onClick={() => {
+            onDelete();
+          }}
+          className="text-gray-400 dark:text-neutral-600 hover:text-gray-600 dark:hover:text-neutral-400"
+        >
+          <PopiconsXLine className="w-4 h-4" />
+        </button>
+      )}
+    </div>
   );
 }
diff --git a/src/app/components/BadgesList/index.tsx b/src/app/components/BadgesList/index.tsx
index 524121449d..f0b7694071 100644
--- a/src/app/components/BadgesList/index.tsx
+++ b/src/app/components/BadgesList/index.tsx
@@ -1,4 +1,5 @@
 import Badge from "@components/Badge";
+import { useTranslation } from "react-i18next";
 import type { Allowance, Badge as BadgeType } from "~/types";
 
 type Props = {
@@ -6,6 +7,9 @@ type Props = {
 };
 
 export default function BadgesList({ allowance }: Props) {
+  const { t: tComponents } = useTranslation("components", {
+    keyPrefix: "badge",
+  });
   const badges: BadgeType[] = [];
   if (allowance.remainingBudget > 0) {
     badges.push({
@@ -23,7 +27,13 @@ export default function BadgesList({ allowance }: Props) {
   return (
     <>
       {badges?.map((b) => {
-        return <Badge key={b.label} label={b.label} className={b.className} />;
+        return (
+          <Badge
+            key={b.label}
+            label={tComponents(`label.${b.label}`)}
+            className={b.className}
+          />
+        );
       })}
     </>
   );
diff --git a/src/app/components/Modal/index.tsx b/src/app/components/Modal/index.tsx
index 7d9580fe51..100d484d78 100644
--- a/src/app/components/Modal/index.tsx
+++ b/src/app/components/Modal/index.tsx
@@ -36,7 +36,7 @@ export default function Modal({
       style={{ content: { maxHeight: "80vh" } }}
     >
       {title && (
-        <h2 className="text-2xl font-bold dark:text-white mb-6">{title}</h2>
+        <h2 className="text-2xl font-bold dark:text-white pb-5">{title}</h2>
       )}
       <button
         onClick={closeModal}
diff --git a/src/app/components/PermissionModal/index.tsx b/src/app/components/PermissionModal/index.tsx
new file mode 100644
index 0000000000..792fc0878d
--- /dev/null
+++ b/src/app/components/PermissionModal/index.tsx
@@ -0,0 +1,114 @@
+import { useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
+import Button from "~/app/components/Button";
+import Modal from "~/app/components/Modal";
+import PublisherCard from "~/app/components/PublisherCard";
+import { useNavigationState } from "~/app/hooks/useNavigationState";
+import { classNames } from "~/app/utils";
+
+import { OriginData, PermissionOption } from "~/types";
+
+type Props = {
+  onClose: () => void;
+  isOpen: boolean;
+  permissionCallback: (permission: PermissionOption) => void;
+  permission: PermissionOption;
+};
+
+export default function PermissionModal({
+  isOpen,
+  onClose,
+  permissionCallback,
+  permission,
+}: Props) {
+  const { t: tCommon } = useTranslation("common");
+
+  const { t } = useTranslation("components", {
+    keyPrefix: "permissions_modal",
+  });
+
+  const navState = useNavigationState();
+  const [permissionOption, setPermissionOption] = useState(
+    PermissionOption.ASK_EVERYTIME
+  );
+  const origin = navState.origin as OriginData;
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      close={() => {
+        onClose();
+      }}
+      contentLabel={t("content_label")}
+      position="top"
+    >
+      <div className="dark:text-white mt-6">
+        <PublisherCard
+          title={origin.name}
+          image={origin.icon}
+          url={origin.host}
+          isSmall={false}
+          isCard={false}
+        />
+        <div className="flex flex-col gap-2 py-1">
+          <p className="text-md">{t("set_permissions")}</p>
+
+          <div className="flex flex-col gap-1">
+            <ListItem checkedValue={PermissionOption.ASK_EVERYTIME} />
+            <ListItem checkedValue={PermissionOption.DONT_ASK_CURRENT} />
+            <ListItem checkedValue={PermissionOption.DONT_ASK_ANY} />
+          </div>
+          <div className="flex mt-5">
+            <Button
+              label={tCommon("actions.save")}
+              primary
+              flex
+              onClick={() => permissionCallback(permissionOption)}
+            />
+          </div>
+        </div>
+      </div>
+    </Modal>
+  );
+
+  type ListItemProps = {
+    checkedValue: PermissionOption;
+  };
+
+  function ListItem({ checkedValue }: ListItemProps) {
+    return (
+      <div className="flex flex-row gap-2 items-center py-1">
+        <input
+          type="radio"
+          id={checkedValue}
+          name="permission"
+          value="permission"
+          checked={permissionOption === checkedValue}
+          onChange={() => {
+            setPermissionOption(checkedValue);
+          }}
+          className={classNames(
+            "border border-gray-200 dark:border-neutral-700 cursor-pointer text-primary focus:ring-0 focus:ring-offset-0",
+            permissionOption !== checkedValue
+              ? "bg-white dark:bg-surface-01dp"
+              : ""
+          )}
+        />
+        <label
+          htmlFor={checkedValue}
+          className="text-sm text-gray-600 dark:text-neutral-400 cursor-pointer"
+        >
+          <Trans
+            i18nKey={checkedValue}
+            t={t}
+            values={{ permission }}
+            components={[
+              // eslint-disable-next-line react/jsx-key
+              <b></b>,
+            ]}
+          />
+        </label>
+      </div>
+    );
+  }
+}
diff --git a/src/app/components/PublisherCard/index.tsx b/src/app/components/PublisherCard/index.tsx
index f316829f50..11d410cbb7 100644
--- a/src/app/components/PublisherCard/index.tsx
+++ b/src/app/components/PublisherCard/index.tsx
@@ -31,8 +31,8 @@ export default function PublisherCard({
     <div
       className={classNames(
         isSmall ? "p-2" : "flex-col justify-center p-4",
-        isCard && "drop-shadow rounded-lg mt-4",
-        "flex items-center bg-white dark:bg-surface-02dp"
+        isCard && "drop-shadow rounded-lg mt-4 bg-white dark:bg-surface-02dp",
+        "flex items-center"
       )}
     >
       {image && (
diff --git a/src/app/components/SitePreferences/index.tsx b/src/app/components/SitePreferences/index.tsx
index d04ef5dea8..fe8c260242 100644
--- a/src/app/components/SitePreferences/index.tsx
+++ b/src/app/components/SitePreferences/index.tsx
@@ -3,7 +3,7 @@ import Hyperlink from "@components/Hyperlink";
 import Setting from "@components/Setting";
 import Toggle from "@components/form/Toggle";
 import type { FormEvent } from "react";
-import { Fragment, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import toast from "~/app/components/Toast";
 import { useAccount } from "~/app/context/AccountContext";
@@ -12,6 +12,7 @@ import { PreferencesIcon } from "~/app/icons";
 import msg from "~/common/lib/msg";
 import type { Allowance, Permission } from "~/types";
 
+import Badge from "~/app/components/Badge";
 import Modal from "~/app/components/Modal";
 import DualCurrencyField from "../form/DualCurrencyField/index";
 
@@ -45,6 +46,9 @@ function SitePreferences({ launcherType, allowance, onEdit, onDelete }: Props) {
 
   const { t } = useTranslation("components", { keyPrefix: "allowance_menu" });
   const { t: tCommon } = useTranslation("common");
+  const { t: tNostr } = useTranslation("translation", {
+    keyPrefix: "nostr",
+  });
   const { t: tPermissions } = useTranslation("permissions");
 
   const hasPermissions = !isLoadingPermissions && !!permissions?.length;
@@ -116,6 +120,20 @@ function SitePreferences({ launcherType, allowance, onEdit, onDelete }: Props) {
     return ids;
   }
 
+  // returns actual permission kind (permission name)
+  function getPermissionKind(permission: Permission): string {
+    return permission.method.split(/[./]/).slice(-1).toString();
+  }
+
+  //constructs i18n key for the permission translations
+  function getPermissionKey(permission: Permission): string {
+    if (permission.method.includes("/")) {
+      return permission.method.toLowerCase().split("/").slice(0, 2).join(".");
+    } else {
+      return permission.method.toLowerCase();
+    }
+  }
+
   async function updateAllowance() {
     try {
       await msg.request("updateAllowance", {
@@ -187,7 +205,7 @@ function SitePreferences({ launcherType, allowance, onEdit, onDelete }: Props) {
             updateAllowance();
           }}
         >
-          <div className="pb-4 border-b border-gray-200 dark:border-neutral-700">
+          <div className="pb-5 border-b border-gray-200 dark:border-neutral-700">
             <DualCurrencyField
               id="budget"
               label={t("new_budget.label")}
@@ -200,7 +218,13 @@ function SitePreferences({ launcherType, allowance, onEdit, onDelete }: Props) {
               onChange={(e) => setBudget(e.target.value)}
             />
           </div>
-          <div className={hasPermissions ? "pb-4" : ""}>
+          <div
+            className={
+              hasPermissions
+                ? "py-1 border-b border-gray-200 dark:border-neutral-700"
+                : ""
+            }
+          >
             <Setting
               title={t("enable_login.title")}
               subtitle={t("enable_login.subtitle")}
@@ -214,43 +238,85 @@ function SitePreferences({ launcherType, allowance, onEdit, onDelete }: Props) {
           </div>
 
           {hasPermissions && (
-            <div>
-              <h2 className="pt-4 text-lg text-gray-900 font-bold dark:text-white">
-                {t("edit_permissions")}
+            <div className="flex flex-col gap-4 pb-3 border-b border-gray-200 dark:border-neutral-700">
+              <h2 className="pt-5 text-md text-gray-800 dark:text-neutral-200">
+                {t("website_permissions")}
               </h2>
               <div>
-                {permissions.map((permission) => (
-                  <Fragment key={permission.id}>
-                    <Setting
-                      title={permission.method}
-                      inline={true}
-                      subtitle={tPermissions(
-                        permission.method
-                          .toLowerCase()
-                          .split("/")
-                          .slice(-2)
-                          .join(".") as unknown as TemplateStringsArray
-                      )}
-                      /* split the method at "/", take the last two items in
-                        the array and join them with "." to get the i18n string
-                        webln/lnd/getinfo -> lnd.getinfo
-                        nostr/nip04decrypt --> nostr.nip04decrypt */
-                    >
-                      <Toggle
-                        checked={permission.enabled}
-                        onChange={() => {
-                          setPermissions(
-                            permissions.map((prm) =>
-                              prm.id === permission.id
-                                ? { ...prm, enabled: !prm.enabled }
-                                : prm
-                            )
-                          );
-                        }}
-                      />
-                    </Setting>
-                  </Fragment>
-                ))}
+                <p className="mb-3 text-xs font-semibold text-gray-800 dark:text-neutral-200">
+                  {t("edit_allowance.always_allow")}
+                </p>
+                <div>
+                  {permissions
+                    .filter((x) => x.enabled)
+                    .map((permission) => (
+                      <>
+                        <Badge
+                          key={permission.method}
+                          label={
+                            permission.method
+                              .toLowerCase()
+                              .startsWith("nostr/signmessage")
+                              ? tNostr(
+                                  `kinds.${getPermissionKind(
+                                    permission
+                                  )}.title`,
+                                  {
+                                    defaultValue: tNostr(
+                                      "kinds.unknown.title",
+                                      {
+                                        kind: getPermissionKind(permission),
+                                      }
+                                    ),
+                                  }
+                                )
+                              : tPermissions(
+                                  `${getPermissionKey(permission)}.title`,
+                                  {
+                                    defaultValue: getPermissionKind(permission),
+                                  }
+                                )
+                          }
+                          description={
+                            permission.method
+                              .toLowerCase()
+                              .startsWith("nostr/signmessage")
+                              ? tNostr(
+                                  `kinds.${getPermissionKind(
+                                    permission
+                                  )}.description`,
+                                  {
+                                    defaultValue: tNostr(
+                                      "kinds.unknown.description",
+                                      {
+                                        kind: getPermissionKind(permission),
+                                      }
+                                    ),
+                                  }
+                                )
+                              : tPermissions(
+                                  getPermissionKey(permission).concat(
+                                    ".description"
+                                  ),
+                                  {
+                                    defaultValue: getPermissionKind(permission),
+                                  }
+                                )
+                          }
+                          onDelete={() => {
+                            setPermissions(
+                              permissions.map((prm) =>
+                                prm.id === permission.id
+                                  ? { ...prm, enabled: !prm.enabled }
+                                  : prm
+                              )
+                            );
+                          }}
+                          className="bg-green-100 dark:bg-emerald-950 border border-green-100 dark:border-emerald-950 text-gray-800 dark:text-neutral-200 gap-1"
+                        />
+                      </>
+                    ))}
+                </div>
               </div>
             </div>
           )}
diff --git a/src/app/screens/Accounts/Detail/index.tsx b/src/app/screens/Accounts/Detail/index.tsx
index 5f4449ed1d..42d9a2399b 100644
--- a/src/app/screens/Accounts/Detail/index.tsx
+++ b/src/app/screens/Accounts/Detail/index.tsx
@@ -38,6 +38,9 @@ function AccountDetail() {
     keyPrefix: "accounts.account_view",
   });
   const { t: tCommon } = useTranslation("common");
+  const { t: tComponents } = useTranslation("components", {
+    keyPrefix: "badge",
+  });
   const { isLoading: isLoadingSettings } = useSettings();
 
   const hasFetchedData = useRef(false);
@@ -396,7 +399,7 @@ function AccountDetail() {
                 {nostrPublicKey && hasImportedNostrKey && (
                   <div className="">
                     <Badge
-                      label="imported"
+                      label={tComponents("label.imported")}
                       className="bg-green-bitcoin text-white"
                     />
                   </div>
diff --git a/src/app/screens/Bitcoin/ConfirmGetAddress/index.tsx b/src/app/screens/Bitcoin/ConfirmGetAddress/index.tsx
index 59676eccc5..e7b86b1aab 100644
--- a/src/app/screens/Bitcoin/ConfirmGetAddress/index.tsx
+++ b/src/app/screens/Bitcoin/ConfirmGetAddress/index.tsx
@@ -68,7 +68,7 @@ function BitcoinConfirmGetAddress() {
             <div className="mb-2 flex items-center">
               <PopiconsCheckLine className="w-5 h-5 mr-2" />
               <p className="dark:text-white">
-                {tPermissions("bitcoin.getaddress")}
+                {tPermissions("bitcoin.getaddress.description")}
               </p>
             </div>
           </div>
diff --git a/src/app/screens/Liquid/ConfirmGetAddress.tsx b/src/app/screens/Liquid/ConfirmGetAddress.tsx
index e931291a03..7858899daf 100644
--- a/src/app/screens/Liquid/ConfirmGetAddress.tsx
+++ b/src/app/screens/Liquid/ConfirmGetAddress.tsx
@@ -68,7 +68,7 @@ function LiquidConfirmGetAddress() {
             <div className="mb-2 flex items-center">
               <PopiconsCheckLine className="w-5 h-5 mr-2" />
               <p className="dark:text-white">
-                {tPermissions("liquid.getaddress")}
+                {tPermissions("liquid.getaddress.description")}
               </p>
             </div>
           </div>
diff --git a/src/app/screens/Nostr/ConfirmDecrypt.tsx b/src/app/screens/Nostr/ConfirmDecrypt.tsx
index f0542e6136..4567ddd6be 100644
--- a/src/app/screens/Nostr/ConfirmDecrypt.tsx
+++ b/src/app/screens/Nostr/ConfirmDecrypt.tsx
@@ -58,18 +58,20 @@ function NostrConfirmDecrypt() {
       <ScreenHeader title={t("title")} />
       <form onSubmit={handleSubmit} className="h-full">
         <Container justifyBetween maxWidth="sm">
-          <PublisherCard
-            title={origin.name}
-            image={origin.icon}
-            url={origin.host}
-            isSmall={false}
-          />
-          <div className="dark:text-white pt-6 mb-4">
-            <p className="mb-2">{t("allow", { host: origin.host })}</p>
-            <p className="dark:text-white">
-              <PopiconsCheckLine className="w-5 h-5 mr-2 inline" />
-              {tPermissions("nostr.nip04decrypt")}
-            </p>
+          <div>
+            <PublisherCard
+              title={origin.name}
+              image={origin.icon}
+              url={origin.host}
+              isSmall={false}
+            />
+            <div className="dark:text-white pt-6 mb-4">
+              <p className="mb-2">{t("allow", { host: origin.host })}</p>
+              <p className="dark:text-white">
+                <PopiconsCheckLine className="w-5 h-5 mr-2 inline" />
+                {tPermissions("nostr.decrypt")}
+              </p>
+            </div>
           </div>
 
           <div className="text-center flex flex-col">
diff --git a/src/app/screens/Nostr/ConfirmGetPublicKey.tsx b/src/app/screens/Nostr/ConfirmGetPublicKey.tsx
index 08d01314df..3987069713 100644
--- a/src/app/screens/Nostr/ConfirmGetPublicKey.tsx
+++ b/src/app/screens/Nostr/ConfirmGetPublicKey.tsx
@@ -68,7 +68,7 @@ function NostrConfirmGetPublicKey() {
             <div className="mb-2 flex items-center">
               <PopiconsCheckLine className="w-5 h-5 mr-2" />
               <p className="dark:text-white">
-                {tPermissions("nostr.getpublickey")}
+                {tPermissions("nostr.getpublickey.description")}
               </p>
             </div>
           </div>
diff --git a/src/app/screens/Nostr/ConfirmSignMessage.tsx b/src/app/screens/Nostr/ConfirmSignMessage.tsx
index 8607bcfca5..673db1ff45 100644
--- a/src/app/screens/Nostr/ConfirmSignMessage.tsx
+++ b/src/app/screens/Nostr/ConfirmSignMessage.tsx
@@ -3,18 +3,19 @@ import Container from "@components/Container";
 import ContentMessage from "@components/ContentMessage";
 import PublisherCard from "@components/PublisherCard";
 import SuccessMessage from "@components/SuccessMessage";
-import Checkbox from "@components/form/Checkbox";
+import { PopiconsShieldCheckLine } from "@popicons/react";
 import { useState } from "react";
 import { Trans, useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import Hyperlink from "~/app/components/Hyperlink";
+import PermissionModal from "~/app/components/PermissionModal";
 import ScreenHeader from "~/app/components/ScreenHeader";
 import toast from "~/app/components/Toast";
 import { useNavigationState } from "~/app/hooks/useNavigationState";
 import { USER_REJECTED_ERROR } from "~/common/constants";
 import msg from "~/common/lib/msg";
 import { Event } from "~/extension/providers/nostr/types";
-import type { OriginData } from "~/types";
+import { OriginData, PermissionOption } from "~/types";
 
 function ConfirmSignMessage() {
   const navState = useNavigationState();
@@ -22,14 +23,21 @@ function ConfirmSignMessage() {
   const { t } = useTranslation("translation", {
     keyPrefix: "nostr",
   });
+  const { t: tPermissions } = useTranslation("components", {
+    keyPrefix: "permissions_modal",
+  });
   const navigate = useNavigate();
 
   const event = navState.args?.event as Event;
   const origin = navState.origin as OriginData;
   const [loading, setLoading] = useState(false);
   const [successMessage, setSuccessMessage] = useState("");
-  const [rememberPermission, setRememberPermission] = useState(false);
+
   const [showJSON, setShowJSON] = useState(false);
+  const [modalOpen, setModalOpen] = useState(false);
+  const [permissionOption, setPermissionOption] = useState<PermissionOption>(
+    PermissionOption.ASK_EVERYTIME
+  );
 
   // TODO: refactor: the success message and loading will not be displayed because after the reply the prompt is closed.
   async function confirm() {
@@ -37,7 +45,7 @@ function ConfirmSignMessage() {
       setLoading(true);
       msg.reply({
         blocked: false,
-        enabled: rememberPermission,
+        permissionOption: permissionOption,
       });
       setSuccessMessage(tCommon("success"));
     } catch (e) {
@@ -90,8 +98,8 @@ function ConfirmSignMessage() {
                     t={t}
                     values={{
                       host: origin.host,
-                      kind: t(`kinds.${event.kind}`, {
-                        defaultValue: t("kinds.unknown", {
+                      kind: t(`kinds.${event.kind}.title`, {
+                        defaultValue: t("kinds.unknown.title", {
                           kind: event.kind,
                         }),
                       }),
@@ -113,28 +121,47 @@ function ConfirmSignMessage() {
                 </div>
               )}
             </div>
-            <div>
-              <div className="flex items-center mb-4">
-                <Checkbox
-                  id="remember_permission"
-                  name="remember_permission"
-                  checked={rememberPermission}
-                  onChange={(event) => {
-                    setRememberPermission(event.target.checked);
-                  }}
-                />
-                <label
-                  htmlFor="remember_permission"
-                  className="cursor-pointer ml-2 block text-sm text-gray-900 font-medium dark:text-white"
-                >
-                  {tCommon("actions.remember")}
-                </label>
-              </div>
+            <div className="flex flex-col gap-4">
+              <PermissionModal
+                isOpen={modalOpen}
+                onClose={() => {
+                  setModalOpen(false);
+                }}
+                permissionCallback={(permission) => {
+                  setPermissionOption(permission);
+                  setModalOpen(false);
+                }}
+                permission={t(`kinds.${event.kind}.title`, {
+                  defaultValue: t("kinds.unknown.title", {
+                    kind: event.kind,
+                  }),
+                })}
+              />
               <ConfirmOrCancel
                 disabled={loading}
                 loading={loading}
                 onCancel={reject}
               />
+
+              <div className="flex gap-2 justify-center text-gray-600 dark:text-neutral-400 text-sm">
+                <div className="shrink-0">
+                  <PopiconsShieldCheckLine className="w-5 h-5"></PopiconsShieldCheckLine>
+                </div>
+                <button type="button" onClick={() => setModalOpen(true)}>
+                  <Trans
+                    i18nKey={permissionOption}
+                    t={tPermissions}
+                    values={{
+                      permission: t(`kinds.${event.kind}.title`, {
+                        defaultValue: t("kinds.unknown.title", {
+                          kind: event.kind,
+                        }),
+                      }),
+                    }}
+                    components={[]}
+                  />
+                </button>
+              </div>
             </div>
           </Container>
         </form>
diff --git a/src/common/constants.ts b/src/common/constants.ts
index 2daff15ba6..79413ab2aa 100644
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -7,6 +7,11 @@ export const ABORT_PROMPT_ERROR = "Prompt was closed";
 export const USER_REJECTED_ERROR = "User rejected";
 export const NO_KEYS_ERROR = "No keys available";
 
+// permissions constants
+export const ASK_EVERYTIME = "ask_everytime";
+export const DONT_ASK_ANY = "dont_ask_any";
+export const DONT_ASK_CURRENT = "dont_ask_current";
+
 // Currently only relevant for connectors which provide stablecoins
 // all other connectors fall back to BTC
 export type ACCOUNT_CURRENCIES = "EUR" | "USD" | "BTC";
diff --git a/src/extension/background-script/actions/ln/__tests__/getBalance.test.ts b/src/extension/background-script/actions/ln/__tests__/getBalance.test.ts
index 9f9b37a1d3..a69d997bba 100644
--- a/src/extension/background-script/actions/ln/__tests__/getBalance.test.ts
+++ b/src/extension/background-script/actions/ln/__tests__/getBalance.test.ts
@@ -123,7 +123,7 @@ describe("prompts the user first and then calls getBalance", () => {
       args: {
         requestPermission: {
           method: "getBalance",
-          description: "webln.getbalance",
+          description: "webln.getbalance.description",
         },
       },
       origin: message.origin,
@@ -147,7 +147,7 @@ describe("prompts the user first and then calls getBalance", () => {
       args: {
         requestPermission: {
           method: "getBalance",
-          description: "webln.getbalance",
+          description: "webln.getbalance.description",
         },
       },
       origin: message.origin,
diff --git a/src/extension/background-script/actions/nostr/signEventOrPrompt.ts b/src/extension/background-script/actions/nostr/signEventOrPrompt.ts
index 3a43cb4617..3e557b1777 100644
--- a/src/extension/background-script/actions/nostr/signEventOrPrompt.ts
+++ b/src/extension/background-script/actions/nostr/signEventOrPrompt.ts
@@ -6,6 +6,7 @@ import {
 } from "~/extension/background-script/permissions";
 import { MessageSignEvent, PermissionMethodNostr, Sender } from "~/types";
 
+import { DONT_ASK_ANY, DONT_ASK_CURRENT } from "~/common/constants";
 import state from "../../state";
 import { validateEvent } from "./helpers";
 
@@ -25,21 +26,33 @@ const signEventOrPrompt = async (message: MessageSignEvent, sender: Sender) => {
       };
     }
 
-    const hasPermission = await hasPermissionFor(
-      PermissionMethodNostr["NOSTR_SIGNMESSAGE"],
-      host
-    );
+    const hasPermission =
+      (await hasPermissionFor(
+        PermissionMethodNostr["NOSTR_SIGNMESSAGE"],
+        host
+      )) ||
+      (await hasPermissionFor(
+        PermissionMethodNostr["NOSTR_SIGNMESSAGE"] + "/" + event.kind,
+        host
+      ));
     if (!hasPermission) {
       const promptResponse = await utils.openPrompt<{
-        enabled: boolean;
         blocked: boolean;
+        permissionOption: string;
       }>({
         ...message,
         action: "public/nostr/confirmSignMessage",
       });
 
       // add permission to db only if user decided to always allow this request
-      if (promptResponse.data.enabled) {
+      if (promptResponse.data.permissionOption == DONT_ASK_CURRENT) {
+        await addPermissionFor(
+          PermissionMethodNostr["NOSTR_SIGNMESSAGE"] + "/" + event.kind,
+          host
+        );
+      }
+
+      if (promptResponse.data.permissionOption == DONT_ASK_ANY) {
         await addPermissionFor(
           PermissionMethodNostr["NOSTR_SIGNMESSAGE"],
           host
diff --git a/src/extension/background-script/actions/webln/getBalanceOrPrompt.ts b/src/extension/background-script/actions/webln/getBalanceOrPrompt.ts
index cd7987cbef..bc9c67d8ea 100644
--- a/src/extension/background-script/actions/webln/getBalanceOrPrompt.ts
+++ b/src/extension/background-script/actions/webln/getBalanceOrPrompt.ts
@@ -43,7 +43,7 @@ const getBalanceOrPrompt = async (message: MessageDefault) => {
         args: {
           requestPermission: {
             method: "getBalance",
-            description: `webln.getbalance`,
+            description: `webln.getbalance.description`,
           },
         },
         origin: message.origin,
diff --git a/src/extension/background-script/permissions/addPermissionFor.ts b/src/extension/background-script/permissions/addPermissionFor.ts
index 9fdef71f00..94dcab3fc8 100644
--- a/src/extension/background-script/permissions/addPermissionFor.ts
+++ b/src/extension/background-script/permissions/addPermissionFor.ts
@@ -10,15 +10,34 @@ export async function addPermissionFor(method: string, host: string) {
   if (!allowance?.id || !accountId) {
     return false;
   }
-  const permissionIsAdded = await db.permissions.add({
-    createdAt: Date.now().toString(),
-    accountId: accountId,
-    allowanceId: allowance.id,
-    host: host,
-    method: method,
-    enabled: true,
-    blocked: false,
-  });
 
-  return !!permissionIsAdded && (await db.saveToStorage());
+  const existingPermission = await db.permissions
+    .filter(
+      (x) =>
+        x.accountId === accountId &&
+        x.allowanceId === allowance.id &&
+        x.host === host &&
+        x.method === method
+    )
+    .first();
+
+  let affectedRows = 0;
+  if (!existingPermission) {
+    affectedRows = await db.permissions.add({
+      createdAt: Date.now().toString(),
+      accountId: accountId,
+      allowanceId: allowance.id,
+      host: host,
+      method: method,
+      enabled: true,
+      blocked: false,
+    });
+  } else {
+    affectedRows = await db.permissions.update(existingPermission.id!, {
+      enabled: true,
+      blocked: false,
+    });
+  }
+
+  return !!affectedRows && (await db.saveToStorage());
 }
diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
index fe97155fa2..523cf5a769 100644
--- a/src/i18n/locales/en/translation.json
+++ b/src/i18n/locales/en/translation.json
@@ -922,30 +922,102 @@
       "block_added": "Added {{host}} to the blocklist, please reload the website.",
       "recipient": "Recipient",
       "kinds": {
-        "unknown": "kind {{kind}}",
-        "0": "metadata",
-        "1": "short text note",
-        "2": "recommend relay",
-        "3": "contacts",
-        "4": "encrypted direct messages",
-        "5": "event deletion",
-        "7": "reaction",
-        "8": "badge award",
-        "40": "channel creation",
-        "41": "channel metadata",
-        "42": "channel message",
-        "43": "channel hide message",
-        "44": "channel mute user",
-        "1984": "reporting",
-        "9734": "zap request",
-        "9735": "zap",
-        "10002": "relay list metadata",
-        "22242": "client authentication",
-        "24133": "nostr connect",
-        "30008": "profile badges",
-        "30009": "badge definition",
-        "30023": "long-form content",
-        "30078": "application-specific data"
+        "unknown": {
+          "title": "kind {{kind}}",
+          "description": "Unidentified action"
+        },
+        "0": {
+          "title": "update profile",
+          "description": "Update your name, description, profile picture, Nostr address and additional profile metadata."
+        },
+        "1": {
+          "title": "short note",
+          "description": "Sign a short text note"
+        },
+        "2": {
+          "title": "recommend relay",
+          "description": "Share a recommended relay"
+        },
+        "3": {
+          "title": "update follow list",
+          "description": "Update the list of accounts you follow"
+        },
+        "4": {
+          "title": "direct message",
+          "description": "Send an encrypted direct message"
+        },
+        "5": {
+          "title": "delete note",
+          "description": "Request relays to delete an event"
+        },
+        "7": {
+          "title": "react",
+          "description": "Sign a reaction to a note"
+        },
+        "8": {
+          "title": "award badge",
+          "description": "Award a badge to a Nostr profile"
+        },
+        "40": {
+          "title": "create channel",
+          "description": "Create a public channel chat"
+        },
+        "41": {
+          "title": "update channel",
+          "description": "Update channel's name, description, picture and additional metadata"
+        },
+        "42": {
+          "title": "send channel message",
+          "description": "Send a text message to a channel"
+        },
+        "43": {
+          "title": "hide channel message",
+          "description": "Hide a text message in a channel"
+        },
+        "44": {
+          "title": "mute channel user",
+          "description": "Hide all messages from a Nostr profile"
+        },
+        "1984": {
+          "title": "report note",
+          "description": "Report a note for spam, illegal or explicit content "
+        },
+        "9734": {
+          "title": "request zap",
+          "description": "Request a lightning payment"
+        },
+        "9735": {
+          "title": "zap receipt",
+          "description": "Display a confirmation of a paid lightning invoice"
+        },
+        "10002": {
+          "title": "relay list",
+          "description": "Update preferred relays for discovering your notes and receiving others' notes"
+        },
+        "22242": {
+          "title": "authenticate",
+          "description": "Authenticate to a relay"
+        },
+        "24133": {
+          "title": "remote sign",
+          "description": "Request and sign events remotely"
+        },
+        "30008": {
+          "title": "profile badge",
+          "description": "Accept, reject and change display order of awarded badges"
+        },
+        "30009": {
+          "title": "create badge",
+          "description": "Create a new badge"
+        },
+        "30023": {
+          "title": "long note",
+          "description": "Sign a long-form notes like articles or blog posts"
+        },
+        "30078": {
+          "title": "app data",
+          "description": "Sign an application-specific data"
+        }
       }
     },
     "transactions": {
@@ -1062,7 +1134,7 @@
   "components": {
     "allowance_menu": {
       "confirm_delete": "Are you sure you want to disconnect this website?",
-      "hint": "Changing this will reset the current budget",
+      "hint": "Changing this number will reset the current budget",
       "new_budget": {
         "label": "One-click payments budget",
         "link_label": "Set a budget for one-click payments"
@@ -1073,9 +1145,10 @@
       },
       "edit_allowance": {
         "title": "Site settings",
-        "screen_reader": "Allowance Options"
+        "screen_reader": "Allowance Options",
+        "always_allow": "Always allow"
       },
-      "edit_permissions": "Edit Permissions"
+      "website_permissions": "Website Permissions"
     },
     "qrcode_scanner": {
       "title": "Scan QR Code",
@@ -1087,6 +1160,13 @@
         "allow_camera_access": "Please allow camera access in the settings screen."
       }
     },
+    "permissions_modal": {
+      "content_label": "Permissions",
+      "set_permissions": "Set Permissions:",
+      "ask_everytime": "Ask everytime for <0>{{permission}}</0>",
+      "dont_ask_current": "Don't ask again for <0>{{permission}}</0>",
+      "dont_ask_any": "Don't ask again for <0>any Nostr Requests</0>"
+    },
     "transactions_table": {
       "fee": "Fee",
       "preimage": "Preimage",
@@ -1160,30 +1240,57 @@
     },
     "badge": {
       "label": {
-        "auth": "LOGIN",
-        "imported": "IMPORTED",
-        "budget": "BUDGET"
+        "auth": "login",
+        "imported": "imported",
+        "budget": "budget"
       }
     }
   },
   "permissions": {
     "webln": {
-      "getbalance": "Read the balance of your account"
+      "getbalance": {
+        "title": "get balance",
+        "description": "Read the balance of your account"
+      }
     },
     "bitcoin": {
-      "getaddress": "Read your Bitcoin receive address"
+      "getaddress": {
+        "title": "get address",
+        "description": "Read your Bitcoin receive address"
+      }
     },
     "liquid": {
-      "getaddress": "Read your Liquid receive address",
-      "signschnorr": "Sign message with your key"
+      "getaddress": {
+        "title": "get address",
+        "description": "Read your Liquid receive address"
+      },
+      "signschnorr": {
+        "title": "sign schnorr",
+        "description": "Sign message with your key"
+      }
     },
     "nostr": {
-      "getpublickey": "Read your public key",
-      "nip04encrypt": "Encrypt data",
-      "nip04decrypt": "Decrypt data",
-      "nip44encrypt": "Encrypt data",
-      "nip44decrypt": "Decrypt data",
-      "signmessage": "Sign message with your key"
+      "getpublickey": {
+        "title": "read public key",
+        "description": "Read your public key"
+      },
+      "decrypt": "Decrypt data",
+      "nip04decrypt": {
+        "title": "decrypt (nip04)",
+        "description": "Decrypt data"
+      },
+      "nip04encrypt": {
+        "title": "encrypt (nip04)",
+        "description": "Encrypt data"
+      },
+      "nip44decrypt": {
+        "title": "decrypt (nip44)",
+        "description": "Decrypt data"
+      },
+      "nip44encrypt": {
+        "title": "encrypt (nip44)",
+        "description": "Encrypt data"
+      }
     },
     "commando": {
       "bkpr-listbalances": "List of all current and historical account balances",
diff --git a/src/types.ts b/src/types.ts
index 8e2737ebe5..dceae6c02b 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -779,6 +779,12 @@ export interface Payment extends Omit<DbPayment, "id"> {
   id: number;
 }
 
+export enum PermissionOption {
+  ASK_EVERYTIME = "ask_everytime",
+  DONT_ASK_CURRENT = "dont_ask_current",
+  DONT_ASK_ANY = "dont_ask_any",
+}
+
 export enum PermissionMethodBitcoin {
   BITCOIN_GETADDRESS = "bitcoin/getAddress",
 }