diff --git a/css/rtl.css b/css/rtl.css
index 0c4504d520f55ccb4eed4f2c1bfc418f8a24e8c6..b66cbe61a1c7ca17d6ef3cdd7ec5181bcbd7cd44 100644
--- a/css/rtl.css
+++ b/css/rtl.css
@@ -117,3 +117,27 @@
     margin-left: 20px;
     background: url(../scp/images/icons/file.gif) 100% 50% no-repeat;
 }
+.rtl .floating-options {
+    right: auto;
+    left: 0;
+    padding-right: initial;
+    padding-left: 5px;
+}
+.rtl .quicknote .header .header-right {
+    right: auto;
+    left: 1em;
+}
+.rtl .quicknote .header .options {
+    border-right: 1px solid rgba(0,0,0,0.2);
+    border-left: none;
+    padding-right: 10px;
+    padding-left: initial;
+    margin-right: 5px;
+    margin-left: initial;
+}
+.rtl i.note-type {
+    border-left: 1px solid rgba(0, 0, 0, 0.2);
+    border-right: none;
+    padding-left: 8px;
+    padding-right: initial;
+}
diff --git a/include/staff/org-view.inc.php b/include/staff/org-view.inc.php
index b973f7fdd52f03c629e05ad78f03ad849e859d14..c5cea44eb18989a13f3a3060f9c704183e383a64 100644
--- a/include/staff/org-view.inc.php
+++ b/include/staff/org-view.inc.php
@@ -10,8 +10,8 @@ if(!defined('OSTSCPINC') || !$thisstaff || !is_object($org)) die('Invalid path')
         </td>
         <td width="50%" class="right_align has_bottom_border">
             <span class="action-button pull-right" data-dropdown="#action-dropdown-more">
+                <i class="icon-caret-down pull-right"></i>
                 <span ><i class="icon-cog"></i> <?php echo __('More'); ?></span>
-                <i class="icon-caret-down"></i>
             </span>
             <a id="org-delete" class="action-button pull-right org-action"
             href="#orgs/<?php echo $org->getId(); ?>/delete"><i class="icon-trash"></i>
diff --git a/include/staff/user-view.inc.php b/include/staff/user-view.inc.php
index 91f2ee98dde7f14e521ef193ef069d29eedd24a3..58f4348ee258fe3d26c1fefe8d196083cb6c2328 100644
--- a/include/staff/user-view.inc.php
+++ b/include/staff/user-view.inc.php
@@ -14,8 +14,8 @@ $org = $user->getOrganization();
         </td>
         <td width="50%" class="right_align has_bottom_border">
             <span class="action-button pull-right" data-dropdown="#action-dropdown-more">
+                <i class="icon-caret-down pull-right"></i>
                 <span ><i class="icon-cog"></i> <?php echo __('More'); ?></span>
-                <i class="icon-caret-down"></i>
             </span>
             <a id="user-delete" class="action-button pull-right user-action"
             href="#users/<?php echo $user->getId(); ?>/delete"><i class="icon-trash"></i>