diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html
index 4689a7546d..2d871a6e44 100644
--- a/phpBB/adm/style/acp_storage.html
+++ b/phpBB/adm/style/acp_storage.html
@@ -6,6 +6,28 @@
 
 <p>{{ lang('STORAGE_TITLE_EXPLAIN') }}</p>
 
+<table class="table1 zebra-table">
+	<thead>
+		<tr>
+			<th>{L_STORAGE_NAME}</th>
+			<th>{L_STORAGE_NUM_FILES}</th>
+			<th>{L_STORAGE_SIZE}</th>
+			<th>{L_STORAGE_FREE}</th>
+		</tr>
+	</thead>
+	<tbody>
+	{% for storage in STORAGES %}
+		<tr>
+			<td>{{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }}</td>
+			<td>{{ storage.get_num_files }}</td>
+			<td>{{ storage.get_size | format_bytes }}</td>
+			<td>{{ storage.free_space | format_bytes }}</td>
+		</tr>
+	{% endfor %}
+	</tbody>
+</table>
+
+
 <form id="acp_storage" method="post" action="{{ U_ACTION }}">
 
 	{% for storage in STORAGES %}
diff --git a/phpBB/language/en/acp/storage.php b/phpBB/language/en/acp/storage.php
index 8d20a24db7..1f43c6963a 100644
--- a/phpBB/language/en/acp/storage.php
+++ b/phpBB/language/en/acp/storage.php
@@ -43,6 +43,10 @@ $lang = array_merge($lang, array(
 	'STORAGE_TITLE_EXPLAIN'			=> 'Change storage providers for the file storage types of phpBB. Choose local or remote providers to store files added to or created by phpBB.',
 	'STORAGE_SELECT'				=> 'Select storage',
 	'STORAGE_SELECT_DESC'			=> 'Select a storage from the list.',
+	'STORAGE_NAME'					=> 'Storage name',
+	'STORAGE_NUM_FILES'				=> 'Number of files',
+	'STORAGE_SIZE'					=> 'Size',
+	'STORAGE_FREE'					=> 'Available space',
 
 	// Storage names
 	'STORAGE_ATTACHMENT_TITLE'		=> 'Attachments storage',
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php
index cc8c2acf04..c42ad34692 100644
--- a/phpBB/phpbb/template/twig/extension.php
+++ b/phpBB/phpbb/template/twig/extension.php
@@ -73,6 +73,7 @@ class extension extends \Twig_Extension
 			new \Twig_SimpleFilter('subset', array($this, 'loop_subset'), array('needs_environment' => true)),
 			// @deprecated 3.2.0 Uses twig's JS escape method instead of addslashes
 			new \Twig_SimpleFilter('addslashes', 'addslashes'),
+			new \Twig_SimpleFilter('format_bytes', 'get_formatted_filesize'),
 		);
 	}