diff --git a/images/images.qrc b/images/images.qrc
index fe20fe0a586..7bf72970ad3 100644
--- a/images/images.qrc
+++ b/images/images.qrc
@@ -1008,6 +1008,8 @@
         <file>themes/default/mIconCloud.svg</file>
         <file>themes/default/mActionTextInsideRect.svg</file>
         <file>themes/default/mIconLabelingRules.svg</file>
+        <file>themes/default/propertyicons/sourcefieldsandforms.svg</file>
+        <file>themes/default/propertyicons/layerconfiguration.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
diff --git a/images/themes/default/propertyicons/layerconfiguration.svg b/images/themes/default/propertyicons/layerconfiguration.svg
new file mode 100644
index 00000000000..7a861769051
--- /dev/null
+++ b/images/themes/default/propertyicons/layerconfiguration.svg
@@ -0,0 +1 @@
+<svg height="32" width="32" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="64" x2="64" y1="21.941" y2="104.06"><stop offset="0" stop-color="#dadada"/><stop offset="1" stop-color="#ccc"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="64" x2="64" xlink:href="#a" y1="21.523" y2="103.07"><stop offset="0" stop-color="#d9d9d9"/><stop offset="1" stop-color="#ccc"/></linearGradient><linearGradient id="c" gradientTransform="matrix(.34108 0 0 .34107 14.988 15.899)" gradientUnits="userSpaceOnUse" x1="64" x2="64" y1="6.874" y2="117.23"><stop offset="0" stop-color="#f2f2f2"/><stop offset="1" stop-color="#d8d8d8"/></linearGradient><linearGradient id="d" gradientTransform="matrix(.29268 0 0 .29217 18.092 18.666)" gradientUnits="userSpaceOnUse" x1="64" x2="64" xlink:href="#a" y1="21.941" y2="104.06"/><linearGradient id="e" gradientTransform="matrix(.29268 0 0 .29217 18.092 18.666)" gradientUnits="userSpaceOnUse" x1="86.133" x2="84.639" y1="105.1" y2="20.895"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#959595"/></linearGradient><linearGradient id="f" gradientTransform="matrix(.33778 0 0 .3372 15.205 15.573)" gradientUnits="userSpaceOnUse" x1="64" x2="64" xlink:href="#b" y1="21.523" y2="103.07"/><linearGradient id="g" gradientTransform="matrix(.33778 0 0 .3372 15.205 15.573)" gradientUnits="userSpaceOnUse" x1="49.273" x2="49.374" xlink:href="#b" y1="22.275" y2="102.05"/><g stroke-width="1.108"><path d="M29.478 12.913h-1.144c-.31 0-.666-.257-.764-.548l-.71-1.716c-.145-.29-.075-.723.143-.94l.81-.807a.978.978 0 0 0 .288-.697.977.977 0 0 0-.289-.696l-3.185-3.175a.985.985 0 0 0-.698-.288.982.982 0 0 0-.699.288l-.808.806c-.219.217-.652.288-.928.15l-1.721-.71c-.308-.103-.565-.459-.565-.767v-1.14a.989.989 0 0 0-.989-.986h-4.503a.988.988 0 0 0-.989.985v1.141c0 .308-.257.664-.55.762l-1.72.708c-.291.145-.725.074-.943-.143l-.809-.806a.983.983 0 0 0-.698-.288.983.983 0 0 0-.699.288L4.123 7.509a.984.984 0 0 0 0 1.394l.809.806c.218.218.288.65.15.925l-.711 1.716c-.104.307-.46.563-.77.563h-.847c-.545 0-1.285.443-1.285.986v4.49c0 .544.444.986.989.986h1.144c.308 0 .665.256.763.548l.71 1.716c.146.29.075.722-.143.94l-.809.807a.984.984 0 0 0 0 1.393l3.185 3.175a.983.983 0 0 0 .699.288.983.983 0 0 0 .699-.288l.809-.806c.218-.217.651-.288.927-.15l1.721.71c.308.103.565.459.565.767v1.14c0 .544.443.986.988.986h4.503a.988.988 0 0 0 .988-.986v-1.14c0-.308.257-.664.55-.762.015-.005 1.72-.708 1.72-.708.292-.145.726-.075.944.143l.809.806a.983.983 0 0 0 .698.288.983.983 0 0 0 .699-.288l3.185-3.175a.977.977 0 0 0 .288-.697.977.977 0 0 0-.288-.696l-.81-.807c-.217-.217-.288-.65-.15-.925l.712-1.716c.104-.306.46-.563.77-.563h1.143a.988.988 0 0 0 .989-.985v-4.491a.987.987 0 0 0-.988-.985zm-13.51 7.423a4.204 4.204 0 0 1-4.205-4.193 4.204 4.204 0 0 1 4.205-4.193 4.204 4.204 0 0 1 4.204 4.193 4.203 4.203 0 0 1-4.204 4.193z" fill="#030303" opacity=".1"/><path d="M55.041 32.447h-1.543c-.416 0-.898-.347-1.03-.741-.007-.02-.958-2.32-.958-2.32-.195-.394-.1-.978.194-1.273l1.09-1.09c.251-.252.39-.586.39-.943s-.139-.692-.39-.943L48.5 20.843c-.25-.251-.586-.39-.942-.39-.357 0-.692.139-.943.39l-1.09 1.09c-.295.295-.88.39-1.252.203-.02-.01-2.32-.96-2.32-.96-.417-.14-.763-.62-.763-1.037v-1.543c-.001-.735-.599-1.333-1.334-1.333h-6.074c-.735 0-1.333.598-1.333 1.333v1.543c0 .416-.347.898-.741 1.03l-2.321.958c-.393.195-.978.1-1.273-.194l-1.09-1.09a1.324 1.324 0 0 0-.943-.39c-.357 0-.691.14-.942.39l-4.296 4.295c-.52.52-.52 1.366 0 1.885l1.09 1.091c.295.294.39.879.204 1.252-.01.02-.96 2.32-.96 2.32-.14.416-.621.762-1.038.762h-1.143c-.735 0-1.733.598-1.733 1.333v6.074c0 .735.598 1.333 1.333 1.333h1.544c.416 0 .898.346 1.03.74.007.021.958 2.321.958 2.321.195.394.1.978-.194 1.273l-1.09 1.09c-.52.52-.52 1.366 0 1.886l4.295 4.295c.25.25.586.39.942.39.358 0 .692-.14.943-.39l1.091-1.09c.294-.295.879-.39 1.251-.204.021.01 2.321.96 2.321.96.416.14.762.621.762 1.038v1.543c0 .735.598 1.333 1.333 1.333h6.074c.735 0 1.333-.598 1.333-1.333v-1.543c0-.417.347-.898.742-1.03l2.32-.958c.394-.196.979-.1 1.273.193l1.09 1.09c.252.252.586.39.943.39s.692-.138.942-.39l4.296-4.295c.25-.25.39-.585.39-.942s-.14-.692-.39-.942l-1.091-1.091c-.294-.294-.389-.88-.203-1.251.01-.021.96-2.321.96-2.321.14-.416.621-.762 1.038-.762h1.543c.735 0 1.333-.598 1.333-1.333v-6.074a1.333 1.333 0 0 0-1.332-1.333zm-18.223 10.48c-3.393 0-6.153-2.755-6.153-6.142 0-3.387 2.76-6.142 6.153-6.142s6.153 2.755 6.153 6.142c0 3.387-2.76 6.142-6.153 6.142z" fill="url(#c)" stroke="#373737" stroke-linecap="round" stroke-linejoin="round" style="fill:url(#c)" transform="matrix(.74137 0 0 .74052 -11.333 -11.12)"/><path d="M36.823 24.917c-6.714 0-12.177 5.453-12.177 12.156 0 6.702 5.462 12.155 12.177 12.155C43.537 49.228 49 43.775 49 37.073c0-6.703-5.463-12.156-12.177-12.156zm0 21.096c-4.947 0-8.956-4.002-8.956-8.94 0-4.939 4.01-8.941 8.956-8.941s8.956 4.002 8.956 8.94c0 4.939-4.01 8.941-8.956 8.941z" fill="url(#d)" stroke="url(#e)" style="fill:url(#d);stroke:url(#e)" transform="matrix(.74137 0 0 .74052 -11.333 -11.12)"/><path d="M36.823 26.364c-5.783 0-10.471 4.68-10.471 10.453S31.04 47.27 36.822 47.27c5.784 0 10.472-4.68 10.472-10.453s-4.688-10.453-10.471-10.453zm0 17.366c-3.825 0-6.925-3.095-6.925-6.912 0-3.818 3.1-6.913 6.925-6.913 3.824 0 6.924 3.095 6.924 6.913s-3.1 6.912-6.924 6.912z" fill="url(#f)" stroke="url(#g)" style="fill:url(#f);stroke:url(#g)" transform="matrix(.74137 0 0 .74052 -11.333 -11.12)"/><path d="M54.915 10.22c0 7.105-6.875 12.865-15.356 12.865-8.48 0-15.356-5.76-15.356-12.865 0-7.104 6.875-12.864 15.356-12.864s15.356 5.76 15.356 12.864z" style="fill:#729fcf;stroke:#000;stroke-width:1.34656;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:.416667" transform="matrix(.55144 0 0 .6735 -5.764 9.42)"/></g></svg>
\ No newline at end of file
diff --git a/images/themes/default/propertyicons/sourcefieldsandforms.svg b/images/themes/default/propertyicons/sourcefieldsandforms.svg
new file mode 100644
index 00000000000..948bc2628ed
--- /dev/null
+++ b/images/themes/default/propertyicons/sourcefieldsandforms.svg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="24"
+   width="24"
+   version="1.1"
+   id="svg30"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs30" /><g
+     transform="translate(0,-8)"
+     id="g14"><g
+       stroke="#6e97c4"
+       id="g12"><path
+         d="m 2.5,15.5 h 19 v 14 h -19 z"
+         fill="#e6e6e6"
+         id="path1" /><path
+         d="m 2.5,10.5 h 19 v 5 h -19 z"
+         fill="#bad9ec"
+         id="path2" /><path
+         d="M 5,13 H 9"
+         fill="none"
+         stroke-width="2"
+         id="path3" /><path
+         d="m 11,13 h 8"
+         fill="none"
+         stroke-width="2"
+         id="path4" /><path
+         d="M 5,17.5 H 9"
+         fill="none"
+         id="path5" /><path
+         d="m 11,17.5 h 8"
+         fill="none"
+         id="path6" /><path
+         d="M 5,20.5 H 9"
+         fill="none"
+         id="path7" /><path
+         d="m 11,20.5 h 8"
+         fill="none"
+         id="path8" /><path
+         d="M 5,23.5 H 9"
+         fill="none"
+         id="path9" /><path
+         d="m 11,23.5 h 8"
+         fill="none"
+         id="path10" /><path
+         d="M 5,26.5 H 9"
+         fill="none"
+         id="path11" /><path
+         d="m 11,26.5 h 8"
+         fill="none"
+         id="path12" /></g><path
+       d="m 6.5,9.5 h 5 v 21 h -5 z"
+       fill="#e0ce7c"
+       fill-rule="evenodd"
+       stroke="#c4a000"
+       stroke-linecap="round"
+       id="path13" /><path
+       d="m 8,13 h 2"
+       fill="none"
+       stroke="#ffffff"
+       stroke-width="2"
+       id="path14" /></g><path
+     d="m 7.49,23 c 0.829,-0.0037 2.19,-0.0037 3.02,0 0.829,0.0037 0.151,0.0068 -1.51,0.0068 -1.66,0 -2.34,-0.003 -1.51,-0.0068 z"
+     fill="#ffff00"
+     stroke-width="0.0255"
+     id="path15" /><path
+     d="M 6.02,12 V 1 H 12 V 23 H 6.02 Z m 4.99,0 V 2 H 6.99 v 20 h 4.02 z"
+     fill="#ffff00"
+     opacity="0.716"
+     stroke-width="0.0255"
+     id="path16" /><path
+     d="M 7.01,12 V 2 h 3.97 V 22 H 7.01 Z M 10,5 V 3.99 H 7.99 L 7.98333,4.97 c -0.00367,0.539 -0.00111,0.994 0.00568,1.01 0.00972,0.0253 0.225,0.0308 1.01,0.0255 l 1,-0.00666 z"
+     opacity="0"
+     stroke-width="0.0255"
+     id="path17" /><path
+     d="m 6.02,1.01 v 22 H 12 v -3.12 c -0.0252,-0.0787 -0.0519,-0.149 -0.0742,-0.246 -0.0484,-0.21 -0.0394,-0.428 -0.0508,-0.643 -0.0107,-0.201 -0.0235,-0.404 -0.0137,-0.605 0.0198,-0.406 0.0678,-0.614 0.139,-0.861 v -16.5 h -2.99 z m 0.967,0.992 h 4.02 v 20 h -4.02 v -10 z"
+     fill="#ffff00"
+     opacity="0.651"
+     stroke-width="0.0255"
+     id="path18" /><g
+     stroke-width="0.0509"
+     id="g30"><path
+       d="M 6.02,12 V 1 h 5.96 V 22.9 H 6.02 Z m 4.99,0 V 2 H 6.99 v 20 h 4.02 z"
+       opacity="0"
+       id="path19" /><path
+       d="M 6.02,12 V 1 h 5.96 V 22.9 H 6.02 Z m 4.99,0 V 2 H 6.99 v 20 h 4.02 z"
+       opacity="0"
+       id="path20" /><path
+       d="M 6.02,12 V 1 h 5.96 V 22.9 H 6.02 Z m 4.99,0 V 2 H 6.99 v 20 h 4.02 z"
+       opacity="0"
+       id="path21" /><path
+       d="M 6.02,12 V 1 h 5.96 V 22.9 H 6.02 Z m 4.99,0 V 2 H 6.99 v 20 h 4.02 z"
+       fill="#ffff0c"
+       opacity="0.268"
+       id="path22" /><path
+       d="M 7.03,12 V 2 H 11 V 22 H 7.03 Z m 3,-7 V 3.98 H 7.99 v 2.04 h 2.04 z"
+       fill="#fffffe"
+       opacity="0.268"
+       id="path23" /><path
+       d="M 7.03,12 V 2 H 11 V 22 H 7.03 Z M 10.01,5 V 4.007 L 9,3.9932 7.99,3.9794 v 2.04 L 9,6.0056 10.01,5.9918 Z"
+       fill="#fffffe"
+       opacity="0.268"
+       id="path24" /><path
+       d="M 6.01,12 V 1 l 2.99,3e-7 2.99,3e-7 V 22.900001 H 9 L 6.01,22.9 Z M 11,12 V 2 H 6.98 V 22 H 11 Z"
+       fill="#fffffe"
+       opacity="0.268"
+       id="path25" /><path
+       d="M 6.01,12 V 1 h 5.96 V 22.9 H 6.01 Z M 11,12 V 2 H 6.98 V 22 H 11 Z"
+       fill="#fffffe"
+       opacity="0.268"
+       id="path26" /><path
+       d="M 6.01,12 V 1 h 5.96 V 22.9 H 6.01 Z M 11,12 V 2 H 6.98 V 22 H 11 Z"
+       fill="#fffffe"
+       opacity="0.268"
+       id="path27" /><path
+       d="M 6.01,12 V 1 h 5.96 V 22.9 H 6.01 Z M 11,12 V 2 H 6.98 V 22 H 11 Z"
+       fill="#ffff40"
+       opacity="0.268"
+       id="path28" /><path
+       d="M 6.01,12 V 1 h 5.96 V 22.9 H 6.01 Z M 11,12 V 2 H 6.98 V 22 H 11 Z"
+       fill="#ffff40"
+       opacity="0.268"
+       id="path29" /><path
+       d="M 6.01,12 V 1 h 5.96 V 22.9 H 6.01 Z M 11,12 V 2 H 6.98 V 22 H 11 Z"
+       fill="#ffff3b"
+       opacity="0.268"
+       id="path30" /></g><g
+     transform="matrix(0.74888337,0,0,0.74888337,5.5245658,-0.46649963)"
+     id="g4"><path
+       d="m 2.5,10.499998 h 19 v 19 h -19 z"
+       fill="#e6e6e6"
+       stroke="#6e97c4"
+       id="path1-5" /><g
+       fill-rule="evenodd"
+       id="g3"><path
+         d="M 5,16 H 9"
+         fill="#46617e"
+         stroke="#455e78"
+         stroke-width="2"
+         id="path2-3" /><rect
+         fill="#fafefe"
+         height="5"
+         rx="0.5"
+         stroke="#6e97c4"
+         width="8"
+         x="10.5"
+         y="13.5"
+         id="rect2" /><path
+         d="M 5,24.000001 H 9"
+         fill="#919699"
+         stroke="#455e78"
+         stroke-width="2"
+         id="path3-5" /><rect
+         fill="#fafefe"
+         height="5"
+         rx="0.5"
+         stroke="#6e97c4"
+         width="8"
+         x="10.500001"
+         y="21.5"
+         id="rect3" /></g></g></svg>
diff --git a/src/gui/qgsmaplayerstylecategoriesmodel.cpp b/src/gui/qgsmaplayerstylecategoriesmodel.cpp
index 9738101d27c..c7667008ca3 100644
--- a/src/gui/qgsmaplayerstylecategoriesmodel.cpp
+++ b/src/gui/qgsmaplayerstylecategoriesmodel.cpp
@@ -126,7 +126,7 @@ QVariant QgsMapLayerStyleCategoriesModel::data( const QModelIndex &index, int ro
         case Qt::ToolTipRole:
           return description;
         case Qt::DecorationRole:
-          return QgsApplication::getThemeIcon( QStringLiteral( "/propertyicons/system.svg" ) );
+          return QgsApplication::getThemeIcon( QStringLiteral( "/propertyicons/layerconfiguration.svg" ) );
       }
       break;
     }
@@ -198,7 +198,7 @@ QVariant QgsMapLayerStyleCategoriesModel::data( const QModelIndex &index, int ro
         case Qt::ToolTipRole:
           return description;
         case Qt::DecorationRole:
-          return QgsApplication::getThemeIcon( QStringLiteral( "/mSourceFields.svg" ) );
+          return QgsApplication::getThemeIcon( QStringLiteral( "/propertyicons/sourcefieldsandforms.svg" ) );
       }
       break;
     }
@@ -432,7 +432,7 @@ QVariant QgsMapLayerStyleCategoriesModel::data( const QModelIndex &index, int ro
         case Qt::ToolTipRole:
           return description;
         case Qt::DecorationRole:
-          return QIcon(); // TODO
+          return QgsApplication::getThemeIcon( QStringLiteral( "/mIndicatorNotes.svg" ) );
       }
       break;
     }