diff --git a/src/IconProvider.h b/src/IconProvider.h
index a1662c8..1296d57 100644
--- a/src/IconProvider.h
+++ b/src/IconProvider.h
@@ -47,9 +47,9 @@ public:
 	 * if no custom icon is registered
 	 */
 	QIcon customIcon(eIcon IconId) const;
-    QIcon customIcon(eAutoHideIcon IconId) const;
+	QIcon customIcon(eAutoHideIcon IconId) const;
 
-    /**
+	/**
 	 * Registers a custom icon for the given IconId
 	 */
 	void registerCustomIcon(eIcon IconId, const QIcon &icon);
diff --git a/src/ads_globals.cpp b/src/ads_globals.cpp
index 26d52cf..932508e 100644
--- a/src/ads_globals.cpp
+++ b/src/ads_globals.cpp
@@ -415,8 +415,10 @@ void setButtonIcon(QAbstractButton* Button, QStyle::StandardPixmap StandarPixmap
 	Button->setIcon(getStandardPixmapIcon(Button, StandarPixmap));
 }
 
+
+//============================================================================
 void setButtonIcon(QAbstractButton *Button, QStyle::StandardPixmap StandardPixmap, QIcon Icon)
- {
+{
 	// First we try to use custom icons if available
 	if (!Icon.isNull())
 	{
@@ -424,23 +426,24 @@ void setButtonIcon(QAbstractButton *Button, QStyle::StandardPixmap StandardPixma
 		return;
 	}
 	Button->setIcon(getStandardPixmapIcon(Button, StandardPixmap));
- }
+}
+
 
 //============================================================================
-QIcon getStandardPixmapIcon(QAbstractButton* Button, QStyle::StandardPixmap Pixmap)
- {
+QIcon getStandardPixmapIcon(QAbstractButton* Button, QStyle::StandardPixmap StandardPixmap)
+{
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
-	return Button->style()->standardIcon(Pixmap);
+	return Button->style()->standardIcon(StandardPixmap);
 #else
 	// The standard icons does not look good on high DPI screens so we create
 	// our own "standard" icon here.
-    const QPixmap normalPixmap = Button->style()->standardPixmap(Pixmap, 0, Button);
+	const QPixmap normalPixmap = Button->style()->standardPixmap(StandardPixmap, 0, Button);
 	QIcon icon;
 	icon.addPixmap(internal::createTransparentPixmap(normalPixmap, 0.25), QIcon::Disabled);
 	icon.addPixmap(normalPixmap, QIcon::Normal);
 	return icon;
 #endif
- }
+}
 
 
 //============================================================================
diff --git a/src/ads_globals.h b/src/ads_globals.h
index ceafcf7..bb0b84b 100644
--- a/src/ads_globals.h
+++ b/src/ads_globals.h
@@ -140,10 +140,10 @@ enum eIcon
  */
 enum eAutoHideIcon
 {
-    AutoHideAutoHideIcon,      //!< AutoHideIcon
-	AutoHideDockAreaMenuIcon,  //!< DockAreaMenuIcon
-	AutoHideDockAreaUndockIcon,//!< DockAreaUndockIcon
-	AutoHideDockAreaCloseIcon, //!< DockAreaCloseIcon
+	AutoHideAutoHideIcon,      //!< AutoHideAutoHideIcon
+	AutoHideDockAreaMenuIcon,  //!< AutoHideDockAreaMenuIcon
+	AutoHideDockAreaUndockIcon,//!< AutoHideDockAreaUndockIcon
+	AutoHideDockAreaCloseIcon, //!< AutoHideDockAreaCloseIcon
 
 	AutoHideIconCount,         //!< just a delimiter for range checks
 };
@@ -357,14 +357,24 @@ void setButtonIcon(QAbstractButton* Button, QStyle::StandardPixmap StandarPixmap
 	ads::eIcon CustomIconId);
 
 
+/**
+ * Helper function to set the icon of a certain button.
+ * Use this function to set the icons for the dock area and dock widget buttons.
+ * If icon given is not a valid icon (icon is null), the function fetches the 
+ * given standard pixmap from the QStyle.
+ * param[in] Button The button whose icons are to be set
+ * param[in] StandardPixmap The standard pixmap to be used for the button
+ * param[in] Icon The custom icon
+ */
 void setButtonIcon(QAbstractButton* Button, QStyle::StandardPixmap StandardPixmap, QIcon Icon);
 
 
 /**
- * Return the icon of standard pixmap for button.
+ * Returns the standard pixmap icon for button from QStyle.
  */
 QIcon getStandardPixmapIcon(QAbstractButton* Button, QStyle::StandardPixmap Pixmap);
 
+
 enum eRepolishChildOptions
 {
 	RepolishIgnoreChildren,