diff --git a/SoObjects/Appointments/Icelandic.lproj/Localizable.strings b/SoObjects/Appointments/Icelandic.lproj/Localizable.strings
index 9074deb84..0bf814c52 100644
--- a/SoObjects/Appointments/Icelandic.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Icelandic.lproj/Localizable.strings
@@ -35,12 +35,13 @@ vtodo_class2 = "(Verkefni er trúnaðarmál)";
 /* Invitation */
 "Event Invitation: \"%{Summary}\"" = "Boð á viðburð: \"%{Summary}\"";
 "(sent by %{SentBy}) " = "(%{SentBy} sendi þetta) ";
-"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
+"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = 
+"%{Organizer} %{SentByText}hefur boðið þér á þennan viðburð: %{Summary}.\n\nByrjun: %{StartDate} at %{StartTime}\nEndir: %{EndDate} at %{EndTime}\nLýsing: %{Description}";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Viðburði aflýst: \"%{Summary}\"";
 "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
-= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
+= "%{Organizer} %{SentByText}hefur aflýst þessum viðburði: %{Summary}.\n\nByrjun: %{StartDate} kl. %{StartTime}\nEndir: %{EndDate} kl. %{EndTime}\nLýsing: %{Description}";
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
@@ -62,4 +63,4 @@ vtodo_class2 = "(Verkefni er trúnaðarmál)";
 = "%{Attendee} %{SentByText}hefur ekki enn tekið ákvörðun varðandi boð þitt.";
 
 /* Resources */
-"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Hámarksfjöldi samtímabókana (%{NumberOfSimultaneousBookings}) hefur verið náð varðandi aðfangið \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
diff --git a/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html b/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html
index 70646c53f..ab729ce4e 100644
--- a/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html
+++ b/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html
@@ -5,8 +5,8 @@
 Efni: <#subject/><#newLine/>
 Dags: <#date/><#newLine/>
 Frá: <#from/><#newLine/>
-<#hasReplyTo>Svara-til: <#replyTo/></#hasReplyTo><#hasOrganization>Skipulagseining: <#organization/></#hasOrganization>Till: <#to/><#newLine/>
-<#hasCc>Afrit: <#cc/></#hasCc><#hasNewsGroups>Fréttahópar: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenser: <#references/></#hasReferences><#newLine/>
+<#hasReplyTo>Svara-til: <#replyTo/></#hasReplyTo><#hasOrganization>Skipulagseining: <#organization/></#hasOrganization>Til: <#to/><#newLine/>
+<#hasCc>Afrit: <#cc/></#hasCc><#hasNewsGroups>Fréttahópar: <#newsgroups/></#hasNewsGroups><#hasReferences>Tilvísanir: <#references/></#hasReferences><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
 <#newLine/>
diff --git a/SoObjects/Mailer/SOGoMailIcelandicReply.wo/SOGoMailIcelandicReply.html b/SoObjects/Mailer/SOGoMailIcelandicReply.wo/SOGoMailIcelandicReply.html
index fc7ceea29..27aa5f323 100644
--- a/SoObjects/Mailer/SOGoMailIcelandicReply.wo/SOGoMailIcelandicReply.html
+++ b/SoObjects/Mailer/SOGoMailIcelandicReply.wo/SOGoMailIcelandicReply.html
@@ -2,12 +2,12 @@
 <#newLine/>
 </#replyPlacementOnTop><#signaturePlacementOnTop><#newLine/>
 <#signature/><#newLine/>
-</#signaturePlacementOnTop><#outlookMode>-------- Orginalmeddelande --------<#newLine/>
+</#signaturePlacementOnTop><#outlookMode>-------- Upprunalegur texti --------<#newLine/>
 Efni: <#subject/><#newLine/>
 Dags: <#date/><#newLine/>
 Frá: <#from/><#newLine/>
 <#hasReplyTo>Svara-til: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>Til: <#to/><#newLine/>
-<#hasCc>Afrit: <#cc/></#hasCc><#hasNewsGroups>Fréttahópar: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenser: <#references/></#hasReferences></#outlookMode><#newLine/>
+<#hasCc>Afrit: <#cc/></#hasCc><#hasNewsGroups>Fréttahópar: <#newsgroups/></#hasNewsGroups><#hasReferences>Tilvísanir: <#references/></#hasReferences></#outlookMode><#newLine/>
 <#standardMode>Þann <#date/>, skrifaði <#from/>:</#standardMode><#newLine/>
 <#newLine/>
 <#messageBody/><#newLine/>
diff --git a/UI/Common/Icelandic.lproj/Localizable.strings b/UI/Common/Icelandic.lproj/Localizable.strings
index fe6796394..77d5f632f 100644
--- a/UI/Common/Icelandic.lproj/Localizable.strings
+++ b/UI/Common/Icelandic.lproj/Localizable.strings
@@ -43,18 +43,18 @@
 "You cannot subscribe to a folder that you own!"
       	= "Ekki er hægt að gerast áskrifandi að sínum eigin möppum.";
 "Unable to unsubscribe from that folder!"
-	= "Unable to unsubscribe from that folder!";
+	= "Ekki var hægt að segja upp áskrift að þeirri möppu!";
 "You cannot unsubscribe from a folder that you own!"
-      	= "You cannot unsubscribe from a folder that you own!";
+      	= "Ekki er hægt að segja upp möppu sem þú átt!";
 "Unable to rename that folder!" = "Ekki var hægt að breyta nafninu á þeirri möppu!";
 "You have already subscribed to that folder!"
-     	= "You have already subscribed to that folder!";
+     	= "Áskrift er nú þegar að þeirri möppu!";
 "The user rights cannot be edited for this object!"
-        = "The user rights cannot be edited for this object!";
+        = "Ekki er hægt að breyta notandaréttindum fyrir þetta viðfang!";
 "A folder by that name already exists." = "Nú þegar er til mappa með því nafni.";
 "You cannot create a list in a shared address book." 
-        = "You cannot create a list in a shared address book.";
-"Warning" = "Aðvörun";
+        = "Ekki er hægt að búa til lista í samnýttri nafnaskrá.";
+"Warning" = "Viðvörun";
 
 "You are not allowed to access this module or this system. Please contact your system administrator."
 = "Þú hefur ekki aðgang að þessari einingu á þessu kerfi. Til þess þarftu að hafa samband við kerfisstjóra Reiknistofnunar HÍ.";
diff --git a/UI/MainUI/Icelandic.lproj/Locale b/UI/MainUI/Icelandic.lproj/Locale
index b6c18dee2..3e9df16ed 100644
--- a/UI/MainUI/Icelandic.lproj/Locale
+++ b/UI/MainUI/Icelandic.lproj/Locale
@@ -1,4 +1,4 @@
-/* Swedish */
+/* Icelandic */
 {
   NSLanguageName = "Icelandic";
   NSFormalName = "Íslenska";
diff --git a/UI/MainUI/Icelandic.lproj/Localizable.strings b/UI/MainUI/Icelandic.lproj/Localizable.strings
index 0a2ccc132..7d04505b1 100644
--- a/UI/MainUI/Icelandic.lproj/Localizable.strings
+++ b/UI/MainUI/Icelandic.lproj/Localizable.strings
@@ -25,6 +25,7 @@
 "German" = "Deutsch";
 "Hungarian" = "Magyar";
 "Italian" = "Italiano";
+"Icelandic" = "Íslenska";
 "Norwegian" = "Norsk";
 "BrazilianPortuguese" = "Português brasileiro";
 "Russian" = "Русский";
@@ -34,10 +35,10 @@
 "Welsh" = "Cymraeg";
 
 "About" = "Um";
-"AboutBox" = "Developed by Inverse, SOGo is a fully-featured groupware server with a focus on scalability and simplicity.<br/><br/>
-SOGo provides a rich AJAX-based Web interface and supports multiple native clients through the use of standard protocols such as CalDAV and CardDAV.<br/><br/>
-SOGo is distributed under the <a href=\"http://gnu.org/licenses/gpl.html\">GNU GPL</a> version 2 or later and parts are distributed under the GNU LGPL version 2. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law.<br/><br/>
-See <a href=\"http://www.sogo.nu/en/support/community.html\">this page</a> for various support options.";
+"AboutBox" = "Hugbúnaðarþróun Inverse hefur framleitt SOGo sem er hópvinnukerfi með öllum þáttum og nýjungum, sem hefur það að markmiði að vera einfalt og skalast vel.<br/><br/>
+SOGo býður upp á auðugt vefviðmót sem byggt er á AJAX viðmóti og það styður fjölda af biðlaraforritum með því að nota staðlaðar samskiptareglur eins og t.d. CalDAV og CardDAV.<br/><br/>
+SOGo er dreift í samkvæmt hugbúnaðarleyfinu <a href=\"http://gnu.org/licenses/gpl.html\">GNU GPL</a> útgáfu 2 eða nýrri og sumum hlutum er dreift samkvæmt GNU LGPL útgáfu 2. Þetta er frjáls og opinn hugbúnaður: þér er frjálst að breyta honum og dreifa honum. Það er ENGIN ÁBYRGÐ, að því marki sem leyfilegt er, lögum samkvæmt.<br/><br/>
+Sjá <a href=\"http://www.sogo.nu/en/support/community.html\">þessa síðu</a> til að skoða ýmsa möguleika á þjónustu.";
 
 "Your account was locked due to too many failed attempts." = "Your account was locked due to too many failed attempts.";
 "Your account was locked due to an expired password." = "Your account was locked due to an expired password.";
diff --git a/UI/Scheduler/Icelandic.lproj/Localizable.strings b/UI/Scheduler/Icelandic.lproj/Localizable.strings
index 904d7b61a..a82ab90cd 100644
--- a/UI/Scheduler/Icelandic.lproj/Localizable.strings
+++ b/UI/Scheduler/Icelandic.lproj/Localizable.strings
@@ -8,7 +8,7 @@
 "Delete this event or task" = "Eyða þessum viðburði eða verkefni";
 "Go to today" = "Skoða daginn í dag";
 "Switch to day view" = "Skifta í dagasýn";
-"Switch to week view" = "Skifta í vikusýn<";
+"Switch to week view" = "Skifta í vikusýn";
 "Switch to month view" = "Skifta í mánaðarsýn";
 "Reload all calendars" = "Sækja öll dagatöl aftur";
 
@@ -43,7 +43,7 @@
 "a2_Friday" = "Fö";
 "a2_Saturday" = "La";
 
-"dayLabelFormat" = "%m/%d/%Y";
+"dayLabelFormat" = "%d/%m/%Y";
 "today" = "Í dag";
 
 "Previous Day" = "Fyrri dagur";
@@ -459,8 +459,8 @@ validate_endbeforestart    = "Lokadagurinn sem er tilgreindur, er fyrr en byrjun
 "Workweek days only" = "Aðeins vinnudagar";
 "Tasks in View" = "Sýnd verkefni";
 
-"eventDeleteConfirmation" = "The following event(s) will be erased: \n%{0}\nWould you like to continue?";
-"taskDeleteConfirmation" = "The following task(s) will be erased: \n%{0}\nWould you like to continue?";
+"eventDeleteConfirmation" = "Eftirfarandi viðburði/viðburðum verður eytt: \n%{0}\nViltu halda áfram?";
+"taskDeleteConfirmation" = "Eftirfarandi verkefni/verkefnum verður eytt: \n%{0}\nViltu halda áfram?";
 
 "You cannot remove nor unsubscribe from your personal calendar."
 = "Ekki er hægt að fjarlægja eða segja upp áskrift að sínu eigin persónulega dagatali.";
@@ -496,7 +496,7 @@ validate_endbeforestart    = "Lokadagurinn sem er tilgreindur, er fyrr en byrjun
 "and" = "og";
 
 "A time conflict exists with one or more attendees.\nWould you like to keep the current settings anyway?"
-= "A time conflict exists with one or more attendees.\nWould you like to keep the current settings anyway?";
+= "Árekstur við tíma hjá einum eða fleiri þáttakendum.\nEiga núverandi stillingar vera óbreyttar?";
 
 /* apt list */
 "Title" = "Titill";
@@ -552,10 +552,10 @@ vtodo_class2 = "(Verkefni er trúnaðarmál)";
 "recurrenceUnsupported" = "Þessa tegund endurtekningar er ekki hægt að styðja enn sem komið er.";
 "tagNotDefined" = "Þú þarft að tilgreina merki ef þú vilt samhæfa þetta dagatal.";
 "tagAlreadyExists" = "Merkið sem þú tilgreindir er nú þegar bendlað við annað dagatal.";
-"tagHasChanged" = "If you change your calendar's tag, you'll need to reload the data on your mobile device.\nContinue?";
-"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?";
-"tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?";
-"DestinationCalendarError" = "The source and destination calendars are the same. Please try to copy to a different calendar.";
+"tagHasChanged" = "Ef þú breytir merkingunni á dagatalinu þínu, þarftu að endurhlaða gögnum inn á farsíman þinn.\nHalda áfram?";
+"tagWasAdded" = "Ef þú vilt samhæfa þetta dagatal, þarftu að endurhlaða gögnum inn á farsíman þinn.\nHalda áfram?";
+"tagWasRemoved" = "Ef þú tekur þetta dagatali úr samhæfingu, þarftu að endurhlaða gögnum inn á farsíman þinn.\nHalda áfram?";
+"DestinationCalendarError" = "Upphafið og ákvörðunarstaðurinn á dagatölunum er sá sami. Betra væri að afrita gögn yfir í annað dagatal.";
 "EventCopyError" = "Afritun mistókst. Það væri reynandi að afrita í annað dagatal.";
 
 "Open Task..." = "Opna Verkefni...";
diff --git a/UI/Templates/SOGoFolderIcelandicAdditionAdvisory.wox b/UI/Templates/SOGoFolderIcelandicAdditionAdvisory.wox
index b74050fae..069f11759 100644
--- a/UI/Templates/SOGoFolderIcelandicAdditionAdvisory.wox
+++ b/UI/Templates/SOGoFolderIcelandicAdditionAdvisory.wox
@@ -12,7 +12,7 @@
 </var:if>
 
 <var:if condition="isBody">
-Mappen <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> hefur verið búinn til. 
+Mappan <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> hefur verið búinn til. 
 <!--
 Hægt er fá þessi aðföng með því að nota eftirfarandi URL: