diff --git a/public/locales/en/layout/modals/add-app.json b/public/locales/en/layout/modals/add-app.json
index f975210f8..ce8d7f37c 100644
--- a/public/locales/en/layout/modals/add-app.json
+++ b/public/locales/en/layout/modals/add-app.json
@@ -15,12 +15,13 @@
 			"label": "Internal address",
 			"description": "Internal IP-address of the app.",
 			"troubleshoot": {
-				"label": "Common Troubleshooting",
-				"header": "This is a list of commonly made mistake and troubleshooting:",
+				"label": "Having issues?",
+				"header": "Here is a list of commonly made mistake and troubleshooting:",
 				"lines": {
-					"nothingAfterPort": "You should, in most if not all cases, not input anything after the port, even the '/admin' for pihole.",
+					"nothingAfterPort": "You should, in most if not all cases, not input any path after the port. (Even the '/admin' for pihole or '/web' for plex)",
 					"protocolCheck": "Always make sure that the URL is preceded by http or https, and to make sure you are using the right one.",
 					"preferIP": "It is recommended to use the direct ip of the machine or container you are trying to communicate with.",
+					"enablePings": "Check that the IP is right by enabling pings. Customize Board -> Layout -> Enable pings. A little red or green bubble will appear on your app tiles and hovering it will give you it's response code (A green bubble with code 200 is expected in most cases).",
 					"wget": "To make sure that homarr can communicate with the other apps, make sure to wget/curl/ping the app's IP:port.",
 					"iframe": "When it comes to iframes, those should always be using the same protocol (http/s) as Homarr.",
 					"clearCache": "Some informations are registered in cache, so an integration might not work unless you clear the cache in Homarr's general options."
diff --git a/src/components/Dashboard/Modals/EditAppModal/Tabs/GeneralTab/GeneralTab.tsx b/src/components/Dashboard/Modals/EditAppModal/Tabs/GeneralTab/GeneralTab.tsx
index aa6f56f85..2d7637751 100644
--- a/src/components/Dashboard/Modals/EditAppModal/Tabs/GeneralTab/GeneralTab.tsx
+++ b/src/components/Dashboard/Modals/EditAppModal/Tabs/GeneralTab/GeneralTab.tsx
@@ -1,7 +1,7 @@
 import { Anchor, Button, Card, Collapse, Group, Stack, Tabs, Text, TextInput } from '@mantine/core';
 import { UseFormReturnType } from '@mantine/form';
 import { useDisclosure } from '@mantine/hooks';
-import { IconAlertCircle, IconClick, IconCursorText, IconLink } from '@tabler/icons-react';
+import { IconClick, IconCursorText, IconLink } from '@tabler/icons-react';
 import { useTranslation } from 'next-i18next';
 import { AppType } from '~/types/app';
 
@@ -21,6 +21,7 @@ export const GeneralTab = ({ form, openTab }: GeneralTabProps) => {
     t('general.internalAddress.troubleshoot.lines.nothingAfterPort'),
     t('general.internalAddress.troubleshoot.lines.protocolCheck'),
     t('general.internalAddress.troubleshoot.lines.preferIP'),
+    t('general.internalAddress.troubleshoot.lines.enablePings'),
     t('general.internalAddress.troubleshoot.lines.wget'),
     t('general.internalAddress.troubleshoot.lines.iframe'),
     t('general.internalAddress.troubleshoot.lines.clearCache'),
@@ -59,12 +60,6 @@ export const GeneralTab = ({ form, openTab }: GeneralTabProps) => {
           {...form.getInputProps('behaviour.externalUrl')}
         />
 
-        <Group position="right" mt={22}>
-          <Button rightIcon={<IconAlertCircle />} onClick={toggle}>
-            {t('general.internalAddress.troubleshoot.label')}
-          </Button>
-        </Group>
-
         <Collapse in={opened}>
           <Card withBorder>
             <Text>{t('general.internalAddress.troubleshoot.header')}</Text>
@@ -93,6 +88,10 @@ export const GeneralTab = ({ form, openTab }: GeneralTabProps) => {
             </Text>
           )}
       </Stack>
+
+      <Button onClick={toggle} bottom={-68} left={0} color="yellow.7" variant="light">
+        {t('general.internalAddress.troubleshoot.label')}
+      </Button>
     </Tabs.Panel>
   );
 };