diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
deleted file mode 100644
index 36f2268b84..0000000000
--- a/phpBB/adm/style/acp_search.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-
-<!-- IF S_SETTINGS -->
-	<h1>{L_ACP_SEARCH_SETTINGS}</h1>
-
-	<p>{L_ACP_SEARCH_SETTINGS_EXPLAIN}</p>
-
-	<form id="acp_search" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>
-	<dl>
-		<dt><label for="load_search">{L_YES_SEARCH}{L_COLON}</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="search_interval">{L_SEARCH_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_interval" type="number" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
-	</dl>
-	<dl>
-		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_anonymous_interval" type="number" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
-	</dl>
-	<dl>
-		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}{L_COLON}</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
-		<dd><input id="limit_search_load" type="text" size="4" maxlength="4" name="config[limit_search_load]" value="{LIMIT_SEARCH_LOAD}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
-		<dd><input id="min_search_author_chars" type="number" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-		<dd><input id="max_num_search_keywords" type="number" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
-	</dl>
-	<dl>
-		<dt>
-			<label for="default_search_return_chars">{{ lang('DEFAULT_SEARCH_RETURN_CHARS') ~ lang('COLON') }}</label>
-			<br><span>{{ lang('DEFAULT_SEARCH_RETURN_CHARS_EXPLAIN') }}</span>
-		</dt>
-		<dd><input id="default_search_return_chars" name="config[default_search_return_chars]" type="number" value="{{ DEFAULT_SEARCH_RETURN_CHARS }}" min="0" max="9999"></dd>
-	</dl>
-	<dl>
-		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}{L_COLON}</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
-		<dd><input id="search_store_results" type="number" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_SEARCH_TYPE}</legend>
-	<dl>
-		<dt><label for="search_type">{L_SEARCH_TYPE}{L_COLON}</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
-		<dd><select id="search_type" name="config[search_type]" data-togglable-settings="true">{S_SEARCH_TYPES}</select></dd>
-	</dl>
-	</fieldset>
-
-	<!-- BEGIN backend -->
-
-		<fieldset id="search_{backend.IDENTIFIER}_settings">
-			<legend>{backend.NAME}</legend>
-		{backend.SETTINGS}
-		</fieldset>
-
-	<!-- END backend -->
-
-	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		</p>
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_INDEX -->
-
-	<script>
-	// <![CDATA[
-		/**
-		* Popup search progress bar
-		*/
-		function popup_progress_bar(progress_type)
-		{
-			close_waitscreen = 0;
-			// no scrollbars
-			popup('{UA_PROGRESS_BAR}&amp;type=' + progress_type, 400, 240, '_index');
-		}
-	// ]]>
-	</script>
-
-	<h1>{L_ACP_SEARCH_INDEX}</h1>
-
-	<!-- IF S_CONTINUE_INDEXING -->
-		<p>{L_CONTINUE_EXPLAIN}</p>
-
-		<form id="acp_search_continue" method="post" action="{U_CONTINUE_INDEXING}">
-			<fieldset>
-				<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-				<p class="submit-buttons">
-					<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-					<input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" />
-				</p>
-				{S_FORM_TOKEN}
-			</fieldset>
-		</form>
-	<!-- ELSE -->
-
-		<p>{L_ACP_SEARCH_INDEX_EXPLAIN}</p>
-
-		<!-- BEGIN backend -->
-
-			{% if backend.S_STATS is not empty %}
-
-			<form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}">
-
-				<fieldset class="tabulated">
-
-				{backend.S_HIDDEN_FIELDS}
-
-				<legend>{L_INDEX_STATS}{L_COLON} {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>
-
-				<table class="table1">
-					<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>
-					<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-				<thead>
-				<tr>
-					<th>{L_STATISTIC}</th>
-					<th>{L_VALUE}</th>
-					<th>{L_STATISTIC}</th>
-					<th>{L_VALUE}</th>
-				</tr>
-				</thead>
-				<tbody>
-				{% for stat in backend.S_STATS | batch(2, '') %}
-					<tr>
-					{% for key, value in stat %}
-						{% if value is not empty %}
-							<td>{{ key }}{L_COLON}</td>
-							<td>{{ value }}</td>
-						{% else %}
-							<td></td>
-							<td></td>
-						{% endif %}
-					{% endfor %}
-					</tr>
-				{% endfor %}
-				</tbody>
-				</table>
-
-			{% endif %}
-
-			<p class="quick">
-			<!-- IF backend.S_INDEXED -->
-				<input type="hidden" name="action" value="delete" />
-				<input class="button2" type="submit" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
-			<!-- ELSE -->
-				<input type="hidden" name="action" value="create" />
-				<input class="button2" type="submit" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
-			<!-- ENDIF -->
-			</p>
-			{S_FORM_TOKEN}
-			</fieldset>
-
-			</form>
-		<!-- END backend -->
-
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_search_index.html b/phpBB/adm/style/acp_search_index.html
new file mode 100644
index 0000000000..8ce882fa89
--- /dev/null
+++ b/phpBB/adm/style/acp_search_index.html
@@ -0,0 +1,80 @@
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+
+<script>
+// <![CDATA[
+	/**
+	* Popup search progress bar
+	*/
+	function popup_progress_bar(progress_type)
+	{
+		close_waitscreen = 0;
+		// no scrollbars
+		popup('{UA_PROGRESS_BAR}&amp;type=' + progress_type, 400, 240, '_index');
+	}
+// ]]>
+</script>
+
+<h1>{L_ACP_SEARCH_INDEX}</h1>
+
+<p>{L_ACP_SEARCH_INDEX_EXPLAIN}</p>
+
+<!-- BEGIN backend -->
+
+	{% if backend.S_STATS is not empty %}
+
+	<form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}">
+
+		<fieldset class="tabulated">
+
+		{backend.S_HIDDEN_FIELDS}
+
+		<legend>{L_INDEX_STATS}{L_COLON} {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>
+
+		<table class="table1">
+			<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>
+			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+		<thead>
+		<tr>
+			<th>{L_STATISTIC}</th>
+			<th>{L_VALUE}</th>
+			<th>{L_STATISTIC}</th>
+			<th>{L_VALUE}</th>
+		</tr>
+		</thead>
+		<tbody>
+		{% for stat in backend.S_STATS | batch(2, '') %}
+			<tr>
+			{% for key, value in stat %}
+				{% if value is not empty %}
+					<td>{{ key }}{L_COLON}</td>
+					<td>{{ value }}</td>
+				{% else %}
+					<td></td>
+					<td></td>
+				{% endif %}
+			{% endfor %}
+			</tr>
+		{% endfor %}
+		</tbody>
+		</table>
+
+	{% endif %}
+
+	<p class="quick">
+	<!-- IF backend.S_INDEXED -->
+		<input type="hidden" name="action" value="delete" />
+		<input class="button2" type="submit" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
+	<!-- ELSE -->
+		<input type="hidden" name="action" value="create" />
+		<input class="button2" type="submit" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
+	<!-- ENDIF -->
+	</p>
+	{S_FORM_TOKEN}
+	</fieldset>
+
+	</form>
+<!-- END backend -->
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_search_index_inprogress.html b/phpBB/adm/style/acp_search_index_inprogress.html
new file mode 100644
index 0000000000..6d9630a35a
--- /dev/null
+++ b/phpBB/adm/style/acp_search_index_inprogress.html
@@ -0,0 +1,34 @@
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+
+<script>
+// <![CDATA[
+	/**
+	* Popup search progress bar
+	*/
+	function popup_progress_bar(progress_type)
+	{
+		close_waitscreen = 0;
+		// no scrollbars
+		popup('{UA_PROGRESS_BAR}&amp;type=' + progress_type, 400, 240, '_index');
+	}
+// ]]>
+</script>
+
+<h1>{L_ACP_SEARCH_INDEX}</h1>
+
+<p>{L_CONTINUE_EXPLAIN}</p>
+
+<form id="acp_search_continue" method="post" action="{U_CONTINUE_INDEXING}">
+	<fieldset>
+		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+			<input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" />
+		</p>
+		{S_FORM_TOKEN}
+	</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_search_settings.html b/phpBB/adm/style/acp_search_settings.html
new file mode 100644
index 0000000000..b468fd17ed
--- /dev/null
+++ b/phpBB/adm/style/acp_search_settings.html
@@ -0,0 +1,78 @@
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+
+<h1>{L_ACP_SEARCH_SETTINGS}</h1>
+
+<p>{L_ACP_SEARCH_SETTINGS_EXPLAIN}</p>
+
+<form id="acp_search" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>
+<dl>
+	<dt><label for="load_search">{L_YES_SEARCH}{L_COLON}</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+</dl>
+<dl>
+	<dt><label for="search_interval">{L_SEARCH_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
+	<dd><input id="search_interval" type="number" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
+</dl>
+<dl>
+	<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
+	<dd><input id="search_anonymous_interval" type="number" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
+</dl>
+<dl>
+	<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}{L_COLON}</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
+	<dd><input id="limit_search_load" type="text" size="4" maxlength="4" name="config[limit_search_load]" value="{LIMIT_SEARCH_LOAD}" /></dd>
+</dl>
+<dl>
+	<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
+	<dd><input id="min_search_author_chars" type="number" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
+</dl>
+<dl>
+	<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
+	<dd><input id="max_num_search_keywords" type="number" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
+</dl>
+<dl>
+	<dt>
+		<label for="default_search_return_chars">{{ lang('DEFAULT_SEARCH_RETURN_CHARS') ~ lang('COLON') }}</label>
+		<br><span>{{ lang('DEFAULT_SEARCH_RETURN_CHARS_EXPLAIN') }}</span>
+	</dt>
+	<dd><input id="default_search_return_chars" name="config[default_search_return_chars]" type="number" value="{{ DEFAULT_SEARCH_RETURN_CHARS }}" min="0" max="9999"></dd>
+</dl>
+<dl>
+	<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}{L_COLON}</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
+	<dd><input id="search_store_results" type="number" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
+</dl>
+</fieldset>
+
+<fieldset>
+	<legend>{L_SEARCH_TYPE}</legend>
+<dl>
+	<dt><label for="search_type">{L_SEARCH_TYPE}{L_COLON}</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
+	<dd><select id="search_type" name="config[search_type]" data-togglable-settings="true">{S_SEARCH_TYPES}</select></dd>
+</dl>
+</fieldset>
+
+<!-- BEGIN backend -->
+
+	<fieldset id="search_{backend.IDENTIFIER}_settings">
+		<legend>{backend.NAME}</legend>
+	{backend.SETTINGS}
+	</fieldset>
+
+<!-- END backend -->
+
+<fieldset>
+	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index 81053d1f33..28758cd91b 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -203,7 +203,6 @@ class acp_search
 
 			'S_SEARCH_TYPES'		=> $search_options,
 			'S_YES_SEARCH'			=> (bool) $config['load_search'],
-			'S_SETTINGS'			=> true,
 
 			'U_ACTION'				=> $this->u_action . '&amp;hash=' . generate_link_hash('acp_search'),
 		]);
@@ -355,7 +354,6 @@ class acp_search
 		$this->page_title = 'ACP_SEARCH_INDEX';
 
 		$template->assign_vars(array(
-			'S_INDEX'				=> true,
 			'U_ACTION'				=> $this->u_action . '&amp;hash=' . generate_link_hash('acp_search'),
 			'U_PROGRESS_BAR'		=> append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&amp;mode=$mode&amp;action=progress_bar"),
 			'UA_PROGRESS_BAR'		=> addslashes(append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&amp;mode=$mode&amp;action=progress_bar")),
@@ -363,6 +361,9 @@ class acp_search
 
 		if (isset($this->state[self::STATE_ACTION]))
 		{
+			$this->tpl_name = 'acp_search_index';
+			$this->page_title = 'ACP_SEARCH_INDEX';
+
 			$template->assign_vars(array(
 				'S_CONTINUE_INDEXING'	=> $this->state[1],
 				'U_CONTINUE_INDEXING'	=> $this->u_action . '&amp;action=' . $this->state[self::STATE_ACTION] . '&amp;hash=' . generate_link_hash('acp_search'),