diff --git a/templates/default/index.html.ep b/templates/default/index.html.ep
index f183cca..0a30fa6 100644
--- a/templates/default/index.html.ep
+++ b/templates/default/index.html.ep
@@ -72,7 +72,7 @@
         </ol>
         <div id="carouselIndexContent" class="carousel-inner">
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
-            <img class="img-responsive carouselLogo" src="<%= $self->get_url('/') %>img/lock.png" alt="<%=l 'SECURE' %>">
+            %= image '/img/lock.png', alt => $self->l('SECURE'), class => "img-responsive carouselLogo"
             <p>
               <%=l 'P2P_COMMUNICATION' %>
             </p>
@@ -83,7 +83,7 @@
             </div>
           </div>
           <div class="item active carouselIndexItem col-xs-10 col-xs-offset-1">
-            <img class="img-responsive carouselLogo" src="<%= $self->get_url('/') %>img/universal.png" alt="<%=l 'WORKS_EVERYWHERE' %>">
+            %= image '/img/universal.png', alt => $self->l('WORKS_EVERYWHERE'), class => "img-responsive carouselLogo"
             <p>
               <%=l 'MODERN_BROWSERS' %>
             </p>
@@ -94,7 +94,7 @@
             </div>
           </div>
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
-            <img class="img-responsive carouselLogo" src="<%= $self->get_url('/') %>img/multi.png" alt="<%=l 'MULTI_USER' %>">
+            %= image '/img/multi.png', alt => $self->l('MULTI_USER'), class => "img-responsive carouselLogo"
             <p>
               <%=l 'THE_LIMIT_IS_YOUR_PIPE' %>
             </p>
@@ -105,7 +105,7 @@
             </div>
           </div>
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
-            <img class="img-responsive carouselLogo" src="<%= $self->get_url('/') %>img/signin.png" alt="<%=l 'NO_SIGNIN' %>">
+            %= image '/img/signin.png', alt => $self->l('NO_SIGNIN'), class => "img-responsive carouselLogo"
             <p>
               <%=l 'YOU_DONT_HAVE_TO_REGISTER' %>
             </p>
@@ -116,7 +116,7 @@
             </div>
           </div>
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
-            <img class="img-responsive carouselLogo" src="<%= $self->get_url('/') %>img/clock.png" alt="<%=l 'QUICK' %>">
+            %= image '/img/clock.png', alt => $self->l('QUICK'), class => "img-responsive carouselLogo"
             <p>
               <%=l 'STOP_WASTING_TIME' %>
             </p>
@@ -127,7 +127,7 @@
             </div>
           </div>
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
-            <img class="img-responsive carouselLogo" src="<%= $self->get_url('/') %>img/screen.png" alt="<%=l 'SCREEN_SHARING' %>">
+            %= image '/img/screen.png', alt => $self->l('SCREEN_SHARING'), class => "img-responsive carouselLogo"
             <p>
               <%=l 'SHARE_DESKTOP_OR_WINDOW' %>
             </p>
@@ -138,7 +138,7 @@
             </div>
           </div>
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
-            <img class="img-responsive carouselLogo" src="<%= $self->get_url('/') %>img/chat.png" alt="<%=l 'TEXT_CHAT' %>">
+            %= image '/img/chat.png', alt => $self->l('TEXT_CHAT'), class => "img-responsive carouselLogo"
             <p>
               <%=l 'SECURED_TEXT_CHAT' %>
             </p>
@@ -150,7 +150,7 @@
           </div>
           <% if ($etherpad eq 'true') { %>
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
-            <img class="img-responsive carouselLogo" src="<%= $self->get_url('/') %>img/note.png" alt="<%=l 'COLLABORATIVE_NOTETAKING' %>">
+            %= image '/img/note.png', alt => $self->l('COLLABORATIVE_NOTETAKING'), class => "img-responsive carouselLogo"
             <p>
               <%=l 'TAKE_NOTE_IN_REALTIME' %>
             </p>
diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep
index edcb057..8f53aa2 100644
--- a/templates/default/join.html.ep
+++ b/templates/default/join.html.ep
@@ -195,7 +195,7 @@
             </h4>
           </div>
           <div class="modal-body">
-            <img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/flash.png" alt="<%=l 'CONNECTION_LOST' %>"/>
+            %= image '/img/flash.png', alt => $self->l('CONNECTION_LOST'), class => "img-responsive center-block"
             <br>
             <p class="text-center">
               <%=l 'CHECK_INTERNET_ACCESS' %>
@@ -214,7 +214,7 @@
           </div>
           <div class="modal-body">
             <div id="connecting-msg" class="connecting-msg">
-              <img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/connecting.gif" alt="<%=l 'CONNECTING' %>"/>
+              %= image '/img/connecting.gif', alt => $self->l('CONNECTING'), class => "img-responsive center-block"
               <br>
               <p class="text-center">
                 <%=l 'CONNECTING_PLEASE_WAIT' %>
@@ -224,7 +224,7 @@
               <p class="text-center">
                 <%=l 'CANT_ACCESS_WEBCAM' %>
               </p>
-              <img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/webcam.png" alt="Webcam"/>
+              %= image '/img/webcam.png', alt => "Webcam", class => "img-responsive center-block"
               <br>
               <p class="text-center">
                 <%=l 'CLICK_IF_NO_WEBCAM' %>
@@ -282,17 +282,17 @@
                 %>
                 <div class="col-xs-4">
                   <a href="<%= $ffurl %>" target="_blank">
-                    <img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/firefox.png" alt="Mozilla Firefox"/>
+                    %= image '/img/firefox.png', alt => "Mozilla Firefox", class => "img-responsive center-block"
                   </a>
                 </div>
                 <div class="col-xs-4">
                   <a href="<%= $churl %>" target="_blank">
-                    <img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/chrome.png" alt="Google Chrome"/>
+                    %= image '/img/chrome.png', alt => "Google Chrome", class => "img-responsive center-block"
                   </a>
                 </div>
                 <div class="col-xs-4">
                   <a href="<%= $opurl %>" target="_blank">
-                    <img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/opera.png" alt="Opera"/>
+                    %= image '/img/opera.png', alt => "Opera", class => "img-responsive center-block"
                   </a>
                 </div>
               </div>
diff --git a/templates/default/public_toolbar.html.ep b/templates/default/public_toolbar.html.ep
index 79d94f0..bc9d0ca 100644
--- a/templates/default/public_toolbar.html.ep
+++ b/templates/default/public_toolbar.html.ep
@@ -7,7 +7,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <img id="navBarLogo" src="<%= $self->get_url('/') %>img/logo_vroom_alpha.png" class="hidden-xs"/>
+        %= image '/img/logo_vroom_alpha.png', id => "navBarLogo", class => "hidden-xs"
       </div>
       <div class="collapse navbar-collapse" id="toolbar">
         <ul class="nav navbar-nav navbar-right">