diff --git a/installation/forms/setup.xml b/installation/forms/setup.xml
index 92a1a7a4fbf0d..7be2b2ad2234f 100644
--- a/installation/forms/setup.xml
+++ b/installation/forms/setup.xml
@@ -6,7 +6,7 @@
 			type="installation.language"
 			label="INSTL_SELECT_LANGUAGE_TITLE"
 			id="language"
-			class="custom-select-sm required"
+			class="required"
 			default="en-GB"
 		/>
 		<field
diff --git a/installation/template/images/select-bg-active.svg b/installation/template/images/select-bg-active.svg
deleted file mode 100644
index 19cd7866984c2..0000000000000
--- a/installation/template/images/select-bg-active.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1854.54 295" preserveAspectRatio="xMinYMid" width="1854.54" height="295"><path d="M1825.1,145.7l6.9,6.9c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.3-0.1l6.9-6.9c0.1-0.1,0.1-0.2,0.1-0.3c0-0.1,0-0.2-0.1-0.3l-0.7-0.7c-0.1-0.1-0.2-0.1-0.3-0.1s-0.2,0-0.3,0.1l-5.8,5.8l-5.8-5.8c-0.1-0.1-0.2-0.1-0.3-0.1c-0.1,0-0.2,0-0.3,0.1l-0.7,0.7c-0.1,0.1-0.1,0.2-0.1,0.3C1824.9,145.5,1825,145.6,1825.1,145.7z" fill="#fff"/></svg>
diff --git a/installation/template/images/select-bg-rtl.svg b/installation/template/images/select-bg-rtl.svg
new file mode 100644
index 0000000000000..e9b3ab21a2be0
--- /dev/null
+++ b/installation/template/images/select-bg-rtl.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1854.54 295" transform="scale(-1,1)" preserveAspectRatio="xMinYMid" width="1854.54" height="295"><path d="M1825.1,145.7l6.9,6.9c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.3-0.1l6.9-6.9c0.1-0.1,0.1-0.2,0.1-0.3c0-0.1,0-0.2-0.1-0.3l-0.7-0.7c-0.1-0.1-0.2-0.1-0.3-0.1s-0.2,0-0.3,0.1l-5.8,5.8l-5.8-5.8c-0.1-0.1-0.2-0.1-0.3-0.1c-0.1,0-0.2,0-0.3,0.1l-0.7,0.7c-0.1,0.1-0.1,0.2-0.1,0.3C1824.9,145.5,1825,145.6,1825.1,145.7z" fill="#fff"/><rect width="1810" height="295" fill="#fff"/></svg>
diff --git a/installation/template/scss/template-rtl.scss b/installation/template/scss/template-rtl.scss
index e26d457b8a369..8f7c18e56e90f 100644
--- a/installation/template/scss/template-rtl.scss
+++ b/installation/template/scss/template-rtl.scss
@@ -36,17 +36,12 @@ textarea.noResize {
   }
 }
 
-.j-install-step-header .fa {
-  display: inline;
-}
-
 .lang-select {
   left: 0;
 }
 
 .control-group {
   .control-label {
-    float: right;
     padding-top: 5px;
     padding-right: 5px;
     text-align: right;
@@ -92,3 +87,8 @@ textarea.noResize {
   direction: ltr;
   text-align: right;
 }
+
+// Language Table
+caption {
+  text-align: right;
+}
diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss
index 6f0f0499d73b1..4cb0105fae333 100644
--- a/installation/template/scss/template.scss
+++ b/installation/template/scss/template.scss
@@ -171,7 +171,6 @@ body {
   }
 
   .control-label {
-    float: left;
     padding-top: 5px;
     padding-right: 5px;
     text-align: left;