diff --git a/metadata/co.loubo.icicle.txt b/metadata/co.loubo.icicle.txt
index 9887d03178..9cdd0553c9 100644
--- a/metadata/co.loubo.icicle.txt
+++ b/metadata/co.loubo.icicle.txt
@@ -1,4 +1,4 @@
-Categories:Internet
+Categories:Internet,Security
 License:GPLv3+
 Web Site:http://loubo.co/icicle
 Source Code:https://github.com/louboco/Icicle
diff --git a/metadata/com.doplgangr.secrecy.txt b/metadata/com.doplgangr.secrecy.txt
index ab7bb7a5dd..55f605890b 100644
--- a/metadata/com.doplgangr.secrecy.txt
+++ b/metadata/com.doplgangr.secrecy.txt
@@ -1,4 +1,4 @@
-Categories:Internet,Security
+Categories:Security
 License:Apache2
 Web Site:https://github.com/Doplgangr/Secrecy_fDroid/blob/HEAD/README.md
 Source Code:https://github.com/Doplgangr/Secrecy_fDroid
diff --git a/metadata/com.eibriel.reddot.txt b/metadata/com.eibriel.reddot.txt
index 65cd958141..e8c502abc2 100644
--- a/metadata/com.eibriel.reddot.txt
+++ b/metadata/com.eibriel.reddot.txt
@@ -1,4 +1,4 @@
-Categories:Games
+Categories:Time
 License:GPLv2
 Web Site:https://github.com/Eibriel/RedDot/blob/HEAD/README.md
 Source Code:https://github.com/Eibriel/RedDot
diff --git a/metadata/com.plusonelabs.calendar.txt b/metadata/com.plusonelabs.calendar.txt
index 582a8783b0..0d64931be7 100644
--- a/metadata/com.plusonelabs.calendar.txt
+++ b/metadata/com.plusonelabs.calendar.txt
@@ -1,4 +1,4 @@
-Categories:Writing
+Categories:Time
 License:Apache2
 Web Site:
 Source Code:https://github.com/plusonelabs/calendar-widget
diff --git a/metadata/com.twofours.surespot.txt b/metadata/com.twofours.surespot.txt
index fa19ae654b..9e2aa94daa 100644
--- a/metadata/com.twofours.surespot.txt
+++ b/metadata/com.twofours.surespot.txt
@@ -1,5 +1,5 @@
 AntiFeatures:NonFreeDep
-Categories:Phone & SMS
+Categories:Security
 License:GPLv3
 Web Site:https://www.surespot.me/
 Source Code:https://github.com/zoff99/surespot-android
diff --git a/metadata/de.boesling.hydromemo.txt b/metadata/de.boesling.hydromemo.txt
index 83e8de8905..484d6e090c 100644
--- a/metadata/de.boesling.hydromemo.txt
+++ b/metadata/de.boesling.hydromemo.txt
@@ -1,4 +1,4 @@
-Categories:Time
+Categories:Time,Sports & Health
 License:GPLv3
 Web Site:
 Source Code:https://github.com/mboesling/HydroMemo
diff --git a/metadata/net.vreeken.quickmsg.txt b/metadata/net.vreeken.quickmsg.txt
index ed6d6f3121..72d102cbc5 100644
--- a/metadata/net.vreeken.quickmsg.txt
+++ b/metadata/net.vreeken.quickmsg.txt
@@ -1,4 +1,4 @@
-Categories:Internet
+Categories:Internet,Security
 License:GPLv3
 Web Site:http://quickmsg.vreeken.net
 Source Code:
diff --git a/metadata/org.ethack.orwall.txt b/metadata/org.ethack.orwall.txt
index fab267b229..ca3ffd5e85 100644
--- a/metadata/org.ethack.orwall.txt
+++ b/metadata/org.ethack.orwall.txt
@@ -1,4 +1,4 @@
-Categories:Internet
+Categories:Internet,Security
 License:GPLv3
 Web Site:https://orwall.org
 Source Code:https://github.com/EthACKdotOrg/orWall
diff --git a/metadata/org.ligi.scr.txt b/metadata/org.ligi.scr.txt
index 60d2730c6c..a9da2af7ab 100644
--- a/metadata/org.ligi.scr.txt
+++ b/metadata/org.ligi.scr.txt
@@ -1,4 +1,4 @@
-Categories:Development
+Categories:Time
 License:GPLv3
 Web Site:https://github.com/ligi/SCR/blob/HEAD/README.md
 Source Code:https://github.com/ligi/SCR
diff --git a/metadata/org.smssecure.smssecure.txt b/metadata/org.smssecure.smssecure.txt
index 7155a381f4..d86f3d65cd 100644
--- a/metadata/org.smssecure.smssecure.txt
+++ b/metadata/org.smssecure.smssecure.txt
@@ -1,4 +1,4 @@
-Categories:Phone & SMS
+Categories:Phone & SMS,Security
 License:GPLv3
 Web Site:https://silence.im/
 Source Code:https://github.com/SilenceIM/Silence
diff --git a/metadata/org.sufficientlysecure.keychain.txt b/metadata/org.sufficientlysecure.keychain.txt
index ff05335a38..2be342d8f8 100644
--- a/metadata/org.sufficientlysecure.keychain.txt
+++ b/metadata/org.sufficientlysecure.keychain.txt
@@ -1,4 +1,4 @@
-Categories:Internet
+Categories:Security
 License:GPLv3+
 Web Site:http://www.openkeychain.org
 Source Code:https://github.com/openpgp-keychain/openpgp-keychain
diff --git a/metadata/ovh.ice.icecons.txt b/metadata/ovh.ice.icecons.txt
index d3934e68b1..51f3bc29d4 100644
--- a/metadata/ovh.ice.icecons.txt
+++ b/metadata/ovh.ice.icecons.txt
@@ -1,4 +1,4 @@
-Categories:Theming,Graphics
+Categories:Theming
 License:GPLv3,CC-BY-SA-4.0
 Web Site:
 Source Code:https://github.com/1C3/ICEcons