diff --git a/doom-modeline-core.el b/doom-modeline-core.el
index e625277..ea9b40e 100644
--- a/doom-modeline-core.el
+++ b/doom-modeline-core.el
@@ -81,10 +81,10 @@ It returns a file name which can be used directly as argument of
 ;; TODO: better performance?
 (doom-moddeline--set-font-widths all-the-icons-data/alltheicons-alist)
 ;; (doom-moddeline--set-font-widths all-the-icons-data/file-icon-alist)
-(doom-moddeline--set-font-widths all-the-icons-data/fa-icon-alist)
-(doom-moddeline--set-font-widths all-the-icons-data/octicons-alist)
 ;; (doom-moddeline--set-font-widths all-the-icons-data/weather-icons-alist)
+(doom-moddeline--set-font-widths all-the-icons-data/octicons-alist)
 (doom-moddeline--set-font-widths all-the-icons-data/material-icons-alist)
+(doom-moddeline--set-font-widths all-the-icons-data/fa-icon-alist)
 
 
 ;;
diff --git a/doom-modeline-segments.el b/doom-modeline-segments.el
index 4d0e277..67db3ac 100644
--- a/doom-modeline-segments.el
+++ b/doom-modeline-segments.el
@@ -922,7 +922,10 @@ icons."
                                          :inherit
                                          mode-line-inactive)))
               (when (and doom-modeline-icon icon text) doom-modeline-inactive-vspc)
-              (when text (propertize text 'face 'mode-line-inactive))))))
+              (when text (propertize text 'face 'mode-line-inactive))))
+           ;; Adjust the position of the last icon
+           (if (and (display-graphic-p) (bound-and-true-p fancy-battery-mode))
+               (propertize " " 'face (if active 'mode-line 'mode-line-inactive)))))
       "")))