diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp
index 6251dc38f..004c5d4cf 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp
@@ -25,6 +25,11 @@
 #include "retroshare/rsidentity.h"
 #include "gui/gxs/GxsCommentDialog.h"
 
+#define IMAGE_FULLSCREEN          ":/icons/fullscreen.png"
+#define IMAGE_FULLSCREENEXIT      ":/icons/fullscreen-exit.png"
+#define IMAGE_SHOW                ":/icons/png/down-arrow.png"
+#define IMAGE_HIDE                ":/icons/png/up-arrow.png"
+
 PhotoDialog::PhotoDialog(RsPhoto *rs_photo, const RsPhotoPhoto &photo, QWidget *parent) :
 	QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint),
 	ui(new Ui::PhotoDialog), mRsPhoto(rs_photo), mPhotoQueue(new TokenQueue(mRsPhoto->getTokenService(), this)),
@@ -76,8 +81,10 @@ void PhotoDialog::toggleDetails()
 {
 	if (ui->frame_details->isVisible()) {
 		ui->frame_details->setVisible(false);
+		ui->detailsButton->setIcon(QIcon(IMAGE_SHOW));
 	} else {
 		ui->frame_details->setVisible(true);
+		ui->detailsButton->setIcon(QIcon(IMAGE_HIDE));
 	}
 }
 
@@ -182,9 +189,11 @@ void PhotoDialog::setFullScreen()
 	show();
 	raise();
 #endif
+	ui->fullscreenButton->setIcon(QIcon(IMAGE_FULLSCREENEXIT));
   } else {
 
 	setWindowState( windowState() ^ Qt::WindowFullScreen );
 	show();
+	ui->fullscreenButton->setIcon(QIcon(IMAGE_FULLSCREEN));
   }
 }
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui
index b8ab9d67b..8a0adf7c9 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>790</width>
-    <height>824</height>
+    <height>509</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -52,11 +52,24 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>558</width>
-               <height>551</height>
+               <width>540</width>
+               <height>318</height>
               </rect>
              </property>
              <layout class="QHBoxLayout" name="horizontalLayout_2">
+              <item>
+               <spacer name="horizontalSpacer">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
               <item>
                <widget class="QLabel" name="label_Photo">
                 <property name="sizePolicy">
@@ -74,8 +87,24 @@
                 <property name="text">
                  <string>TextLabel</string>
                 </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
                </widget>
               </item>
+              <item>
+               <spacer name="horizontalSpacer_2">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
              </layout>
             </widget>
            </widget>
@@ -92,8 +121,8 @@
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/window_fullscreen.png</normaloff>:/images/window_fullscreen.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/fullscreen.png</normaloff>:/icons/fullscreen.png</iconset>
             </property>
             <property name="autoRaise">
              <bool>true</bool>
@@ -103,7 +132,11 @@
           <item>
            <widget class="QPushButton" name="detailsButton">
             <property name="text">
-             <string>Details \/</string>
+             <string>Details</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/png/down-arrow.png</normaloff>:/icons/png/down-arrow.png</iconset>
             </property>
            </widget>
           </item>
@@ -136,6 +169,10 @@
             <property name="text">
              <string>&lt;N&gt; Comments &gt;&gt;</string>
             </property>
+            <property name="icon">
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/png/comment.png</normaloff>:/icons/png/comment.png</iconset>
+            </property>
            </widget>
           </item>
          </layout>
@@ -255,6 +292,7 @@
  </widget>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp
index 7e5fb6d00..3965bb79a 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp
@@ -22,6 +22,9 @@
 #include "gui/PhotoShare/PhotoDrop.h"
 #include "gui/gxs/GxsIdDetails.h"
 
+#define IMAGE_FULLSCREEN          ":/icons/fullscreen.png"
+#define IMAGE_FULLSCREENEXIT      ":/icons/fullscreen-exit.png"
+
 #include <iostream>
 
 /** Constructor */
@@ -300,10 +303,12 @@ void PhotoSlideShow::setFullScreen()
     show();
     raise();
 #endif
+	ui.fullscreenButton->setIcon(QIcon(IMAGE_FULLSCREENEXIT));
   } else {
 
     setWindowState( windowState() ^ Qt::WindowFullScreen );
     show();
+	ui.fullscreenButton->setIcon(QIcon(IMAGE_FULLSCREEN));
   }
 }
 
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.ui b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.ui
index bc771eec0..50d031e4e 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.ui
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.ui
@@ -98,8 +98,8 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../images.qrc">
-         <normaloff>:/images/window_fullscreen.png</normaloff>:/images/window_fullscreen.png</iconset>
+        <iconset resource="../icons.qrc">
+         <normaloff>:/icons/fullscreen.png</normaloff>:/icons/fullscreen.png</iconset>
        </property>
        <property name="autoRaise">
         <bool>false</bool>
@@ -157,6 +157,7 @@
  <resources>
   <include location="Photo_images.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 94a8129ef..53b572552 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -316,5 +316,7 @@
         <file>icons/textedit/smile.png</file>
         <file>icons/textedit/font-increase.png</file>
         <file>icons/textedit/code.png</file>
+        <file>icons/fullscreen.png</file>
+        <file>icons/fullscreen-exit.png</file>
     </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/icons/fullscreen-exit.png b/retroshare-gui/src/gui/icons/fullscreen-exit.png
new file mode 100644
index 000000000..eb0d29385
Binary files /dev/null and b/retroshare-gui/src/gui/icons/fullscreen-exit.png differ
diff --git a/retroshare-gui/src/gui/icons/fullscreen.png b/retroshare-gui/src/gui/icons/fullscreen.png
new file mode 100644
index 000000000..3b14cbe35
Binary files /dev/null and b/retroshare-gui/src/gui/icons/fullscreen.png differ