diff --git a/autoload/airline.vim b/autoload/airline.vim
index 1ce78d5..7a87cf6 100644
--- a/autoload/airline.vim
+++ b/autoload/airline.vim
@@ -55,7 +55,9 @@ function! airline#highlight(modes)
       endfor
     endif
   endfor
-  call airline#themes#exec_highlight_separator('Al2', 'warningmsg')
+  if exists('w:airline_current_builder')
+    call w:airline_current_builder.refresh_separator_highlights()
+  endif
 endfunction
 
 " for 7.2 compatibility
@@ -72,6 +74,7 @@ endfunction
 
 function! airline#get_statusline(winnr, active)
   let builder = airline#builder#new(a:active)
+  call setwinvar(a:winnr, 'airline_current_builder', builder)
 
   if s:getwinvar(a:winnr, 'airline_render_left', a:active || (!a:active && !g:airline_inactive_collapse))
     call builder.add_section('Al2', s:get_section(a:winnr, 'a').'%{g:airline_detect_paste && &paste ? g:airline_paste_symbol." " : ""}')
diff --git a/autoload/airline/builder.vim b/autoload/airline/builder.vim
index 5b443dd..ced5f03 100644
--- a/autoload/airline/builder.vim
+++ b/autoload/airline/builder.vim
@@ -4,6 +4,7 @@
 function! airline#builder#new(active)
   let builder = {}
   let builder._sections = []
+  let builder._separator_groups = []
   let builder._active = a:active
 
   function! builder.split(gutter)
@@ -18,6 +19,12 @@ function! airline#builder#new(active)
     call add(self._sections, ['_', a:text])
   endfunction
 
+  function! builder.refresh_separator_highlights()
+    for sep in self._separator_groups
+      call airline#themes#exec_highlight_separator(sep[0], sep[1])
+    endfor
+  endfunction
+
   function! builder._group(group)
     return '%#' . (self._active ? a:group : a:group.'_inactive') . '#'
   endfunction
@@ -39,9 +46,11 @@ function! airline#builder#new(active)
       endif
 
       if prev_group != ''
+        let sep = side == 0 ? [section[0], prev_group] : [prev_group, section[0]]
+        call add(self._separator_groups, sep)
         let line .= side == 0
-              \ ? self._group(airline#themes#exec_highlight_separator(section[0], prev_group))
-              \ : self._group(airline#themes#exec_highlight_separator(prev_group, section[0]))
+              \ ? self._group(section[0].'_to_'.prev_group)
+              \ : self._group(prev_group.'_to_'.section[0])
         let line .= side == 0
               \ ? self._active ? g:airline_left_sep : g:airline_left_alt_sep
               \ : self._active ? g:airline_right_sep : g:airline_right_alt_sep
@@ -50,6 +59,7 @@ function! airline#builder#new(active)
       let line .= self._group(section[0]).section[1]
       let prev_group = section[0]
     endfor
+    call self.refresh_separator_highlights()
     return line
   endfunction