diff --git a/src/apps.json b/src/apps.json
index 975530295..e36664ac0 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -2218,23 +2218,6 @@
 			"icon": "ESERV-10.png",
 			"website": "http://www.violasystems.com"
 		},
-		"Etherpad": {
-			"cats": [
-				24
-			],
-			"headers": {
-				"Server": "^Etherpad"
-			},
-			"env": [
-				"^pad(?:editbar|impexp)$"
-			],
-			"script": [
-				"/ep_etherpad-lite/"
-			],
-			"icon": "etherpad.png",
-			"implies": "Node.js",
-			"website": "https://etherpad.org"
-		},
 		"EWS-NIC4": {
 			"cats": [
 				22
@@ -2368,6 +2351,23 @@
 			"icon": "Erlang.png",
 			"website": "http://www.erlang.org"
 		},
+		"Etherpad": {
+			"cats": [
+				24
+			],
+			"env": [
+				"^pad(?:editbar|impexp)$"
+			],
+			"headers": {
+				"Server": "^Etherpad"
+			},
+			"icon": "etherpad.png",
+			"implies": "Node.js",
+			"script": [
+				"/ep_etherpad-lite/"
+			],
+			"website": "https://etherpad.org"
+		},
 		"Exagon Concept": {
 			"cats": [
 				1
@@ -2867,6 +2867,13 @@
 			"icon": "Glyphicons.png",
 			"website": "http://glyphicons.com"
 		},
+		"Go": {
+			"cats": [
+				27
+			],
+			"icon": "Go.svg",
+			"website": "https://golang.org"
+		},
 		"GoAhead": {
 			"cats": [
 				22
diff --git a/src/icons/Go.svg b/src/icons/Go.svg
new file mode 100644
index 000000000..8b0b1af64
--- /dev/null
+++ b/src/icons/Go.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 128 128" overflow="visible"><g clip-rule="evenodd"><path d="M17.42 102.92c.186 3.843 4.025 2.065 5.764.864 1.65-1.14 2.133-.193 2.278-2.444.095-1.48.266-2.96.182-4.444-2.496-.226-5.21.368-7.257 1.855-1.054.767-3.03 3.21-.967 4.17" fill="#f6d2a2" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M17.42 102.92c.56-.207 1.15-.355 1.53-.86" fill="#c6b198" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M26.292 57.14c-14.71-4.136-3.772-22.85 8.04-15.153l-8.04 15.154zm65.36-16.558c11.645-8.178 22.167 10.274 8.634 14.917L91.652 40.58z" fill="#6ad7e5" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M94.157 150.215c2.958 1.83 8.364 7.364 3.927 10.047-4.263 3.903-6.65-4.284-10.39-5.42 1.61-2.187 3.653-4.183 6.463-4.627z" fill="#f6d2a2" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M98.084 160.262c-.658-1.308-.88-2.835-1.977-3.89" stroke="#000" stroke-width=".732" stroke-linecap="round" fill="none"/><path d="M41.316 156.47c-3.47.536-5.425 3.668-8.32 5.258-2.726 1.626-3.77-.52-4.015-.956-.427-.195-.39.18-1.05-.483-2.53-3.99 2.634-6.907 5.322-8.89 3.744-.756 6.09 2.49 8.064 5.07z" fill="#f6d2a2" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M28.98 160.772c.133-1.52 1.34-2.54 1.913-3.825" stroke="#000" stroke-width=".732" stroke-linecap="round" fill="none"/><path d="M26.906 51.972c-1.94-1.027-3.365-2.42-2.178-4.666 1.1-2.078 3.14-1.852 5.082-.826l-2.904 5.492zM97.22 50.02c1.94-1.027 3.365-2.42 2.178-4.666-1.1-2.078-3.14-1.852-5.082-.826l2.904 5.492z" fill-rule="evenodd"/><path d="M110.58 102.432c-.186 3.843-4.025 2.065-5.764.864-1.65-1.14-2.133-.193-2.278-2.444-.095-1.48-.266-2.958-.182-4.444 2.496-.226 5.21.368 7.257 1.855 1.054.766 3.03 3.21.967 4.17" fill="#f6d2a2" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M110.58 102.432c-.56-.207-1.15-.355-1.53-.86" fill="#c6b198" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M62.53 32.81c14.73 0 28.537 2.106 35.735 16.257 6.46 15.86 4.163 32.965 5.15 49.728.845 14.394 2.72 31.024-3.957 44.363-7.024 14.033-24.578 17.563-39.04 17.046-11.36-.406-25.08-4.112-31.492-14.49-7.522-12.176-3.96-30.28-3.415-43.83.648-16.047-4.346-32.144.926-47.847 5.47-16.29 20.22-19.972 36.095-21.228" fill="#6ad7e5" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M65.126 52.58c2.644 15.37 27.77 11.307 24.16-4.195-3.235-13.902-25.04-10.054-24.16 4.195" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-width=".709" stroke-linecap="round"/><path d="M35.1 55.066c3.428 13.382 24.853 9.956 24.046-3.467-.968-16.078-27.322-12.976-24.045 3.466" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-width=".688" stroke-linecap="round"/><path d="M68.157 71.025c.01 2 .454 4.242.076 6.368-.51.964-1.51 1.066-2.373 1.456a3.493 3.493 0 0 1-2.675-2.087c-.306-2.427.114-4.777.192-7.204l4.78 1.465z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><g transform="matrix(.244 0 0 .244 14.833 29.609)" fill-rule="evenodd"><ellipse ry="16.062" rx="14.829" cy="95.404" cx="107.324"/><ellipse ry="4.082" rx="3.496" cy="99.029" cx="114.069" fill="#fff"/></g><g transform="matrix(.244 0 0 .244 14.833 29.609)" fill-rule="evenodd"><ellipse ry="16.062" rx="14.582" cy="91.404" cx="231.571"/><ellipse ry="4.082" rx="3.438" cy="95.029" cx="238.204" fill="#fff"/></g><path d="M57.818 70.808c-1.578 3.825.88 11.475 5.164 5.833-.307-2.426.114-4.775.19-7.203l-5.354 1.37z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><g fill-rule="evenodd"><path d="M58.363 63.443c-2.942.25-5.347 3.75-3.817 6.517 2.025 3.666 6.548-.324 9.364.05 3.242.066 5.897 3.427 8.5.607 2.897-3.136-1.246-6.19-4.483-7.556l-9.564.383z" fill="#f6d2a2" stroke="#231f20" stroke-width=".732" stroke-linecap="round"/><path d="M57.993 63.29c-.218-5.097 9.5-5.735 10.648-1.468 1.146 4.257-10.17 5.246-10.647 1.468-.382-3.017 0 0 0 0z"/></g></g></svg>
\ No newline at end of file