diff --git a/powerline/config_files/colorschemes/vim/__main__.json b/powerline/config_files/colorschemes/vim/__main__.json
index ea9ba29e..e7d995b8 100644
--- a/powerline/config_files/colorschemes/vim/__main__.json
+++ b/powerline/config_files/colorschemes/vim/__main__.json
@@ -15,7 +15,7 @@
 		"position":         "information:additional",
 		"single_tab":       "line_current",
 		"many_tabs":        "line_current",
-		"bufnr":            "information:unimportant",
+		"bufnr":            "file_directory",
 		"winnr":            "information:unimportant",
 		"tabnr":            "file_directory"
 	}
diff --git a/powerline/config_files/themes/vim/tabline.json b/powerline/config_files/themes/vim/tabline.json
index d4a9e69b..42aed081 100644
--- a/powerline/config_files/themes/vim/tabline.json
+++ b/powerline/config_files/themes/vim/tabline.json
@@ -13,6 +13,12 @@
 						"exclude_modes": ["tab", "buf", "buf_nc"],
 						"priority": 5
 					},
+					{
+						"name": "bufnr",
+						"after": " ",
+						"exclude_modes": ["tab", "buf", "tab_nc"],
+						"priority": 5
+					},
 					{
 						"name": "file_directory",
 						"priority": 40
@@ -23,6 +29,11 @@
 							"display_no_file": true
 						},
 						"priority": 10
+					},
+					{
+						"name": "modified_indicator",
+						"exclude_modes": ["tab", "tab_nc"],
+						"priority": 5
 					}
 				]
 			},
diff --git a/tests/test_tabline.vim b/tests/test_tabline.vim
index 3819e74b..8e2cca40 100755
--- a/tests/test_tabline.vim
+++ b/tests/test_tabline.vim
@@ -26,7 +26,7 @@ catch
 	cquit
 endtry
 
-if result isnot# '%#Pl_240_5789784_235_2500134_NONE# ./%#Pl_244_8421504_235_2500134_bold#abc %#Pl_244_8421504_235_2500134_NONE# %#Pl_240_5789784_235_2500134_NONE#./%#Pl_244_8421504_235_2500134_bold#def %#Pl_235_2500134_240_5789784_NONE# %#Pl_250_12369084_240_5789784_NONE#./%#Pl_231_16777215_240_5789784_bold#ghi %#Pl_240_5789784_236_3158064_NONE# %#Pl_231_16777215_236_3158064_NONE#                                               %#Pl_252_13684944_236_3158064_NONE# %#Pl_235_2500134_252_13684944_bold# Bufs '
+if result isnot# '%#Pl_240_5789784_235_2500134_NONE# 1 %#Pl_240_5789784_235_2500134_NONE#./%#Pl_244_8421504_235_2500134_bold#abc %#Pl_244_8421504_235_2500134_NONE# %#Pl_240_5789784_235_2500134_NONE#2 %#Pl_240_5789784_235_2500134_NONE#./%#Pl_244_8421504_235_2500134_bold#def %#Pl_235_2500134_240_5789784_NONE# %#Pl_250_12369084_240_5789784_NONE#./%#Pl_231_16777215_240_5789784_bold#ghi %#Pl_240_5789784_236_3158064_NONE# %#Pl_231_16777215_236_3158064_NONE#                                           %#Pl_252_13684944_236_3158064_NONE# %#Pl_235_2500134_252_13684944_bold# Bufs '
 	call writefile(['Unexpected tabline (2)', result], 'message.fail')
 	cquit
 endif