diff --git a/src/background/bgPopupHandler.ts b/src/background/bgPopupHandler.ts
index 2f2b20524..cbf343191 100644
--- a/src/background/bgPopupHandler.ts
+++ b/src/background/bgPopupHandler.ts
@@ -1,9 +1,11 @@
 import { v4 as uuid } from 'uuid';
 import type {
   Dictionary,
+  IAppData,
   IPopupProps,
   PopupType,
 } from '@/types';
+import { UNKNOWN_SOURCE, UNKNOWN_APP_DETAILS } from '@/constants/common';
 
 interface IPopupConfigNoActions {
   id: string;
@@ -38,8 +40,16 @@ export const openPopup = async (
   popupProps: Partial<IPopupProps> = {},
 ) => {
   const id = uuid();
-  const { href, protocol, host } = (typeof aepp === 'object') ? getAeppUrl(aepp) : new URL(aepp);
-  const { name = host } = (typeof aepp === 'object') ? aepp : {} as any;
+
+  let app: IAppData;
+
+  if (typeof aepp === 'object') {
+    app = getAeppUrl(aepp);
+  } else if (aepp === UNKNOWN_SOURCE) {
+    app = UNKNOWN_APP_DETAILS;
+  } else {
+    app = new URL(aepp);
+  }
 
   const tabs = await browser.tabs.query({ active: true });
 
@@ -47,14 +57,14 @@ export const openPopup = async (
     const tabUrl = new URL(tabURL as string);
     if (
       tabUrl.searchParams.get('type') === POPUP_TYPE_CONNECT
-      && decodeURIComponent(tabUrl.searchParams.get('url') || '') === href
+      && decodeURIComponent(tabUrl.searchParams.get('url') || '') === app.href
     ) {
       browser.tabs.remove(tabId as number);
     }
   });
 
   const extUrl = browser.runtime.getURL('./index.html');
-  const popupUrl = `${extUrl}?id=${id}&type=${popupType}&url=${encodeURIComponent(href)}`;
+  const popupUrl = `${extUrl}?id=${id}&type=${popupType}&url=${encodeURIComponent(app.href!)}`;
   const isMacOsExtension = IS_EXTENSION && browser.runtime.getPlatformInfo().then(({ os }) => os === 'mac');
 
   const popupWindow = await browser.windows.create({
@@ -73,10 +83,10 @@ export const openPopup = async (
     props: {
       ...popupProps,
       app: {
-        url: href,
-        name,
-        protocol,
-        host,
+        url: app.href,
+        name: app.name || app.host,
+        protocol: app.protocol,
+        host: app.host,
       },
     },
   };
diff --git a/src/composables/deepLinkApi.ts b/src/composables/deepLinkApi.ts
index a426f9d5c..565dc8ed0 100644
--- a/src/composables/deepLinkApi.ts
+++ b/src/composables/deepLinkApi.ts
@@ -7,12 +7,15 @@ import { checkIfSuperheroCallbackUrl } from '@/utils';
 import { IS_IOS, IS_MOBILE_APP, MODAL_TRANSFER_SEND } from '@/constants';
 import { useModals } from '@/composables/modals';
 
-export function useDeepLinkApi() {
-  const router = useIonRouter();
+let isDeepLinkUsed = false;
+
+export function useDeepLinkApi(doNotInitializeRouter?: boolean) {
+  // `useIonRouter` breaks if it is not run in `IonPage` context
+  const router = doNotInitializeRouter ? null : useIonRouter();
   const route = useRoute();
 
   const callbackOrigin = ref<URL | null>(
-    route.query['x-success']
+    route?.query['x-success']
       ? (new URL(decodeURIComponent(route.query['x-success'] as string)))
       : null,
   );
@@ -37,14 +40,14 @@ export function useDeepLinkApi() {
   ) {
     const callbackUrlTemplate = route.query[isSuccess ? 'x-success' : 'x-cancel'];
     if (!callbackUrlTemplate) {
-      router.replace({ name: ROUTE_ACCOUNT });
+      router?.replace({ name: ROUTE_ACCOUNT });
       return;
     }
     const callbackUrl = Object.entries(templateParams).reduce(
       (url, [key, value]) => url.replace(new RegExp(`{${key}}`, 'g'), encodeURIComponent(value)),
       decodeURIComponent(String(route.query[isSuccess ? 'x-success' : 'x-cancel'])),
     ) as string;
-    router.replace({ name: ROUTE_ACCOUNT });
+    router?.replace({ name: ROUTE_ACCOUNT });
     if (IS_MOBILE_APP && !IS_IOS) {
       window.open(callbackUrl, '_system');
     } else {
@@ -52,9 +55,15 @@ export function useDeepLinkApi() {
     }
   }
 
+  function setIsDeepLinkUsed(value: boolean) {
+    isDeepLinkUsed = value;
+  }
+
   return {
     checkIfOpenTransferSendModal,
     callbackOrigin,
     openCallbackOrGoHome,
+    setIsDeepLinkUsed,
+    isDeepLinkUsed,
   };
 }
diff --git a/src/composables/permissions.ts b/src/composables/permissions.ts
index db581051e..76641cb9c 100644
--- a/src/composables/permissions.ts
+++ b/src/composables/permissions.ts
@@ -23,6 +23,7 @@ import {
   POPUP_TYPE_SIGN,
   STORAGE_KEYS,
   PROTOCOLS,
+  UNKNOWN_SOURCE,
 } from '@/constants';
 import { getCleanModalOptions } from '@/utils';
 import { aettosToAe, isTxOfASupportedType } from '@/protocols/aeternity/helpers';
@@ -197,8 +198,8 @@ export function usePermissions() {
         popup = POPUP_TYPE_RAW_SIGN;
       }
       await (
-        (IS_OFFSCREEN_TAB && app?.url)
-          ? openPopup(popup, app.url, props)
+        (IS_OFFSCREEN_TAB)
+          ? openPopup(popup, app?.url || UNKNOWN_SOURCE, props)
           : openModal(modal, props)
       );
       return true;
diff --git a/src/constants/common.ts b/src/constants/common.ts
index 964ceaa56..127163846 100644
--- a/src/constants/common.ts
+++ b/src/constants/common.ts
@@ -1,4 +1,4 @@
-import type { ICurrency, IPermission } from '@/types';
+import type { ICurrency, IAppData, IPermission } from '@/types';
 import { IS_MOBILE_APP } from './environment';
 
 export const APP_NAME = 'Superhero Wallet';
@@ -375,6 +375,16 @@ export const POPUP_TYPES = [
 export const POPUP_CONNECT_ADDRESS_PERMISSION = 'address';
 export const POPUP_CONNECT_TRANSACTIONS_PERMISSION = 'transactions';
 
+export const UNKNOWN_SOURCE = 'Unknown source';
+export const UNKNOWN_URL = 'Unknown url';
+export const UNKNOWN_APP_DETAILS: IAppData = {
+  url: UNKNOWN_URL,
+  href: UNKNOWN_URL,
+  protocol: '',
+  host: '',
+  name: UNKNOWN_SOURCE,
+};
+
 export const POPUP_ACTIONS = {
   getProps: 'getProps',
   resolve: 'resolve',
diff --git a/src/icons/warning-outline.svg b/src/icons/warning-outline.svg
new file mode 100644
index 000000000..11982e71f
--- /dev/null
+++ b/src/icons/warning-outline.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 20C15.4695 20 20 15.4792 20 10C20 4.53049 15.4695 0 9.99032 0C4.52081 0 0 4.53049 0 10C0 15.4792 4.53049 20 10 20ZM10 18.0348C5.54695 18.0348 1.97483 14.453 1.97483 10C1.97483 5.54695 5.53727 1.97483 9.99032 1.97483C14.4434 1.97483 18.0252 5.54695 18.0348 10C18.0348 14.453 14.453 18.0348 10 18.0348Z" fill="currentColor"/>
+<path d="M10.0266 11.3376C10.5051 11.3376 10.7748 11.0679 10.7922 10.5633L10.8574 8.471L10.9227 6.37869C10.9401 5.86539 10.5573 5.5 10.0179 5.5C9.47849 5.5 9.1044 5.85669 9.1218 6.36999L9.2436 10.572C9.26099 11.0679 9.53939 11.3376 10.0266 11.3376ZM10.0266 14.226C10.5921 14.226 11.0532 13.8171 11.0532 13.269C11.0532 12.7122 10.5921 12.312 10.0266 12.312C9.46109 12.312 9 12.7209 9 13.269C9 13.8171 9.46979 14.226 10.0266 14.226Z" fill="currentColor"/>
+</svg>
diff --git a/src/popup/components/DetailsItem.vue b/src/popup/components/DetailsItem.vue
index f32935ae9..d9046d764 100644
--- a/src/popup/components/DetailsItem.vue
+++ b/src/popup/components/DetailsItem.vue
@@ -4,6 +4,7 @@
     :class="{
       expandable,
       expanded,
+      warning,
     }"
   >
     <Component
@@ -63,6 +64,7 @@ export default defineComponent({
     expandable: Boolean,
     small: Boolean,
     highlight: Boolean,
+    warning: Boolean,
   },
   setup(props) {
     const expanded = ref(!props.expandable);
@@ -156,5 +158,15 @@ export default defineComponent({
       }
     }
   }
+
+  &.warning {
+    .label {
+      color: $color-warning;
+    }
+
+    .value {
+      color: rgba($color-warning, 0.85);
+    }
+  }
 }
 </style>
diff --git a/src/popup/components/Modals/ConfirmRawSign.vue b/src/popup/components/Modals/ConfirmRawSign.vue
index 08de427fe..4940e10be 100644
--- a/src/popup/components/Modals/ConfirmRawSign.vue
+++ b/src/popup/components/Modals/ConfirmRawSign.vue
@@ -6,9 +6,19 @@
     data-cy="popup-aex2"
   >
     <TransactionInfo
-      :custom-labels="[$t('modals.confirm-raw-sign.title')]"
+      :custom-labels="[
+        ...(isUnknownDapp ? [$t('common.unknown')] : []),
+        $t('modals.confirm-raw-sign.title'),
+      ]"
       :sender="sender"
       :recipient="activeAccount!"
+      :first-label-warning="isUnknownDapp"
+    />
+
+    <NoOriginWarning
+      v-if="isUnknownDapp"
+      :action="$t('unknownDapp.signDataAction')"
+      :warning="$t('unknownDapp.signDataWarning')"
     />
 
     <div
@@ -62,6 +72,7 @@ import {
   MODAL_SIGN_AIR_GAP_TRANSACTION,
   PROTOCOLS,
   RUNNING_IN_POPUP,
+  UNKNOWN_SOURCE,
 } from '@/constants';
 import { RejectedByUserError } from '@/lib/errors';
 import { useAccounts, useModals, usePopupProps } from '@/composables';
@@ -93,6 +104,9 @@ export default defineComponent({
     const activeAccount = getLastActiveProtocolAccount(PROTOCOLS.aeternity);
 
     const dataAsString = computed((): string => popupProps.value?.txBase64?.toString() || '');
+    const isUnknownDapp = computed(() => (
+      !popupProps.value?.app || popupProps.value.app.name === UNKNOWN_SOURCE
+    ));
 
     async function confirm() {
       if (RUNNING_IN_POPUP && activeAccount?.type === 'airgap') {
@@ -124,6 +138,7 @@ export default defineComponent({
       cancel,
       activeAccount,
       dataAsString,
+      isUnknownDapp,
       sender,
     };
   },
diff --git a/src/popup/components/Modals/ConfirmTransactionSign.vue b/src/popup/components/Modals/ConfirmTransactionSign.vue
index 5eca10075..7fd480755 100644
--- a/src/popup/components/Modals/ConfirmTransactionSign.vue
+++ b/src/popup/components/Modals/ConfirmTransactionSign.vue
@@ -13,7 +13,13 @@
     <template v-else>
       <TransactionOverview
         :transaction="transaction"
-        :additional-tag="appName"
+        :additional-tag="isUnknownDapp ? $t('common.unknown') : appName"
+        :first-label-warning="isUnknownDapp"
+      />
+      <NoOriginWarning
+        v-if="isUnknownDapp"
+        :action="$t('unknownDapp.confirmTransactionAction')"
+        :warning="$t('unknownDapp.confirmTransactionWarning')"
       />
       <div
         v-if="appName || error"
@@ -231,6 +237,7 @@ import {
   RUNNING_IN_POPUP,
   SUPERHERO_CHAT_URLS,
   TX_DIRECTION,
+  UNKNOWN_SOURCE,
 } from '@/constants';
 import {
   fetchJson,
@@ -268,6 +275,7 @@ import DetailsItem from '../DetailsItem.vue';
 import TokenAmount from '../TokenAmount.vue';
 import TransactionDetailsPoolTokenRow from '../TransactionDetailsPoolTokenRow.vue';
 import TransactionCallDataDetails from '../TransactionCallDataDetails.vue';
+import NoOriginWarning from '../NoOriginWarning.vue';
 
 import AnimatedSpinner from '../../../icons/animated-spinner.svg?vue-component';
 
@@ -299,6 +307,7 @@ export default defineComponent({
     TokenAmount,
     TransactionDetailsPoolTokenRow,
     TransactionCallDataDetails,
+    NoOriginWarning,
     AnimatedSpinner,
   },
   setup() {
@@ -363,6 +372,10 @@ export default defineComponent({
 
     const app = computed(() => popupProps.value?.app);
 
+    const isUnknownDapp = computed(() => (
+      !popupProps.value?.app || popupProps.value.app.name === UNKNOWN_SOURCE
+    ));
+
     const fee = computed(() => (protocol === PROTOCOLS.aeternity)
       ? getAeFee(popupProps.value?.tx?.fee!)
       : popupProps.value?.tx?.fee!);
@@ -658,6 +671,7 @@ export default defineComponent({
       isDexSwap,
       isTokenSale,
       isHash,
+      isUnknownDapp,
       loading,
       nameAeFee,
       popupProps,
diff --git a/src/popup/components/Modals/ConfirmUnsafeSign.vue b/src/popup/components/Modals/ConfirmUnsafeSign.vue
index a9f9da965..73459191e 100644
--- a/src/popup/components/Modals/ConfirmUnsafeSign.vue
+++ b/src/popup/components/Modals/ConfirmUnsafeSign.vue
@@ -7,6 +7,7 @@
   >
     <TransactionInfo
       :custom-labels="[
+        ...(isUnknownDapp ? [$t('common.unknown')] : []),
         ...(isAeppChatSuperhero)
           ? [$t('modals.confirmTransactionSign.superheroChat')]
           : [],
@@ -14,9 +15,17 @@
       ]"
       :sender="sender"
       :recipient="activeAccount"
+      :first-label-warning="isUnknownDapp"
+    />
+
+    <NoOriginWarning
+      v-if="isUnknownDapp"
+      :action="$t('unknownDapp.signDataAction')"
+      :warning="$t('unknownDapp.signDataWarning')"
     />
 
     <DetailsItem
+      v-else
       :label="isAeppChatSuperhero ? $t('modals.confirmTransactionSign.superheroChat') : sender.name"
       class="sender"
       data-cy="aepp"
@@ -78,7 +87,12 @@ import {
   onUnmounted,
 } from 'vue';
 
-import { JWT_HEADER, PROTOCOLS, SUPERHERO_CHAT_URLS } from '@/constants';
+import {
+  JWT_HEADER,
+  PROTOCOLS,
+  SUPERHERO_CHAT_URLS,
+  UNKNOWN_SOURCE,
+} from '@/constants';
 import { fromBase64Url, handleUnknownError } from '@/utils';
 import { RejectedByUserError } from '@/lib/errors';
 import { useAccounts, usePopupProps } from '@/composables';
@@ -88,6 +102,7 @@ import TransactionInfo from '../TransactionInfo.vue';
 import BtnMain from '../buttons/BtnMain.vue';
 import DetailsItem from '../DetailsItem.vue';
 import CopyText from '../CopyText.vue';
+import NoOriginWarning from '../NoOriginWarning.vue';
 
 export default defineComponent({
   components: {
@@ -96,6 +111,7 @@ export default defineComponent({
     BtnMain,
     DetailsItem,
     CopyText,
+    NoOriginWarning,
   },
   setup() {
     const { popupProps, sender, setPopupProps } = usePopupProps();
@@ -104,6 +120,10 @@ export default defineComponent({
     const isJwt = ref(false);
     const messageToDisplay = ref('');
 
+    const isUnknownDapp = computed(() => (
+      !popupProps.value?.app || popupProps.value.app.name === UNKNOWN_SOURCE
+    ));
+
     if (popupProps.value?.data) {
       messageToDisplay.value = Buffer.from(popupProps.value?.data).toString();
 
@@ -144,6 +164,7 @@ export default defineComponent({
       activeAccount,
       isAeppChatSuperhero,
       isJwt,
+      isUnknownDapp,
       messageToDisplay,
       sender,
       popupProps,
diff --git a/src/popup/components/NoOriginWarning.vue b/src/popup/components/NoOriginWarning.vue
new file mode 100644
index 000000000..88938ac03
--- /dev/null
+++ b/src/popup/components/NoOriginWarning.vue
@@ -0,0 +1,53 @@
+<template>
+  <DetailsItem
+    warning
+    class="no-origin-warning"
+  >
+    <template #label>
+      <div class="label">
+        <WarningOutlineIcon class="icon" />
+        {{ $t('pages.connectConfirm.unknownSource') }}
+      </div>
+    </template>
+
+    <template #value>
+      <div>
+        <p>{{ $t('unknownDapp.request', { action }) }}</p>
+        <p>{{ $t('unknownDapp.warning', { warning }) }}</p>
+      </div>
+    </template>
+  </DetailsItem>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+import DetailsItem from './DetailsItem.vue';
+
+import WarningOutlineIcon from '../../icons/warning-outline.svg?vue-component';
+
+export default defineComponent({
+  components: {
+    DetailsItem,
+    WarningOutlineIcon,
+  },
+  props: {
+    action: { type: String, required: true },
+    warning: { type: String, required: true },
+  },
+});
+</script>
+
+<style lang="scss" scoped>
+.no-origin-warning .label {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+
+  .icon {
+    width: 24px;
+    height: 24px;
+    padding-right: 4px;
+  }
+}
+</style>
diff --git a/src/popup/components/TransactionTagList.vue b/src/popup/components/TransactionTagList.vue
index 33dac159d..9a9ee02be 100644
--- a/src/popup/components/TransactionTagList.vue
+++ b/src/popup/components/TransactionTagList.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     class="transaction-tag-list"
-    :class="{ dense }"
+    :class="{ dense, 'first-label-warning': firstLabelWarning }"
   >
     <TransactionTag
       v-for="label in labels"
@@ -45,6 +45,7 @@ export default defineComponent({
     transaction: { type: Object as PropType<ITransaction>, default: null },
     additionalTag: { type: String, default: null },
     dense: Boolean,
+    firstLabelWarning: Boolean,
   },
   setup(props) {
     const { t } = useI18n();
@@ -193,6 +194,7 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 @use '@/styles/mixins';
+@use '@/styles/variables' as *;
 
 .transaction-tag-list {
   @include mixins.flex(center, center);
@@ -204,5 +206,10 @@ export default defineComponent({
     gap: 4px;
     margin-bottom: 0;
   }
+
+  &.first-label-warning .title-tag:first-of-type {
+    color: rgba($color-warning, 0.5);
+    border-color: rgba($color-warning, 0.5);
+  }
 }
 </style>
diff --git a/src/popup/locales/en.json b/src/popup/locales/en.json
index 657ee8ce9..b320c1669 100644
--- a/src/popup/locales/en.json
+++ b/src/popup/locales/en.json
@@ -2,6 +2,7 @@
   "common": {
     "activeAccount": "Active account",
     "address": "Address",
+    "allow": "Allow",
     "name": "Name",
     "addressCopied": "Copied",
     "all": "All",
@@ -55,6 +56,7 @@
     "total": "Total",
     "totalMultisig": "Total in multisig vaults",
     "tx": "Tx",
+    "unknown": "Unknown",
     "unrecognized": "Unrecognized",
     "you": "You",
     "verifying": "Verifying...",
@@ -801,8 +803,9 @@
       "websiteRequestConnect": "would like to connect to your account.",
       "websiteRequest": "This website is requesting access to view your current account address. Always make sure you trust the website you interact with. ",
       "cancelButton": "Deny",
-      "confirmButton": "Accept",
-      "transactionLabel": "Transaction",
+      "addressLabel": "Address request",
+      "transactionLabel": "Confirm transaction",
+      "unknownSource": "Unknown source",
       "addressRequest": "This aepp is requesting access to view your current account address.",
       "transactionRequest": "This aepp may prepare a transaction, you are in charge of confirming it."
     },
@@ -1215,6 +1218,18 @@
       "decline": "Decline"
     }
   },
+  "unknownDapp": {
+    "request": "Unknown URL would like you to {action}.",
+    "warning": "Kindly ensure that you are aware of the request origin. {warning} might cause undesired results, including loss of your funds.",
+    "signMessageAction": "sign a message",
+    "signMessageWarning": "Signing this message",
+    "allowAccessAction": "access your account",
+    "allowAccessWarning": "Allowing access",
+    "confirmTransactionAction": "confirm a transaction",
+    "confirmTransactionWarning": "Confirming this transaction",
+    "signDataAction": "sign data",
+    "signDataWarning": "Signing this data"
+  },
   "dappActionBrowser": {
     "refresh": {
       "title": "Refresh",
diff --git a/src/popup/pages/Address.vue b/src/popup/pages/Address.vue
index 8507cf165..f00dcb8a4 100644
--- a/src/popup/pages/Address.vue
+++ b/src/popup/pages/Address.vue
@@ -15,7 +15,11 @@ import {
 } from '@/composables';
 import { handleUnknownError } from '@/utils';
 import { RejectedByUserError } from '@/lib/errors';
-import { MODAL_CONFIRM_CONNECT, POPUP_CONNECT_ADDRESS_PERMISSION } from '@/constants';
+import {
+  MODAL_CONFIRM_CONNECT,
+  POPUP_CONNECT_ADDRESS_PERMISSION,
+  UNKNOWN_APP_DETAILS,
+} from '@/constants';
 
 export default defineComponent({
   name: 'Address',
@@ -29,11 +33,11 @@ export default defineComponent({
     const { openModal } = useModals();
     const { setLoaderVisible } = useUi();
 
-    const app = computed((): IAppData => callbackOrigin.value ? {
+    const app = computed((): IAppData => callbackOrigin.value?.toString() ? {
       name: callbackOrigin.value.hostname,
       url: callbackOrigin.value.origin,
       host: callbackOrigin.value.host,
-    } : {} as IAppData);
+    } : UNKNOWN_APP_DETAILS);
 
     onMounted(async () => {
       try {
diff --git a/src/popup/pages/JwtSign.vue b/src/popup/pages/JwtSign.vue
index aacebf6db..ca4a1ca27 100644
--- a/src/popup/pages/JwtSign.vue
+++ b/src/popup/pages/JwtSign.vue
@@ -9,7 +9,12 @@ import { useRoute } from 'vue-router';
 import { Encoded, decode, signJwt } from '@aeternity/aepp-sdk';
 
 import { AeAccountHdWallet } from '@/protocols/aeternity/libs/AeAccountHdWallet';
-import { JWT_HEADER, MODAL_CONFIRM_UNSAFE_SIGN, PROTOCOLS } from '@/constants';
+import {
+  JWT_HEADER,
+  MODAL_CONFIRM_UNSAFE_SIGN,
+  PROTOCOLS,
+  UNKNOWN_APP_DETAILS,
+} from '@/constants';
 import { handleUnknownError, toBase64Url } from '@/utils';
 import { RejectedByUserError } from '@/lib/errors';
 import {
@@ -39,6 +44,13 @@ export default defineComponent({
         setLoaderVisible(true);
         const payload = route.query.payload?.toString();
         const { host, href, protocol } = callbackOrigin.value || {} as any;
+        const app = host && href
+          ? {
+            host,
+            name: host,
+            url: href,
+            protocol,
+          } : UNKNOWN_APP_DETAILS;
 
         const signerAddress = getLastActiveProtocolAccount(PROTOCOLS.aeternity)?.address;
 
@@ -62,12 +74,7 @@ export default defineComponent({
 
         await openModal(MODAL_CONFIRM_UNSAFE_SIGN, {
           data: messageToConfirm,
-          app: {
-            host,
-            protocol,
-            name: host,
-            url: href,
-          },
+          app,
         });
 
         const dataToSign = JSON.parse(payload);
diff --git a/src/popup/pages/Popups/Connect.vue b/src/popup/pages/Popups/Connect.vue
index 13d5fe63e..a1c99d458 100644
--- a/src/popup/pages/Popups/Connect.vue
+++ b/src/popup/pages/Popups/Connect.vue
@@ -6,12 +6,23 @@
     data-cy="popup-aex2"
   >
     <TransactionInfo
-      :custom-labels="[$t('pages.connectConfirm.title')]"
+      :custom-labels="[
+        ...(isUnknownDapp ? [$t('common.unknown')] : []),
+        $t('pages.connectConfirm.title'),
+      ]"
       :sender="sender"
       :recipient="activeAccount"
+      :first-label-warning="isUnknownDapp"
+    />
+
+    <NoOriginWarning
+      v-if="isUnknownDapp"
+      :action="$t('unknownDapp.allowAccessAction')"
+      :warning="$t('unknownDapp.allowAccessWarning')"
     />
 
     <div
+      v-else
       class="subtitle"
       data-cy="aepp"
     >
@@ -20,22 +31,28 @@
     </div>
 
     <div class="permissions">
-      <template v-if="access.includes(POPUP_CONNECT_ADDRESS_PERMISSION)">
-        <span class="title">
-          <CheckMark class="icon" /> {{ $t('common.address') }}
-        </span>
-        <span class="description">
-          {{ $t('pages.connectConfirm.addressRequest') }}
-        </span>
-      </template>
-      <template v-if="access.includes(POPUP_CONNECT_TRANSACTIONS_PERMISSION)">
-        <span class="title">
-          <CheckMark class="icon" /> {{ $t('pages.connectConfirm.transactionLabel') }}
-        </span>
-        <span class="description">
-          {{ $t('pages.connectConfirm.transactionRequest') }}
-        </span>
-      </template>
+      <DetailsItem
+        v-if="access.includes(POPUP_CONNECT_ADDRESS_PERMISSION)"
+        :value="$t('pages.connectConfirm.addressRequest')"
+      >
+        <template #label>
+          <div class="label">
+            <CheckSuccessCircleIcon class="icon" />
+            {{ $t('pages.connectConfirm.addressLabel') }}
+          </div>
+        </template>
+      </DetailsItem>
+      <DetailsItem
+        v-if="access.includes(POPUP_CONNECT_TRANSACTIONS_PERMISSION)"
+        :value="$t('pages.connectConfirm.transactionRequest')"
+      >
+        <template #label>
+          <div class="label">
+            <CheckSuccessCircleIcon class="icon" />
+            {{ $t('pages.connectConfirm.transactionLabel') }}
+          </div>
+        </template>
+      </DetailsItem>
     </div>
 
     <template #footer>
@@ -48,7 +65,7 @@
       />
       <BtnMain
         data-cy="accept"
-        :text="$t('pages.connectConfirm.confirmButton')"
+        :text="$t('common.allow')"
         @click="confirm()"
       />
     </template>
@@ -59,7 +76,6 @@
 import {
   computed,
   defineComponent,
-  onMounted,
   onUnmounted,
 } from 'vue';
 import { RejectedByUserError } from '@/lib/errors';
@@ -68,21 +84,27 @@ import {
   POPUP_CONNECT_ADDRESS_PERMISSION,
   POPUP_CONNECT_TRANSACTIONS_PERMISSION,
   PROTOCOLS,
+  UNKNOWN_SOURCE,
 } from '@/constants';
 import { useAccounts, usePopupProps } from '@/composables';
 import { usePermissions } from '@/composables/permissions';
 
+import DetailsItem from '@/popup/components/DetailsItem.vue';
+import NoOriginWarning from '@/popup/components/NoOriginWarning.vue';
 import Modal from '../../components/Modal.vue';
 import BtnMain from '../../components/buttons/BtnMain.vue';
 import TransactionInfo from '../../components/TransactionInfo.vue';
-import CheckMark from '../../../icons/check-mark.svg?vue-component';
+
+import CheckSuccessCircleIcon from '../../../icons/check-success-circle.svg?vue-component';
 
 export default defineComponent({
   components: {
+    DetailsItem,
     Modal,
     BtnMain,
     TransactionInfo,
-    CheckMark,
+    NoOriginWarning,
+    CheckSuccessCircleIcon,
   },
   props: {
     access: {
@@ -100,18 +122,20 @@ export default defineComponent({
 
     const activeAccount = getLastActiveProtocolAccount(PROTOCOLS.aeternity);
 
+    const isUnknownDapp = computed(() => (
+      !popupProps.value?.app || popupProps.value.app.name === UNKNOWN_SOURCE
+    ));
+
     const permission = computed(() => {
       const host = popupProps.value?.app?.host;
       return (host) ? permissions.value[host] : undefined;
     });
 
-    const appName = computed(() => permission.value?.name || popupProps.value?.app?.name);
-
     function confirm() {
       addPermission({
         ...PERMISSION_DEFAULTS,
-        ...popupProps.value?.app,
-        ...permission.value,
+        ...(popupProps.value?.app || {}),
+        ...(permission.value || {}),
       });
       popupProps.value?.resolve();
     }
@@ -120,10 +144,6 @@ export default defineComponent({
       popupProps.value?.reject(new RejectedByUserError());
     }
 
-    onMounted(() => {
-      sender.value.name = appName.value;
-    });
-
     onUnmounted(() => {
       setPopupProps(null);
     });
@@ -132,6 +152,7 @@ export default defineComponent({
       POPUP_CONNECT_ADDRESS_PERMISSION,
       POPUP_CONNECT_TRANSACTIONS_PERMISSION,
       activeAccount,
+      isUnknownDapp,
       sender,
       confirm,
       cancel,
@@ -162,33 +183,21 @@ export default defineComponent({
     }
   }
 
-  .permissions {
-    margin: 16px 0;
+  .label {
+    display: flex;
+    align-items: center;
+    gap: 8px;
 
-    .title {
-      @extend %face-sans-15-medium;
-
-      display: flex;
-      align-items: center;
-      padding-bottom: 4px;
-      color: $color-grey-dark;
-
-      .icon {
-        width: 24px;
-        height: 24px;
-        color: $color-success;
-        padding-right: 4px;
-      }
+    .icon {
+      width: 24px;
+      height: 24px;
+      padding-right: 4px;
+      color: $color-success-dark;
     }
+  }
 
-    .description {
-      @extend %face-sans-15-regular;
-
-      display: block;
-      padding-bottom: 16px;
-      color: $color-white;
-      text-align: left;
-    }
+  .permissions {
+    margin: 16px 0;
   }
 }
 </style>
diff --git a/src/popup/pages/Popups/MessageSign.vue b/src/popup/pages/Popups/MessageSign.vue
index 1a2efda8d..61e7969cd 100644
--- a/src/popup/pages/Popups/MessageSign.vue
+++ b/src/popup/pages/Popups/MessageSign.vue
@@ -6,12 +6,21 @@
     data-cy="popup-aex2"
   >
     <TransactionInfo
-      :custom-labels="[$t('pages.popupMessageSign.title')]"
+      :custom-labels="[
+        ...(isUnknownDapp ? [$t('common.unknown')] : []),
+        $t('pages.popupMessageSign.title'),
+      ]"
       :sender="sender"
       :recipient="activeAccount"
+      :first-label-warning="isUnknownDapp"
+    />
+    <NoOriginWarning
+      v-if="isUnknownDapp"
+      :action="$t('unknownDapp.signMessageAction')"
+      :warning="$t('unknownDapp.signMessageWarning')"
     />
-
     <div
+      v-else
       class="subtitle"
       data-cy="aepp"
     >
@@ -47,11 +56,12 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onUnmounted } from 'vue';
-import { PROTOCOLS } from '@/constants';
+import { computed, defineComponent, onUnmounted } from 'vue';
+import { PROTOCOLS, UNKNOWN_SOURCE } from '@/constants';
 import { RejectedByUserError } from '@/lib/errors';
 import { useAccounts, usePopupProps } from '@/composables';
 
+import NoOriginWarning from '@/popup/components/NoOriginWarning.vue';
 import Modal from '../../components/Modal.vue';
 import BtnMain from '../../components/buttons/BtnMain.vue';
 import TransactionInfo from '../../components/TransactionInfo.vue';
@@ -65,6 +75,7 @@ export default defineComponent({
     TransactionInfo,
     DetailsItem,
     CopyText,
+    NoOriginWarning,
   },
   setup() {
     const { getLastActiveProtocolAccount } = useAccounts();
@@ -72,6 +83,10 @@ export default defineComponent({
 
     const activeAccount = getLastActiveProtocolAccount(PROTOCOLS.aeternity);
 
+    const isUnknownDapp = computed(() => (
+      !popupProps.value?.app || popupProps.value.app.name === UNKNOWN_SOURCE
+    ));
+
     function cancel() {
       popupProps.value?.reject(new RejectedByUserError());
     }
@@ -82,6 +97,7 @@ export default defineComponent({
 
     return {
       activeAccount,
+      isUnknownDapp,
       popupProps,
       sender,
       cancel,
diff --git a/src/popup/pages/SignMessage.vue b/src/popup/pages/SignMessage.vue
index 274a38dcf..b9be6fb6d 100644
--- a/src/popup/pages/SignMessage.vue
+++ b/src/popup/pages/SignMessage.vue
@@ -7,7 +7,7 @@ import { IonPage } from '@ionic/vue';
 import { defineComponent, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 
-import { MODAL_MESSAGE_SIGN } from '@/constants';
+import { MODAL_MESSAGE_SIGN, UNKNOWN_APP_DETAILS } from '@/constants';
 import { handleUnknownError } from '@/utils';
 import { RejectedByUserError } from '@/lib/errors';
 import {
@@ -39,14 +39,16 @@ export default defineComponent({
         const message = isHexEncodedMessage ? Buffer.from(rawMessage, 'hex') : rawMessage;
         const displayMessage = message?.toString();
         const { host, href } = callbackOrigin.value || {} as any;
-
-        await openModal(MODAL_MESSAGE_SIGN, {
-          message: displayMessage,
-          app: {
+        const app = host && href
+          ? {
             host,
             name: host,
             url: href,
-          },
+          } : UNKNOWN_APP_DETAILS;
+
+        await openModal(MODAL_MESSAGE_SIGN, {
+          message: displayMessage,
+          app,
         });
 
         const signature = await aeSdk.signMessage(message as string);
diff --git a/src/popup/pages/SignTransaction.vue b/src/popup/pages/SignTransaction.vue
index 35830ebfd..22da56cac 100644
--- a/src/popup/pages/SignTransaction.vue
+++ b/src/popup/pages/SignTransaction.vue
@@ -33,7 +33,7 @@ export default defineComponent({
     const { t } = useI18n();
 
     onMounted(async () => {
-      const { callbackOrigin, openCallbackOrGoHome } = useDeepLinkApi();
+      const { callbackOrigin, openCallbackOrGoHome, setIsDeepLinkUsed } = useDeepLinkApi();
       const { nodeNetworkId, getAeSdk } = useAeSdk();
       const { openDefaultModal } = useModals();
       const { setLoaderVisible } = useUi();
@@ -57,6 +57,7 @@ export default defineComponent({
       }
 
       try {
+        setIsDeepLinkUsed(true);
         setLoaderVisible(true);
         const {
           transaction, networkId, broadcast, 'replace-caller': replaceCaller,
@@ -85,7 +86,7 @@ export default defineComponent({
           decodeURIComponent(txToSign as string) as Encoded.Transaction,
           {
             networkId,
-            aeppOrigin: callbackOrigin.value?.toString(),
+            aeppOrigin: callbackOrigin.value?.toString() || undefined,
             isSenderReplaced: replaceCaller === 'true',
           } as any,
         );
@@ -109,6 +110,7 @@ export default defineComponent({
           handleUnknownError(error);
         }
       } finally {
+        setIsDeepLinkUsed(false);
         setLoaderVisible(false);
       }
     });
diff --git a/src/protocols/aeternity/libs/AeAccountHdWallet.ts b/src/protocols/aeternity/libs/AeAccountHdWallet.ts
index cd6a2ab38..d99899992 100644
--- a/src/protocols/aeternity/libs/AeAccountHdWallet.ts
+++ b/src/protocols/aeternity/libs/AeAccountHdWallet.ts
@@ -25,6 +25,7 @@ import { handleUnknownError, isAccountAirGap } from '@/utils';
 
 import { useModals } from '@/composables/modals';
 import { useAccounts } from '@/composables/accounts';
+import { useDeepLinkApi } from '@/composables/deepLinkApi';
 import { useAeMiddleware } from '@/protocols/aeternity/composables';
 import { usePermissions } from '@/composables/permissions';
 
@@ -39,12 +40,21 @@ interface InternalOptions {
 export class AeAccountHdWallet extends MemoryAccount {
   override readonly address: Encoded.AccountAddress;
 
+  /**
+   * The `isSigningAlreadyConfirmed` property
+   * is used to not show an additional confirmation modal
+   * at the time of the actual raw sign,
+   * in case the user has already confirmed the action.
+   */
+  isSigningAlreadyConfirmed: boolean;
+
   nodeNetworkId: Ref<string | undefined>;
 
   constructor(nodeNetworkId: Ref<string | undefined>) {
     super(Buffer.alloc(64));
     const aeAccount = AeAccountHdWallet.getAccount();
     this.address = aeAccount!.address as Encoded.AccountAddress;
+    this.isSigningAlreadyConfirmed = false;
     this.nodeNetworkId = nodeNetworkId;
   }
 
@@ -84,8 +94,10 @@ export class AeAccountHdWallet extends MemoryAccount {
       }
     }
 
+    const { isDeepLinkUsed } = useDeepLinkApi(true);
+
     const tx = unpackTx(txBase64) as any as ITx;
-    if (options?.aeppOrigin) {
+    if (isDeepLinkUsed || IS_OFFSCREEN_TAB) {
       const { checkOrAskPermission } = usePermissions();
       const permissionGranted = await checkOrAskPermission(
         METHODS.sign,
@@ -101,9 +113,9 @@ export class AeAccountHdWallet extends MemoryAccount {
       return signedTx;
     }
 
+    this.isSigningAlreadyConfirmed = true;
     return super.signTransaction(txBase64, {
       ...options, // Mainly to pass the `fromAccount` property
-      aeppOrigin: undefined,
       networkId: this.nodeNetworkId.value,
     } as any);
   }
@@ -124,7 +136,7 @@ export class AeAccountHdWallet extends MemoryAccount {
       });
     }
 
-    if (options?.aeppOrigin) {
+    if (IS_OFFSCREEN_TAB) {
       const { checkOrAskPermission } = usePermissions();
       const permissionGranted = await checkOrAskPermission(
         METHODS.signMessage,
@@ -136,12 +148,10 @@ export class AeAccountHdWallet extends MemoryAccount {
       }
     }
 
+    this.isSigningAlreadyConfirmed = true;
     return super.signMessage(
       message,
-      {
-        ...options, // Mainly to pass the `fromAccount` property
-        aeppOrigin: undefined,
-      },
+      options, // Mainly to pass the `fromAccount` property
     );
   }
 
@@ -150,7 +160,7 @@ export class AeAccountHdWallet extends MemoryAccount {
     aci: Parameters<AccountBase['signTypedData']>[1],
     options: Parameters<AccountBase['signTypedData']>[2] = {},
   ): Promise<Encoded.Signature> {
-    if (options?.aeppOrigin) {
+    if (IS_OFFSCREEN_TAB) {
       const dataType = new TypeResolver().resolveType(aci);
       const decodedData = new ContractByteArrayEncoder().decodeWithType(data, dataType);
       const {
@@ -174,13 +184,11 @@ export class AeAccountHdWallet extends MemoryAccount {
       }
     }
 
+    this.isSigningAlreadyConfirmed = true;
     return super.signTypedData(
       data,
       aci,
-      {
-        ...options, // Mainly to pass the `fromAccount` property
-        aeppOrigin: undefined,
-      },
+      options, // Mainly to pass the `fromAccount` property
     );
   }
 
@@ -191,7 +199,8 @@ export class AeAccountHdWallet extends MemoryAccount {
     let message;
     let resolvedName;
     const { getMiddleware } = useAeMiddleware();
-    if (options?.aeppOrigin) {
+
+    if (IS_OFFSCREEN_TAB) {
       const params = unpackDelegation(delegation);
       switch (params.tag) {
         case DelegationTag.AensName:
@@ -228,6 +237,7 @@ export class AeAccountHdWallet extends MemoryAccount {
       }
     }
 
+    this.isSigningAlreadyConfirmed = true;
     return super.signDelegation(delegation, {
       ...options, // Mainly to pass the `fromAccount` property
       networkId: this.nodeNetworkId.value,
@@ -245,7 +255,8 @@ export class AeAccountHdWallet extends MemoryAccount {
     if (account && isAccountAirGap(account)) {
       throw new Error('AirGap sign not implemented yet');
     }
-    if (options?.aeppOrigin) {
+
+    if (IS_OFFSCREEN_TAB && !this.isSigningAlreadyConfirmed) {
       const { checkOrAskPermission } = usePermissions();
       const permissionGranted = await checkOrAskPermission(
         METHODS.unsafeSign,
@@ -256,6 +267,7 @@ export class AeAccountHdWallet extends MemoryAccount {
         throw new RpcRejectedByUserError('Rejected by user');
       }
     }
+    this.isSigningAlreadyConfirmed = false;
     if (account && account.secretKey && account.protocol === PROTOCOLS.aeternity) {
       return sign(data, account.secretKey);
     }
diff --git a/src/types/index.ts b/src/types/index.ts
index 396c743ef..d3f6cc980 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -115,8 +115,9 @@ export interface IPageableResponse<T> {
 }
 
 export interface IAppData {
-  name: string;
-  url: string;
+  href?: string;
+  name?: string;
+  url?: string;
   host: string;
   protocol?: string;
 }