diff --git a/public/assets/css/theme-gitdotgay-dark.css b/public/assets/css/theme-gitdotgay-dark.css
index 7c251ec..33e9ef8 100644
--- a/public/assets/css/theme-gitdotgay-dark.css
+++ b/public/assets/css/theme-gitdotgay-dark.css
@@ -353,6 +353,9 @@
   --color-orange-badge-bg: #ea580c22;
   --color-orange-badge-hover-bg: #ea580c44;
   --color-git: #f05133;
+  /* Icon colors (PR/Issue/...) */
+  --color-icon-red: var(--color-red);
+  --color-icon-purple: var(--color-primary);
   /* target-based colors */
   --color-body: var(--steel-800);
   --color-box-header: var(--steel-750);
@@ -598,6 +601,9 @@ i.grey.icon.icon.icon.icon {
   color: inherit;
   margin-bottom: 16px !important;
 }
+.issue-state-label.green {
+  background-color: #16a34a !important;
+}
 
 /* friendlycaptcha */
 .frc-captcha.frc-captcha,
diff --git a/public/assets/css/theme-gitdotgay-light.css b/public/assets/css/theme-gitdotgay-light.css
index a8b975e..4cf5eea 100644
--- a/public/assets/css/theme-gitdotgay-light.css
+++ b/public/assets/css/theme-gitdotgay-light.css
@@ -144,6 +144,9 @@
   --color-orange-badge-bg: #ea580c22;
   --color-orange-badge-hover-bg: #ea580c44;
   --color-git: #f05133;
+  /* Icon colors (PR/Issue/...) */
+  --color-icon-red: var(--color-red);
+  --color-icon-purple: var(--color-primary);
   /* target-based colors */
   --color-body: #fff;
   --color-box-header: var(--steel-100);
@@ -366,6 +369,9 @@ i.grey.icon.icon.icon.icon {
   color: inherit;
   margin-bottom: 16px !important;
 }
+.issue-state-label.green {
+  background-color: #16a34a !important;
+}
 
 /* friendlycaptcha */
 .frc-captcha.frc-captcha,