diff --git a/core/css/icons.scss b/core/css/icons.scss
index 38b4590e43f..7c47a3e12c8 100644
--- a/core/css/icons.scss
+++ b/core/css/icons.scss
@@ -488,3 +488,57 @@ img, object, video, button, textarea, input, select {
.icon-picture {
background-image: url('../img/places/picture.svg?v=1');
}
+
+/* APP CATEGORIES ------------------------------------------------------------------- */
+.icon-category-installed {
+ background-image: url('../img/actions/user.svg?v=1');
+}
+.icon-category-enabled {
+ background-image: url('../img/actions/checkmark.svg?v=1');
+}
+.icon-category-disabled {
+ background-image: url('../img/actions/close.svg?v=1');
+}
+.icon-category-app-bundles {
+ background-image: url('../img/categories/bundles.svg?v=1');
+}
+
+.icon-category-files {
+ background-image: url('../img/categories/files.svg?v=1');
+}
+
+.icon-category-social {
+ background-image: url('../img/categories/social.svg?v=1');
+}
+
+.icon-category-office {
+ background-image: url('../img/categories/office.svg?v=1');
+}
+
+.icon-category-auth {
+ background-image: url('../img/categories/auth.svg?v=1');
+}
+
+.icon-category-monitoring {
+ background-image: url('../img/categories/monitoring.svg?v=1');
+}
+
+.icon-category-multimedia {
+ background-image: url('../img/categories/multimedia.svg?v=1');
+}
+
+.icon-category-organization {
+ background-image: url('../img/categories/organization.svg?v=1');
+}
+
+.icon-category-customization {
+ background-image: url('../img/categories/customization.svg?v=1');
+}
+
+.icon-category-integration {
+ background-image: url('../img/categories/integration.svg?v=1');
+}
+
+.icon-category-tools {
+ background-image: url('../img/actions/settings-dark.svg?v=1');
+}
diff --git a/core/img/actions/close.svg b/core/img/actions/close.svg
index 012c34844ca..c58fe6379f3 100644
--- a/core/img/actions/close.svg
+++ b/core/img/actions/close.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
+
diff --git a/core/img/categories/auth.svg b/core/img/categories/auth.svg
new file mode 100644
index 00000000000..e770e396ab7
--- /dev/null
+++ b/core/img/categories/auth.svg
@@ -0,0 +1 @@
+
diff --git a/core/img/categories/bundles.svg b/core/img/categories/bundles.svg
new file mode 100644
index 00000000000..4ad1413ae04
--- /dev/null
+++ b/core/img/categories/bundles.svg
@@ -0,0 +1 @@
+
diff --git a/core/img/categories/customization.svg b/core/img/categories/customization.svg
new file mode 100644
index 00000000000..7136e4d5550
--- /dev/null
+++ b/core/img/categories/customization.svg
@@ -0,0 +1 @@
+
diff --git a/core/img/categories/files.svg b/core/img/categories/files.svg
new file mode 100644
index 00000000000..8ed1bf118a7
--- /dev/null
+++ b/core/img/categories/files.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/core/img/categories/integration.svg b/core/img/categories/integration.svg
new file mode 100644
index 00000000000..b2cbc9531c0
--- /dev/null
+++ b/core/img/categories/integration.svg
@@ -0,0 +1 @@
+
diff --git a/core/img/categories/monitoring.svg b/core/img/categories/monitoring.svg
new file mode 100644
index 00000000000..d672b660bac
--- /dev/null
+++ b/core/img/categories/monitoring.svg
@@ -0,0 +1 @@
+
diff --git a/core/img/categories/multimedia.svg b/core/img/categories/multimedia.svg
new file mode 100644
index 00000000000..3ea1ed2e540
--- /dev/null
+++ b/core/img/categories/multimedia.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/core/img/categories/office.svg b/core/img/categories/office.svg
new file mode 100644
index 00000000000..0cb37f3b265
--- /dev/null
+++ b/core/img/categories/office.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/core/img/categories/organization.svg b/core/img/categories/organization.svg
new file mode 100644
index 00000000000..10bc79fa063
--- /dev/null
+++ b/core/img/categories/organization.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/core/img/categories/social.svg b/core/img/categories/social.svg
new file mode 100644
index 00000000000..7953cd06878
--- /dev/null
+++ b/core/img/categories/social.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 258b0f4adcc..b400572a542 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -40,10 +40,10 @@ OC.Settings.Apps = OC.Settings.Apps || {
this._loadCategoriesCall.abort();
}
- var categories = [
- {displayName: t('settings', 'Enabled apps'), ident: 'enabled', id: '0'},
- {displayName: t('settings', 'Disabled apps'), ident: 'disabled', id: '1'},
- {displayName: t('settings', 'Your apps'), ident: 'installed', id: '2'}
+ var categories = [,
+ {displayName: t('settings', 'Your apps'), ident: 'installed', id: '0'},
+ {displayName: t('settings', 'Enabled apps'), ident: 'enabled', id: '1',},
+ {displayName: t('settings', 'Disabled apps'), ident: 'disabled', id: '2'}
];
var source = $("#categories-template").html();
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index e32a524f78a..91a73fcbe56 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -18,13 +18,13 @@ script(