diff --git a/rc.lua b/rc.lua
index 191c6ba..9d2c108 100644
--- a/rc.lua
+++ b/rc.lua
@@ -45,5 +45,5 @@ screen.connect_signal('arrange', function(s)
     end
 end)
 
-local on_screen_connect = require('src.theme.screen')
+local on_screen_connect = require('src.theme.wibar')
 require('awful').screen.connect_for_each_screen(function(s) on_screen_connect(s) end)
diff --git a/src/theme/screen.lua b/src/theme/wibar.lua
similarity index 85%
rename from src/theme/screen.lua
rename to src/theme/wibar.lua
index bc087ba..cd15c17 100644
--- a/src/theme/screen.lua
+++ b/src/theme/wibar.lua
@@ -5,10 +5,14 @@ local dpi = require('beautiful.xresources').apply_dpi
 local theme = require('src.theme')
 local widgets = require('src.widgets')
 
+local function create_separator()
+    return wibox.widget.separator({ orientation = 'vertical', forced_width = 7, thickness = 1, span_ratio = 0.7, color = theme.fg_normal })
+end
+
 local info_widgets = {}
 for i = #widgets, 1, -1 do
-    table.insert(info_widgets, wibox.widget.separator({ orientation = 'vertical', forced_width = 9, thickness = 1, span_ratio = 0.7, color = theme.fg_normal }))
     table.insert(info_widgets, widgets[i])
+    if i > 1 then table.insert(info_widgets, create_separator()) end
 end
 info_widgets['layout'] = wibox.layout.fixed.horizontal
 
@@ -63,10 +67,14 @@ return function(s)
 
     s.wibox = awful.wibar({ position = 'top', screen = s, height = dpi(19), bg = theme.bg_normal, fg = theme.fg_normal })
 
+    local screen_info_widgets = info_widgets
     if s.index == theme.systray_screen then
         local tray = wibox.widget.systray()
         tray.screen = s
-        table.insert(info_widgets, 1, tray)
+        screen_info_widgets = gears.table.join(
+            { create_separator(),tray },
+            info_widgets
+        )
     end
 
     s.wibox:setup({
@@ -76,8 +84,8 @@ return function(s)
             awful.widget.layoutbox({ screen = s, buttons = layout_buttons }),
             awful.widget.taglist({ screen = s, filter = function() return true end, buttons = taglist_buttons})
         },
-        wibox.container.margin(tasklist, 10, 10, 0, 0),
-        info_widgets,
+        wibox.container.margin(tasklist, 10, 5, 0, 0),
+        screen_info_widgets,
         { widget = wibox.container.margin, left = 50, { widget = wibox.widget.textbox } }
     })
 end
diff --git a/src/widgets/7_mpris.lua b/src/widgets/7_mpris.lua
index 55c2157..1d8692f 100644
--- a/src/widgets/7_mpris.lua
+++ b/src/widgets/7_mpris.lua
@@ -56,7 +56,7 @@ local function signal_cbk(_conn, _sender, _object_path, _interface_name, _signal
         data = data['Metadata']
         local title = data['xesam:title'] or ''
         local artist = (data['xesam:artist'] or {})[1] or ''
-        mpris_widget.text = artist .. ' | ' .. title
+        mpris_widget.text = artist .. ' -> ' .. title
     end
 end