diff --git a/install/onionshare.nsi b/install/onionshare.nsi
index 55ecdbcb..0a9e6cf2 100644
--- a/install/onionshare.nsi
+++ b/install/onionshare.nsi
@@ -203,6 +203,7 @@ Section "install"
     SetOutPath "$INSTDIR\share\images"
     File "${BINPATH}\share\images\favicon.ico"
     File "${BINPATH}\share\images\file_delete.png"
+    File "${BINPATH}\share\images\info.png"
     File "${BINPATH}\share\images\logo.png"
     File "${BINPATH}\share\images\logo_transparent.png"
     File "${BINPATH}\share\images\logo_grayscale.png"
@@ -384,6 +385,7 @@ FunctionEnd
         Delete "$INSTDIR\share\html\index.html"
         Delete "$INSTDIR\share\images\favicon.ico"
         Delete "$INSTDIR\share\images\file_delete.png"
+        Delete "$INSTDIR\share\images\info.png"
         Delete "$INSTDIR\share\images\logo.png"
         Delete "$INSTDIR\share\images\logo_transparent.png"
         Delete "$INSTDIR\share\images\logo_grayscale.png"
diff --git a/onionshare_gui/server_status.py b/onionshare_gui/server_status.py
index dc7a34bb..1bd18e2f 100644
--- a/onionshare_gui/server_status.py
+++ b/onionshare_gui/server_status.py
@@ -129,15 +129,19 @@ class ServerStatus(QtWidgets.QWidget):
         if self.status == self.STATUS_STARTED:
             self.url_description.show()
 
+            info_image = common.get_resource_path('images/info.png')
+            self.url_label.setText(strings._('gui_url_label', True).format(info_image))
+            # Show a Tool Tip explaining the lifecycle of this URL
             if self.settings.get('save_private_key'):
-                self.url_label.setText(strings._('gui_url_label_persistent', True))
-                self.url_label.setToolTip(strings._('gui_url_persistence_warning', True))
-            elif self.settings.get('close_after_first_download'):
-                self.url_label.setText(strings._('gui_url_label_one_time', True))
-                self.url_label.setToolTip('')
+                if self.settings.get('close_after_first_download'):
+                    self.url_label.setToolTip(strings._('gui_url_label_onetime_and_persistent', True))
+                else:
+                    self.url_label.setToolTip(strings._('gui_url_label_persistent', True))
             else:
-                self.url_label.setText(strings._('gui_url_label', True))
-                self.url_label.setToolTip('')
+                if self.settings.get('close_after_first_download'):
+                    self.url_label.setToolTip(strings._('gui_url_label_onetime', True))
+                else:
+                    self.url_label.setToolTip(strings._('gui_url_label_stay_open', True))
             self.url_label.show()
 
             self.url.setText('http://{0:s}/{1:s}'.format(self.app.onion_host, self.web.slug))
diff --git a/share/images/info.png b/share/images/info.png
new file mode 100644
index 00000000..4be4e65e
Binary files /dev/null and b/share/images/info.png differ
diff --git a/share/locale/en.json b/share/locale/en.json
index 313469dc..cda00fcb 100644
--- a/share/locale/en.json
+++ b/share/locale/en.json
@@ -44,8 +44,8 @@
     "gui_copy_hidservauth": "Copy HidServAuth",
     "gui_downloads": "Downloads:",
     "gui_canceled": "Canceled",
-    "gui_copied_url_title": "Copied Onion address",
-    "gui_copied_url": "The Onion address has been copied to clipboard",
+    "gui_copied_url_title": "Copied OnionShare address",
+    "gui_copied_url": "The OnionShare address has been copied to clipboard",
     "gui_copied_hidservauth_title": "Copied HidServAuth",
     "gui_copied_hidservauth": "The HidServAuth line has been copied to clipboard",
     "gui_starting_server1": "Starting Tor onion service...",
@@ -136,10 +136,11 @@
     "share_via_onionshare": "Share via OnionShare",
     "gui_save_private_key_checkbox": "Use a persistent address\n(unchecking will delete any saved address)",
     "gui_url_description": "<b>Anyone</b> with this link can <b>download</b> your files using <b>Tor Browser</b>:",
-    "gui_url_label": "Your Download Address",
-    "gui_url_label_persistent": "Your <strong>Persistent</strong> Download Address <em>(what's this?)</em>",
-    "gui_url_label_one_time": "Your One-Time Download Address",
-    "gui_url_persistence_warning": "Every share will have the same URL.<br><br>If you want to go back to using one-time URLs, turn off persistence in the Settings.",
+    "gui_url_label": "Your Download Address <img src={} />",
+    "gui_url_label_persistent": "This share will not stop automatically<br><br>Every share will have the same address (to use one-time addresses, disable persistence in the Settings)",
+    "gui_url_label_stay_open": "This share will not stop automatically",
+    "gui_url_label_onetime": "This share will stop after the first download",
+    "gui_url_label_onetime_and_persistent": "This share will stop after the first download<br><br>Every share will have the same address (to use one-time addresses, disable persistence in the Settings)",
     "gui_status_indicator_stopped": "Ready to Share",
     "gui_status_indicator_working": "Starting...",
     "gui_status_indicator_started": "Sharing",