2 files changed, 13 insertions, 10 deletions
diff --git a/app/assets/stylesheets/context_menu_rtl.css b/app/assets/stylesheets/context_menu_rtl.css
index cab05ad64..4e0379935 100644
--- a/app/assets/stylesheets/context_menu_rtl.css
+++ b/app/assets/stylesheets/context_menu_rtl.css
@@ -7,9 +7,8 @@
 #context-menu li.folder ul { left:auto; right:168px; }
 #context-menu li.folder>ul { left:auto; right:148px; }
 #context-menu li a.submenu { background:url("/arrow_left.png") left no-repeat; }
-
-#context-menu a {
-   background-position: 100% 40%;
-   padding-right: 20px;
-   padding-left: 0px;
+#context-menu li.folder ul li a:not(.icon) {padding-right: 28px;}
+#context-menu li a.submenu {
+   padding-right: 28px;
+   padding-left: 0;
 }
diff --git a/app/assets/stylesheets/rtl.css b/app/assets/stylesheets/rtl.css
index 0e7096d8a..83b08b23b 100644
--- a/app/assets/stylesheets/rtl.css
+++ b/app/assets/stylesheets/rtl.css
@@ -40,8 +40,8 @@ div.modal p.buttons {text-align:left;}
 #sidebar a.selected {padding:1px 2px 2px 3px; margin-left:0px; margin-right:-2px;}
 #admin-menu a.selected {padding-left:0!important; padding-right:20px!important; background-position:right 2px 40%;}
 
-a.collapsible {padding-left:0px; padding-right:12px; background: url(/arrow_down.png) no-repeat right 0px top 50%;}
-a.collapsible.collapsed {background-image: url(/arrow_left.png);}
+a.collapsible:not(:has(svg)) {padding-left:0px; padding-right:12px; background: url(/arrow_down.png) no-repeat right 0px top 50%;}
+a.collapsible.collapsed:not(:has(svg)) {background-image: url(/arrow_left.png);}
 
 /***** Tables *****/
 table.list td {padding-left:0px; padding-right:10px;}
@@ -137,8 +137,8 @@ div.issue div.subject div div {padding-left:0px; padding-right:16px;}
 
 div.issue span.private, div.journal span.private {margin-right:0px; margin-left:2px;}
 
-fieldset.collapsible>legend {padding-left:0px; padding-right:18px; background: url(/arrow_down.png) no-repeat right 50%;}
-fieldset.collapsible.collapsed>legend { background-image: url(/arrow_left.png); }
+fieldset.collapsible>legend:not(:has(svg)) {padding-left:0px; padding-right:18px; background: url(/arrow_down.png) no-repeat right 50%;}
+fieldset.collapsible.collapsed>legend:not(:has(svg)) { background-image: url(/arrow_left.png); }
 
 fieldset#filters td.add-filter {text-align:left; }
 
@@ -345,7 +345,7 @@ a.wiki-anchor {margin-left:0px; margin-right:6px;}
 .project.marker {margin-left:0; margin-right:-4px;}
 
 /***** Icons *****/
-.icon {
+.icon:not(:has(svg)) {
   background-position: right 50%;
   padding-left:0; padding-right:20px;
 }
@@ -360,6 +360,10 @@ div.issue table img.gravatar {
   margin: 0 0em 0 0.5em;
 }
 
+span.icon-label {
+  margin-right: 4px;
+}
+
 h2 img.gravatar {margin: -2px 0 -4px 4px;}
 h3 img.gravatar {margin: -4px 0 -4px 4px;}
 h4 img.gravatar {margin: -6px 0 -4px 4px;}