diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index e3592c7fd0..c460081a04 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -205,6 +205,8 @@
 		<li>[Fix] Fix handling of bookmarks and subscriptions on &quot;split topcis&quot;, &quot;merge topics&quot; and &quot;merge posts&quot;. (Bug #50035)</li>
 		<li>[Fix] Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)</li>
 		<li>[Fix] Add header gradient back into subsilver2 but keep site logo easily replaceable with smaller and bigger ones. (Bug #11142 - Patch by dark/Rain and Raimon)</li>
+		<li>[Fix] Activation email not sent from user settings (Bug #43145)</li>
+		<li>[Fix] Resend activation e-mail link inappropriate if using Admin activation (Bug #44375 - Patch by bbrunnrman)</li>
 		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
 		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
 		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
@@ -231,11 +233,12 @@
 		<li>[Change] Parse multiline url title for [url] BBCode tag. (Bug #1309)</li>
 		<li>[Change] Introduce new parameter to page_header() for forum specific who is online listings.</li>
 		<li>[Change] Lifted minimum requirement for Firebird DBMS from 2.0+ to 2.1+.</li>
-		<li>[Change] Unapproved topics can no longer be replied to (Bug #44005)</li>
+		<li>[Change] Unapproved topics can no longer be replied to (Bug #44005, #47675, #23605)</li>
 		<li>[Change] Require user to be registered and logged in to search for unread posts if topic read tracking is disabled for guests (Bug #49525)</li>
 		<li>[Change] Allow three-digit hex notation in Color BBcode. (Bug #39965 - Patch by m0rpha)</li>
 		<li>[Change] Simplified login_box() and redirection after login. S_LOGIN_ACTION can now be used on every page. (Bug #50285)</li>
 		<li>[Change] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</li>
+		<li>[Change] Resize oversized Topic icons (Bug #44415)</li>
 		<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
 		<li>[Feature] Backported 3.2 captcha plugins.
 			<ul>
@@ -269,7 +272,7 @@
 		<li>[Feature] Add option to disable remote upload avatars (Bug #45375 - Patch by nickvergessen)</li>
 		<li>[Feature] Ability to delete warnings and keep warnings permanently (Bug #43375 - Patch by nickvergessen)</li>
 		<li>[Feature] Ability to empty a user's outbox from the user ACP quick tools.</li>
-		<li>[Feature] Ability to filter ACP / MCP logs</li>
+		<li>[Feature] Ability to search ACP / MCP logs</li>
 		<li>[Feature] Users can report PMs to moderators which are then visible in a new MCP module</li>
 		<li>[Feature] Parse email text files with the template engine.</li>
 		<li>[Feature] Use email-style quoting when bbcodes are disabled.</li>
diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php
index 542ed47f3b..3198376584 100644
--- a/phpBB/includes/acp/acp_ban.php
+++ b/phpBB/includes/acp/acp_ban.php
@@ -156,7 +156,8 @@ class acp_ban
 					FROM ' . BANLIST_TABLE . '
 					WHERE (ban_end >= ' . time() . "
 							OR ban_end = 0)
-						AND ban_ip <> ''";
+						AND ban_ip <> ''
+					ORDER BY ban_ip";
 			break;
 
 			case 'email':
@@ -168,7 +169,8 @@ class acp_ban
 					FROM ' . BANLIST_TABLE . '
 					WHERE (ban_end >= ' . time() . "
 							OR ban_end = 0)
-						AND ban_email <> ''";
+						AND ban_email <> ''
+					ORDER BY ban_email";
 			break;
 		}
 		$result = $db->sql_query($sql);
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php
index fa1e324cc6..8213c55ccb 100644
--- a/phpBB/includes/acp/acp_icons.php
+++ b/phpBB/includes/acp/acp_icons.php
@@ -89,6 +89,18 @@ class acp_icons
 						continue;
 					}
 
+					// adjust the width and height to be lower than 128px while perserving the aspect ratio
+					if ($img_size[0] > 127 && $img_size[0] > $img_size[1])
+					{
+						$img_size[1] = (int) ($img_size[1] * (127 / $img_size[0]));
+						$img_size[0] = 127;
+					}
+					else if ($img_size[1] > 127)
+					{
+						$img_size[0] = (int) ($img_size[0] * (127 / $img_size[1]));
+						$img_size[1] = 127;
+					}
+
 					$_images[$path . $img]['file'] = $path . $img;
 					$_images[$path . $img]['width'] = $img_size[0];
 					$_images[$path . $img]['height'] = $img_size[1];
@@ -388,6 +400,17 @@ class acp_icons
 							$image_height[$image] = $img_size[1];
 						}
 
+						if ($image_width[$image] > 127 && $image_width[$image] > $image_height[$image])
+						{
+							$image_height[$image] = (int) ($image_height[$image] * (127 / $image_width[$image]));
+							$image_width[$image] = 127;
+						}
+						else if ($image_height[$image] > 127)
+						{
+							$image_width[$image] = (int) ($image_width[$image] * (127 / $image_height[$image]));
+							$image_height[$image] = 127;
+						}
+
 						$img_sql = array(
 							$fields . '_url'		=> $image,
 							$fields . '_width'		=> $image_width[$image],
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 71720f45b4..98a0cfebd5 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -385,6 +385,31 @@ class acp_users
 
 							user_active_flip('flip', $user_id);
 
+							if ($user_row['user_type'] == USER_INACTIVE)
+							{
+								if ($config['require_activation'] == USER_ACTIVATION_ADMIN)
+								{
+									include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+
+									$messenger = new messenger(false);
+
+									$messenger->template('admin_welcome_activated', $user_row['user_lang']);
+
+									$messenger->to($user_row['user_email'], $user_row['username']);
+
+									$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
+									$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
+									$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
+									$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+
+									$messenger->assign_vars(array(
+										'USERNAME'	=> htmlspecialchars_decode($user_row['username']))
+									);
+
+									$messenger->send(NOTIFY_EMAIL);
+								}
+							}
+
 							$message = ($user_row['user_type'] == USER_INACTIVE) ? 'USER_ADMIN_ACTIVATED' : 'USER_ADMIN_DEACTIVED';
 							$log = ($user_row['user_type'] == USER_INACTIVE) ? 'LOG_USER_ACTIVE' : 'LOG_USER_INACTIVE';
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 96ecf739ed..8957633ec7 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3006,7 +3006,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
 		'LOGIN_EXPLAIN'		=> $l_explain,
 
 		'U_SEND_PASSWORD' 		=> ($config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : '',
-		'U_RESEND_ACTIVATION'	=> ($config['require_activation'] != USER_ACTIVATION_NONE && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '',
+		'U_RESEND_ACTIVATION'	=> ($config['require_activation'] == USER_ACTIVATION_SELF && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '',
 		'U_TERMS_USE'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
 		'U_PRIVACY'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),