diff --git a/src/components/editor/task-bar/dark-mode-button.tsx b/src/components/editor/task-bar/dark-mode-button.tsx
index e87f755e7..61ba5e7be 100644
--- a/src/components/editor/task-bar/dark-mode-button.tsx
+++ b/src/components/editor/task-bar/dark-mode-button.tsx
@@ -1,10 +1,10 @@
 import React, { useState } from 'react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { ToggleButton, ToggleButtonGroup } from 'react-bootstrap'
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next'
 
 const DarkModeButton: React.FC = () => {
-  const { t } = useTranslation();
+  const { t } = useTranslation()
   const [buttonState, setButtonState] = useState(false)
   const buttonToggle = () => {
     setButtonState(prevState => !prevState)
@@ -13,12 +13,15 @@ const DarkModeButton: React.FC = () => {
   return (
     <ToggleButtonGroup type="checkbox" defaultValue={[]} name="dark-mode" className="ml-2" value={buttonState ? ['dark'] : ['']}>
       <ToggleButton
-        title={ buttonState ? t('editor.darkMode.switchToDark') : t('editor.darkMode.switchToLight')}
+        title={ buttonState ? t('editor.darkMode.switchToLight') : t('editor.darkMode.switchToDark')}
         variant={ buttonState ? 'secondary' : 'light' }
         className={ buttonState ? 'text-white' : 'text-secondary' }
         onChange={buttonToggle} value={'dark'}
       >
-        <FontAwesomeIcon icon="moon"/>
+        {buttonState
+          ? <FontAwesomeIcon icon="sun"/>
+          : <FontAwesomeIcon icon="moon"/>
+        }
       </ToggleButton>
     </ToggleButtonGroup>
   )
diff --git a/src/initializers/fontAwesome.ts b/src/initializers/fontAwesome.ts
index 2b0a3bba2..c01b2440c 100644
--- a/src/initializers/fontAwesome.ts
+++ b/src/initializers/fontAwesome.ts
@@ -38,6 +38,7 @@ import {
   faSort,
   faSortDown,
   faSortUp,
+  faSun,
   faSync,
   faTag,
   faThumbtack,
@@ -55,5 +56,5 @@ export const setUpFontAwesome: (() => void) = () => {
     faDropbox, faTwitter, faUsers, faAddressCard, faEye, faPencilAlt, faColumns,
     faMoon, faQuestionCircle, faShareSquare, faHistory, faFileCode, faPaste,
     faCircle, faSort, faDownload, faUpload, faTrash, faSync, faSortUp, faSortDown, faCopy,
-    faHashtag, faLanguage, faTag, faDotCircle)
+    faHashtag, faLanguage, faTag, faDotCircle, faSun)
 }