diff --git a/kirigami.pri b/kirigami.pri
index 70ff4145..922ca53a 100644
--- a/kirigami.pri
+++ b/kirigami.pri
@@ -1,70 +1,72 @@
 
 QT          += core qml quick gui svg network quickcontrols2
 HEADERS     += $$PWD/src/kirigamiplugin.h \
                $$PWD/src/enums.h \
                $$PWD/src/settings.h \
                $$PWD/src/colorutils.h \
                $$PWD/src/columnview_p.h \
                $$PWD/src/columnview.h \
                $$PWD/src/formlayoutattached.h \
                $$PWD/src/mnemonicattached.h \
                $$PWD/src/scenepositionattached.h \
                $$PWD/src/libkirigami/basictheme_p.h \
                $$PWD/src/libkirigami/platformtheme.h \
                $$PWD/src/libkirigami/kirigamipluginfactory.h \
                $$PWD/src/libkirigami/tabletmodewatcher.h \
                $$PWD/src/scenegraph/paintedrectangleitem.h \
                $$PWD/src/scenegraph/shadowedrectanglenode.h \
                $$PWD/src/scenegraph/shadowedborderrectanglematerial.h \
                $$PWD/src/scenegraph/shadowedbordertexturematerial.h \
                $$PWD/src/scenegraph/shadowedrectanglematerial.h \
                $$PWD/src/scenegraph/shadowedtexturematerial.h \
                $$PWD/src/scenegraph/shadowedtexturenode.h \
                $$PWD/src/icon.h \
                $$PWD/src/delegaterecycler.h \
                $$PWD/src/wheelhandler.h \
                $$PWD/src/shadowedrectangle.h \
                $$PWD/src/shadowedtexture.h \
                $$PWD/src/pagerouter.h \
-               $$PWD/src/pagepool.h
+               $$PWD/src/pagepool.h \
+               $$PWD/src/avatar.h
 SOURCES     += $$PWD/src/kirigamiplugin.cpp \
                $$PWD/src/enums.cpp \
                $$PWD/src/settings.cpp \
                $$PWD/src/colorutils.cpp \
                $$PWD/src/columnview.cpp \
                $$PWD/src/formlayoutattached.cpp \
                $$PWD/src/mnemonicattached.cpp \
                $$PWD/src/scenepositionattached.cpp \
                $$PWD/src/libkirigami/basictheme.cpp \
                $$PWD/src/libkirigami/platformtheme.cpp \
                $$PWD/src/libkirigami/kirigamipluginfactory.cpp \
                $$PWD/src/libkirigami/tabletmodewatcher.cpp \
                $$PWD/src/scenegraph/paintedrectangleitem.cpp \
                $$PWD/src/scenegraph/shadowedrectanglenode.cpp \
                $$PWD/src/scenegraph/shadowedborderrectanglematerial.cpp \
                $$PWD/src/scenegraph/shadowedbordertexturematerial.cpp \
                $$PWD/src/scenegraph/shadowedrectanglematerial.cpp \
                $$PWD/src/scenegraph/shadowedtexturematerial.cpp \
                $$PWD/src/scenegraph/shadowedtexturenode.cpp \
                $$PWD/src/icon.cpp \
                $$PWD/src/delegaterecycler.cpp \
                $$PWD/src/wheelhandler.cpp \
                $$PWD/src/shadowedrectangle.cpp \
                $$PWD/src/shadowedtexture.cpp \
                $$PWD/src/pagerouter.cpp \
-               $$PWD/src/pagepool.cpp
+               $$PWD/src/pagepool.cpp \
+               $$PWD/src/avatar.cpp
 
 INCLUDEPATH += $$PWD/src $$PWD/src/libkirigami
 DEFINES     += KIRIGAMI_BUILD_TYPE_STATIC
 
 API_VER=1.0
 
 RESOURCES += $$PWD/kirigami.qrc
 
 exists($$_PRO_FILE_PWD_/kirigami-icons.qrc) {
     message("Using icons QRC file shipped by the project")
     RESOURCES += $$_PRO_FILE_PWD_/kirigami-icons.qrc
 } else {
     message("Using icons QRCfile shipped in kirigami")
     RESOURCES += $$PWD/kirigami-icons.qrc
 }
diff --git a/kirigami.qrc b/kirigami.qrc
index 5fcf4f80..d208b57b 100644
--- a/kirigami.qrc
+++ b/kirigami.qrc
@@ -1,95 +1,97 @@
 <RCC>
     <qresource prefix="/org/kde/kirigami/">
         <file alias="AbstractApplicationWindow.qml">src/controls/AbstractApplicationWindow.qml</file>
         <file alias="ContextDrawer.qml">src/controls/ContextDrawer.qml</file>
         <file alias="Action.qml">src/controls/Action.qml</file>
         <file alias="Page.qml">src/controls/Page.qml</file>
         <file alias="PageRow.qml">src/controls/PageRow.qml</file>
         <file alias="AbstractListItem.qml">src/controls/AbstractListItem.qml</file>
         <file alias="Theme.qml">src/controls/Theme.qml</file>
         <file alias="AbstractCard.qml">src/controls/AbstractCard.qml</file>
         <file alias="templates/AbstractCard.qml">src/controls/templates/AbstractCard.qml</file>
         <file alias="Card.qml">src/controls/Card.qml</file>
         <file alias="CardsLayout.qml">src/controls/CardsLayout.qml</file>
         <file alias="CardsListView.qml">src/controls/CardsListView.qml</file>
         <file alias="CardsGridView.qml">src/controls/CardsGridView.qml</file>
         <file alias="ActionToolBar.qml">src/controls/ActionToolBar.qml</file>
         <file alias="templates/InlineMessage.qml">src/controls/templates/InlineMessage.qml</file>
         <file alias="InlineMessage.qml">src/controls/InlineMessage.qml</file>
         <file alias="ToolBarApplicationHeader.qml">src/controls/ToolBarApplicationHeader.qml</file>
         <file alias="ActionTextField.qml">src/controls/ActionTextField.qml</file>
         <file alias="SearchField.qml">src/controls/SearchField.qml</file>
         <file alias="PasswordField.qml">src/controls/PasswordField.qml</file>
         <file alias="private/GlobalDrawerActionItem.qml">src/controls/private/GlobalDrawerActionItem.qml</file>
         <file alias="private/ContextDrawerActionItem.qml">src/controls/private/ContextDrawerActionItem.qml</file>
         <file alias="private/RefreshableScrollView.qml">src/controls/private/RefreshableScrollView.qml</file>
         <file alias="private/SwipeItemEventFilter.qml">src/controls/private/SwipeItemEventFilter.qml</file>
         <file alias="private/PageActionPropertyGroup.qml">src/controls/private/PageActionPropertyGroup.qml</file>
         <file alias="private/ActionIconGroup.qml">src/controls/private/ActionIconGroup.qml</file>
         <file alias="private/CornerShadow.qml">src/controls/private/CornerShadow.qml</file>
         <file alias="private/ActionButton.qml">src/controls/private/ActionButton.qml</file>
         <file alias="private/DefaultListItemBackground.qml">src/controls/private/DefaultListItemBackground.qml</file>
         <file alias="private/DefaultCardBackground.qml">src/controls/private/DefaultCardBackground.qml</file>
         <file alias="private/BannerImage.qml">src/controls/private/BannerImage.qml</file>
         <file alias="private/EdgeShadow.qml">src/controls/private/EdgeShadow.qml</file>
         <file alias="private/ActionToolBarLayoutDetails.qml">src/controls/private/ActionToolBarLayoutDetails.qml</file>
         <file alias="private/globaltoolbar/AbstractPageHeader.qml">src/controls/private/globaltoolbar/AbstractPageHeader.qml</file>
         <file alias="private/globaltoolbar/PageRowGlobalToolBarStyleGroup.qml">src/controls/private/globaltoolbar/PageRowGlobalToolBarStyleGroup.qml</file>
         <file alias="private/globaltoolbar/PageRowGlobalToolBarUI.qml">src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml</file>
         <file alias="private/PrivateActionToolButton.qml">src/controls/private/PrivateActionToolButton.qml</file>
         <file alias="private/globaltoolbar/TitlesPageHeader.qml">src/controls/private/globaltoolbar/TitlesPageHeader.qml</file>
         <file alias="private/globaltoolbar/ToolBarPageHeader.qml">src/controls/private/globaltoolbar/ToolBarPageHeader.qml</file>
         <file alias="private/globaltoolbar/BreadcrumbControl.qml">src/controls/private/globaltoolbar/BreadcrumbControl.qml</file>
         <file alias="private/globaltoolbar/TabBarControl.qml">src/controls/private/globaltoolbar/TabBarControl.qml</file>
         <file alias="private/ActionsMenu.qml">src/controls/private/ActionsMenu.qml</file>
         <file alias="private/ActionMenuItem.qml">src/controls/private/ActionMenuItem.qml</file>
         <file alias="private/CardsGridViewPrivate.qml">src/controls/private/CardsGridViewPrivate.qml</file>
         <file alias="private/CardsListViewPrivate.qml">src/controls/private/CardsListViewPrivate.qml</file>
         <file alias="Separator.qml">src/controls/Separator.qml</file>
         <file alias="OverlayDrawer.qml">src/controls/OverlayDrawer.qml</file>
         <file alias="OverlaySheet.qml">src/controls/OverlaySheet.qml</file>
         <file alias="GlobalDrawer.qml">src/controls/GlobalDrawer.qml</file>
         <file alias="templates/AbstractListItem.qml">src/controls/templates/AbstractListItem.qml</file>
         <file alias="templates/private/MenuIcon.qml">src/controls/templates/private/MenuIcon.qml</file>
         <file alias="templates/private/GenericDrawerIcon.qml">src/controls/templates/private/GenericDrawerIcon.qml</file>
         <file alias="templates/private/PassiveNotification.qml">src/controls/templates/private/PassiveNotification.qml</file>
         <file alias="templates/private/ContextIcon.qml">src/controls/templates/private/ContextIcon.qml</file>
         <file alias="templates/private/ScrollView.qml">src/controls/templates/private/ScrollView.qml</file>
         <file alias="templates/private/BackButton.qml">src/controls/templates/private/BackButton.qml</file>
         <file alias="templates/private/IconPropertiesGroup.qml">src/controls/templates/private/IconPropertiesGroup.qml</file>
         <file alias="templates/private/ForwardButton.qml">src/controls/templates/private/ForwardButton.qml</file>
+        <file alias="templates/private/BorderPropertiesGroup.qml">src/controls/templates/private/BorderPropertiesGroup.qml</file>
         <file alias="templates/OverlayDrawer.qml">src/controls/templates/OverlayDrawer.qml</file>
         <file alias="templates/OverlaySheet.qml">src/controls/templates/OverlaySheet.qml</file>
         <file alias="templates/SwipeListItem.qml">src/controls/templates/SwipeListItem.qml</file>
         <file alias="templates/ApplicationHeader.qml">src/controls/templates/ApplicationHeader.qml</file>
         <file alias="templates/AbstractApplicationHeader.qml">src/controls/templates/AbstractApplicationHeader.qml</file>
         <file alias="Units.qml">src/controls/Units.qml</file>
         <file alias="SwipeListItem.qml">src/controls/SwipeListItem.qml</file>
         <file alias="ApplicationWindow.qml">src/controls/ApplicationWindow.qml</file>
 	<file alias="AbstractApplicationItem.qml">src/controls/AbstractApplicationItem.qml</file>
 	<file alias="ApplicationItem.qml">src/controls/ApplicationItem.qml</file>
         <file alias="ApplicationHeader.qml">src/controls/ApplicationHeader.qml</file>
         <file alias="Heading.qml">src/controls/Heading.qml</file>
         <file alias="ScrollablePage.qml">src/controls/ScrollablePage.qml</file>
         <file alias="AboutPage.qml">src/controls/AboutPage.qml</file>
         <file alias="UrlButton.qml">src/controls/UrlButton.qml</file>
         <file alias="LinkButton.qml">src/controls/LinkButton.qml</file>
         <file alias="Label.qml">src/controls/Label.qml</file>
         <file alias="BasicListItem.qml">src/controls/BasicListItem.qml</file>
         <file alias="AbstractApplicationHeader.qml">src/controls/AbstractApplicationHeader.qml</file>
         <file alias="FormLayout.qml">src/controls/FormLayout.qml</file>
         <file alias="ListItemDragHandle.qml">src/controls/ListItemDragHandle.qml</file>
         <file alias="ShadowedImage.qml">src/controls/ShadowedImage.qml</file>
+        <file alias="Avatar.qml">src/controls/ShadowedImage.qml</file>
         <file alias="styles/Material/AbstractListItem.qml">src/styles/Material/AbstractListItem.qml</file>
         <file alias="styles/Material/Theme.qml">src/styles/Material/Theme.qml</file>
         <file alias="styles/Material/SwipeListItem.qml">src/styles/Material/SwipeListItem.qml</file>
         <file alias="styles/Material/Label.qml">src/styles/Material/Label.qml</file>
         <file alias="styles/org.kde.desktop/AbstractListItem.qml">src/styles/org.kde.desktop/AbstractListItem.qml</file>
         <file alias="styles/org.kde.desktop/Theme.qml">src/styles/org.kde.desktop/Theme.qml</file>
         <file alias="styles/org.kde.desktop/Units.qml">src/styles/org.kde.desktop/Units.qml</file>
         <file alias="styles/org.kde.desktop/SwipeListItem.qml">src/styles/org.kde.desktop/SwipeListItem.qml</file>
         <file alias="styles/org.kde.desktop/ApplicationWindow.qml">src/styles/org.kde.desktop/ApplicationWindow.qml</file>
         <file alias="styles/org.kde.desktop/AbstractApplicationHeader.qml">src/styles/org.kde.desktop/AbstractApplicationHeader.qml</file>
         <file alias="PlaceholderMessage.qml">src/controls/PlaceholderMessage.qml</file>
     </qresource>
 </RCC>