diff --git a/public/stylesheets/sass/rtl.sass b/public/stylesheets/sass/rtl.sass
index 1831ed4ac24306525980c5781e42a0355569219f..9f503ac7d806c782366195b1ca4f0fd92a7297a8 100644
--- a/public/stylesheets/sass/rtl.sass
+++ b/public/stylesheets/sass/rtl.sass
@@ -1,3 +1,92 @@
 body
   :direction rtl
   :text-align right
+
+#user_menu
+  :left 0
+  :right auto
+
+.diaspora_header_logo
+  :float right
+  :margin-left 1em
+  :margin-right 0
+
+#global_search
+  :float right
+
+#notification_badge, #message_inbox_badge
+  :margin 0 10px 0 -5px
+
+.append-2
+  :padding-left 80px
+  :padding-right 0px
+  :float right
+
+footer ul#footer_nav
+  :float left
+
+.right
+  :left 0
+  :right auto
+
+.stream .avatar
+  :float right
+
+.stream_element .content
+  :padding-right 60px
+  :padding-left 0
+
+#publisher_textarea_wrapper textarea
+  :left auto
+  :right -9999px
+
+#publisher #file-upload
+  :float left
+
+#publisher .options_and_submit .public_toggle
+  :text-align left
+
+#publisher #click_to_share img
+  :right 0
+  :left auto
+
+#publisher #click_to_share span
+  :margin-right 12px
+  :margin-left 0
+
+#publisher_textarea_wrapper #photodropzone
+  :right 5px
+  :left auto
+
+#publisher_textarea_wrapper #photodropzone li .circle
+  :left -7px
+  :right auto
+
+#publisher_textarea_wrapper #photodropzone li .x
+  :left -1px
+  :right auto
+
+#webSocketContainer
+  :left auto !important
+  :right -100px
+
+header ul#user_menu
+  :padding 5px 30px 5px 5px
+  :right auto
+  :margin -2px 0 0 -5px
+
+header ul#user_menu .avatar
+  :left auto
+  :right 2px
+
+header ul#user_menu a
+  :padding-left 15px
+
+header ul#user_menu .right
+  :right auto
+  :left 5px
+
+.stream_element .right
+  :left 12px
+  :right auto
+