diff --git a/UI/data/themes/Acri.qss b/UI/data/themes/Acri.qss
index 6423ede33..782fd2e7e 100644
--- a/UI/data/themes/Acri.qss
+++ b/UI/data/themes/Acri.qss
@@ -149,6 +149,17 @@ QToolTip {
 }
 
 /* Context Menu */
+
+QMenu::icon {
+    left: 4px;
+}
+
+QMenu::separator {
+    background: rgb(42,42,44);
+    height: 1px;
+    margin: 3px 6px;
+}
+
 QMenu::item:disabled {
     color: rgb(153,153,153);
     background: transparent;
@@ -168,11 +179,13 @@ QListWidget::item {
     color: palette(text);
 }
 
+QMenu,
 SceneTree,
 SourceTree {
     padding: 3px;
 }
 
+QMenu::item,
 SceneTree::item,
 SourceTree::item {
     border-radius: 4px;
@@ -181,15 +194,18 @@ SourceTree::item {
 	border: 0px solid transparent;
 }
 
+QMenu::item:selected,
 QListWidget::item:selected,
 SceneTree::item:selected,
 SourceTree::item:selected {
     background-color: rgb(19,26,48);
 }
 
+QMenu::item:hover,
 QListWidget::item:hover,
 SceneTree::item:hover,
 SourceTree::item:hover,
+QMenu::item:selected:hover,
 QListWidget::item:selected:hover,
 SceneTree::item:selected:hover,
 SourceTree::item:selected:hover {
diff --git a/UI/data/themes/Grey.qss b/UI/data/themes/Grey.qss
index c5736b9fb..d7999b5a4 100644
--- a/UI/data/themes/Grey.qss
+++ b/UI/data/themes/Grey.qss
@@ -149,6 +149,17 @@ QToolTip {
 }
 
 /* Context Menu */
+
+QMenu::icon {
+    left: 4px;
+}
+
+QMenu::separator {
+    background: palette(button);
+    height: 1px;
+    margin: 3px 6px;
+}
+
 QMenu::item:disabled {
     color: rgb(153,153,153);
     background: transparent;
@@ -168,11 +179,13 @@ QListWidget::item {
     color: palette(text);
 }
 
+QMenu,
 SceneTree,
 SourceTree {
     padding: 3px;
 }
 
+QMenu::item,
 SceneTree::item,
 SourceTree::item {
     border-radius: 4px;
@@ -181,15 +194,18 @@ SourceTree::item {
 	border: 0px solid transparent;
 }
 
+QMenu::item:selected,
 QListWidget::item:selected,
 SceneTree::item:selected,
 SourceTree::item:selected {
     background-color: rgb(40,76,184);
 }
 
+QMenu::item:hover,
 QListWidget::item:hover,
 SceneTree::item:hover,
 SourceTree::item:hover,
+QMenu::item:selected:hover,
 QListWidget::item:selected:hover,
 SceneTree::item:selected:hover,
 SourceTree::item:selected:hover {
diff --git a/UI/data/themes/Light.qss b/UI/data/themes/Light.qss
index da96735f5..461ddfb53 100644
--- a/UI/data/themes/Light.qss
+++ b/UI/data/themes/Light.qss
@@ -149,6 +149,17 @@ QToolTip {
 }
 
 /* Context Menu */
+
+QMenu::icon {
+    left: 4px;
+}
+
+QMenu::separator {
+    background: rgb(192,192,192);
+    height: 1px;
+    margin: 3px 6px;
+}
+
 QMenu::item:disabled {
     color: rgb(74,74,74);
     background: transparent;
@@ -168,11 +179,13 @@ QListWidget::item {
     color: palette(text);
 }
 
+QMenu,
 SceneTree,
 SourceTree {
     padding: 3px;
 }
 
+QMenu::item,
 SceneTree::item,
 SourceTree::item {
     border-radius: 4px;
@@ -181,15 +194,18 @@ SourceTree::item {
 	border: 0px solid transparent;
 }
 
+QMenu::item:selected,
 QListWidget::item:selected,
 SceneTree::item:selected,
 SourceTree::item:selected {
     background-color: rgb(140,181,255);
 }
 
+QMenu::item:hover,
 QListWidget::item:hover,
 SceneTree::item:hover,
 SourceTree::item:hover,
+QMenu::item:selected:hover,
 QListWidget::item:selected:hover,
 SceneTree::item:selected:hover,
 SourceTree::item:selected:hover {
diff --git a/UI/data/themes/Rachni.qss b/UI/data/themes/Rachni.qss
index 9f6898e5b..34f893d72 100644
--- a/UI/data/themes/Rachni.qss
+++ b/UI/data/themes/Rachni.qss
@@ -151,6 +151,17 @@ QToolTip {
 }
 
 /* Context Menu */
+
+QMenu::icon {
+    left: 4px;
+}
+
+QMenu::separator {
+    background: palette(light);
+    height: 1px;
+    margin: 3px 6px;
+}
+
 QMenu::item:disabled {
     color: rgb(153,153,153);
     background: transparent;
@@ -170,11 +181,13 @@ QListWidget::item {
     color: palette(text);
 }
 
+QMenu,
 SceneTree,
 SourceTree {
     padding: 3px;
 }
 
+QMenu::item,
 SceneTree::item,
 SourceTree::item {
     border-radius: 4px;
@@ -183,15 +196,18 @@ SourceTree::item {
 	border: 0px solid transparent;
 }
 
+QMenu::item:selected,
 QListWidget::item:selected,
 SceneTree::item:selected,
 SourceTree::item:selected {
     background-color: rgb(89,66,79);
 }
 
+QMenu::item:hover,
 QListWidget::item:hover,
 SceneTree::item:hover,
 SourceTree::item:hover,
+QMenu::item:selected:hover,
 QListWidget::item:selected:hover,
 SceneTree::item:selected:hover,
 SourceTree::item:selected:hover {
diff --git a/UI/data/themes/Yami.qss b/UI/data/themes/Yami.qss
index fdbc677e9..458878998 100644
--- a/UI/data/themes/Yami.qss
+++ b/UI/data/themes/Yami.qss
@@ -149,6 +149,17 @@ QToolTip {
 }
 
 /* Context Menu */
+
+QMenu::icon {
+    left: 4px;
+}
+
+QMenu::separator {
+    background: palette(button);
+    height: 1px;
+    margin: 3px 6px;
+}
+
 QMenu::item:disabled {
     color: rgb(153,153,153);
     background: transparent;
@@ -168,11 +179,13 @@ QListWidget::item {
     color: palette(text);
 }
 
+QMenu,
 SceneTree,
 SourceTree {
     padding: 3px;
 }
 
+QMenu::item,
 SceneTree::item,
 SourceTree::item {
     border-radius: 4px;
@@ -181,15 +194,18 @@ SourceTree::item {
 	border: 0px solid transparent;
 }
 
+QMenu::item:selected,
 QListWidget::item:selected,
 SceneTree::item:selected,
 SourceTree::item:selected {
     background-color: rgb(40,76,184);
 }
 
+QMenu::item:hover,
 QListWidget::item:hover,
 SceneTree::item:hover,
 SourceTree::item:hover,
+QMenu::item:selected:hover,
 QListWidget::item:selected:hover,
 SceneTree::item:selected:hover,
 SourceTree::item:selected:hover {