diff --git a/css/rtl.css b/css/rtl.css
index ba61617f51bf5da94191c89f869e33278c9d487a..a9a3e7cb04a7926d198e9402cb2cc6ca372e6fc8 100644
--- a/css/rtl.css
+++ b/css/rtl.css
@@ -47,10 +47,12 @@
     padding-right: 0;
     padding-left: 1.5em;
 }
+.rtl #msg_notice,
 .rtl #warning_bar,
 .rtl #msg_error,
 .rtl .error-banner {
     background-position: 99% 50%;
+    background-position: calc(100% - 10px) 50%;
     padding-left: 10px;
     padding-right: 36px;
 }
diff --git a/include/staff/header.inc.php b/include/staff/header.inc.php
index 8754a29262c59b726f35e42cee17f3ed979979db..bca7df85e9f50f0b288e707c1f5d9605a6852582 100644
--- a/include/staff/header.inc.php
+++ b/include/staff/header.inc.php
@@ -60,8 +60,8 @@ if (($lang = Internationalization::getCurrentLanguage())
         echo sprintf('<div id="notice_bar">%s</div>', $ost->getNotice());
     ?>
     <div id="header">
-        <a href="index.php" class="no-pjax" id="logo">osTicket &mdash; <?php echo __('Customer Support System'); ?></a>
-        <p id="info"><?php echo sprintf(__('Welcome, %s.'), '<strong>'.$thisstaff->getFirstName().'</strong>'); ?>
+        <a href="index.php" class="no-pjax pull-left" id="logo">osTicket &mdash; <?php echo __('Customer Support System'); ?></a>
+        <p id="info" class="pull-right"><?php echo sprintf(__('Welcome, %s.'), '<strong>'.$thisstaff->getFirstName().'</strong>'); ?>
            <?php
             if($thisstaff->isAdmin() && !defined('ADMINPAGE')) { ?>
             | <a href="admin.php" class="no-pjax"><?php echo __('Admin Panel'); ?></a>
diff --git a/scp/css/scp.css b/scp/css/scp.css
index d608875c2d7c9667810009765a4dbc5d5e18defb..09df3b92d5c7a2f022f53cfb0ed06d2082b23dbf 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -99,7 +99,6 @@ div#header a {
 
 #logo {
     display:block;
-    float:left;
     width:190px;
     height:76px;
     text-decoration:none;
@@ -110,8 +109,8 @@ div#header a {
 
 #header p {
     display:block;
-    width:430px;
-    float:right;
+    width:auto;
+    max-width:630px;
     margin:10px;
     background:#eee;
     border:1px solid #ccc;