diff --git a/bin/CryptoBoxContainer.py b/bin/CryptoBoxContainer.py
index e658c53..42dc953 100755
--- a/bin/CryptoBoxContainer.py
+++ b/bin/CryptoBoxContainer.py
@@ -14,14 +14,14 @@ import logging
 from CryptoBoxExceptions import *
 
 """exceptions:
-	VolumeIsActive
-	NameActivelyUsed
-	InvalidName
-	InvalidPassword
-	InvalidType
-	CreateError
-	MountError
-	ChangePasswordError
+	CBVolumeIsActive
+	CBNameActivelyUsed
+	CBInvalidName
+	CBInvalidPassword
+	CBInvalidType
+	CBCreateError
+	CBMountError
+	CBChangePasswordError
 	"""
 
 class CryptoBoxContainer:
diff --git a/templates/macros.cs b/templates/macros.cs
index dacd199..650e049 100644
--- a/templates/macros.cs
+++ b/templates/macros.cs
@@ -157,7 +157,7 @@ def:help_link(pagename) ?><?cs
 	<div class="help_link">
 		<a href="<?cs call:link('help','page',pagename,'','') ?>" title="<?cs var:html_escape(Lang.Button.HelpForForm) ?>">
 			<?cs var:html_escape(Lang.Button.HelpForForm) ?>
-			<img class="message_symbol" src="/icons/help" alt="icon: help" />
+			<img class="message_symbol" src="cryptobox-misc/icon_get_help.png" alt="icon: help" />
 			</a></div><?cs
 /def ?><?cs