diff --git a/lam/docs/manual-sources/images/automount3.png b/lam/docs/manual-sources/images/automount3.png
index 590143ff..d2dc2956 100644
Binary files a/lam/docs/manual-sources/images/automount3.png and b/lam/docs/manual-sources/images/automount3.png differ
diff --git a/lam/docs/manual-sources/images/configModules1.png b/lam/docs/manual-sources/images/configModules1.png
index 408434be..b10162b9 100644
Binary files a/lam/docs/manual-sources/images/configModules1.png and b/lam/docs/manual-sources/images/configModules1.png differ
diff --git a/lam/docs/manual-sources/images/customFields14.png b/lam/docs/manual-sources/images/customFields14.png
index fc9561ae..17f70e75 100644
Binary files a/lam/docs/manual-sources/images/customFields14.png and b/lam/docs/manual-sources/images/customFields14.png differ
diff --git a/lam/docs/manual-sources/images/dhcpConf3.png b/lam/docs/manual-sources/images/dhcpConf3.png
index 7111326e..0d49d958 100644
Binary files a/lam/docs/manual-sources/images/dhcpConf3.png and b/lam/docs/manual-sources/images/dhcpConf3.png differ
diff --git a/lam/docs/manual-sources/images/groupOfNames4.png b/lam/docs/manual-sources/images/groupOfNames4.png
index 10686de1..989a0170 100644
Binary files a/lam/docs/manual-sources/images/groupOfNames4.png and b/lam/docs/manual-sources/images/groupOfNames4.png differ
diff --git a/lam/docs/manual-sources/images/imapAccess1.png b/lam/docs/manual-sources/images/imapAccess1.png
index b2cd96b4..f5bffef7 100644
Binary files a/lam/docs/manual-sources/images/imapAccess1.png and b/lam/docs/manual-sources/images/imapAccess1.png differ
diff --git a/lam/docs/manual-sources/images/mod_bind3.png b/lam/docs/manual-sources/images/mod_bind3.png
index a9cde6e2..664194b5 100644
Binary files a/lam/docs/manual-sources/images/mod_bind3.png and b/lam/docs/manual-sources/images/mod_bind3.png differ
diff --git a/lam/docs/manual-sources/images/mod_freeRadius1.png b/lam/docs/manual-sources/images/mod_freeRadius1.png
index 9142e8ff..0a2f3d08 100644
Binary files a/lam/docs/manual-sources/images/mod_freeRadius1.png and b/lam/docs/manual-sources/images/mod_freeRadius1.png differ
diff --git a/lam/docs/manual-sources/images/mod_groupOfNamesUser2.png b/lam/docs/manual-sources/images/mod_groupOfNamesUser2.png
index 65d2994f..7d9579de 100644
Binary files a/lam/docs/manual-sources/images/mod_groupOfNamesUser2.png and b/lam/docs/manual-sources/images/mod_groupOfNamesUser2.png differ
diff --git a/lam/docs/manual-sources/images/mod_kolab3.png b/lam/docs/manual-sources/images/mod_kolab3.png
index 867d1b4e..3444f434 100644
Binary files a/lam/docs/manual-sources/images/mod_kolab3.png and b/lam/docs/manual-sources/images/mod_kolab3.png differ
diff --git a/lam/docs/manual-sources/images/mod_kolab8.png b/lam/docs/manual-sources/images/mod_kolab8.png
index c5eab613..e172b2e5 100644
Binary files a/lam/docs/manual-sources/images/mod_kolab8.png and b/lam/docs/manual-sources/images/mod_kolab8.png differ
diff --git a/lam/docs/manual-sources/images/mod_oracle3.png b/lam/docs/manual-sources/images/mod_oracle3.png
index 954d54df..7e3d06f1 100644
Binary files a/lam/docs/manual-sources/images/mod_oracle3.png and b/lam/docs/manual-sources/images/mod_oracle3.png differ
diff --git a/lam/docs/manual-sources/images/mod_organizationalRole3.png b/lam/docs/manual-sources/images/mod_organizationalRole3.png
index 4bbbb67e..2e58a5f7 100644
Binary files a/lam/docs/manual-sources/images/mod_organizationalRole3.png and b/lam/docs/manual-sources/images/mod_organizationalRole3.png differ
diff --git a/lam/docs/manual-sources/images/mod_organizationalRoleUser1.png b/lam/docs/manual-sources/images/mod_organizationalRoleUser1.png
index 33635137..050a21c0 100644
Binary files a/lam/docs/manual-sources/images/mod_organizationalRoleUser1.png and b/lam/docs/manual-sources/images/mod_organizationalRoleUser1.png differ
diff --git a/lam/docs/manual-sources/images/mod_personal3.png b/lam/docs/manual-sources/images/mod_personal3.png
index 760e1c82..9c71d1ee 100644
Binary files a/lam/docs/manual-sources/images/mod_personal3.png and b/lam/docs/manual-sources/images/mod_personal3.png differ
diff --git a/lam/docs/manual-sources/images/mod_puppet2.png b/lam/docs/manual-sources/images/mod_puppet2.png
index a77113fc..5bab0a96 100644
Binary files a/lam/docs/manual-sources/images/mod_puppet2.png and b/lam/docs/manual-sources/images/mod_puppet2.png differ
diff --git a/lam/docs/manual-sources/images/mod_pykotaCode3.png b/lam/docs/manual-sources/images/mod_pykotaCode3.png
index 09fd916b..3eb1511f 100644
Binary files a/lam/docs/manual-sources/images/mod_pykotaCode3.png and b/lam/docs/manual-sources/images/mod_pykotaCode3.png differ
diff --git a/lam/docs/manual-sources/images/mod_pykotaGroup1.png b/lam/docs/manual-sources/images/mod_pykotaGroup1.png
index 06f9da6f..2c03e807 100644
Binary files a/lam/docs/manual-sources/images/mod_pykotaGroup1.png and b/lam/docs/manual-sources/images/mod_pykotaGroup1.png differ
diff --git a/lam/docs/manual-sources/images/mod_pykotaPrinter3.png b/lam/docs/manual-sources/images/mod_pykotaPrinter3.png
index 1b02e8e4..0b785ec4 100644
Binary files a/lam/docs/manual-sources/images/mod_pykotaPrinter3.png and b/lam/docs/manual-sources/images/mod_pykotaPrinter3.png differ
diff --git a/lam/docs/manual-sources/images/mod_pykotaUser1.png b/lam/docs/manual-sources/images/mod_pykotaUser1.png
index 3c9ea84b..a969915c 100644
Binary files a/lam/docs/manual-sources/images/mod_pykotaUser1.png and b/lam/docs/manual-sources/images/mod_pykotaUser1.png differ
diff --git a/lam/docs/manual-sources/images/mod_unixGroupConfig1.png b/lam/docs/manual-sources/images/mod_unixGroupConfig1.png
index ba9f2d8a..c1a5536b 100644
Binary files a/lam/docs/manual-sources/images/mod_unixGroupConfig1.png and b/lam/docs/manual-sources/images/mod_unixGroupConfig1.png differ
diff --git a/lam/docs/manual-sources/images/mod_windowsGroup1.png b/lam/docs/manual-sources/images/mod_windowsGroup1.png
index 58da7dbc..d9566111 100644
Binary files a/lam/docs/manual-sources/images/mod_windowsGroup1.png and b/lam/docs/manual-sources/images/mod_windowsGroup1.png differ
diff --git a/lam/docs/manual-sources/images/mod_windowsServer2.png b/lam/docs/manual-sources/images/mod_windowsServer2.png
index 3203a949..b1b64894 100644
Binary files a/lam/docs/manual-sources/images/mod_windowsServer2.png and b/lam/docs/manual-sources/images/mod_windowsServer2.png differ
diff --git a/lam/docs/manual-sources/images/mod_windowsUser1.png b/lam/docs/manual-sources/images/mod_windowsUser1.png
index ec47c77d..4030a43f 100644
Binary files a/lam/docs/manual-sources/images/mod_windowsUser1.png and b/lam/docs/manual-sources/images/mod_windowsUser1.png differ
diff --git a/lam/docs/manual-sources/images/nisMailAlias3.png b/lam/docs/manual-sources/images/nisMailAlias3.png
index 9cf211cb..0940bbe1 100644
Binary files a/lam/docs/manual-sources/images/nisMailAlias3.png and b/lam/docs/manual-sources/images/nisMailAlias3.png differ
diff --git a/lam/docs/manual-sources/images/nisMailAliasUser1.png b/lam/docs/manual-sources/images/nisMailAliasUser1.png
index 13988475..a17afb83 100644
Binary files a/lam/docs/manual-sources/images/nisMailAliasUser1.png and b/lam/docs/manual-sources/images/nisMailAliasUser1.png differ
diff --git a/lam/docs/manual-sources/images/passwordSelfReset7.png b/lam/docs/manual-sources/images/passwordSelfReset7.png
index 4b37a15b..7890d8df 100644
Binary files a/lam/docs/manual-sources/images/passwordSelfReset7.png and b/lam/docs/manual-sources/images/passwordSelfReset7.png differ
diff --git a/lam/docs/manual-sources/images/rfc2307bis.png b/lam/docs/manual-sources/images/rfc2307bis.png
index 9e3ab688..1a280c77 100644
Binary files a/lam/docs/manual-sources/images/rfc2307bis.png and b/lam/docs/manual-sources/images/rfc2307bis.png differ
diff --git a/lam/docs/manual-sources/images/sudoRole2.png b/lam/docs/manual-sources/images/sudoRole2.png
index 4a54a44e..a5b299a9 100644
Binary files a/lam/docs/manual-sources/images/sudoRole2.png and b/lam/docs/manual-sources/images/sudoRole2.png differ
diff --git a/lam/docs/manual-sources/images/zarafa1.png b/lam/docs/manual-sources/images/zarafa1.png
index 422be89c..426a3180 100644
Binary files a/lam/docs/manual-sources/images/zarafa1.png and b/lam/docs/manual-sources/images/zarafa1.png differ
diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php
index e75afd36..ccea1b02 100644
--- a/lam/templates/config/confmodules.php
+++ b/lam/templates/config/confmodules.php
@@ -257,13 +257,8 @@ function config_showAccountModules($scope, $title, &$container) {
 	$typeSettings = $conf->get_typeSettings();
 	// account modules
 	$available = getAvailableModules($scope, true);
-	$selected = $typeSettings['modules_' . $scope];
-	if (isset($selected) && ($selected != '')) {
-		$selected = explode(',', $selected);
-	}
-	else {
-		$selected = array();
-	}
+	$selected = !empty($typeSettings['modules_' . $scope]) ? $typeSettings['modules_' . $scope] : '';
+	$selected = explode(',', $selected);
 	$sortedAvailable = array();
 	for ($i = 0; $i < sizeof($available); $i++) {
 		$sortedAvailable[$available[$i]] = getModuleAlias($available[$i], $scope);
@@ -340,7 +335,7 @@ function config_showAccountModules($scope, $title, &$container) {
 		$availDiv->setCSSClasses(array('confModList'));
 		$container->addElement($availDiv, true);
 	}
-	$positions = '';
+	$positions = array();
 	for ($i = 0; $i < sizeof($selOptions); $i++) {
 		$positions[] = $i;
 	}
@@ -365,8 +360,8 @@ function checkInput() {
 	for ($t = 0; $t < sizeof($accountTypes); $t++) {
 		$scope = $accountTypes[$t];
 		$available = getAvailableModules($scope, true);
-		$selected_temp = $typeSettings['modules_' . $scope];
-		if (isset($selected_temp)) $selected_temp = explode(',', $selected_temp);
+		$selected_temp = (isset($typeSettings['modules_' . $scope])) ? $typeSettings['modules_' . $scope] : '';
+		$selected_temp = explode(',', $selected_temp);
 		$selected = array();
 		// only use available modules as selected
 		for ($i = 0; $i < sizeof($selected_temp); $i++) {