2 files changed, 27 insertions, 4 deletions
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 380cf9f3f5..f81c56846d 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -351,6 +351,12 @@ span.corners-bottom span {
 	margin-left: 2px;
 }
 
+.rtl #toggle {
+	left: 75%;
+	margin-right: 0;
+	margin-left: 6px;
+}
+
 #toggle-handle {
 	display: block;
 	width: 18px;
@@ -359,6 +365,11 @@ span.corners-bottom span {
 	background-image: url(../images/toggle.gif);
 }
 
+.rtl #toggle-handle {
+	background-image: url(../images/toggle.gif);
+	background-position: 100% 50%;
+}
+
 /* Menu */
 #menu {
 	float: left;
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index d75d89ab13..4cc4dbd678 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -129,11 +129,17 @@ function switch_menu()
 			main.style.width = '93%';
 			menu_state = 'hidden';
 			menu.style.display = 'none';
-			toggle.style.left = '0';
 			toggle.style.width = '20px';
 			handle.style.backgroundImage = 'url(images/toggle.gif)';
-			handle.style.backgroundPosition = '100% 50%';
 			handle.style.backgroundRepeat = 'no-repeat';
+
+			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+				handle.style.backgroundPosition = '0% 50%';
+				toggle.style.left = '96%';
+			<!-- ELSE -->
+				handle.style.backgroundPosition = '100% 50%';
+				toggle.style.left = '0';
+			<!-- ENDIF -->
 		break;
 
 		// show
@@ -141,11 +147,17 @@ function switch_menu()
 			main.style.width = '76%';
 			menu_state = 'shown';
 			menu.style.display = 'block';
-			toggle.style.left = '15%';
 			toggle.style.width = '5%';
 			handle.style.backgroundImage = 'url(images/toggle.gif)';
-			handle.style.backgroundPosition = '0% 50%';
 			handle.style.backgroundRepeat = 'no-repeat';
+
+			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+				handle.style.backgroundPosition = '100% 50%';
+				toggle.style.left = '75%';
+			<!-- ELSE -->
+				handle.style.backgroundPosition = '0% 50%';
+				toggle.style.left = '15%';
+			<!-- ENDIF -->
 		break;
 	}
 }