diff --git a/css/rtl.css b/css/rtl.css
index ed51362c5601c446daaaaad8293550e119dcb06e..63ec9e487c8713d618dfd5170689662483e39172 100644
--- a/css/rtl.css
+++ b/css/rtl.css
@@ -90,3 +90,12 @@
     margin-right: 0;
     margin-left: 0.3em;
 }
+.rtl ul.tabs {
+    padding-left: 4px;
+    padding-right: 20px;
+    text-align:right;
+}
+.rtl #response_options ul.tabs {
+    padding-right:190px;
+    padding-left: 4px;
+}
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index 27347d5a2b0668ea76dfc23d7fa06bd216730789..fe760996e8841b53d681a7f52a6724daa0664364 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -632,7 +632,7 @@ print $response_form->getField('attachments')->render();
             </tr>
          </tbody>
         </table>
-        <p  style="padding-left:165px;">
+        <p  style="padding:0 165px;">
             <input class="btn_sm" type="submit" value="<?php echo __('Post Reply');?>">
             <input class="btn_sm" type="reset" value="<?php echo __('Reset');?>">
         </p>
diff --git a/scp/css/bootstrap.css b/scp/css/bootstrap.css
index 596bdd56453bc4187ae7e1368c80d7f9918fb652..7a02fb748814898548e67f60e34185991712de67 100644
--- a/scp/css/bootstrap.css
+++ b/scp/css/bootstrap.css
@@ -1268,7 +1268,7 @@ legend + .control-group {
 }
 .nav-tabs > li,
 .nav-pills > li {
-  float: left;
+  display: inline-block;
 }
 .nav-tabs > li > a,
 .nav-pills > li > a {
diff --git a/scp/css/scp.css b/scp/css/scp.css
index b9ca8df1b4bd6311593c551317afefbc4d05632f..a085fe39f1eb364df804b57fd0a35c9c30f7d98b 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -919,14 +919,14 @@ ul.tabs li a {
     height:18px;
     line-height:20px;
     color:#444;
-    display:block;
-    float:left;
+    display:inline-block;
     outline:none;
     position:relative;
-    top:0;
+    bottom:1px;
     background:#fbfbfb;
     border:1px solid #eee;
     border-bottom:none;
+    text-align: center;
 }
 
 #response_options .reply_tab.tell {
@@ -943,6 +943,7 @@ ul.tabs li a.active {
     border:1px solid #aaa;
     border-top:2px solid #81a9d7;
     border-bottom:none;
+    bottom: 0;
 }
 
 #response_options > form {