diff --git a/app/widgets/Bookmark/Bookmark.php b/app/widgets/Bookmark/Bookmark.php
index 7a0369c4e..c5ef288a4 100644
--- a/app/widgets/Bookmark/Bookmark.php
+++ b/app/widgets/Bookmark/Bookmark.php
@@ -234,17 +234,19 @@ class Bookmark extends WidgetBase
                             <input name="name" placeholder="'.t('Name').'"/>
                         </div>
                     </fieldset>
-                    <a 
-                        class="button icon yes black merged left"
-                        onclick="'.$submit.'"
-                    >'.
-                            t('Add').'
-                    </a><a 
-                        class="button icon no black merged right" 
-                        onclick="movim_toggle_display(\'#bookmarkadd\')"
-                    >'.
-                            t('Close').'
-                    </a>
+                    <div class="menu">
+                        <a 
+                            class="button icon yes black merged left"
+                            onclick="'.$submit.'"
+                        >'.
+                                t('Add').'
+                        </a><a 
+                            class="button icon no black merged right" 
+                            onclick="movim_toggle_display(\'#bookmarkadd\')"
+                        >'.
+                                t('Close').'
+                        </a>
+                    </div>
                 </form>
             </div>
         ';
diff --git a/app/widgets/Media/Media.php b/app/widgets/Media/Media.php
index 181292f88..f3c3518a6 100644
--- a/app/widgets/Media/Media.php
+++ b/app/widgets/Media/Media.php
@@ -51,21 +51,23 @@ class Media extends WidgetBase {
     function listFiles()
     {
         $html = '<ul class="thumb">';
-        
-        foreach(scandir($this->user->userdir) as $s) {
-            if(
-                $s != '.' && 
-                $s != '..' && 
-                substr($s, 0, 6) != 'thumb_' &&
-                substr($s, 0, 7) != 'medium_' && 
-                $s != 'index.html')
-                $html .= 
-                    '<li style="background-image: url('.$this->user->useruri.'thumb_'.$s.');">
-                        <a href="'.Route::urlize('media', $s).'">
+
+        foreach($this->user->getDir() as $key => $value) {
+            $html .= 
+                    '<li style="background-image: url('.$value['thumb'].');">
+                        <a href="'.Route::urlize('media', $key).'">
                         </a>
-                            <div class="remove" onclick="'.$this->genCallAjax('ajaxDeleteItem', "'".$s."'").'">x</div>
+                            <div 
+                                class="remove" 
+                                onclick="'.
+                                    $this->genCallAjax(
+                                        'ajaxDeleteItem', 
+                                        "'".$key."'"
+                                    ).'">
+                                x
+                            </div>
                     </li>
-                    ';           
+                    '; 
         }
         
         $html .= '</ul>';
diff --git a/app/widgets/WidgetCommon/WidgetCommon.php b/app/widgets/WidgetCommon/WidgetCommon.php
index 558552ea8..ff3f64e56 100644
--- a/app/widgets/WidgetCommon/WidgetCommon.php
+++ b/app/widgets/WidgetCommon/WidgetCommon.php
@@ -366,6 +366,8 @@ class WidgetCommon extends WidgetBase {
                 
         $view->assign('toggle_position', $this->genCallAjax('ajaxShowPosition', "'poss'"));
         
+        $view->assign('gallery', $this->user->getDir());
+        
         $view->assign(
             'publish_item', 
             $this->genCallAjax(
diff --git a/app/widgets/WidgetCommon/_submit_form.tpl b/app/widgets/WidgetCommon/_submit_form.tpl
index 74732409e..98c0a7ebb 100644
--- a/app/widgets/WidgetCommon/_submit_form.tpl
+++ b/app/widgets/WidgetCommon/_submit_form.tpl
@@ -8,10 +8,28 @@
     <div class="content" id="postpreviewcontent">
 
     </div>
-    <a 
-        class="button color icon no" 
-        onclick="movim_toggle_display('#postpreview');"
-    >{$c->t('Close')}</a>
+    <div class="menu">
+        <a 
+            class="button color icon no" 
+            onclick="movim_toggle_display('#postpreview');"
+        >{$c->t('Close')}</a>
+    </div>
+</div>
+
+<div class="popup post" id="galleryselect" style="padding: 0;">
+    <ul class="thumb">
+    {loop="gallery"}
+        <li style="background-image: url({$value.thumb});">
+            <a href="#"></a>
+        </li>
+    {/loop}
+    </ul>
+    <div class="menu">
+        <a 
+            class="button color icon no" 
+            onclick="movim_toggle_display('#galleryselect');"
+        >{$c->t('Close')}</a>  
+    </div>  
 </div>
 <table id="feedsubmitform">
     <tbody>
@@ -38,6 +56,14 @@
                         class="button icon color green icon yes">
                         {$c->t("Submit")}
                     </a>
+                    <a 
+                        class="button icon color alone merged left images"
+                        style="float: left;"
+                        title="{$c->t('Gallery')}"
+                        onclick="
+                            movim_toggle_display('#galleryselect');
+                            "
+                    ></a>
                     <a 
                         class="button icon color alone merged left preview"
                         style="float: left;"
diff --git a/lib/RainTPL.php b/lib/RainTPL.php
index a03b82c86..74031702e 100644
--- a/lib/RainTPL.php
+++ b/lib/RainTPL.php
@@ -53,7 +53,7 @@ class RainTPL{
 		 *
 		 * @var unknown_type
 		 */
-		private $path_replace = true;
+		private $path_replace = false;
 
 
 		/**
diff --git a/system/User.php b/system/User.php
index 887e2d491..506027614 100644
--- a/system/User.php
+++ b/system/User.php
@@ -42,13 +42,37 @@ class User {
     function dirSize()
     {
         $sum = 0;
+
+        foreach($this->getDir() as $s)
+            $sum = $sum + filesize($s['dir']);
         
+        return $sum;
+    }
+    
+    /**
+     * Get a list of the files in the user dir with uri, dir and thumbs
+     */
+    function getDir()
+    {
+        $dir = array();
         foreach(scandir($this->userdir) as $s) {
-            if($s != '.' && $s != '..' && $s != 'index.html')
-                $sum = $sum + filesize($this->userdir.$s);
+            if(
+                $s != '.' && 
+                $s != '..' && 
+                substr($s, 0, 6) != 'thumb_' &&
+                substr($s, 0, 7) != 'medium_' && 
+                $s != 'index.html') {
+                
+                $file = array(
+                    'uri'       => $this->useruri.$s,
+                    'dir'       => $this->userdir.$s,
+                    'thumb'    => $this->useruri.'thumb_'.$s,
+                    'medium'   => $this->useruri.'medium_'.$s);
+                $dir[$s] = $file;
+            }
         }
         
-        return $sum;
+        return $dir;
     }
 
 	/**
diff --git a/system/Utils.php b/system/Utils.php
index 215ed5fb0..adae0204a 100644
--- a/system/Utils.php
+++ b/system/Utils.php
@@ -38,31 +38,38 @@ function sprintln($string)
 function prepareString($string) {
     $smileys = 
         array(
-            // famfamfam icons
-            ':\)'   => 'emoticon_smile.png',
-            ':-\)'  => 'emoticon_smile.png',
-            ':\('   => 'emoticon_unhappy.png',
-            ':o'    => 'emoticon_surprised.png',
-            ':O'    => 'emoticon_surprised.png',
-            ':3'    => 'emoticon_waii.png',
-            ':D'    => 'emoticon_grin.png',
-            ':d'    => 'emoticon_grin.png',
-            ':p'    => 'emoticon_tongue.png',
-            ':P'    => 'emoticon_tongue.png',
-            ':-P'   => 'emoticon_tongue.png',
-            ';D'    => 'emoticon_wink.png',
-            ';d'    => 'emoticon_wink.png',
-            '\^\^'  => 'emoticon_happy.png',
-            '\(k\)' => 'heart.png',
-            
             // HFR icons
-            ':\/'   => 'bof.gif',
-            ';\)'   => 'emoticon_wink.png',
-            'B\)'   => 'sol.gif',
             ":'\("  => 'cry.gif',
             ':love:'=> 'love.gif',
             'O:\)'  => 'ange.gif',
             'O:-\)' => 'ange.gif',
+            ':redface:' => 'redface.gif',
+            ':petrus:'  => 'petrus75.gif',
+            
+            // famfamfam icons
+            ':\)\)' => 'grin.png',
+            ':\)'   => 'smiley.png',
+            ':-\)'  => 'smiley.png',
+            ':\('   => 'sad.png',
+            ':o'    => 'shocked.png',
+            ':O'    => 'shocked.png',
+            ':3'    => 'emoticon_waii.png',
+            ':D'    => 'grin.png',
+            ':d'    => 'grin.png',
+            ':p'    => 'tongue.png',
+            ':P'    => 'tongue.png',
+            ':-P'   => 'tongue.png',
+            ';D'    => 'wink.png',
+            ';d'    => 'wink.png',
+            ';\)'   => 'wink.png',
+            '\^\^'  => 'happy.png',
+            '\(k\)' => 'heart.png',
+            'B\)'   => 'cool.png',
+            ':s'    => 'confused.png',
+            ':S'    => 'confused.png',
+            ':\/'   => 'wondering.png',
+            ':evil:'=> 'evil.png',
+            ":\|"   => 'neutral.png',
             
             // Meme icons
             ':okay:' => 'okay.gif',
diff --git a/themes/movim/css/forms.css b/themes/movim/css/forms.css
index 14f444785..42d639503 100644
--- a/themes/movim/css/forms.css
+++ b/themes/movim/css/forms.css
@@ -322,6 +322,7 @@ legend {
 .icon.no:before     { background-image: url(../img/icons/button/close.png); }
 .icon.chat:before   { background-image: url(../img/icons/button/bubbles.png);}
 .icon.image:before  { background-image: url(../img/icons/button/image.png);}
+.icon.images:before { background-image: url(../img/icons/button/images.png);}
 .icon.add:before    { background-image: url(../img/icons/button/plus.png); }
 .icon.rm:before     { background-image: url(../img/icons/button/minus.png); }
 .icon.write:before  { background-image: url(../img/icons/button/pencil.png); }
diff --git a/themes/movim/css/style.css b/themes/movim/css/style.css
index 5959f4344..c7ce2f935 100644
--- a/themes/movim/css/style.css
+++ b/themes/movim/css/style.css
@@ -700,10 +700,11 @@ dl dd {
 /* Popup */
 .popup {
     position: fixed;
-    top: 10%;
-    left: 25%;
+    top: 6em;
+    left: 50%;
     z-index: 10;
-    width: 50%;
+    width: 870px;
+    margin-left: -435px;
     max-height: 80%;
     overflow-y: auto;
     display: none;
@@ -727,6 +728,18 @@ dl dd {
     pointer-events: none;
 }
 
+.popup .menu {
+    position: fixed;
+    top: 3em;
+    left: 50%;
+    width: 870px;
+    margin-left: -435px;
+    background-color: rgba(0, 0, 0, 0.8);
+    padding-top: 0.5em;
+    padding-left: 0.5em;
+    height: 2.5em;
+}
+
 .popup span, .popup p, .popup pre, .popup h2, .popup h3, .popup a {
     color: white;
 }
diff --git a/themes/movim/img/smileys/angry.png b/themes/movim/img/smileys/angry.png
new file mode 100644
index 000000000..96ff52a95
Binary files /dev/null and b/themes/movim/img/smileys/angry.png differ
diff --git a/themes/movim/img/smileys/biggrin.gif b/themes/movim/img/smileys/biggrin.gif
deleted file mode 100644
index 5c5960ce2..000000000
Binary files a/themes/movim/img/smileys/biggrin.gif and /dev/null differ
diff --git a/themes/movim/img/smileys/bof.gif b/themes/movim/img/smileys/bof.gif
deleted file mode 100644
index 3af9c9f97..000000000
Binary files a/themes/movim/img/smileys/bof.gif and /dev/null differ
diff --git a/themes/movim/img/smileys/confused.png b/themes/movim/img/smileys/confused.png
new file mode 100644
index 000000000..f7e624424
Binary files /dev/null and b/themes/movim/img/smileys/confused.png differ
diff --git a/themes/movim/img/smileys/cool.png b/themes/movim/img/smileys/cool.png
new file mode 100644
index 000000000..cb7a961b8
Binary files /dev/null and b/themes/movim/img/smileys/cool.png differ
diff --git a/themes/movim/img/smileys/emoticon_evilgrin.png b/themes/movim/img/smileys/emoticon_evilgrin.png
deleted file mode 100644
index 817bd509b..000000000
Binary files a/themes/movim/img/smileys/emoticon_evilgrin.png and /dev/null differ
diff --git a/themes/movim/img/smileys/emoticon_grin.png b/themes/movim/img/smileys/emoticon_grin.png
deleted file mode 100644
index fc60c5e1c..000000000
Binary files a/themes/movim/img/smileys/emoticon_grin.png and /dev/null differ
diff --git a/themes/movim/img/smileys/emoticon_happy.png b/themes/movim/img/smileys/emoticon_happy.png
deleted file mode 100644
index 6b7336e17..000000000
Binary files a/themes/movim/img/smileys/emoticon_happy.png and /dev/null differ
diff --git a/themes/movim/img/smileys/emoticon_smile.png b/themes/movim/img/smileys/emoticon_smile.png
deleted file mode 100644
index ade431851..000000000
Binary files a/themes/movim/img/smileys/emoticon_smile.png and /dev/null differ
diff --git a/themes/movim/img/smileys/emoticon_surprised.png b/themes/movim/img/smileys/emoticon_surprised.png
deleted file mode 100644
index 4520cfc55..000000000
Binary files a/themes/movim/img/smileys/emoticon_surprised.png and /dev/null differ
diff --git a/themes/movim/img/smileys/emoticon_tongue.png b/themes/movim/img/smileys/emoticon_tongue.png
deleted file mode 100644
index ecafd2ffc..000000000
Binary files a/themes/movim/img/smileys/emoticon_tongue.png and /dev/null differ
diff --git a/themes/movim/img/smileys/emoticon_unhappy.png b/themes/movim/img/smileys/emoticon_unhappy.png
deleted file mode 100644
index fd5d030ef..000000000
Binary files a/themes/movim/img/smileys/emoticon_unhappy.png and /dev/null differ
diff --git a/themes/movim/img/smileys/emoticon_waii.png b/themes/movim/img/smileys/emoticon_waii.png
deleted file mode 100644
index 458f93611..000000000
Binary files a/themes/movim/img/smileys/emoticon_waii.png and /dev/null differ
diff --git a/themes/movim/img/smileys/emoticon_wink.png b/themes/movim/img/smileys/emoticon_wink.png
deleted file mode 100644
index a631949b5..000000000
Binary files a/themes/movim/img/smileys/emoticon_wink.png and /dev/null differ
diff --git a/themes/movim/img/smileys/evil.png b/themes/movim/img/smileys/evil.png
new file mode 100644
index 000000000..a9d69b659
Binary files /dev/null and b/themes/movim/img/smileys/evil.png differ
diff --git a/themes/movim/img/smileys/grin.png b/themes/movim/img/smileys/grin.png
new file mode 100644
index 000000000..c3e8c56c2
Binary files /dev/null and b/themes/movim/img/smileys/grin.png differ
diff --git a/themes/movim/img/smileys/happy.png b/themes/movim/img/smileys/happy.png
new file mode 100644
index 000000000..465c4c7e9
Binary files /dev/null and b/themes/movim/img/smileys/happy.png differ
diff --git a/themes/movim/img/smileys/heart.png b/themes/movim/img/smileys/heart.png
index d9ee53e59..96afa8d89 100644
Binary files a/themes/movim/img/smileys/heart.png and b/themes/movim/img/smileys/heart.png differ
diff --git a/themes/movim/img/smileys/locked.png b/themes/movim/img/smileys/locked.png
new file mode 100644
index 000000000..808ef3a02
Binary files /dev/null and b/themes/movim/img/smileys/locked.png differ
diff --git a/themes/movim/img/smileys/loop.png b/themes/movim/img/smileys/loop.png
new file mode 100644
index 000000000..474bcaa6e
Binary files /dev/null and b/themes/movim/img/smileys/loop.png differ
diff --git a/themes/movim/img/smileys/love.gif b/themes/movim/img/smileys/love.gif
deleted file mode 100644
index 977d0559b..000000000
Binary files a/themes/movim/img/smileys/love.gif and /dev/null differ
diff --git a/themes/movim/img/smileys/neutral.png b/themes/movim/img/smileys/neutral.png
new file mode 100644
index 000000000..6b7bb3f86
Binary files /dev/null and b/themes/movim/img/smileys/neutral.png differ
diff --git a/themes/movim/img/smileys/pencil.png b/themes/movim/img/smileys/pencil.png
new file mode 100644
index 000000000..7c731277b
Binary files /dev/null and b/themes/movim/img/smileys/pencil.png differ
diff --git a/themes/movim/img/smileys/sad.png b/themes/movim/img/smileys/sad.png
new file mode 100644
index 000000000..a2199ff2e
Binary files /dev/null and b/themes/movim/img/smileys/sad.png differ
diff --git a/themes/movim/img/smileys/shocked.png b/themes/movim/img/smileys/shocked.png
new file mode 100644
index 000000000..5fda04bf4
Binary files /dev/null and b/themes/movim/img/smileys/shocked.png differ
diff --git a/themes/movim/img/smileys/smile.gif b/themes/movim/img/smileys/smile.gif
deleted file mode 100644
index 603ddddbd..000000000
Binary files a/themes/movim/img/smileys/smile.gif and /dev/null differ
diff --git a/themes/movim/img/smileys/smiley.png b/themes/movim/img/smileys/smiley.png
new file mode 100644
index 000000000..158743509
Binary files /dev/null and b/themes/movim/img/smileys/smiley.png differ
diff --git a/themes/movim/img/smileys/sol.gif b/themes/movim/img/smileys/sol.gif
deleted file mode 100644
index 811610f19..000000000
Binary files a/themes/movim/img/smileys/sol.gif and /dev/null differ
diff --git a/themes/movim/img/smileys/tongue.gif b/themes/movim/img/smileys/tongue.gif
deleted file mode 100644
index 1ffb7149b..000000000
Binary files a/themes/movim/img/smileys/tongue.gif and /dev/null differ
diff --git a/themes/movim/img/smileys/tongue.png b/themes/movim/img/smileys/tongue.png
new file mode 100644
index 000000000..deb298247
Binary files /dev/null and b/themes/movim/img/smileys/tongue.png differ
diff --git a/themes/movim/img/smileys/users.png b/themes/movim/img/smileys/users.png
new file mode 100644
index 000000000..c118a9e93
Binary files /dev/null and b/themes/movim/img/smileys/users.png differ
diff --git a/themes/movim/img/smileys/wink.gif b/themes/movim/img/smileys/wink.gif
deleted file mode 100644
index ec6294e3a..000000000
Binary files a/themes/movim/img/smileys/wink.gif and /dev/null differ
diff --git a/themes/movim/img/smileys/wink.png b/themes/movim/img/smileys/wink.png
new file mode 100644
index 000000000..25ed69344
Binary files /dev/null and b/themes/movim/img/smileys/wink.png differ
diff --git a/themes/movim/img/smileys/wondering.png b/themes/movim/img/smileys/wondering.png
new file mode 100644
index 000000000..50e85f189
Binary files /dev/null and b/themes/movim/img/smileys/wondering.png differ