diff --git a/TODO.md b/TODO.md
index fe2fea8d..9f286ed0 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,8 +3,6 @@
 
   - Theming
     - File format
-    - Make the icon blue in EditAccount when hovering and no avatar set
-    - Remove the filled theme
     - Have a default background
 
   - Composer
diff --git a/src/qml/Pages/EditAccount/Profile.qml b/src/qml/Pages/EditAccount/Profile.qml
index e950cc9f..75b4f3ce 100644
--- a/src/qml/Pages/EditAccount/Profile.qml
+++ b/src/qml/Pages/EditAccount/Profile.qml
@@ -74,22 +74,25 @@ HGridLayout {
 
             anchors.fill: parent
             color: Utils.hsluv(0, 0, 0,
-                (! avatar.imageUrl && overlayHover.hovered) ? 0.9 : 0.7
+                (! avatar.imageUrl && overlayHover.hovered) ? 0.8 : 0.7
             )
 
             Behavior on opacity { HNumberAnimation {} }
             Behavior on color { HColorAnimation {} }
 
+            HoverHandler { id: overlayHover }
+
             HColumnLayout {
                 anchors.centerIn: parent
                 spacing: currentSpacing
                 width: parent.width
 
-                HoverHandler { id: overlayHover }
-
                 HIcon {
                     svgName: "upload-avatar"
+                    colorize: (! avatar.imageUrl && overlayHover.hovered) ?
+                              theme.colors.accentText : theme.icons.colorize
                     dimension: 64
+
                     Layout.alignment: Qt.AlignCenter
                 }
 
@@ -98,8 +101,7 @@ HGridLayout {
                 HLabel {
                     text: qsTr("Upload profile picture")
                     color: (! avatar.imageUrl && overlayHover.hovered) ?
-                           Qt.lighter(theme.colors.accentText, 1.2) :
-                           Utils.hsluv(0, 0, 90, 1)
+                           theme.colors.accentText : theme.colors.brightText
                     Behavior on color { HColorAnimation {} }
 
                     font.pixelSize: theme.fontSize.big *