Index: src/core/symbology-ng/qgsfillsymbollayerv2.cpp
===================================================================
--- src/core/symbology-ng/qgsfillsymbollayerv2.cpp	(revision 15861)
+++ src/core/symbology-ng/qgsfillsymbollayerv2.cpp	(working copy)
@@ -62,11 +62,15 @@
   }
 
   QColor selColor = context.selectionColor();
-  // selColor.setAlphaF( context.alpha() );
+  QColor selPenColor = selColor == mColor ? selColor : mBorderColor;
+  if ( ! selectionIsOpaque ) selColor.setAlphaF( context.alpha() );
   mSelBrush = QBrush( selColor );
+  // N.B. unless a "selection line colour" is implemented in addition to the "selection colour" option
+  // this would mean symbols with "no fill" look the same whether or not they are selected
   if ( selectFillStyle )  mSelBrush.setStyle( mBrushStyle );
   mBorderColor.setAlphaF( context.alpha() );
   mPen = QPen( mBorderColor );
+  mSelPen = QPen( selPenColor );
   mPen.setStyle( mBorderStyle );
   mPen.setWidthF( context.outputLineWidth( mBorderWidth ) );
 }
@@ -84,7 +88,7 @@
   }
 
   p->setBrush( context.selected() ? mSelBrush : mBrush );
-  p->setPen( mPen );
+  p->setPen( context.selected() ? mSelPen : mPen );
 
   if ( !mOffset.isNull() )
     p->translate( mOffset );
@@ -251,7 +255,8 @@
   if ( context.selected() )
   {
     QColor selColor = context.selectionColor();
-    if ( ! selectionIsOpaque ) selColor.setAlphaF( context.alpha() );
+	// Alister - this doesn't seem to work here
+    //if ( ! selectionIsOpaque ) selColor.setAlphaF( context.alpha() );
     p->setBrush( QBrush( selColor ) );
     _renderPolygon( p, points, rings );
   }
Index: src/core/symbology-ng/qgsfillsymbollayerv2.h
===================================================================
--- src/core/symbology-ng/qgsfillsymbollayerv2.h	(revision 15861)
+++ src/core/symbology-ng/qgsfillsymbollayerv2.h	(working copy)
@@ -63,6 +63,7 @@
     Qt::PenStyle mBorderStyle;
     double mBorderWidth;
     QPen mPen;
+	QPen mSelPen;
 
     QPointF mOffset;
 };
Index: src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
===================================================================
--- src/core/symbology-ng/qgsmarkersymbollayerv2.cpp	(revision 15861)
+++ src/core/symbology-ng/qgsmarkersymbollayerv2.cpp	(working copy)
@@ -31,13 +31,14 @@
 
 //////
 
-QgsSimpleMarkerSymbolLayerV2::QgsSimpleMarkerSymbolLayerV2( QString name, QColor color, QColor borderColor, double size, double angle )
+QgsSimpleMarkerSymbolLayerV2::QgsSimpleMarkerSymbolLayerV2( QString name, QColor color, Qt::BrushStyle style, QColor borderColor, double size, double angle )
 {
   mName = name;
   mColor = color;
   mBorderColor = borderColor;
   mSize = size;
   mAngle = angle;
+  mBrushStyle = style;
   mOffset = QPointF( 0, 0 );
 }
 
@@ -45,6 +46,7 @@
 {
   QString name = DEFAULT_SIMPLEMARKER_NAME;
   QColor color = DEFAULT_SIMPLEMARKER_COLOR;
+  Qt::BrushStyle style = DEFAULT_SIMPLEMARKER_STYLE;
   QColor borderColor = DEFAULT_SIMPLEMARKER_BORDERCOLOR;
   double size = DEFAULT_SIMPLEMARKER_SIZE;
   double angle = DEFAULT_SIMPLEMARKER_ANGLE;
@@ -53,6 +55,8 @@
     name = props["name"];
   if ( props.contains( "color" ) )
     color = QgsSymbolLayerV2Utils::decodeColor( props["color"] );
+  if ( props.contains( "style" ) )
+    style = QgsSymbolLayerV2Utils::decodeBrushStyle( props["style"] );
   if ( props.contains( "color_border" ) )
     borderColor = QgsSymbolLayerV2Utils::decodeColor( props["color_border"] );
   if ( props.contains( "size" ) )
@@ -60,7 +64,7 @@
   if ( props.contains( "angle" ) )
     angle = props["angle"].toDouble();
 
-  QgsSimpleMarkerSymbolLayerV2* m = new QgsSimpleMarkerSymbolLayerV2( name, color, borderColor, size, angle );
+  QgsSimpleMarkerSymbolLayerV2* m = new QgsSimpleMarkerSymbolLayerV2( name, color, style, borderColor, size, angle );
   if ( props.contains( "offset" ) )
     m->setOffset( QgsSymbolLayerV2Utils::decodePoint( props["offset"] ) );
   return m;
@@ -76,26 +80,35 @@
 {
   QColor brushColor = mColor;
   QColor penColor = mBorderColor;
+  QColor selColor = context.selectionColor();
+  QColor selPenColor = selColor == mColor ? selColor : mBorderColor;
   if ( context.alpha() < 1 )
   {
+    brushColor.setAlphaF( context.alpha() );
     penColor.setAlphaF( context.alpha() );
-    brushColor.setAlphaF( context.alpha() );
+    if ( ! selectionIsOpaque ) 
+	{
+		selColor.setAlphaF( context.alpha() );
+		// N.B. this doesn't work right if transparency is set to 100%.  But then why would you use 100% transparency?
+		selPenColor.setAlphaF( context.alpha() );
+	}
   }
-  mBrush = QBrush( brushColor );
+
+  // Alister - Sunil used `QBrush ( mColor, mBrushStyle )` whereas previously it was `QBrush( brushColor)`
+  // What are the implications of using brushColor vs using mColor?
+  mBrush = QBrush( brushColor, mBrushStyle );
   mPen = QPen( penColor );
+  mSelBrush = QBrush( selColor );
+  mSelPen = QPen( selPenColor );
   mPen.setWidthF( context.outputLineWidth( mPen.widthF() ) );
-
-  QColor selBrushColor = context.selectionColor();
-  QColor selPenColor = selBrushColor == mColor ? selBrushColor : mBorderColor;
-  if ( context.alpha() < 1 )
-  {
-    selBrushColor.setAlphaF( context.alpha() );
-    selPenColor.setAlphaF( context.alpha() );
-  }
-  mSelBrush = QBrush( selBrushColor );
-  mSelPen = QPen( selPenColor );
   mSelPen.setWidthF( context.outputLineWidth( mPen.widthF() ) );
 
+  // N.B. unless a "selection line colour" is implemented in addition to the "selection colour" option
+  // this would mean symbols with "no fill" look the same whether or not they are selected...
+  // except, at the moment it doesn't work right if fill style is set to "no fill" :)
+  // e.g. if the symbol is a circle, it and the square area it fits in are filled with the selection colour
+  if ( selectFillStyle )  mSelBrush.setStyle( mBrushStyle );
+  
   bool hasDataDefinedRotation = context.renderHints() & QgsSymbolV2::DataDefinedRotation;
   bool hasDataDefinedSize = context.renderHints() & QgsSymbolV2::DataDefinedSizeScale;
 
@@ -114,7 +127,7 @@
       // For these set the selected border color to the selected color
 
       if ( mName != "circle" )
-        mSelPen.setColor( selBrushColor );
+        mSelPen.setColor( selColor );
     }
     else
     {
@@ -410,6 +423,7 @@
   QgsStringMap map;
   map["name"] = mName;
   map["color"] = QgsSymbolLayerV2Utils::encodeColor( mColor );
+  map["style"] = QgsSymbolLayerV2Utils::encodeBrushStyle( mBrushStyle );
   map["color_border"] = QgsSymbolLayerV2Utils::encodeColor( mBorderColor );
   map["size"] = QString::number( mSize );
   map["angle"] = QString::number( mAngle );
@@ -419,7 +433,7 @@
 
 QgsSymbolLayerV2* QgsSimpleMarkerSymbolLayerV2::clone() const
 {
-  QgsSimpleMarkerSymbolLayerV2* m = new QgsSimpleMarkerSymbolLayerV2( mName, mColor, mBorderColor, mSize, mAngle );
+  QgsSimpleMarkerSymbolLayerV2* m = new QgsSimpleMarkerSymbolLayerV2( mName, mColor, mBrushStyle, mBorderColor, mSize, mAngle );
   m->setOffset( mOffset );
   return m;
 }
Index: src/core/symbology-ng/qgsmarkersymbollayerv2.h
===================================================================
--- src/core/symbology-ng/qgsmarkersymbollayerv2.h	(revision 15861)
+++ src/core/symbology-ng/qgsmarkersymbollayerv2.h	(working copy)
@@ -6,6 +6,7 @@
 
 #define DEFAULT_SIMPLEMARKER_NAME         "circle"
 #define DEFAULT_SIMPLEMARKER_COLOR        QColor(255,0,0)
+#define DEFAULT_SIMPLEMARKER_STYLE        Qt::SolidPattern
 #define DEFAULT_SIMPLEMARKER_BORDERCOLOR  QColor(0,0,0)
 #define DEFAULT_SIMPLEMARKER_SIZE         DEFAULT_POINT_SIZE
 #define DEFAULT_SIMPLEMARKER_ANGLE        0
@@ -21,6 +22,7 @@
   public:
     QgsSimpleMarkerSymbolLayerV2( QString name = DEFAULT_SIMPLEMARKER_NAME,
                                   QColor color = DEFAULT_SIMPLEMARKER_COLOR,
+                                  Qt::BrushStyle style = DEFAULT_SIMPLEMARKER_STYLE,
                                   QColor borderColor = DEFAULT_SIMPLEMARKER_BORDERCOLOR,
                                   double size = DEFAULT_SIMPLEMARKER_SIZE,
                                   double angle = DEFAULT_SIMPLEMARKER_ANGLE );
@@ -42,6 +44,9 @@
     QgsStringMap properties() const;
 
     QgsSymbolLayerV2* clone() const;
+    
+    Qt::BrushStyle brushStyle() const { return mBrushStyle; }
+    void setBrushStyle( Qt::BrushStyle style ) { mBrushStyle = style; }
 
     QString name() const { return mName; }
     void setName( QString name ) { mName = name; }
@@ -64,6 +69,7 @@
     QPolygonF mPolygon;
     QPainterPath mPath;
     QString mName;
+    Qt::BrushStyle mBrushStyle;
     QImage mCache;
     QPen mSelPen;
     QBrush mSelBrush;
Index: src/core/symbology-ng/qgssymbologyv2conversion.cpp
===================================================================
--- src/core/symbology-ng/qgssymbologyv2conversion.cpp	(revision 15861)
+++ src/core/symbology-ng/qgssymbologyv2conversion.cpp	(working copy)
@@ -32,7 +32,8 @@
         QColor color = s->fillColor();
         QColor borderColor = s->color();
         QString name = symbolName.mid( 5 );
-        sl = new QgsSimpleMarkerSymbolLayerV2( name, color, borderColor, size, angle );
+        Qt::BrushStyle brushStyle = s->brush().style();
+        sl = new QgsSimpleMarkerSymbolLayerV2( name, color, brushStyle, borderColor, size, angle );
       }
       else
       {
Index: src/gui/symbology-ng/qgssymbollayerv2widget.cpp
===================================================================
--- src/gui/symbology-ng/qgssymbollayerv2widget.cpp	(revision 15861)
+++ src/gui/symbology-ng/qgssymbollayerv2widget.cpp	(working copy)
@@ -168,9 +168,10 @@
   names << "circle" << "rectangle" << "diamond" << "pentagon" << "cross" << "cross2" << "triangle"
   << "equilateral_triangle" << "star" << "regular_star" << "arrow" << "line" << "arrowhead" << "filled_arrowhead";
   double markerSize = DEFAULT_POINT_SIZE * 2;
+  Qt::BrushStyle brushStyle =   DEFAULT_SIMPLEFILL_STYLE ;
   for ( int i = 0; i < names.count(); ++i )
   {
-    QgsSimpleMarkerSymbolLayerV2* lyr = new QgsSimpleMarkerSymbolLayerV2( names[i], QColor( 200, 200, 200 ), QColor( 0, 0, 0 ), markerSize );
+    QgsSimpleMarkerSymbolLayerV2* lyr = new QgsSimpleMarkerSymbolLayerV2( names[i], QColor( 200, 200, 200 ),brushStyle, QColor( 0, 0, 0 ), markerSize );
     QIcon icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( lyr, QgsSymbolV2::MM, size );
     QListWidgetItem* item = new QListWidgetItem( icon, QString(), lstNames );
     item->setData( Qt::UserRole, names[i] );
@@ -180,8 +181,9 @@
   connect( lstNames, SIGNAL( currentRowChanged( int ) ), this, SLOT( setName() ) );
   connect( btnChangeColorBorder, SIGNAL( clicked() ), this, SLOT( setColorBorder() ) );
   connect( btnChangeColorFill, SIGNAL( clicked() ), this, SLOT( setColorFill() ) );
+  connect( spinAngle, SIGNAL( valueChanged( double ) ), this, SLOT( setAngle() ) );
   connect( spinSize, SIGNAL( valueChanged( double ) ), this, SLOT( setSize() ) );
-  connect( spinAngle, SIGNAL( valueChanged( double ) ), this, SLOT( setAngle() ) );
+  connect( cboFillStyleMarker,SIGNAL( currentIndexChanged( int ) ), this, SLOT( setBrushStyle() )) ;
   connect( spinOffsetX, SIGNAL( valueChanged( double ) ), this, SLOT( setOffset() ) );
   connect( spinOffsetY, SIGNAL( valueChanged( double ) ), this, SLOT( setOffset() ) );
 }
@@ -208,6 +210,7 @@
   btnChangeColorFill->setColor( mLayer->color() );
   spinSize->setValue( mLayer->size() );
   spinAngle->setValue( mLayer->angle() );
+  cboFillStyleMarker->setBrushStyle( mLayer->brushStyle() );
 
   // without blocking signals the value gets changed because of slot setOffset()
   spinOffsetX->blockSignals( true );
@@ -259,6 +262,12 @@
   emit changed();
 }
 
+void QgsSimpleMarkerSymbolLayerV2Widget::setBrushStyle()
+{
+  mLayer->setBrushStyle( cboFillStyleMarker->brushStyle() );
+  emit changed();
+}
+
 void QgsSimpleMarkerSymbolLayerV2Widget::setSize()
 {
   mLayer->setSize( spinSize->value() );
Index: src/gui/symbology-ng/qgssymbollayerv2widget.h
===================================================================
--- src/gui/symbology-ng/qgssymbollayerv2widget.h	(revision 15861)
+++ src/gui/symbology-ng/qgssymbollayerv2widget.h	(working copy)
@@ -4,6 +4,7 @@
 
 #include <QWidget>
 
+#define DEFAULT_SIMPLEFILL_STYLE        Qt::SolidPattern
 class QgsSymbolLayerV2;
 
 
@@ -80,6 +81,7 @@
     void setName();
     void setColorBorder();
     void setColorFill();
+    void setBrushStyle();
     void setSize();
     void setAngle();
     void setOffset();
Index: src/ui/symbollayer/widget_simplemarker.ui
===================================================================
--- src/ui/symbollayer/widget_simplemarker.ui	(revision 15861)
+++ src/ui/symbollayer/widget_simplemarker.ui	(working copy)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>394</width>
-    <height>275</height>
+    <height>305</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -60,21 +60,21 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
+     <item row="3" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Size</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
+     <item row="5" column="0">
       <widget class="QLabel" name="label_4">
        <property name="text">
         <string>Angle</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="5" column="1">
       <widget class="QDoubleSpinBox" name="spinAngle">
        <property name="decimals">
         <number>1</number>
@@ -87,14 +87,14 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
+     <item row="6" column="0">
       <widget class="QLabel" name="label_5">
        <property name="text">
         <string>Offset X,Y</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
+     <item row="6" column="1">
       <layout class="QHBoxLayout" name="horizontalLayout">
        <item>
         <widget class="QDoubleSpinBox" name="spinOffsetX">
@@ -118,7 +118,7 @@
        </item>
       </layout>
      </item>
-     <item row="2" column="1">
+     <item row="3" column="1">
       <widget class="QDoubleSpinBox" name="spinSize">
        <property name="decimals">
         <number>2</number>
@@ -131,6 +131,16 @@
        </property>
       </widget>
      </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Fill Style</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QgsBrushStyleComboBox" name="cboFillStyleMarker"/>
+     </item>
     </layout>
    </item>
    <item>
@@ -156,9 +166,6 @@
      <property name="flow">
       <enum>QListView::LeftToRight</enum>
      </property>
-     <property name="resizeMode">
-      <enum>QListView::Adjust</enum>
-     </property>
      <property name="spacing">
       <number>4</number>
      </property>
@@ -196,6 +203,11 @@
  </widget>
  <customwidgets>
   <customwidget>
+   <class>Q3ComboBox</class>
+   <extends>QWidget</extends>
+   <header>Qt3Support/Q3ComboBox</header>
+  </customwidget>
+  <customwidget>
    <class>QgsColorButtonV2</class>
    <extends>QPushButton</extends>
    <header>qgscolorbutton.h</header>