diff --git a/CHANGELOG.md b/CHANGELOG.md
index c360e511..5132d110 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,8 @@ _This release is scheduled to be released on 2021-01-01._
 - Calendar parsing where RRULE bug returns wrong date, add Windows timezone name support. (#2145, #2151)
 - Wrong node-ical version installed (package.json) requested version. (#2153)
 - Fix calendar fetcher subsequent timing (#2160)
+- Rename Greek translation to correct ISO 639-1 alpha-2 code (gr > el). (#2155)
+- Add a space after icons of sunrise and sunset (#2169)
 
 ## [2.13.0] - 2020-10-01
 
diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js
index 1c7109b6..6e3d7090 100644
--- a/modules/default/clock/clock.js
+++ b/modules/default/clock/clock.js
@@ -187,10 +187,10 @@ Module.register("clock", {
 				'"><i class="fa fa-sun-o" aria-hidden="true"></i> ' +
 				untilNextEventString +
 				"</span>" +
-				'<span><i class="fa fa-arrow-up" aria-hidden="true"></i>' +
+				'<span><i class="fa fa-arrow-up" aria-hidden="true"></i> ' +
 				formatTime(this.config, sunTimes.sunrise) +
 				"</span>" +
-				'<span><i class="fa fa-arrow-down" aria-hidden="true"></i>' +
+				'<span><i class="fa fa-arrow-down" aria-hidden="true"></i> ' +
 				formatTime(this.config, sunTimes.sunset) +
 				"</span>";
 		}
diff --git a/translations/gr.json b/translations/el.json
similarity index 100%
rename from translations/gr.json
rename to translations/el.json
diff --git a/translations/translations.js b/translations/translations.js
index 7d0fcfa0..b972b9a8 100644
--- a/translations/translations.js
+++ b/translations/translations.js
@@ -25,7 +25,7 @@ var translations = {
 	"zh-tw": "translations/zh-tw.json", // Traditional Chinese
 	ja: "translations/ja.json", // Japanese
 	pl: "translations/pl.json", // Polish
-	gr: "translations/gr.json", // Greek
+	el: "translations/el.json", // Greek
 	da: "translations/da.json", // Danish
 	tr: "translations/tr.json", // Turkish
 	ru: "translations/ru.json", // Russian